X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fsmtp%2Fserv_smtpqueue.c;h=b2196a88755a1dc76fec4ed185606f0704b6a563;hb=158e8958500476d1115c7b70f6c81a87bb0ade47;hp=589b13a482156ecdc9de2ba9e1a9fd1f15fe1490;hpb=8ffb37bf859b810c6f3c0895d1cd2edba32e54bf;p=citadel.git

diff --git a/citadel/modules/smtp/serv_smtpqueue.c b/citadel/modules/smtp/serv_smtpqueue.c
index 589b13a48..b2196a887 100644
--- a/citadel/modules/smtp/serv_smtpqueue.c
+++ b/citadel/modules/smtp/serv_smtpqueue.c
@@ -194,7 +194,7 @@ void FreeMailQEntry(void *qv)
 */
 	FreeStrBuf(&Q->Recipient);
 	FreeStrBuf(&Q->StatusMessage);
-
+	FreeStrBuf(&Q->AllStatusMessages);
 	memset(Q, 0, sizeof(MailQEntry));
 	free(Q);
 }
@@ -246,7 +246,7 @@ int CheckQEntryIsBounce(MailQEntry *ThisItem)
 		return 0;
 }	
 
-int CountActiveQueueEntries(OneQueItem *MyQItem)
+int CountActiveQueueEntries(OneQueItem *MyQItem, int before)
 {
 	HashPos  *It;
 	long len;
@@ -258,15 +258,20 @@ int CountActiveQueueEntries(OneQueItem *MyQItem)
 	It = GetNewHashPos(MyQItem->MailQEntries, 0);
 	while (GetNextHashPos(MyQItem->MailQEntries, It, &len, &Key, &vQE))
 	{
+		int Active;
 		MailQEntry *ThisItem = vQE;
 
 		if (CheckQEntryActive(ThisItem))
 		{
 			ActiveDeliveries++;
-			ThisItem->Active = 1;
+			Active = 1;
 		}
 		else
-			ThisItem->Active = 0;
+			Active = 0;
+		if (before)
+			ThisItem->Active = Active;
+		else
+			ThisItem->StillActive = Active;
 	}
 	DeleteHashPos(&It);
 	return ActiveDeliveries;
@@ -380,7 +385,10 @@ StrBuf *SerializeQueueItem(OneQueItem *MyQItem)
 		StrBufAppendBufPlain(QMessage, HKEY("|"), 0);
 		StrBufAppendPrintf(QMessage, "%d", ThisItem->Status);
 		StrBufAppendBufPlain(QMessage, HKEY("|"), 0);
-		StrBufAppendBuf(QMessage, ThisItem->StatusMessage, 0);
+		if (ThisItem->AllStatusMessages != NULL)
+			StrBufAppendBuf(QMessage, ThisItem->AllStatusMessages, 0);
+		else
+			StrBufAppendBuf(QMessage, ThisItem->StatusMessage, 0);
 	}
 	DeleteHashPos(&It);
 	StrBufAppendBufPlain(QMessage, HKEY("\n"), 0);
@@ -473,7 +481,7 @@ void QItem_Handle_Attempted(OneQueItem *Item, StrBuf *Line, const char **Pos)
 /**
  * this one has to have the context for loading the message via the redirect buffer...
  */
-StrBuf *smtp_load_msg(OneQueItem *MyQItem, int n)
+StrBuf *smtp_load_msg(OneQueItem *MyQItem, int n, char **Author, char **Address)
 {
 	CitContext *CCC=CC;
 	StrBuf *SendMsg;
@@ -482,7 +490,9 @@ StrBuf *smtp_load_msg(OneQueItem *MyQItem, int n)
 	CtdlOutputMsg(MyQItem->MessageID,
 		      MT_RFC822, HEADERS_ALL,
 		      0, 1, NULL,
-		      (ESC_DOT|SUPPRESS_ENV_TO) );
+		      (ESC_DOT|SUPPRESS_ENV_TO),
+		      Author,
+		      Address);
 
 	SendMsg = CCC->redirect_buffer;
 	CCC->redirect_buffer = NULL;
