/* If the last item in a list of recipients was truncated to a partial address,

[citadel.git] / citadel / msgbase.c

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 1401175565d5525ef0ef1b5ff3ef29a1f4a4319c..ac0c33161cef9cc1063c2594dd9abe99c688a0b9 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -1593,6 +1593,31 @@ char *qp_encode_email_addrs(char *source)
 }
 
 
+/* If the last item in a list of recipients was truncated to a partial address,
+ * remove it completely in order to avoid choking libSieve
+ */
+void sanitize_truncated_recipient(char *str)
+{
+       if (!str) return;
+       if (num_tokens(str, ',') < 2) return;
+
+       int len = strlen(str);
+       if (len < 900) return;
+       if (len > 998) str[998] = 0;
+
+       char *cptr = strrchr(str, ',');
+       if (!cptr) return;
+
+       char *lptr = strchr(cptr, '<');
+       char *rptr = strchr(cptr, '>');
+
+       if ( (lptr) && (rptr) && (rptr > lptr) ) return;
+
+       *cptr = 0;
+}
+
+
+
 /*
  * Get a message off disk.  (returns om_* values found in msgbase.h)
  */
@@ -1623,7 +1648,6 @@ int CtdlOutputPreLoadedMsg(
        char luser[100];
        char fuser[100];
        char snode[100];
-       char lnode[100];
        char mid[100];
        char datestamp[100];
 
@@ -1783,7 +1807,6 @@ int CtdlOutputPreLoadedMsg(
        strcpy(luser, "");
        strcpy(fuser, "");
        strcpy(snode, NODENAME);
-       strcpy(lnode, HUMANNODE);
        if (mode == MT_RFC822) {
                for (i = 0; i < 256; ++i) {
                        if (TheMessage->cm_fields[i]) {
@@ -1794,8 +1817,10 @@ int CtdlOutputPreLoadedMsg(
                                        safestrncpy(suser, mptr, sizeof suser);
                                }
                                else if (i == 'Y') {
-                                       if ((flags & QP_EADDR) != 0) 
+                                       if ((flags & QP_EADDR) != 0) {
                                                mptr = qp_encode_email_addrs(mptr);
+                                       }
+                                       sanitize_truncated_recipient(mptr);
                                        cprintf("CC: %s%s", mptr, nl);
                                }
                                else if (i == 'P') {
@@ -1815,8 +1840,6 @@ int CtdlOutputPreLoadedMsg(
                                }
                                else if (i == 'I')
                                        safestrncpy(mid, mptr, sizeof mid);
-                               else if (i == 'H')
-                                       safestrncpy(lnode, mptr, sizeof lnode);
                                else if (i == 'F')
                                        safestrncpy(fuser, mptr, sizeof fuser);
                                /* else if (i == 'O')
@@ -1828,13 +1851,18 @@ int CtdlOutputPreLoadedMsg(
                                {
                                        if (haschar(mptr, '@') == 0)
                                        {
-                                               cprintf("To: %s@%s%s", mptr, config.c_fqdn, nl);
+                                               sanitize_truncated_recipient(mptr);
+                                               cprintf("To: %s@%s", mptr, config.c_fqdn);
+                                               cprintf("%s", nl);
                                        }
                                        else
                                        {
-                                               if ((flags & QP_EADDR) != 0) 
+                                               if ((flags & QP_EADDR) != 0) {
                                                        mptr = qp_encode_email_addrs(mptr);
-                                               cprintf("To: %s%s", mptr, nl);
+                                               }
+                                               sanitize_truncated_recipient(mptr);
+                                               cprintf("To: %s", mptr);
+                                               cprintf("%s", nl);
                                        }
                                }
                                else if (i == 'T') {
@@ -1895,8 +1923,6 @@ int CtdlOutputPreLoadedMsg(
                        cprintf("From: \"%s\" <%s@%s>%s", luser, suser, snode, nl);
                }
 
-               cprintf("Organization: %s%s", lnode, nl);
-
                /* Blank line signifying RFC822 end-of-headers */
                if (TheMessage->cm_format_type != FMT_RFC822) {
                        cprintf("%s", nl);