more places to fix the new linebreak behaviour of the base64 encoder.

[citadel.git] / citadel / modules / smtp / smtp_clienthandlers.c

diff --git a/citadel/modules/smtp/smtp_clienthandlers.c b/citadel/modules/smtp/smtp_clienthandlers.c
index 6762016c5bd11fd1f1fb125c35909ef6ab5f60b0..198649e1f2c00522b2f738b7ee04cbf15e1840ef 100644 (file)
--- a/citadel/modules/smtp/smtp_clienthandlers.c
+++ b/citadel/modules/smtp/smtp_clienthandlers.c
@@ -113,6 +113,11 @@
 #define SMTP_DBG_READ() \
        EVS_syslog(LOG_DEBUG, "< %s\n", ChrPtr(Msg->IO.IOBuf))
 
+/*
+ * if a Read handler wants to skip to a specific part use this macro.
+ * the -1 is here since the auto-forward following has to be taken into account.
+ */
+#define READ_NEXT_STATE(state) Msg->State = state - 1
 
 /*****************************************************************************/
 /*                     SMTP CLIENT STATE CALLBACKS                           */
@@ -152,15 +157,20 @@ eNextState SMTPC_read_EHLO_reply(SmtpOutMsg *Msg)
        SMTP_DBG_READ();
 
        if (SMTP_IS_STATE('2')) {
-               Msg->State ++;
+               READ_NEXT_STATE(eSMTPAuth);
 
                if ((Msg->pCurrRelay == NULL) ||
                    (Msg->pCurrRelay->User == NULL))
-                       Msg->State ++; /* Skip auth... */
+                       READ_NEXT_STATE(eFROM); /* Skip auth... */
                if (Msg->pCurrRelay != NULL)
                {
                        if (strstr(ChrPtr(Msg->IO.IOBuf), "LOGIN") != NULL)
                                Msg->SendLogin = 1;
+                       else if ((Msg->MultiLineBuf != NULL) &&
+                                strstr(ChrPtr(Msg->MultiLineBuf), "LOGIN") != NULL)
+                       {
+                               Msg->SendLogin = 1;
+                       }
                }
        }
        /* else we fall back to 'helo' */
@@ -196,7 +206,7 @@ eNextState SMTPC_read_HELO_reply(SmtpOutMsg *Msg)
        }
        if ((Msg->pCurrRelay == NULL) ||
            (Msg->pCurrRelay->User == NULL))
-               Msg->State ++; /* Skip auth... */
+               READ_NEXT_STATE(eFROM); /* Skip auth... */
 
        return eSendReply;
 }
@@ -209,31 +219,13 @@ eNextState SMTPC_send_auth(SmtpOutMsg *Msg)
 
        if ((Msg->pCurrRelay == NULL) ||
            (Msg->pCurrRelay->User == NULL))
-               Msg->State ++; /* Skip auth, shouldn't even come here!... */
+               READ_NEXT_STATE(eFROM); /* Skip auth, shouldn't even come here!... */
        else {
                /* Do an AUTH command if necessary */
                if (Msg->SendLogin)
                {
-                       sprintf(buf, "%s",
-                               Msg->pCurrRelay->User);
-
-                       CtdlEncodeBase64(encoded, buf,
-                                        strlen(Msg->pCurrRelay->User) * 2 +
-                                        strlen(Msg->pCurrRelay->Pass) + 2, 0);
-                       
-                       StrBufPrintf(Msg->IO.SendBuf.Buf,
-                                    "AUTH LOGIN %s\r\n",
-                                    encoded);
-                       sprintf(buf, "%s",
-                               Msg->pCurrRelay->Pass);
-                       
-                       CtdlEncodeBase64(encoded, buf,
-                                        strlen(Msg->pCurrRelay->User) * 2 +
-                                        strlen(Msg->pCurrRelay->Pass) + 2, 0);
-                       
-                       StrBufAppendPrintf(Msg->IO.SendBuf.Buf,
-                                          "%s\r\n",
-                                          encoded);
+                       StrBufPlain(Msg->IO.SendBuf.Buf,
+                                   HKEY("AUTH LOGIN\r\n"));
                }
                else
                {
@@ -242,10 +234,14 @@ eNextState SMTPC_send_auth(SmtpOutMsg *Msg)
                                Msg->pCurrRelay->User, '\0',
                                Msg->pCurrRelay->Pass);
                        
-                       CtdlEncodeBase64(encoded, buf,
-                                        strlen(Msg->pCurrRelay->User) * 2 +
-                                        strlen(Msg->pCurrRelay->Pass) + 2, 0);
-                       
+                       size_t len = CtdlEncodeBase64(encoded, buf,
+                                                     strlen(Msg->pCurrRelay->User) * 2 +
+                                                     strlen(Msg->pCurrRelay->Pass) + 2, 0);
+
+                       if (buf[len - 1] == '\n') {
+                               buf[len - 1] = '\0';
+                       }
+
                        StrBufPrintf(Msg->IO.SendBuf.Buf,
                                     "AUTH PLAIN %s\r\n",
                                     encoded);
@@ -255,6 +251,7 @@ eNextState SMTPC_send_auth(SmtpOutMsg *Msg)
        return eReadMessage;
 }
 
