#include "ctdl_module.h"
-#include "smtp_util.h"
#include "smtpqueue.h"
#include "event_client.h"
MailQEntry *MyQEntry,
StrBuf *MsgText,
int KeepMsgText, /* KeepMsgText allows us to use MsgText as ours. */
- int MsgCount);
+ int MsgCount,
+ ParsedURL *RelayUrls);
void smtp_evq_cleanup(void)
StrBufAppendBufPlain(QMessage, HKEY("\nmsgid|"), 0);
StrBufAppendPrintf(QMessage, "%ld", MyQItem->MessageID);
+ StrBufAppendBufPlain(QMessage, HKEY("\nsubmitted|"), 0);
+ StrBufAppendPrintf(QMessage, "%ld", MyQItem->Submitted);
+
if (StrLength(MyQItem->BounceTo) > 0) {
StrBufAppendBufPlain(QMessage, HKEY("\nbounceto|"), 0);
StrBufAppendBuf(QMessage, MyQItem->BounceTo, 0);
continue; /* skip already sent ones from the spoolfile. */
for (i=0; i < ThisItem->nAttempts; i++) {
+ /* TODO: most probably there is just one retry/attempted per message! */
StrBufAppendBufPlain(QMessage, HKEY("\nretry|"), 0);
StrBufAppendPrintf(QMessage, "%ld",
ThisItem->Attempts[i].retry);
if (Item->MailQEntries == NULL)
Item->MailQEntries = NewHash(1, Flathash);
+ Item->Current->StatusMessage = NewStrBuf();
Item->Current->n = GetCount(Item->MailQEntries);
Put(Item->MailQEntries, IKEY(Item->Current->n), Item->Current, FreeMailQEntry);
}
Item->Current->Attempts[Item->Current->nAttempts].retry = StrBufExtractNext_int(Line, Pos, '|');
}
+
+void QItem_Handle_Submitted(OneQueItem *Item, StrBuf *Line, const char **Pos)
+{
+ Item->Submitted = atol(*Pos);
+
+}
+
void QItem_Handle_Attempted(OneQueItem *Item, StrBuf *Line, const char **Pos)
{
if (Item->Current == NULL)
+/*
+ * smtp_do_bounce() is caled by smtp_do_procmsg() to scan a set of delivery
+ * instructions for "5" codes (permanent fatal errors) and produce/deliver
+ * a "bounce" message (delivery status notification).
+ */
+void smtpq_do_bounce(OneQueItem *MyQItem, StrBuf *OMsgTxt)
+{
+ static int seq = 0;
+
+ struct CtdlMessage *bmsg = NULL;
+ StrBuf *boundary;
+ StrBuf *Msg = NULL;
+ StrBuf *BounceMB;
+ struct recptypes *valid;
+
+ HashPos *It;
+ void *vQE;
+ long len;
+ const char *Key;
+
+ int successful_bounce = 0;
+ int num_bounces = 0;
+ int give_up = 0;
+
+ CtdlLogPrintf(CTDL_DEBUG, "smtp_do_bounce() called\n");
+
+ if ( (ev_time() - MyQItem->Submitted) > SMTP_GIVE_UP ) {
+ give_up = 1;/// TODO: replace time by libevq timer get
+ }
+
+ /*
+ * Now go through the instructions checking for stuff.
+ */
+ It = GetNewHashPos(MyQItem->MailQEntries, 0);
+ while (GetNextHashPos(MyQItem->MailQEntries, It, &len, &Key, &vQE))
+ {
+ MailQEntry *ThisItem = vQE;
+ if ((ThisItem->Status == 5) || /* failed now? */
+ ((give_up == 1) && (ThisItem->Status != 2))) /* giving up after failed attempts... */
+ {
+ if (num_bounces == 0)
+ Msg = NewStrBufPlain(NULL, 1024);
+ ++num_bounces;
+
+ StrBufAppendBuf(Msg, ThisItem->Recipient, 0);
+ StrBufAppendBufPlain(Msg, HKEY(": "), 0);
+ StrBufAppendBuf(Msg, ThisItem->StatusMessage, 0);
+ StrBufAppendBufPlain(Msg, HKEY("\r\n"), 0);
+ }
+ }
+ DeleteHashPos(&It);
+
+ /* Deliver the bounce if there's anything worth mentioning */
+ CtdlLogPrintf(CTDL_DEBUG, "num_bounces = %d\n", num_bounces);
+
+ if (num_bounces == 0) {
+ FreeStrBuf(&Msg);
+ return;
+ }
+
+ boundary = NewStrBufPlain(HKEY("=_Citadel_Multipart_"));
+ StrBufAppendPrintf(boundary, "%s_%04x%04x", config.c_fqdn, getpid(), ++seq);
+
+ /* Start building our bounce message; go shopping for memory first. */
+ BounceMB = NewStrBufPlain(NULL,
+ 1024 + /* mime stuff.... */
+ StrLength(Msg) + /* the bounce information... */
+ StrLength(OMsgTxt)); /* the original message */
+ if (BounceMB == NULL) {
+ FreeStrBuf(&boundary);
+ CtdlLogPrintf(CTDL_ERR, "Failed to alloc() bounce message.\n");
+
+ return;
+ }
+
+ bmsg = (struct CtdlMessage *) malloc(sizeof(struct CtdlMessage));
+ if (bmsg == NULL) {
+ FreeStrBuf(&boundary);
+ FreeStrBuf(&BounceMB);
+ CtdlLogPrintf(CTDL_ERR, "Failed to alloc() bounce message.\n");
+
+ return;
+ }
+ memset(bmsg, 0, sizeof(struct CtdlMessage));
+
+
+ StrBufAppendBufPlain(BounceMB, HKEY("Content-type: multipart/mixed; boundary=\""), 0);
+ StrBufAppendBuf(BounceMB, boundary, 0);
+ StrBufAppendBufPlain(BounceMB, HKEY("\"\r\n"), 0);
+ StrBufAppendBufPlain(BounceMB, HKEY("MIME-Version: 1.0\r\n"), 0);
+ StrBufAppendBufPlain(BounceMB, HKEY("X-Mailer: " CITADEL "\r\n"), 0);
+ StrBufAppendBufPlain(BounceMB, HKEY("\r\nThis is a multipart message in MIME format.\r\n\r\n"), 0);
+ StrBufAppendBufPlain(BounceMB, HKEY("--"), 0);
+ StrBufAppendBuf(BounceMB, boundary, 0);
+ StrBufAppendBufPlain(BounceMB, HKEY("\r\n"), 0);
+ StrBufAppendBufPlain(BounceMB, HKEY("Content-type: text/plain\r\n\r\n"), 0);
+
+ if (give_up)
+ StrBufAppendBufPlain(
+ BounceMB,
+ HKEY(
+ "A message you sent could not be delivered to some or all of its recipients\n"
+ "due to prolonged unavailability of its destination(s).\n"
+ "Giving up on the following addresses:\n\n"
+ ), 0);
+ else
+ StrBufAppendBufPlain(
+ BounceMB,
+ HKEY(
+ "A message you sent could not be delivered to some or all of its recipients.\n"
+ "The following addresses were undeliverable:\n\n"
+ ), 0);
+
+ StrBufAppendBuf(BounceMB, Msg, 0);
+ FreeStrBuf(&Msg);
+
+ /* Attach the original message */
+ StrBufAppendBufPlain(BounceMB, HKEY("--"), 0);
+ StrBufAppendBuf(BounceMB, boundary, 0);
+ StrBufAppendBufPlain(BounceMB, HKEY("\r\n"), 0);
+ StrBufAppendBufPlain(BounceMB, HKEY("Content-type: message/rfc822\r\n"), 0);
+ StrBufAppendBufPlain(BounceMB, HKEY("Content-Transfer-Encoding: 7bit\r\n"), 0);
+ StrBufAppendBufPlain(BounceMB, HKEY("Content-Disposition: inline\r\n"), 0);
+ StrBufAppendBufPlain(BounceMB, HKEY("\r\n"), 0);
+ StrBufAppendBuf(BounceMB, OMsgTxt, 0);
+
+ /* Close the multipart MIME scope */
+ StrBufAppendBufPlain(BounceMB, HKEY("--"), 0);
+ StrBufAppendBuf(BounceMB, boundary, 0);
+ StrBufAppendBufPlain(BounceMB, HKEY("--\r\n"), 0);
+
+
+
+ bmsg->cm_magic = CTDLMESSAGE_MAGIC;
+ 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);
+
+ /* First try the user who sent the message */
+ if (StrLength(MyQItem->BounceTo) == 0)
+ CtdlLogPrintf(CTDL_ERR, "No bounce address specified\n");
+ else
+ CtdlLogPrintf(CTDL_DEBUG, "bounce to user? <%s>\n", ChrPtr(MyQItem->BounceTo));
+
+ /* Can we deliver the bounce to the original sender? */
+ valid = validate_recipients(ChrPtr(MyQItem->BounceTo), NULL, 0);
+ if ((valid != NULL) && (valid->num_error == 0)) {
+ CtdlSubmitMsg(bmsg, valid, "", QP_EADDR);
+ successful_bounce = 1;
+ }
+
+ /* If not, post it in the Aide> room */
+ if (successful_bounce == 0) {
+ CtdlSubmitMsg(bmsg, NULL, config.c_aideroom, QP_EADDR);
+ }
+
+ /* Free up the memory we used */
+ free_recipients(valid);
+ FreeStrBuf(&boundary);
+ CtdlFreeMessage(bmsg);
+ CtdlLogPrintf(CTDL_DEBUG, "Done processing bounces\n");
+}
+
+
+
+int ParseURL(ParsedURL **Url, StrBuf *UrlStr, short DefaultPort)
+{
+ const char *pch, *pStartHost, *pEndHost, *pPort, *pCredEnd, *pUserEnd;
+ ParsedURL *url = (ParsedURL *)malloc(sizeof(ParsedURL));
+ memset(url, 0, sizeof(ParsedURL));
+
+ url->af = AF_INET;
+ url->Port = DefaultPort;
+ /*
+ * http://username:passvoid@[ipv6]:port/url
+ */
+ url->URL = NewStrBufDup(UrlStr);
+ pStartHost = pch = ChrPtr(url->URL);
+ url->LocalPart = strchr(pch, '/');
+ if (url->LocalPart != NULL) {
+ if ((*(url->LocalPart + 1) == '/') &&
+ (*(url->LocalPart + 2) == ':')) { /* TODO: find default port for this protocol... */
+ pStartHost = url->LocalPart + 3;
+ url->LocalPart = strchr(pStartHost, '/');
+ }
+ }
+ if (url->LocalPart == NULL) {
+ url->LocalPart = pch + StrLength(UrlStr);
+ }
+
+ pCredEnd = strchr(pch, '@');
+ if (pCredEnd >= url->LocalPart)
+ pCredEnd = NULL;
+ if (pCredEnd != NULL)
+ {
+ url->User = pStartHost;
+ pStartHost = pCredEnd + 1;
+ pUserEnd = strchr(url->User, ':');
+
+ if (pUserEnd > pCredEnd)
+ pUserEnd = pCredEnd;
+ else {
+ url->Pass = pUserEnd + 1;
+ }
+ StrBufPeek(UrlStr, pUserEnd, 0, '\0');
+ StrBufPeek(UrlStr, pCredEnd, 0, '\0');
+ }
+
+ pPort = NULL;
+ if (*pStartHost == '[') {
+ pStartHost ++;
+ pEndHost = strchr(pStartHost, ']');
+ if (pEndHost == NULL) {
+ free(url);
+ return 0; /* invalid syntax, no ipv6 */
+ }
+ if (*(pEndHost + 1) == ':')
+ pPort = pEndHost + 2;
+ url->af = AF_INET6;
+ }
+ else {
+ pPort = strchr(pStartHost, ':');
+ if (pPort != NULL)
+ pPort ++;
+ }
+ if (pPort != NULL)
+ url->Port = atol(pPort);
+ url->IsIP = inet_pton(url->af, pStartHost, &url->Addr);
+ return 1;
+}
+/*
+{
+
+ if (threadding)
+ n_smarthosts = get_hosts(char *mxbuf, char *rectype);
+}
+*/
/*
* smtp_do_procmsg()
*
void *vQE;
long len;
const char *Key;
-
+ int nRelays = 0;
+ ParsedURL *RelayUrls = NULL;
+ int HaveBuffers = 0;
+ StrBuf *Msg =NULL;
+
CtdlLogPrintf(CTDL_DEBUG, "SMTP Queue: smtp_do_procmsg(%ld)\n", msgnum);
///strcpy(envelope_from, "");
return;
}
+ {
+ char mxbuf[SIZ];
+ ParsedURL **Url = &RelayUrls; ///&MyQItem->Relay;
+ 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) {
+ StrBufExtract_NextToken(One, All, &Pos, '|');
+ if (!ParseURL(Url, One, 25))
+ CtdlLogPrintf(CTDL_DEBUG, "Failed to parse: %s\n", ChrPtr(One));
+ else
+ Url = &(*Url)->Next;
+ }
+ }
+ }
+
It = GetNewHashPos(MyQItem->MailQEntries, 0);
while (GetNextHashPos(MyQItem->MailQEntries, It, &len, &Key, &vQE))
{
{
int n = MsgCount++;
int i = 1;
- StrBuf *Msg = smtp_load_msg(MyQItem, n);
+ Msg = smtp_load_msg(MyQItem, n);
It = GetNewHashPos(MyQItem->MailQEntries, 0);
while ((i <= MyQItem->ActiveDeliveries) &&
(GetNextHashPos(MyQItem->MailQEntries, It, &len, &Key, &vQE)))
{
MailQEntry *ThisItem = vQE;
if (ThisItem->Active == 1) {
+ int KeepBuffers = (i == MyQItem->ActiveDeliveries);
if (i > 1) n = MsgCount++;
CtdlLogPrintf(CTDL_DEBUG, "SMTP Queue: Trying <%s>\n", ChrPtr(ThisItem->Recipient));
- smtp_try(MyQItem, ThisItem, Msg, (i == MyQItem->ActiveDeliveries), n);
+ smtp_try(MyQItem, ThisItem, Msg, KeepBuffers, n, RelayUrls);
+ if (KeepBuffers) HaveBuffers = 1;
i++;
}
}
// TODO: bounce & delete?
}
+ if (!HaveBuffers) {
+ FreeStrBuf (&Msg);
+// TODO : free RelayUrls
+ }
}
Put(QItemHandlers, HKEY("attempted"), QItem_Handle_Attempted, reference_free_handler);
Put(QItemHandlers, HKEY("remote"), QItem_Handle_Recipient, reference_free_handler);
Put(QItemHandlers, HKEY("bounceto"), QItem_Handle_BounceTo, reference_free_handler);
-///submitted /TODO: flush qitemhandlers on exit
+ Put(QItemHandlers, HKEY("submitted"), QItem_Handle_Submitted, reference_free_handler);
+////TODO: flush qitemhandlers on exit
smtp_init_spoolout();
CtdlRegisterCleanupHook(smtp_evq_cleanup);
projects / citadel.git / blobdiff