* The VRFY and EXPN commands have been removed from this implementation
* because nobody uses these commands anymore, except for spammers.
*
- * Copyright (c) 1998-2012 by the citadel.org team
+ * Copyright (c) 1998-2015 by the citadel.org team
*
- * This program is open source software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3.
- *
- *
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3.
*
- *
- *
- *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*/
#include "sysdep.h"
DeleteEntryFromHash(ActiveQItems, It);
else
{
- SMTPC_syslog(LOG_WARNING,
+ syslog(LOG_WARNING,
"unable to find QItem with ID[%ld]",
MyQItem->MessageID);
while (GetNextHashPos(ActiveQItems, It, &len, &Key, &VData))
- SMTPC_syslog(LOG_WARNING,
+ syslog(LOG_WARNING,
"have_: ID[%ld]",
((OneQueItem *)VData)->MessageID);
}
{
MailQEntry *Q = qv;
/*
- SMTPC_syslog(LOG_DEBUG, "---------------%s--------------", __FUNCTION__);
+ syslog(LOG_DEBUG, "---------------%s--------------", __FUNCTION__);
cit_backtrace();
*/
FreeStrBuf(&Q->Recipient);
FreeStrBuf(&Q->StatusMessage);
-
+ FreeStrBuf(&Q->AllStatusMessages);
memset(Q, 0, sizeof(MailQEntry));
free(Q);
}
void FreeQueItem(OneQueItem **Item)
{
/*
- SMTPC_syslog(LOG_DEBUG, "---------------%s--------------", __FUNCTION__);
+ syslog(LOG_DEBUG, "---------------%s--------------", __FUNCTION__);
cit_backtrace();
*/
DeleteHash(&(*Item)->MailQEntries);
return 0;
}
-int CountActiveQueueEntries(OneQueItem *MyQItem)
+int CountActiveQueueEntries(OneQueItem *MyQItem, int before)
{
HashPos *It;
long len;
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;
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);
0, 1, NULL,
(ESC_DOT|SUPPRESS_ENV_TO),
Author,
- Address);
+ Address,
+ NULL);
SendMsg = CCC->redirect_buffer;
CCC->redirect_buffer = NULL;
if ((StrLength(SendMsg) > 0) &&
ChrPtr(SendMsg)[StrLength(SendMsg) - 1] != '\n') {
- SMTPC_syslog(LOG_WARNING,
+ syslog(LOG_WARNING,
"[%d] Possible problem: message did not "
"correctly terminate. (expecting 0x10, got 0x%02x)\n",
MsgCount, //yes uncool, but best choice here...
* 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;
int num_bounces = 0;
int give_up = 0;
- SMTPCM_syslog(LOG_DEBUG, "smtp_do_bounce() called\n");
+ syslog(LOG_DEBUG, "smtp_do_bounce() called\n");
if (MyQItem->SendBounceMail == 0)
return;
{
++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);
}
}
DeleteHashPos(&It);
/* Deliver the bounce if there's anything worth mentioning */
- SMTPC_syslog(LOG_DEBUG, "num_bounces = %d\n", num_bounces);
+ syslog(LOG_DEBUG, "num_bounces = %d\n", num_bounces);
if (num_bounces == 0) {
FreeStrBuf(&Msg);
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",
- config.c_fqdn,
+ CtdlGetConfigStr("c_fqdn"),
getpid(),
++seq);
StrLength(OMsgTxt)); /* the original message */
if (BounceMB == NULL) {
FreeStrBuf(&boundary);
- SMTPCM_syslog(LOG_ERR, "Failed to alloc() bounce message.\n");
+ syslog(LOG_ERR, "Failed to alloc() bounce message.\n");
return;
}
if (bmsg == NULL) {
FreeStrBuf(&boundary);
FreeStrBuf(&BounceMB);
- SMTPCM_syslog(LOG_ERR, "Failed to alloc() bounce message.\n");
+ syslog(LOG_ERR, "Failed to alloc() bounce message.\n");
return;
}
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, CtdlGetConfigStr("c_nodename"), strlen(CtdlGetConfigStr("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) {
- SMTPCM_syslog(LOG_ERR, "No bounce address specified\n");
+ syslog(LOG_ERR, "No bounce address specified\n");
}
else {
- SMTPC_syslog(LOG_DEBUG, "bounce to user? <%s>\n",
+ syslog(LOG_DEBUG, "bounce to user? <%s>\n",
ChrPtr(MyQItem->BounceTo));
}
/* If not, post it in the Aide> room */
if (successful_bounce == 0) {
- CtdlSubmitMsg(bmsg, NULL, config.c_aideroom, QP_EADDR);
+ CtdlSubmitMsg(bmsg, NULL, CtdlGetConfigStr("c_aideroom"), QP_EADDR);
}
/* Free up the memory we used */
free_recipients(valid);
FreeStrBuf(&boundary);
- CtdlFreeMessage(bmsg);
- SMTPCM_syslog(LOG_DEBUG, "Done processing bounces\n");
+ CM_Free(bmsg);
+ syslog(LOG_DEBUG, "Done processing bounces\n");
}
ParsedURL *LoadRelayUrls(OneQueItem *MyQItem,
{
StrBufExtract_NextToken(One, All, &Pos, '|');
if (!ParseURL(Url, One, DefaultMXPort)) {
- SMTPC_syslog(LOG_DEBUG,
+ syslog(LOG_DEBUG,
"Failed to parse: %s\n",
ChrPtr(One));
}
if (!strcmp(User + 1, Author) ||
!strcmp(User + 1, Address))
StrBufCutAt(One, 0, User);
- else
+ else {
+ MyQItem->HaveRelay = 1;
continue;
-
+ }
}
if (!ParseURL(Url, One, DefaultMXPort)) {
- SMTPC_syslog(LOG_DEBUG,
+ syslog(LOG_DEBUG,
"Failed to parse: %s\n",
ChrPtr(One));
}
StrBuf *Msg =NULL;
if (mynumsessions > max_sessions_for_outbound_smtp) {
- SMTPC_syslog(LOG_DEBUG,
+ syslog(LOG_INFO,
"skipping because of num jobs %d > %d max_sessions_for_outbound_smtp",
mynumsessions,
max_sessions_for_outbound_smtp);
}
- SMTPC_syslog(LOG_DEBUG, "smtp_do_procmsg(%ld)\n", msgnum);
+ syslog(LOG_DEBUG, "smtp_do_procmsg(%ld)\n", msgnum);
///strcpy(envelope_from, "");
- msg = CtdlFetchMessage(msgnum, 1);
+ msg = CtdlFetchMessage(msgnum, 1, 1);
if (msg == NULL) {
- SMTPC_syslog(LOG_ERR, "tried %ld but no such message!\n",
+ syslog(LOG_ERR, "tried %ld but no such message!\n",
msgnum);
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);
if (MyQItem == NULL) {
- SMTPC_syslog(LOG_ERR,
+ syslog(LOG_ERR,
"Msg No %ld: already in progress!\n",
msgnum);
return; /* s.b. else is already processing... */
(now < MyQItem->ReattemptWhen) &&
(run_queue_now == 0))
{
- SMTPC_syslog(LOG_DEBUG,
+ syslog(LOG_DEBUG,
"Retry time not yet reached. %ld seconds left.",
MyQItem->ReattemptWhen - now);
* Bail out if there's no actual message associated with this
*/
if (MyQItem->MessageID < 0L) {
- SMTPCM_syslog(LOG_ERR, "no 'msgid' directive found!\n");
+ syslog(LOG_ERR, "no 'msgid' directive found!\n");
It = GetNewHashPos(MyQItem->MailQEntries, 0);
pthread_mutex_lock(&ActiveQItemsLock);
{
while (GetNextHashPos(MyQItem->MailQEntries, It, &len, &Key, &vQE))
{
MailQEntry *ThisItem = vQE;
- SMTPC_syslog(LOG_DEBUG, "SMTP Queue: Task: <%s> %d\n",
+ syslog(LOG_DEBUG, "SMTP Queue: Task: <%s> %d\n",
ChrPtr(ThisItem->Recipient),
ThisItem->Active);
}
DeleteHashPos(&It);
MyQItem->NotYetShutdownDeliveries =
- MyQItem->ActiveDeliveries = CountActiveQueueEntries(MyQItem);
+ MyQItem->ActiveDeliveries = CountActiveQueueEntries(MyQItem, 1);
/* failsafe against overload:
* will we exceed the limit set?
(((MyQItem->ActiveDeliveries * 2) < max_sessions_for_outbound_smtp)))
{
/* abort delivery for another time. */
- SMTPC_syslog(LOG_DEBUG,
+ 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;
}
int m = MyQItem->ActiveDeliveries;
int i = 1;
+ 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);
- It = GetNewHashPos(MyQItem->MailQEntries, 0);
while ((i <= m) &&
(GetNextHashPos(MyQItem->MailQEntries,
It, &len, &Key, &vQE)))
if (i > 1) n = MsgCount++;
syslog(LOG_DEBUG,
- "SMTPC: Trying <%ld> <%s> %d / %d \n",
- MyQItem->MessageID,
- ChrPtr(ThisItem->Recipient),
- i,
- m);
+ "SMTPC: Trying <%ld> <%s> %d / %d \n",
+ MyQItem->MessageID,
+ ChrPtr(ThisItem->Recipient),
+ i,
+ m);
(*((int*) userdata)) ++;
smtp_try_one_queue_entry(MyQItem,
ThisItem,
n,
RelayUrls);
- if (KeepBuffers) HaveBuffers = 1;
+ if (KeepBuffers) HaveBuffers++;
i++;
}
const char* Key;
void *VData;
- SMTPC_syslog(LOG_WARNING,
+ syslog(LOG_WARNING,
"unable to find QItem with ID[%ld]",
MyQItem->MessageID);
while (GetNextHashPos(ActiveQItems,
&Key,
&VData))
{
- SMTPC_syslog(LOG_WARNING,
+ syslog(LOG_WARNING,
"have: ID[%ld]",
((OneQueItem *)VData)->MessageID);
}
int num_activated = 0;
pthread_setspecific(MyConKey, (void *)&smtp_queue_CC);
- SMTPCM_syslog(LOG_INFO, "processing outbound queue");
+ syslog(LOG_DEBUG, "processing outbound queue");
if (CtdlGetRoom(&CC->room, SMTP_SPOOLOUT_ROOM) != 0) {
- SMTPC_syslog(LOG_ERR, "Cannot find room <%s>", SMTP_SPOOLOUT_ROOM);
+ syslog(LOG_ERR, "Cannot find room <%s>", SMTP_SPOOLOUT_ROOM);
}
else {
num_processed = CtdlForEachMessage(MSGS_ALL,
smtp_do_procmsg,
&num_activated);
}
- SMTPC_syslog(LOG_INFO,
- "queue run completed; %d messages processed %d activated",
- num_processed, num_activated);
+ if (num_activated > 0) {
+ syslog(LOG_INFO,
+ "queue run completed; %d messages processed %d activated",
+ num_processed, num_activated);
+ }
}
}
+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];
+ StrBuf *SpoolMsg = NewStrBuf();
+ long nTokens;
+ int i;
+
+ 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)
{
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);
projects / citadel.git / blobdiff