@@ -505,15 +515,15 @@ StrBuf *smtp_load_msg(OneQueItem *MyQItem, int n)
  * instructions for "5" codes (permanent fatal errors) and produce/deliver
  * a "bounce" message (delivery status notification).
  */
-void smtpq_do_bounce(OneQueItem *MyQItem, StrBuf *OMsgTxt)
+void smtpq_do_bounce(OneQueItem *MyQItem, StrBuf *OMsgTxt, ParsedURL *Relay)
 {
 	static int seq = 0;
-
+	
 	struct CtdlMessage *bmsg = NULL;
 	StrBuf *boundary;
 	StrBuf *Msg = NULL;
 	StrBuf *BounceMB;
-	struct recptypes *valid;
+	recptypes *valid;
 	time_t now;
 
 	HashPos *It;
@@ -556,9 +566,13 @@ void smtpq_do_bounce(OneQueItem *MyQItem, StrBuf *OMsgTxt)
 		{
 			++num_bounces;
 
+			StrBufAppendBufPlain(Msg, HKEY(" "), 0);
 			StrBufAppendBuf(Msg, ThisItem->Recipient, 0);
 			StrBufAppendBufPlain(Msg, HKEY(": "), 0);
-			StrBufAppendBuf(Msg, ThisItem->StatusMessage, 0);
+			if (ThisItem->AllStatusMessages != NULL)
+				StrBufAppendBuf(Msg, ThisItem->AllStatusMessages, 0);
+			else
+				StrBufAppendBuf(Msg, ThisItem->StatusMessage, 0);
 			StrBufAppendBufPlain(Msg, HKEY("\r\n"), 0);
 		}
 	}
@@ -572,6 +586,22 @@ void smtpq_do_bounce(OneQueItem *MyQItem, StrBuf *OMsgTxt)
 		return;
 	}
 
