X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fsmtp%2Fserv_smtpeventclient.c;h=f3a1566bdefa8f83caac66159bbaa80c2eacf706;hb=7cced4381b0497cf3d99a489bbb1a4f5375ded32;hp=3276f90f0036581baeabcc499a9ede6469cf3445;hpb=be9e2d6776cff2e276880c7432ac88a3e0a11626;p=citadel.git diff --git a/citadel/modules/smtp/serv_smtpeventclient.c b/citadel/modules/smtp/serv_smtpeventclient.c index 3276f90f0..f3a1566bd 100644 --- a/citadel/modules/smtp/serv_smtpeventclient.c +++ b/citadel/modules/smtp/serv_smtpeventclient.c @@ -16,7 +16,7 @@ * RFC 2821 - Simple Mail Transfer Protocol * RFC 2822 - Internet Message Format * RFC 2920 - SMTP Service Extension for Command Pipelining - * + * * The VRFY and EXPN commands have been removed from this implementation * because nobody uses these commands anymore, except for spammers. * @@ -90,7 +90,6 @@ #include "smtpqueue.h" #include "smtp_clienthandlers.h" -#ifdef EXPERIMENTAL_SMTP_EVENT_CLIENT const unsigned short DefaultMXPort = 25; void DeleteSmtpOutMsg(void *v) { @@ -99,8 +98,10 @@ void DeleteSmtpOutMsg(void *v) ares_free_data(Msg->AllMX); if (Msg->HostLookup.VParsedDNSReply != NULL) Msg->HostLookup.DNSReplyFree(Msg->HostLookup.VParsedDNSReply); + FreeURL(&Msg->Relay); FreeStrBuf(&Msg->msgtext); FreeAsyncIOContents(&Msg->IO); + memset (Msg, 0, sizeof(SmtpOutMsg)); /* just to be shure... */ free(Msg); } @@ -109,6 +110,7 @@ eNextState SMTP_C_Timeout(AsyncIO *IO); eNextState SMTP_C_ConnFail(AsyncIO *IO); eNextState SMTP_C_DispatchReadDone(AsyncIO *IO); eNextState SMTP_C_DispatchWriteDone(AsyncIO *IO); +eNextState SMTP_C_DNSFail(AsyncIO *IO); eNextState SMTP_C_Terminate(AsyncIO *IO); eReadState SMTP_C_ReadServerStatus(AsyncIO *IO); @@ -123,66 +125,91 @@ eNextState get_one_mx_host_ip(AsyncIO *IO); ******************************************************************************/ void FinalizeMessageSend(SmtpOutMsg *Msg) { - CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__); - - if (DecreaseQReference(Msg->MyQItem)) - { - int nRemain; - StrBuf *MsgData; + int IDestructQueItem; + int nRemain; + StrBuf *MsgData; + AsyncIO *IO = &Msg->IO; + + IDestructQueItem = DecreaseQReference(Msg->MyQItem); - nRemain = CountActiveQueueEntries(Msg->MyQItem); + nRemain = CountActiveQueueEntries(Msg->MyQItem); + if ((nRemain > 0) || IDestructQueItem) MsgData = SerializeQueueItem(Msg->MyQItem); - /* - * Uncompleted delivery instructions remain, so delete the old - * instructions and replace with the updated ones. - */ - CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, &Msg->MyQItem->QueMsgID, 1, ""); - smtpq_do_bounce(Msg->MyQItem, - Msg->msgtext); - if (nRemain > 0) { - struct CtdlMessage *msg; - msg = malloc(sizeof(struct CtdlMessage)); - memset(msg, 0, sizeof(struct CtdlMessage)); - msg->cm_magic = CTDLMESSAGE_MAGIC; - msg->cm_anon_type = MES_NORMAL; - msg->cm_format_type = FMT_RFC822; - msg->cm_fields['M'] = SmashStrBuf(&MsgData); - CtdlSubmitMsg(msg, NULL, SMTP_SPOOLOUT_ROOM, QP_EADDR); - CtdlFreeMessage(msg); - } - else { - CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, &Msg->MyQItem->MessageID, 1, ""); - FreeStrBuf(&MsgData); - } + else + MsgData = NULL; - RemoveQItem(Msg->MyQItem); + /* + * Uncompleted delivery instructions remain, so delete the old + * instructions and replace with the updated ones. + */ + EVS_syslog(LOG_DEBUG, "SMTPQD: %ld", Msg->MyQItem->QueMsgID); + CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, &Msg->MyQItem->QueMsgID, 1, ""); + + if (IDestructQueItem) + smtpq_do_bounce(Msg->MyQItem,Msg->msgtext); + + if (nRemain > 0) + { + struct CtdlMessage *msg; + msg = malloc(sizeof(struct CtdlMessage)); + memset(msg, 0, sizeof(struct CtdlMessage)); + msg->cm_magic = CTDLMESSAGE_MAGIC; + msg->cm_anon_type = MES_NORMAL; + msg->cm_format_type = FMT_RFC822; + msg->cm_fields['M'] = SmashStrBuf(&MsgData); + Msg->MyQItem->QueMsgID = + CtdlSubmitMsg(msg, NULL, SMTP_SPOOLOUT_ROOM, QP_EADDR); + EVS_syslog(LOG_DEBUG, "SMTPQ: %ld", Msg->MyQItem->QueMsgID); + CtdlFreeMessage(msg); } + else { + CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, + &Msg->MyQItem->MessageID, + 1, + ""); + FreeStrBuf(&MsgData); + } + RemoveContext(Msg->IO.CitContext); + if (IDestructQueItem) + RemoveQItem(Msg->MyQItem); DeleteSmtpOutMsg(Msg); } eNextState FailOneAttempt(AsyncIO *IO) { SmtpOutMsg *SendMsg = IO->Data; + + if (SendMsg->MyQEntry->Status == 2) + return eAbort; + /* * possible ways here: * - connection timeout - * - - */ - SendMsg->pCurrRelay = SendMsg->pCurrRelay->Next; + * - dns lookup failed + */ + StopClientWatchers(IO); - if (SendMsg->pCurrRelay == NULL) + if (SendMsg->pCurrRelay != NULL) + SendMsg->pCurrRelay = SendMsg->pCurrRelay->Next; + + if (SendMsg->pCurrRelay == NULL) { + EVS_syslog(LOG_DEBUG, "SMTP: %s Aborting\n", __FUNCTION__); return eAbort; - if (SendMsg->pCurrRelay->IsIP) + } + if (SendMsg->pCurrRelay->IsIP) { + EVS_syslog(LOG_DEBUG, "SMTP: %s connecting IP\n", __FUNCTION__); return mx_connect_ip(IO); - else + } + else { + EVS_syslog(LOG_DEBUG, "SMTP: %s resolving next MX Record\n", __FUNCTION__); return get_one_mx_host_ip(IO); + } } void SetConnectStatus(AsyncIO *IO) { - SmtpOutMsg *SendMsg = IO->Data; char buf[256]; void *src; @@ -204,14 +231,14 @@ void SetConnectStatus(AsyncIO *IO) sizeof(buf)); if (SendMsg->mx_host == NULL) - SendMsg->mx_host = ""; + SendMsg->mx_host = ""; - CtdlLogPrintf(CTDL_DEBUG, - "SMTP client[%ld]: connecting to %s [%s]:%d ...\n", - SendMsg->n, - SendMsg->mx_host, - buf, - SendMsg->IO.ConnectMe->Port); + EVS_syslog(LOG_DEBUG, + "SMTP client[%ld]: connecting to %s [%s]:%d ...\n", + SendMsg->n, + SendMsg->mx_host, + buf, + SendMsg->IO.ConnectMe->Port); SendMsg->MyQEntry->Status = 5; StrBufPrintf(SendMsg->MyQEntry->StatusMessage, @@ -219,6 +246,7 @@ void SetConnectStatus(AsyncIO *IO) SendMsg->mx_host, buf, SendMsg->IO.ConnectMe->Port); + SendMsg->IO.NextState = eConnect; } /***************************************************************************** @@ -228,17 +256,16 @@ eNextState mx_connect_ip(AsyncIO *IO) { SmtpOutMsg *SendMsg = IO->Data; - CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__); - + EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__); + IO->ConnectMe = SendMsg->pCurrRelay; - /* Bypass the ns lookup result like this: IO->Addr.sin_addr.s_addr = inet_addr("127.0.0.1"); */ SetConnectStatus(IO); - return InitEventIO(IO, SendMsg, - SMTP_C_ConnTimeout, - SMTP_C_ReadTimeouts[0], - 1); + return EvConnectSock(IO, + SMTP_C_ConnTimeout, + SMTP_C_ReadTimeouts[0], + 1); } eNextState get_one_mx_host_ip_done(AsyncIO *IO) @@ -272,6 +299,7 @@ eNextState get_one_mx_host_ip_done(AsyncIO *IO) addr->sin_port = htons(DefaultMXPort); } + SendMsg->mx_host = SendMsg->pCurrRelay->Host; return mx_connect_ip(IO); } else // TODO: here we need to find out whether there are more mx'es, backup relay, and so on @@ -290,13 +318,14 @@ eNextState get_one_mx_host_ip(AsyncIO *IO) InitC_ares_dns(IO); - CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__); + EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__); - CtdlLogPrintf(CTDL_DEBUG, - "SMTP client[%ld]: looking up %s : %d ...\n", - SendMsg->n, - SendMsg->pCurrRelay->Host, - SendMsg->pCurrRelay->Port); + EVS_syslog(LOG_DEBUG, + "SMTP client[%ld]: looking up %s-Record %s : %d ...\n", + SendMsg->n, + (SendMsg->pCurrRelay->IPv6)? "aaaa": "a", + SendMsg->pCurrRelay->Host, + SendMsg->pCurrRelay->Port); if (!QueueQuery((SendMsg->pCurrRelay->IPv6)? ns_t_aaaa : ns_t_a, SendMsg->pCurrRelay->Host, @@ -307,8 +336,10 @@ eNextState get_one_mx_host_ip(AsyncIO *IO) SendMsg->MyQEntry->Status = 5; StrBufPrintf(SendMsg->MyQEntry->StatusMessage, "No MX hosts found for <%s>", SendMsg->node); + SendMsg->IO.NextState = eTerminateConnection; return IO->NextState; } + IO->NextState = eReadDNSReply; return IO->NextState; } @@ -323,18 +354,18 @@ eNextState smtp_resolve_mx_record_done(AsyncIO *IO) QueryCbDone(IO); - CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__); + EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__); pp = &SendMsg->Relay; while ((pp != NULL) && (*pp != NULL) && ((*pp)->Next != NULL)) pp = &(*pp)->Next; - if ((IO->DNSQuery->DNSStatus == ARES_SUCCESS) && - (IO->DNSQuery->VParsedDNSReply != NULL)) + if ((IO->DNS.Query->DNSStatus == ARES_SUCCESS) && + (IO->DNS.Query->VParsedDNSReply != NULL)) { /* ok, we found mx records. */ SendMsg->IO.ErrMsg = SendMsg->MyQEntry->StatusMessage; SendMsg->CurrMX = SendMsg->AllMX - = IO->DNSQuery->VParsedDNSReply; + = IO->DNS.Query->VParsedDNSReply; while (SendMsg->CurrMX) { int i; for (i = 0; i < 2; i++) { @@ -367,7 +398,7 @@ eNextState smtp_resolve_mx_record_done(AsyncIO *IO) p->Host = SendMsg->node; *pp = p; - pp = &p; + pp = &p->Next; } SendMsg->CXFlags = SendMsg->CXFlags & F_DIRECT; } @@ -380,7 +411,7 @@ eNextState resolve_mx_records(AsyncIO *IO) { SmtpOutMsg * SendMsg = IO->Data; - CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__); + EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__); /* start resolving MX records here. */ if (!QueueQuery(ns_t_mx, SendMsg->node, @@ -393,7 +424,8 @@ eNextState resolve_mx_records(AsyncIO *IO) "No MX hosts found for <%s>", SendMsg->node); return IO->NextState; } - return eAbort; + SendMsg->IO.NextState = eReadDNSReply; + return IO->NextState; } @@ -403,7 +435,7 @@ eNextState resolve_mx_records(AsyncIO *IO) ******************************************************************************/ SmtpOutMsg *new_smtp_outmsg(OneQueItem *MyQItem, - MailQEntry *MyQEntry, + MailQEntry *MyQEntry, int MsgCount) { SmtpOutMsg * SendMsg; @@ -416,41 +448,46 @@ SmtpOutMsg *new_smtp_outmsg(OneQueItem *MyQItem, SendMsg->MyQItem = MyQItem; SendMsg->pCurrRelay = MyQItem->URL; - SendMsg->IO.Data = SendMsg; - - SendMsg->IO.SendDone = SMTP_C_DispatchWriteDone; - SendMsg->IO.ReadDone = SMTP_C_DispatchReadDone; - SendMsg->IO.Terminate = SMTP_C_Terminate; - SendMsg->IO.LineReader = SMTP_C_ReadServerStatus; - SendMsg->IO.ConnFail = SMTP_C_ConnFail; - SendMsg->IO.Timeout = SMTP_C_Timeout; - SendMsg->IO.ShutdownAbort = SMTP_C_Shutdown; - - SendMsg->IO.SendBuf.Buf = NewStrBufPlain(NULL, 1024); - SendMsg->IO.RecvBuf.Buf = NewStrBufPlain(NULL, 1024); - SendMsg->IO.IOBuf = NewStrBuf(); + InitIOStruct(&SendMsg->IO, + SendMsg, + eReadMessage, + SMTP_C_ReadServerStatus, + SMTP_C_DNSFail, + SMTP_C_DispatchWriteDone, + SMTP_C_DispatchReadDone, + SMTP_C_Terminate, + SMTP_C_ConnFail, + SMTP_C_Timeout, + SMTP_C_Shutdown); - SendMsg->IO.sock = (-1); - SendMsg->IO.NextState = eReadMessage; - return SendMsg; } void smtp_try_one_queue_entry(OneQueItem *MyQItem, - MailQEntry *MyQEntry, - StrBuf *MsgText, + MailQEntry *MyQEntry, + StrBuf *MsgText, int KeepMsgText, /* KeepMsgText allows us to use MsgText as ours. */ int MsgCount) { SmtpOutMsg *SendMsg; - CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__); + syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__); SendMsg = new_smtp_outmsg(MyQItem, MyQEntry, MsgCount); if (KeepMsgText) SendMsg->msgtext = MsgText; - else SendMsg->msgtext = NewStrBufDup(MsgText); - + else SendMsg->msgtext = NewStrBufDup(MsgText); + if (smtp_resolve_recipients(SendMsg)) { + + safestrncpy( + ((CitContext *)SendMsg->IO.CitContext)->cs_host, + SendMsg->node, + sizeof(((CitContext *)SendMsg->IO.CitContext)->cs_host)); + + syslog(LOG_DEBUG, "SMTP Starting: [%ld] <%s> CC <%d> \n", + SendMsg->MyQItem->MessageID, + ChrPtr(SendMsg->MyQEntry->Recipient), + ((CitContext*)SendMsg->IO.CitContext)->cs_pid); if (SendMsg->pCurrRelay == NULL) QueueEventContext(&SendMsg->IO, resolve_mx_records); @@ -467,10 +504,10 @@ void smtp_try_one_queue_entry(OneQueItem *MyQItem, } else { /* No recipients? well fail then. */ - if ((SendMsg==NULL) || + if ((SendMsg==NULL) || (SendMsg->MyQEntry == NULL)) { SendMsg->MyQEntry->Status = 5; - StrBufPlain(SendMsg->MyQEntry->StatusMessage, + StrBufPlain(SendMsg->MyQEntry->StatusMessage, HKEY("Invalid Recipient!")); } FinalizeMessageSend(SendMsg); @@ -488,9 +525,13 @@ void smtp_try_one_queue_entry(OneQueItem *MyQItem, void SMTPSetTimeout(eNextState NextTCPState, SmtpOutMsg *pMsg) { - CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__); - double Timeout; + double Timeout = 0.0; + AsyncIO *IO = &pMsg->IO; + + EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__); + switch (NextTCPState) { + case eSendFile: case eSendReply: case eSendMore: Timeout = SMTP_C_SendTimeouts[pMsg->State]; @@ -509,6 +550,13 @@ void SMTPSetTimeout(eNextState NextTCPState, SmtpOutMsg *pMsg) Timeout += StrLength(pMsg->msgtext) / 1024; } break; + case eSendDNSQuery: + case eReadDNSReply: + case eDBQuery: + case eReadFile: + case eReadMore: + case eReadPayload: + case eConnect: case eTerminateConnection: case eAbort: return; @@ -517,18 +565,21 @@ void SMTPSetTimeout(eNextState NextTCPState, SmtpOutMsg *pMsg) } eNextState SMTP_C_DispatchReadDone(AsyncIO *IO) { - CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__); + EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__); SmtpOutMsg *pMsg = IO->Data; eNextState rc; rc = ReadHandlers[pMsg->State](pMsg); - pMsg->State++; - SMTPSetTimeout(rc, pMsg); + if (rc != eAbort) + { + pMsg->State++; + SMTPSetTimeout(rc, pMsg); + } return rc; } eNextState SMTP_C_DispatchWriteDone(AsyncIO *IO) { - CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__); + EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__); SmtpOutMsg *pMsg = IO->Data; eNextState rc; @@ -545,7 +596,7 @@ eNextState SMTP_C_Terminate(AsyncIO *IO) { SmtpOutMsg *pMsg = IO->Data; - CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__); + EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__); FinalizeMessageSend(pMsg); return eAbort; } @@ -553,7 +604,7 @@ eNextState SMTP_C_Timeout(AsyncIO *IO) { SmtpOutMsg *pMsg = IO->Data; - CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__); + EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__); StrBufPlain(IO->ErrMsg, CKEY(ReadErrors[pMsg->State])); return FailOneAttempt(IO); } @@ -561,13 +612,18 @@ eNextState SMTP_C_ConnFail(AsyncIO *IO) { SmtpOutMsg *pMsg = IO->Data; - CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__); + EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__); StrBufPlain(IO->ErrMsg, CKEY(ReadErrors[pMsg->State])); return FailOneAttempt(IO); } +eNextState SMTP_C_DNSFail(AsyncIO *IO) +{ + EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__); + return FailOneAttempt(IO); +} eNextState SMTP_C_Shutdown(AsyncIO *IO) { - CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__); + EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__); SmtpOutMsg *pMsg = IO->Data; pMsg->MyQEntry->Status = 3; @@ -608,7 +664,6 @@ eReadState SMTP_C_ReadServerStatus(AsyncIO *IO) return Finished; } -#endif CTDL_MODULE_INIT(smtp_eventclient) { return "smtpeventclient";