+
 eNextState SMTPC_read_auth_reply(SmtpOutMsg *Msg)
 {
        AsyncIO *IO = &Msg->IO;
@@ -262,6 +259,108 @@ eNextState SMTPC_read_auth_reply(SmtpOutMsg *Msg)
 
        SMTP_DBG_READ();
 
+       if (Msg->SendLogin)
+       {
+               if (!SMTP_IS_STATE('3'))
+                       SMTP_VERROR(5);
+       }
+       else
+       {
+               if (!SMTP_IS_STATE('2')) {
+                       if (SMTP_IS_STATE('4'))
+                               SMTP_VERROR(4);
+                       else
+                               SMTP_VERROR(5);
+               }
+               READ_NEXT_STATE(eFROM);
+       }
+       return eSendReply;
+}
+
+
+eNextState SMTPC_send_authplain_1(SmtpOutMsg *Msg)
+{
+       AsyncIO *IO = &Msg->IO;
+       char buf[SIZ];
+       char encoded[1024];
+       long encodedlen;
+
+       sprintf(buf, "%s",
+               Msg->pCurrRelay->User);
+       
+       encodedlen = CtdlEncodeBase64(
+               encoded,
+               Msg->pCurrRelay->User,
+               strlen(Msg->pCurrRelay->User),
+               0);
+       if (encoded[encodedlen - 1] == '\n') {
+               encodedlen --;
+               encoded[encodedlen] = '\0';
+       }
+
+       StrBufPlain(Msg->IO.SendBuf.Buf,
+                   encoded,
+                   encodedlen);
+
+       StrBufAppendBufPlain(Msg->IO.SendBuf.Buf,
+                            HKEY("\r\n"), 0);
+
+       SMTP_DBG_SEND();
+
+       return eReadMessage;
+}
+eNextState SMTPC_read_auth_plain_reply_1(SmtpOutMsg *Msg)
+{
+       AsyncIO *IO = &Msg->IO;
+       /* Do an AUTH command if necessary */
+
+       SMTP_DBG_READ();
+
+       if (!SMTP_IS_STATE('3'))
+               SMTP_VERROR(5);
+       return eSendReply;
+}
+
+
+eNextState SMTPC_send_authplain_2(SmtpOutMsg *Msg)
+{
+       AsyncIO *IO = &Msg->IO;
+       char buf[SIZ];
+       char encoded[1024];
+       long encodedlen;
+
+       sprintf(buf, "%s",
+               Msg->pCurrRelay->Pass);
+       
+       encodedlen = CtdlEncodeBase64(
+               encoded,
+               Msg->pCurrRelay->Pass,
+               strlen(Msg->pCurrRelay->Pass),
+               0);
+
+       if (encoded[encodedlen - 1] == '\n') {
+               encodedlen --;
+               encoded[encodedlen] = '\0';
+       }
+
+       StrBufPlain(Msg->IO.SendBuf.Buf,
+                   encoded,
+                   encodedlen);
+
+       StrBufAppendBufPlain(Msg->IO.SendBuf.Buf,
+                            HKEY("\r\n"), 0);
+
+       SMTP_DBG_SEND();
+
+       return eReadMessage;
+}
+eNextState SMTPC_read_auth_plain_reply_2(SmtpOutMsg *Msg)
+{
+       AsyncIO *IO = &Msg->IO;
+       /* Do an AUTH command if necessary */
+
+       SMTP_DBG_READ();
+
        if (!SMTP_IS_STATE('2')) {
                if (SMTP_IS_STATE('4'))
                        SMTP_VERROR(4);
@@ -360,6 +459,10 @@ eNextState SMTPC_send_data_body(SmtpOutMsg *Msg)
        Buf = Msg->IO.SendBuf.Buf;
        Msg->IO.SendBuf.Buf = Msg->msgtext;
        Msg->msgtext = Buf;
+       /* 
+        * sending the message itself doesn't use this state machine.
+        * so we have to operate it here by ourselves.
+        */
        Msg->State ++;
 
        return eSendMore;
@@ -444,6 +547,8 @@ SMTPReadHandler ReadHandlers[eMaxSMTPC] = {
        SMTPC_read_EHLO_reply,
        SMTPC_read_HELO_reply,
        SMTPC_read_auth_reply,
+       SMTPC_read_auth_plain_reply_1,
+       SMTPC_read_auth_plain_reply_2,
        SMTPC_read_FROM_reply,
        SMTPC_read_RCPT_reply,
        SMTPC_read_DATAcmd_reply,
@@ -456,6 +561,8 @@ SMTPSendHandler SendHandlers[eMaxSMTPC] = {
        SMTPC_send_EHLO,
        STMPC_send_HELO,
        SMTPC_send_auth,
+       SMTPC_send_authplain_1,
+       SMTPC_send_authplain_2,
        SMTPC_send_FROM,
        SMTPC_send_RCPT,
        SMTPC_send_DATAcmd,
@@ -471,6 +578,8 @@ const double SMTP_C_ReadTimeouts[eMaxSMTPC] = {
        30., /* EHLO */
        30., /* HELO */
        30., /* Auth */
+       30., /* Auth */
+       30., /* Auth */
        30., /* From */
        90., /* RCPT */
        30., /* DATA */
@@ -483,6 +592,8 @@ const double SMTP_C_SendTimeouts[eMaxSMTPC] = {
        30., /* EHLO */
        30., /* HELO */
        30., /* Auth */
+       30., /* Auth */
+       30., /* Auth */
        30., /* From */
        30., /* RCPT */
        30., /* DATA */
@@ -496,6 +607,8 @@ const ConstStr ReadErrors[eMaxSMTPC + 1] = {
        {HKEY("Connection broken during SMTP EHLO")},
        {HKEY("Connection broken during SMTP HELO")},
        {HKEY("Connection broken during SMTP AUTH")},
+       {HKEY("Connection broken during SMTP AUTH PLAIN I")},
+       {HKEY("Connection broken during SMTP AUTH PLAIN II")},
        {HKEY("Connection broken during SMTP MAIL FROM")},
        {HKEY("Connection broken during SMTP RCPT")},
        {HKEY("Connection broken during SMTP DATA")},