+	if ((StrLength(MyQItem->SenderRoom) == 0) && MyQItem->HaveRelay) {
+		const char *RelayUrlStr = "[not found]";
+		/* one message that relaying is broken is enough; no extra room error message. */
+		StrBuf *RelayDetails = NewStrBuf();
+
+		if (Relay != NULL)
+			RelayUrlStr = ChrPtr(Relay->URL);
+
+		StrBufPrintf(RelayDetails,
+			     "Relaying via %s failed permanently. \n Reason:\n%s\n Revalidate your relay configuration.",
+			     RelayUrlStr,
+			     ChrPtr(Msg));
+                CtdlAideMessage(ChrPtr(RelayDetails), "Relaying Failed");
+		FreeStrBuf(&RelayDetails);
+	}
+
 	boundary = NewStrBufPlain(HKEY("=_Citadel_Multipart_"));
 	StrBufAppendPrintf(boundary,
 			   "%s_%04x%04x",
@@ -670,11 +700,11 @@ void smtpq_do_bounce(OneQueItem *MyQItem, StrBuf *OMsgTxt)
 	bmsg->cm_anon_type = MES_NORMAL;
 	bmsg->cm_format_type = FMT_RFC822;
 
-	bmsg->cm_fields['O'] = strdup(MAILROOM);
-	bmsg->cm_fields['A'] = strdup("Citadel");
-	bmsg->cm_fields['N'] = strdup(config.c_nodename);
-	bmsg->cm_fields['U'] = strdup("Delivery Status Notification (Failure)");
-	bmsg->cm_fields['M'] = SmashStrBuf(&BounceMB);
+	CM_SetField(bmsg, eOriginalRoom, HKEY(MAILROOM));
+	CM_SetField(bmsg, eAuthor, HKEY("Citadel"));
+	CM_SetField(bmsg, eNodeName, config.c_nodename, strlen(config.c_nodename));
+	CM_SetField(bmsg, eMsgSubject, HKEY("Delivery Status Notification (Failure)"));
+	CM_SetAsFieldSB(bmsg, eMesageText, &BounceMB);
 
 	/* First try the user who sent the message */
 	if (StrLength(MyQItem->BounceTo) == 0) {
@@ -700,10 +730,85 @@ void smtpq_do_bounce(OneQueItem *MyQItem, StrBuf *OMsgTxt)
 	/* Free up the memory we used */
 	free_recipients(valid);
 	FreeStrBuf(&boundary);
-	CtdlFreeMessage(bmsg);
+	CM_Free(bmsg);
 	SMTPCM_syslog(LOG_DEBUG, "Done processing bounces\n");
 }
 
+ParsedURL *LoadRelayUrls(OneQueItem *MyQItem,
+			 char *Author,
+			 char *Address)
+{
+	int nRelays = 0;
+	ParsedURL *RelayUrls = NULL;
+	char mxbuf[SIZ];
+	ParsedURL **Url = &MyQItem->URL;
+
+	nRelays = get_hosts(mxbuf, "fallbackhost");
+	if (nRelays > 0) {
+		StrBuf *All;
+		StrBuf *One;
+		const char *Pos = NULL;
+		All = NewStrBufPlain(mxbuf, -1);
+		One = NewStrBufPlain(NULL, StrLength(All) + 1);
+		
+		while ((Pos != StrBufNOTNULL) &&
+		       ((Pos == NULL) ||
+			!IsEmptyStr(Pos)))
+		{
+			StrBufExtract_NextToken(One, All, &Pos, '|');
+			if (!ParseURL(Url, One, DefaultMXPort)) {
+				SMTPC_syslog(LOG_DEBUG,
+					     "Failed to parse: %s\n",
+					     ChrPtr(One));
+			}
+			else {
+				(*Url)->IsRelay = 1;
+				MyQItem->HaveRelay = 1;
+			}
+		}
+		FreeStrBuf(&All);
+		FreeStrBuf(&One);
+	}
+	nRelays = get_hosts(mxbuf, "smarthost");
+	if (nRelays > 0) {
+		char *User;
+		StrBuf *All;
+		StrBuf *One;
+		const char *Pos = NULL;
+		All = NewStrBufPlain(mxbuf, -1);
+		One = NewStrBufPlain(NULL, StrLength(All) + 1);
+		
+		while ((Pos != StrBufNOTNULL) &&
+		       ((Pos == NULL) ||
+			!IsEmptyStr(Pos)))
+		{
+			StrBufExtract_NextToken(One, All, &Pos, '|');
+			User = strchr(ChrPtr(One), ' ');
+			if (User != NULL) {
+				if (!strcmp(User + 1, Author) ||
+				    !strcmp(User + 1, Address))
+					StrBufCutAt(One, 0, User);
+				else {
+					MyQItem->HaveRelay = 1;
+					continue;
+				}
+			}
+			if (!ParseURL(Url, One, DefaultMXPort)) {
+				SMTPC_syslog(LOG_DEBUG,
+					     "Failed to parse: %s\n",
+					     ChrPtr(One));
+			}
+			else {
+				///if (!Url->IsIP)) // todo dupe me fork ipv6
+				(*Url)->IsRelay = 1;
+				MyQItem->HaveRelay = 1;
+			}
+		}
+		FreeStrBuf(&All);
+		FreeStrBuf(&One);
+	}
+	return RelayUrls;
+}
 /*
  * smtp_do_procmsg()
  *
@@ -713,6 +818,8 @@ void smtp_do_procmsg(long msgnum, void *userdata) {
 	time_t now;
 	int mynumsessions = num_sessions;
 	struct CtdlMessage *msg = NULL;
+	char *Author = NULL;
+	char *Address = NULL;
 	char *instr = NULL;
 	StrBuf *PlainQItem;
 	OneQueItem *MyQItem;
@@ -721,13 +828,11 @@ void smtp_do_procmsg(long msgnum, void *userdata) {
 	void *vQE;
 	long len;
 	const char *Key;
-	int nRelays = 0;
-	ParsedURL *RelayUrls = NULL;
 	int HaveBuffers = 0;
 	StrBuf *Msg =NULL;
 
 	if (mynumsessions > max_sessions_for_outbound_smtp) {
-		SMTPC_syslog(LOG_DEBUG,
+		SMTPC_syslog(LOG_INFO,
 			     "skipping because of num jobs %d > %d max_sessions_for_outbound_smtp",
 			     mynumsessions,
 			     max_sessions_for_outbound_smtp);
@@ -743,18 +848,21 @@ void smtp_do_procmsg(long msgnum, void *userdata) {
 		return;
 	}
 
-	pch = instr = msg->cm_fields['M'];
+	pch = instr = msg->cm_fields[eMesageText];
 
 	/* Strip out the headers (no not amd any other non-instruction) line */
 	while (pch != NULL) {
 		pch = strchr(pch, '\n');
-		if ((pch != NULL) && (*(pch + 1) == '\n')) {
+		if ((pch != NULL) &&
+		    ((*(pch + 1) == '\n') ||
+		     (*(pch + 1) == '\r')))
+		{
 			instr = pch + 2;
 			pch = NULL;
 		}
 	}
 	PlainQItem = NewStrBufPlain(instr, -1);
-	CtdlFreeMessage(msg);
+	CM_Free(msg);
 	MyQItem = DeserializeQueueItem(PlainQItem, msgnum);
 	FreeStrBuf(&PlainQItem);
 
@@ -814,62 +922,6 @@ void smtp_do_procmsg(long msgnum, void *userdata) {
 		return;
 	}
 
-	{
-		char mxbuf[SIZ];
-		ParsedURL **Url = &MyQItem->URL;
-		nRelays = get_hosts(mxbuf, "smarthost");
-		if (nRelays > 0) {
-			StrBuf *All;
-			StrBuf *One;
-			const char *Pos = NULL;
-			All = NewStrBufPlain(mxbuf, -1);
-			One = NewStrBufPlain(NULL, StrLength(All) + 1);
-
-			while ((Pos != StrBufNOTNULL) &&
-			       ((Pos == NULL) ||
-				!IsEmptyStr(Pos)))
-			{
-				StrBufExtract_NextToken(One, All, &Pos, '|');
-				if (!ParseURL(Url, One, DefaultMXPort)) {
-					SMTPC_syslog(LOG_DEBUG,
-						     "Failed to parse: %s\n",
-						     ChrPtr(One));
-				}
-				else {
-					///if (!Url->IsIP)) // todo dupe me fork ipv6
-					Url = &(*Url)->Next;
-				}
-			}
-			FreeStrBuf(&All);
-			FreeStrBuf(&One);
-		}
-
-		Url = &MyQItem->FallBackHost;
-		nRelays = get_hosts(mxbuf, "fallbackhost");
-		if (nRelays > 0) {
-			StrBuf *All;
-			StrBuf *One;
-			const char *Pos = NULL;
-			All = NewStrBufPlain(mxbuf, -1);
-			One = NewStrBufPlain(NULL, StrLength(All) + 1);
-
-			while ((Pos != StrBufNOTNULL) &&
-			       ((Pos == NULL) ||
-				!IsEmptyStr(Pos)))
-			{
-				StrBufExtract_NextToken(One, All, &Pos, '|');
-				if (!ParseURL(Url, One, DefaultMXPort)) {
-					SMTPC_syslog(LOG_DEBUG,
-						     "Failed to parse: %s\n",
-						     ChrPtr(One));
-				}
-				else
-					Url = &(*Url)->Next;
-			}
-			FreeStrBuf(&All);
-			FreeStrBuf(&One);
-		}
-	}
 
 	It = GetNewHashPos(MyQItem->MailQEntries, 0);
 	while (GetNextHashPos(MyQItem->MailQEntries, It, &len, &Key, &vQE))
@@ -882,7 +934,7 @@ void smtp_do_procmsg(long msgnum, void *userdata) {
 	DeleteHashPos(&It);
 
 	MyQItem->NotYetShutdownDeliveries = 
-	MyQItem->ActiveDeliveries = CountActiveQueueEntries(MyQItem);
+		MyQItem->ActiveDeliveries = CountActiveQueueEntries(MyQItem, 1);
 
 	/* failsafe against overload: 
 	 * will we exceed the limit set? 
@@ -894,13 +946,23 @@ void smtp_do_procmsg(long msgnum, void *userdata) {
 	    (((MyQItem->ActiveDeliveries * 2)  < max_sessions_for_outbound_smtp)))
 	{
 		/* abort delivery for another time. */
-		SMTPC_syslog(LOG_DEBUG,
+		SMTPC_syslog(LOG_INFO,
 			     "SMTP Queue: skipping because of num jobs %d + %ld > %d max_sessions_for_outbound_smtp",
 			     mynumsessions,
 			     MyQItem->ActiveDeliveries,
 			     max_sessions_for_outbound_smtp);
 
-		FreeQueItem(&MyQItem);
+		It = GetNewHashPos(MyQItem->MailQEntries, 0);
+		pthread_mutex_lock(&ActiveQItemsLock);
+		{
+			if (GetHashPosFromKey(ActiveQItems,
+					      LKEY(MyQItem->MessageID),
+					      It))
+			{
+				DeleteEntryFromHash(ActiveQItems, It);
+			}
+		}
+		pthread_mutex_unlock(&ActiveQItemsLock);
 
 		return;
 	}
@@ -908,12 +970,60 @@ void smtp_do_procmsg(long msgnum, void *userdata) {
 
 	if (MyQItem->ActiveDeliveries > 0)
 	{
+		ParsedURL *RelayUrls = NULL;
 		int nActivated = 0;
 		int n = MsgCount++;
 		int m = MyQItem->ActiveDeliveries;
 		int i = 1;
-		Msg = smtp_load_msg(MyQItem, n);
+
 		It = GetNewHashPos(MyQItem->MailQEntries, 0);
+
+		Msg = smtp_load_msg(MyQItem, n, &Author, &Address);
+		RelayUrls = LoadRelayUrls(MyQItem, Author, Address);
+		if ((RelayUrls == NULL) && MyQItem->HaveRelay) {
+
+			while ((i <= m) &&
+			       (GetNextHashPos(MyQItem->MailQEntries,
+					       It, &len, &Key, &vQE)))
+			{
+				int KeepBuffers = (i == m);
+				MailQEntry *ThisItem = vQE;
+				StrBufPrintf(ThisItem->StatusMessage,
+					     "No relay configured matching %s / %s", 
+					     (Author != NULL)? Author : "",
+					     (Address != NULL)? Address : "");
+				ThisItem->Status = 5;
+
+				nActivated++;
+
+				if (i > 1) n = MsgCount++;
+				syslog(LOG_INFO,
+				       "SMTPC: giving up on <%ld> <%s> %d / %d \n",
+				       MyQItem->MessageID,
+				       ChrPtr(ThisItem->Recipient),
+				       i,
+				       m);
+				(*((int*) userdata)) ++;
+				smtp_try_one_queue_entry(MyQItem,
+							 ThisItem,
+							 Msg,
+							 KeepBuffers,
+							 n,
+							 RelayUrls);
+
+				if (KeepBuffers) HaveBuffers++;
+
+				i++;
+			}
+			if (Author != NULL) free (Author);
+			if (Address != NULL) free (Address);
+			DeleteHashPos(&It);
+
+			return;
+		}
+		if (Author != NULL) free (Author);
+		if (Address != NULL) free (Address);
+
 		while ((i <= m) &&
 		       (GetNextHashPos(MyQItem->MailQEntries,
 				       It, &len, &Key, &vQE)))
@@ -943,7 +1053,7 @@ void smtp_do_procmsg(long msgnum, void *userdata) {
 							 n,
 							 RelayUrls);
 
-				if (KeepBuffers) HaveBuffers = 1;
+				if (KeepBuffers) HaveBuffers++;
 
 				i++;
 			}
@@ -1095,6 +1205,70 @@ void cmd_smtp(char *argbuf) {
 
 }
 
+int smtp_aftersave(struct CtdlMessage *msg,
+		   recptypes *recps)
+{
+	/* For internet mail, generate delivery instructions.
+	 * Yes, this is recursive.  Deal with it.  Infinite recursion does
+	 * not happen because the delivery instructions message does not
+	 * contain a recipient.
+	 */
+	if ((recps != NULL) && (recps->num_internet > 0)) {
+		struct CtdlMessage *imsg = NULL;
+		char recipient[SIZ];
+		CitContext *CCC = MyContext();
+		StrBuf *SpoolMsg = NewStrBuf();
+		long nTokens;
+		int i;
+
+		MSGM_syslog(LOG_DEBUG, "Generating delivery instructions\n");
+
+		StrBufPrintf(SpoolMsg,
+			     "Content-type: "SPOOLMIME"\n"
+			     "\n"
+			     "msgid|%s\n"
+			     "submitted|%ld\n"
+			     "bounceto|%s\n",
+			     msg->cm_fields[eVltMsgNum],
+			     (long)time(NULL),
+			     recps->bounce_to);
+
+		if (recps->envelope_from != NULL) {
+			StrBufAppendBufPlain(SpoolMsg, HKEY("envelope_from|"), 0);
+			StrBufAppendBufPlain(SpoolMsg, recps->envelope_from, -1, 0);
+			StrBufAppendBufPlain(SpoolMsg, HKEY("\n"), 0);
+		}
+		if (recps->sending_room != NULL) {
+			StrBufAppendBufPlain(SpoolMsg, HKEY("source_room|"), 0);
+			StrBufAppendBufPlain(SpoolMsg, recps->sending_room, -1, 0);
+			StrBufAppendBufPlain(SpoolMsg, HKEY("\n"), 0);
+		}
+
+		nTokens = num_tokens(recps->recp_internet, '|');
+	  	for (i = 0; i < nTokens; i++) {
+			long len;
+			len = extract_token(recipient, recps->recp_internet, i, '|', sizeof recipient);
+			if (len > 0) {
+				StrBufAppendBufPlain(SpoolMsg, HKEY("remote|"), 0);
+				StrBufAppendBufPlain(SpoolMsg, recipient, len, 0);
+				StrBufAppendBufPlain(SpoolMsg, HKEY("|0||\n"), 0);
+			}
+		}
+
+		imsg = malloc(sizeof(struct CtdlMessage));
+		memset(imsg, 0, sizeof(struct CtdlMessage));
+		imsg->cm_magic = CTDLMESSAGE_MAGIC;
+		imsg->cm_anon_type = MES_NORMAL;
+		imsg->cm_format_type = FMT_RFC822;
+		CM_SetField(imsg, eMsgSubject, HKEY("QMSG"));
+		CM_SetField(imsg, eAuthor, HKEY("Citadel"));
+		CM_SetField(imsg, eJournal, HKEY("do not journal"));
+		CM_SetAsFieldSB(imsg, eMesageText, &SpoolMsg);
+		CtdlSubmitMsg(imsg, NULL, SMTP_SPOOLOUT_ROOM, QP_EADDR);
+		CM_Free(imsg);
+	}
+	return 0;
+}
 
 CTDL_MODULE_INIT(smtp_queu)
 {
@@ -1114,8 +1288,7 @@ CTDL_MODULE_INIT(smtp_queu)
 		if ((pstr != NULL) && (*pstr != '\0'))
 			delay_msec = atol(pstr) * 1000; /* this many seconds. */
 
-
-
+		CtdlRegisterMessageHook(smtp_aftersave, EVT_AFTERSAVE);
 
 		CtdlFillSystemContext(&smtp_queue_CC, "SMTP_Send");
 		ActiveQItems = NewHash(1, lFlathash);
@@ -1137,7 +1310,7 @@ CTDL_MODULE_INIT(smtp_queu)
 		CtdlRegisterEVCleanupHook(smtp_evq_cleanup);
 
 		CtdlRegisterProtoHook(cmd_smtp, "SMTP", "SMTP utility commands");
-		CtdlRegisterSessionHook(smtp_do_queue, EVT_TIMER);
+		CtdlRegisterSessionHook(smtp_do_queue, EVT_TIMER, PRIO_SEND + 10);
 	}
 
 	/* return our Subversion id for the Log */