X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fsmtpqueue.c;h=b5c750a311a1b4106a9072b8ae20f3e51db4996a;hb=HEAD;hp=4a30afa45b80dd334864420fed0b3a03b3e9e7ad;hpb=715008dfb6283528fcac64dc21b88dcbb237abad;p=citadel.git
diff --git a/webcit/smtpqueue.c b/webcit/smtpqueue.c
index 4a30afa45..b5c750a31 100644
--- a/webcit/smtpqueue.c
+++ b/webcit/smtpqueue.c
@@ -3,269 +3,10 @@
*/
#include "webcit.h"
+CtxType CTX_MAILQITEM = CTX_NONE;
+CtxType CTX_MAILQ_RCPT = CTX_NONE;
HashList *QItemHandlers = NULL;
-/*
- * display one message in the queue
- */
-void display_queue_msg(long msgnum)
-{
- char buf[1024];
- char keyword[32];
- int in_body = 0;
- int is_delivery_list = 0;
- time_t submitted = 0;
- time_t attempted = 0;
- time_t last_attempt = 0;
- int number_of_attempts = 0;
- char sender[256];
- char recipients[65536];
- int recipients_len = 0;
- char thisrecp[256];
- char thisdsn[256];
- char thismsg[512];
- int thismsg_len;
- long msgid = 0;
- int len;
-
- strcpy(sender, "");
- strcpy(recipients, "");
- recipients_len = 0;
-
- serv_printf("MSG2 %ld", msgnum);
- serv_getln(buf, sizeof buf);
- if (buf[0] != '1') return;
-
- while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-
- if (!IsEmptyStr(buf)) {
- len = strlen(buf);
- if (buf[len - 1] == 13) {
- buf[len - 1] = 0;
- }
- }
-
- if ( (IsEmptyStr(buf)) && (in_body == 0) ) {
- in_body = 1;
- }
-
- if ( (!in_body)
- && (!strncasecmp(buf, "Content-type: application/x-citadel-delivery-list", 49))
- ) {
- is_delivery_list = 1;
- }
-
- if ( (in_body) && (!is_delivery_list) ) {
- while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
- /* Not a delivery list; flush and return quietly. */
- }
- return;
- }
-
- if ( (in_body) && (is_delivery_list) ) {
- extract_token(keyword, buf, 0, '|', sizeof keyword);
-
- if (!strcasecmp(keyword, "msgid")) {
- msgid = extract_long(buf, 1);
- }
-
- if (!strcasecmp(keyword, "submitted")) {
- submitted = extract_long(buf, 1);
- }
-
- if (!strcasecmp(keyword, "attempted")) {
- attempted = extract_long(buf, 1);
- ++number_of_attempts;
- if (attempted > last_attempt) {
- last_attempt = attempted;
- }
- }
-
- if (!strcasecmp(keyword, "bounceto")) {
- char *atsign;
- extract_token(sender, buf, 1, '|', sizeof sender);
-
- /* Strip off local hostname if it's our own */
- atsign = strchr(sender, '@');
- if (atsign != NULL) {
- ++atsign;
- if (!strcasecmp(atsign, ChrPtr(WC->serv_info->serv_nodename))) {
- --atsign;
- *atsign = 0;
- }
- }
- }
-
- if (!strcasecmp(keyword, "remote")) {
- thismsg[0] = 0;
-
- extract_token(thisrecp, buf, 1, '|', sizeof thisrecp);
- extract_token(thisdsn, buf, 3, '|', sizeof thisdsn);
-
- if (!IsEmptyStr(thisrecp)) {
- stresc(thismsg, sizeof thismsg, thisrecp, 1, 1);
- if (!IsEmptyStr(thisdsn)) {
- strcat(thismsg, "
");
- stresc(&thismsg[strlen(thismsg)], sizeof thismsg,
- thisdsn, 1, 1);
- strcat(thismsg, "");
- }
- thismsg_len = strlen(thismsg);
-
- if ((recipients_len + thismsg_len + 100) < sizeof recipients) {
- if (!IsEmptyStr(recipients)) {
- strcpy(&recipients[recipients_len], "
");
- recipients_len += 6;
- }
- strcpy(&recipients[recipients_len], thismsg);
- recipients_len += thismsg_len;
- }
- }
-
- }
-
- }
-
- }
-
- wc_printf("
");
- wc_printf(_("You do not have permission to view this resource."));
- wc_printf("
\n");
-
- wc_printf("
"
- "\n");
-
- wc_printf(""
- ""
- " |
\n", _("Refresh this page")
- );
-
- StrBufAppendPrintf(WC->trailing_javascript, "RefreshSMTPqueueDisplay();\n");
-
- wDumpContent(1);
-
-}
-
-
-
-
-
-
-
-
typedef struct _mailq_entry {
@@ -275,6 +16,7 @@ typedef struct _mailq_entry {
/**<
* 0 = No delivery has yet been attempted
* 2 = Delivery was successful
+ * 3 = Transient error like connection problem. Try next remote if available.
* 4 = A transient error was experienced ... try again later
* 5 = Delivery to this address failed permanently. The error message
* should be placed in the fourth field so that a bounce message may
@@ -301,6 +43,7 @@ typedef struct queueitem {
long ActiveDeliveries;
StrBuf *EnvelopeFrom;
StrBuf *BounceTo;
+ StrBuf *SenderRoom;
ParsedURL *URL;
ParsedURL *FallBackHost;
} OneQueItem;
@@ -308,6 +51,16 @@ typedef struct queueitem {
typedef void (*QItemHandler)(OneQueItem *Item, StrBuf *Line, const char **Pos);
+typedef struct __QItemHandlerStruct {
+ QItemHandler H;
+} QItemHandlerStruct;
+
+void RegisterQItemHandler(const char *Key, long Len, QItemHandler H)
+{
+ QItemHandlerStruct *HS = (QItemHandlerStruct*)malloc(sizeof(QItemHandlerStruct));
+ HS->H = H;
+ Put(QItemHandlers, Key, Len, HS, NULL);
+}
void FreeMailQEntry(void *qv)
{
@@ -321,6 +74,7 @@ void FreeQueItem(OneQueItem **Item)
DeleteHash(&(*Item)->MailQEntries);
FreeStrBuf(&(*Item)->EnvelopeFrom);
FreeStrBuf(&(*Item)->BounceTo);
+ FreeStrBuf(&(*Item)->SenderRoom);
FreeURL(&(*Item)->URL);
free(*Item);
Item = NULL;
@@ -355,9 +109,9 @@ OneQueItem *DeserializeQueueItem(StrBuf *RawQItem, long QueMsgID)
StrBufExtract_NextToken(Token, Line, &pItemPart, '|');
if (GetHash(QItemHandlers, SKEY(Token), &vHandler))
{
- QItemHandler H;
- H = (QItemHandler) vHandler;
- H(Item, Line, &pItemPart);
+ QItemHandlerStruct *HS;
+ HS = (QItemHandlerStruct*) vHandler;
+ HS->H(Item, Line, &pItemPart);
}
}
FreeStrBuf(&Line);
@@ -374,42 +128,54 @@ OneQueItem *DeserializeQueueItem(StrBuf *RawQItem, long QueMsgID)
void tmplput_MailQID(StrBuf *Target, WCTemplputParams *TP)
{
- OneQueItem *Item = (OneQueItem*) CTX;
+ OneQueItem *Item = (OneQueItem*) CTX(CTX_MAILQITEM);
StrBufAppendPrintf(Target, "%ld", Item->QueMsgID);;
}
void tmplput_MailQPayloadID(StrBuf *Target, WCTemplputParams *TP)
{
- OneQueItem *Item = (OneQueItem*) CTX;
+ OneQueItem *Item = (OneQueItem*) CTX(CTX_MAILQITEM);
StrBufAppendPrintf(Target, "%ld", Item->MessageID);
}
void tmplput_MailQBounceTo(StrBuf *Target, WCTemplputParams *TP)
{
- OneQueItem *Item = (OneQueItem*) CTX;
+ OneQueItem *Item = (OneQueItem*) CTX(CTX_MAILQITEM);
StrBufAppendTemplate(Target, TP, Item->BounceTo, 0);
}
void tmplput_MailQAttempted(StrBuf *Target, WCTemplputParams *TP)
{
char datebuf[64];
- OneQueItem *Item = (OneQueItem*) CTX;
+ OneQueItem *Item = (OneQueItem*) CTX(CTX_MAILQITEM);
webcit_fmt_date(datebuf, 64, Item->ReattemptWhen, DATEFMT_BRIEF);
StrBufAppendBufPlain(Target, datebuf, -1, 0);
}
void tmplput_MailQSubmitted(StrBuf *Target, WCTemplputParams *TP)
{
char datebuf[64];
- OneQueItem *Item = (OneQueItem*) CTX;
+ OneQueItem *Item = (OneQueItem*) CTX(CTX_MAILQITEM);
webcit_fmt_date(datebuf, 64, Item->Submitted, DATEFMT_BRIEF);
StrBufAppendBufPlain(Target, datebuf, -1, 0);
}
void tmplput_MailQEnvelopeFrom(StrBuf *Target, WCTemplputParams *TP)
{
- OneQueItem *Item = (OneQueItem*) CTX;
+ OneQueItem *Item = (OneQueItem*) CTX(CTX_MAILQITEM);
StrBufAppendTemplate(Target, TP, Item->EnvelopeFrom, 0);
}
+void tmplput_MailQSourceRoom(StrBuf *Target, WCTemplputParams *TP)
+{
+ OneQueItem *Item = (OneQueItem*) CTX(CTX_MAILQITEM);
+ StrBufAppendTemplate(Target, TP, Item->SenderRoom, 0);
+}
+
+int Conditional_MailQ_HaveSourceRoom(StrBuf *Target, WCTemplputParams *TP)
+{
+ OneQueItem *Item = (OneQueItem*) CTX(CTX_MAILQITEM);
+ return StrLength(Item->SenderRoom) > 0;
+}
+
void tmplput_MailQRetry(StrBuf *Target, WCTemplputParams *TP)
{
char datebuf[64];
- OneQueItem *Item = (OneQueItem*) CTX;
+ OneQueItem *Item = (OneQueItem*) CTX(CTX_MAILQITEM);
if (Item->Retry == 0) {
StrBufAppendBufPlain(Target, _("First Attempt pending"), -1, 0);
@@ -422,23 +188,23 @@ void tmplput_MailQRetry(StrBuf *Target, WCTemplputParams *TP)
void tmplput_MailQRCPT(StrBuf *Target, WCTemplputParams *TP)
{
- MailQEntry *Entry = (MailQEntry*) CTX;
+ MailQEntry *Entry = (MailQEntry*) CTX(CTX_MAILQ_RCPT);
StrBufAppendTemplate(Target, TP, Entry->Recipient, 0);
}
void tmplput_MailQRCPTStatus(StrBuf *Target, WCTemplputParams *TP)
{
- MailQEntry *Entry = (MailQEntry*) CTX;
+ MailQEntry *Entry = (MailQEntry*) CTX(CTX_MAILQ_RCPT);
StrBufAppendPrintf(Target, "%ld", Entry->Status);
}
void tmplput_MailQStatusMsg(StrBuf *Target, WCTemplputParams *TP)
{
- MailQEntry *Entry = (MailQEntry*) CTX;
+ MailQEntry *Entry = (MailQEntry*) CTX(CTX_MAILQ_RCPT);
StrBufAppendTemplate(Target, TP, Entry->StatusMessage, 0);
}
HashList *iterate_get_Recipients(StrBuf *Target, WCTemplputParams *TP)
{
- OneQueItem *Item = (OneQueItem*) CTX;
+ OneQueItem *Item = (OneQueItem*) CTX(CTX_MAILQITEM);
return Item->MailQEntries;
}
@@ -477,8 +243,16 @@ void QItem_Handle_BounceTo(OneQueItem *Item, StrBuf *Line, const char **Pos)
StrBufExtract_NextToken(Item->BounceTo, Line, Pos, '|');
}
+void QItem_Handle_SenderRoom(OneQueItem *Item, StrBuf *Line, const char **Pos)
+{
+ if (Item->SenderRoom == NULL)
+ Item->SenderRoom = NewStrBufPlain(NULL, StrLength(Line));
+ StrBufExtract_NextToken(Item->SenderRoom, Line, Pos, '|');
+}
+
void QItem_Handle_Recipient(OneQueItem *Item, StrBuf *Line, const char **Pos)
{
+ const char *pch;
if (Item->Current == NULL)
NewMailQEntry(Item);
if (Item->Current->Recipient == NULL)
@@ -486,15 +260,25 @@ void QItem_Handle_Recipient(OneQueItem *Item, StrBuf *Line, const char **Pos)
StrBufExtract_NextToken(Item->Current->Recipient, Line, Pos, '|');
Item->Current->Status = StrBufExtractNext_int(Line, Pos, '|');
StrBufExtract_NextToken(Item->Current->StatusMessage, Line, Pos, '|');
+
+ pch = ChrPtr(Item->Current->StatusMessage);
+ while ((pch != NULL) && (*pch != '\0')) {
+ pch = strchr(pch, ';');
+ if (pch != NULL) {
+ pch ++;
+ if (*pch == ' ') {
+ StrBufPeek(Item->Current->StatusMessage,
+ pch, -1, '\n');
+ }
+ }
+ }
Item->Current = NULL; // TODO: is this always right?
}
void QItem_Handle_retry(OneQueItem *Item, StrBuf *Line, const char **Pos)
{
- Item->Retry =
- StrBufExtractNext_int(Line, Pos, '|');
- Item->Retry *= 2;
+ Item->Retry = StrBufExtractNext_int(Line, Pos, '|');
}
@@ -512,19 +296,20 @@ void QItem_Handle_Attempted(OneQueItem *Item, StrBuf *Line, const char **Pos)
-
-
-
-
-void render_QUEUE(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset)
+void render_QUEUE(StrBuf *Target, WCTemplputParams *TP, StrBuf *FoundCharset)
{
+ wc_mime_attachment *Mime = CTX(CTX_MIME_ATACH);
WCTemplputParams SubTP;
+ OneQueItem* Context;
- memset(&SubTP, 0, sizeof(WCTemplputParams));
- SubTP.Filter.ContextType = CTX_MAILQITEM;
- SubTP.Context = DeserializeQueueItem(Mime->Data, Mime->msgnum);
- DoTemplate(HKEY("view_mailq_message"),NULL, &SubTP);
- FreeQueItem ((OneQueItem**)&SubTP.Context);
+ Context = DeserializeQueueItem(Mime->Data, Mime->msgnum);
+ StackContext(TP, &SubTP, Context, CTX_MAILQITEM, 0, TP->Tokens);
+ {
+ DoTemplate(HKEY("view_mailq_message"), NULL, &SubTP);
+ }
+ UnStackContext(&SubTP);
+
+ FreeQueItem (&Context);
}
void
@@ -542,14 +327,10 @@ ServerStartModule_SMTP_QUEUE
int qview_PrintPageHeader(SharedMessageStatus *Stat, void **ViewSpecific)
{
- if (!WC->is_aide)
- {
- output_headers(1, 1, 1, 0, 0, 0);
- }
+ if (yesbstr("ListOnly"))
+ output_headers(1, 0, 0, 0, 0, 0);
else
- {
- output_headers(1, 1, 2, 0, 0, 0);
- }
+ output_headers(1, 1, 1, 0, 0, 0);
return 0;
}
@@ -571,7 +352,10 @@ int qview_GetParamsGetServerCall(SharedMessageStatus *Stat,
else {
snprintf(cmd, len, "MSGS ALL|0|1");
snprintf(filter, flen, "SUBJ|QMSG");
- DoTemplate(HKEY("view_mailq_header"), NULL, NULL);
+ if (yesbstr("ListOnly"))
+ DoTemplate(HKEY("view_mailq_table"), NULL, NULL);
+ else
+ DoTemplate(HKEY("view_mailq_header"), NULL, NULL);
return 200;
}
}
@@ -589,7 +373,7 @@ int qview_LoadMsgFromServer(SharedMessageStatus *Stat,
const StrBuf *Mime;
/* Not (yet?) needed here? calview *c = (calview *) *ViewSpecific; */
- read_message(WCC->WBuf, HKEY("view_mailq_message_bearer"), Msg->msgnum, NULL, &Mime);
+ read_message(WCC->WBuf, HKEY("view_mailq_message_bearer"), Msg->msgnum, NULL, &Mime, NULL);
return 0;
}
@@ -602,16 +386,23 @@ int qview_RenderView_or_Tail(SharedMessageStatus *Stat,
wcsession *WCC = WC;
WCTemplputParams SubTP;
- if (GetCount(WCC->summ) == 0)
- DoTemplate(HKEY("view_mailq_footer_empty"),NULL, &SubTP);
+ memset(&SubTP, 0, sizeof(WCTemplputParams));
+ if (yesbstr("ListOnly"))
+ DoTemplate(HKEY("view_mailq_footer_listonly"),NULL, &SubTP);
else
- DoTemplate(HKEY("view_mailq_footer"),NULL, &SubTP);
-
+ {
+ if (GetCount(WCC->summ) == 0)
+ DoTemplate(HKEY("view_mailq_footer_empty"),NULL, &SubTP);
+ else
+ DoTemplate(HKEY("view_mailq_footer"),NULL, &SubTP);
+ }
+
return 0;
}
int qview_Cleanup(void **ViewSpecific)
{
- wDumpContent(1);
+
+ wDumpContent(yesbstr("ListOnly")?0:1);
return 0;
}
@@ -619,26 +410,26 @@ void
InitModule_SMTP_QUEUE
(void)
{
-
- Put(QItemHandlers, HKEY("msgid"), QItem_Handle_MsgID, reference_free_handler);
- Put(QItemHandlers, HKEY("envelope_from"), QItem_Handle_EnvelopeFrom, reference_free_handler);
- Put(QItemHandlers, HKEY("retry"), QItem_Handle_retry, reference_free_handler);
- 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);
- Put(QItemHandlers, HKEY("submitted"), QItem_Handle_Submitted, reference_free_handler);
-
- WebcitAddUrlHandler(HKEY("display_smtpqueue"), "", 0, display_smtpqueue, 0);
- WebcitAddUrlHandler(HKEY("display_smtpqueue_inner_div"), "", 0, display_smtpqueue_inner_div, 0);
+ RegisterCTX(CTX_MAILQITEM);
+ RegisterCTX(CTX_MAILQ_RCPT);
+
+ RegisterQItemHandler(HKEY("msgid"), QItem_Handle_MsgID);
+ RegisterQItemHandler(HKEY("envelope_from"), QItem_Handle_EnvelopeFrom);
+ RegisterQItemHandler(HKEY("retry"), QItem_Handle_retry);
+ RegisterQItemHandler(HKEY("attempted"), QItem_Handle_Attempted);
+ RegisterQItemHandler(HKEY("remote"), QItem_Handle_Recipient);
+ RegisterQItemHandler(HKEY("bounceto"), QItem_Handle_BounceTo);
+ RegisterQItemHandler(HKEY("source_room"), QItem_Handle_SenderRoom);
+ RegisterQItemHandler(HKEY("submitted"), QItem_Handle_Submitted);
RegisterMimeRenderer(HKEY("application/x-citadel-delivery-list"), render_QUEUE, 1, 9000);
-
-
RegisterNamespace("MAILQ:ID", 0, 0, tmplput_MailQID, NULL, CTX_MAILQITEM);
RegisterNamespace("MAILQ:PAYLOAD:ID", 0, 0, tmplput_MailQPayloadID, NULL, CTX_MAILQITEM);
RegisterNamespace("MAILQ:BOUNCETO", 0, 1, tmplput_MailQBounceTo, NULL, CTX_MAILQITEM);
RegisterNamespace("MAILQ:ATTEMPTED", 0, 0, tmplput_MailQAttempted, NULL, CTX_MAILQITEM);
RegisterNamespace("MAILQ:SUBMITTED", 0, 0, tmplput_MailQSubmitted, NULL, CTX_MAILQITEM);
RegisterNamespace("MAILQ:ENVELOPEFROM", 0, 1, tmplput_MailQEnvelopeFrom, NULL, CTX_MAILQITEM);
+ RegisterNamespace("MAILQ:SRCROOM", 0, 1, tmplput_MailQSourceRoom, NULL, CTX_MAILQITEM);
+ RegisterConditional("COND:MAILQ:HAVESRCROOM", 0, Conditional_MailQ_HaveSourceRoom, CTX_MAILQITEM);
RegisterNamespace("MAILQ:RETRY", 0, 0, tmplput_MailQRetry, NULL, CTX_MAILQITEM);
RegisterNamespace("MAILQ:RCPT:ADDR", 0, 1, tmplput_MailQRCPT, NULL, CTX_MAILQ_RCPT);
@@ -657,6 +448,7 @@ InitModule_SMTP_QUEUE
NULL,
qview_LoadMsgFromServer,
qview_RenderView_or_Tail,
- qview_Cleanup);
+ qview_Cleanup,
+ NULL);
}