* Fixed up the "Date:" headers to be RFC822-compliant

[citadel.git] / citadel / internet_addressing.c

diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c
index 6dc5a1fc683efe4c6cecc8c775e97e84d6c95f28..6e3ccbdeaf62243791c6ce3d0a762f13d85717f4 100644 (file)
--- a/citadel/internet_addressing.c
+++ b/citadel/internet_addressing.c
@@ -10,6 +10,7 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <fcntl.h>
+#include <ctype.h>
 #include <signal.h>
 #include <pwd.h>
 #include <errno.h>
@@ -28,6 +29,8 @@
 #include "tools.h"
 #include "internet_addressing.h"
 #include "user_ops.h"
+#include "parsedate.h"
+
 
 
 /*
@@ -48,6 +51,27 @@ int fuzzy_match(struct usersupp *us, char *matchstring) {
 }
 
 
+/*
+ * Unfold a multi-line field into a single line, removing multi-whitespaces
+ */
+void unfold_rfc822_field(char *field) {
+       int i;
+       int quote = 0;
+
+       striplt(field);         /* remove leading/trailing whitespace */
+
+       /* convert non-space whitespace to spaces, and remove double blanks */
+       for (i=0; i<strlen(field); ++i) {
+               if (field[i]=='\"') quote = 1 - quote;
+               if (!quote) {
+                       if (isspace(field[i])) field[i] = ' ';
+                       while (isspace(field[i]) && isspace(field[i+1])) {
+                               strcpy(&field[i+1], &field[i+2]);
+                       }
+               }
+       }
+}
+
 
 
 /*
@@ -256,6 +280,79 @@ int convert_internet_address(char *destuser, char *desthost, char *source)
 
 
 
+/*
+ * convert_field() is a helper function for convert_internet_message().
+ * Given start/end positions for an rfc822 field, it converts it to a Citadel
+ * field if it wants to, and unfolds it if necessary.
+ *
+ * Returns 1 if the field was converted and inserted into the Citadel message
+ * structure, implying that the source field should be removed from the
+ * message text.
+ */
+int convert_field(struct CtdlMessage *msg, int beg, int end) {
+       char *rfc822;
+       char *key, *value;
+       int i;
+       int colonpos = (-1);
+       int processed = 0;
+       char buf[256];
+       char *user, *node, *name;
+
+       rfc822 = msg->cm_fields['M'];   /* M field contains rfc822 text */
+       for (i = end; i >= beg; --i) {
+               if (rfc822[i] == ':') colonpos = i;
+       }
+
+       if (colonpos < 0) return(0);    /* no colon? not a valid header line */
+
+       value = mallok((end - beg) + 2);
+       safestrncpy(value, &rfc822[beg], (end-beg)+1);
+       key = value;
+       key[colonpos - beg] = 0;
+       value = &key[(colonpos - beg) + 1];
+       unfold_rfc822_field(value);
+
+       /* Here's the big rfc822-to-citadel loop. */
+
+       if (!strcasecmp(key, "Date")) {
+               lprintf(9, "converting date <%s>\n", value);
+               sprintf(buf, "%ld", parsedate(value) );
+               lprintf(9, "parsed value is <%s>\n", buf);
+               if (msg->cm_fields['T'] != NULL)
+                       msg->cm_fields['T'] = strdoop(buf);
+               processed = 1;
+       }
+
+       else if (!strcasecmp(key, "From")) {
+               user = mallok(strlen(value));
+               node = mallok(strlen(value));
+               name = mallok(strlen(value));
+               process_rfc822_addr(value, user, node, name);
+               if (msg->cm_fields['A'] != NULL)
+                       msg->cm_fields['A'] = strdoop(user);
+               if (msg->cm_fields['N'] != NULL)
+                       msg->cm_fields['N'] = strdoop(node);
+               if (msg->cm_fields['H'] != NULL)
+                       msg->cm_fields['H'] = strdoop(name);
+               phree(user);
+               phree(node);
+               phree(name);
+               processed = 1;
+       }
+
+       else if (!strcasecmp(key, "Subject")) {
+               if (msg->cm_fields['U'] != NULL)
+                       msg->cm_fields['U'] = strdoop(key);
+               processed = 1;
+       }
+
+       /* Clean up and move on. */
+       lprintf(9, "Field: key=<%s> value=<%s> processed=%d\n",
+               key, value, processed);
+       phree(key);     /* Don't free 'value', it's actually the same buffer */
+       return(processed);
+}
+
 
 /*
  * Convert an RFC822 message (headers + body) to a CtdlMessage structure.
@@ -263,12 +360,11 @@ int convert_internet_address(char *destuser, char *desthost, char *source)
 struct CtdlMessage *convert_internet_message(char *rfc822) {
 
        struct CtdlMessage *msg;
-       char *buf;
-       int pos;
+       int pos, beg, end;
        int msglen;
        int done;
-       char *field;
        char buf[256];
+       int converted;
 
        msg = mallok(sizeof(struct CtdlMessage));
        if (msg == NULL) return msg;
@@ -283,19 +379,41 @@ struct CtdlMessage *convert_internet_message(char *rfc822) {
        msglen = strlen(rfc822);
        pos = 0;
        done = 0;
-       field = NULL;
 
        while (!done) {
 
-               for (i=pos; i<=strlen(rfc822); ++i) {
+               /* Locate beginning and end of field, keeping in mind that
+                * some fields might be multiline
+                */
+               beg = pos;
+               end = (-1);
+               for (pos=beg; ((pos<=strlen(rfc822))&&(end<0)); ++pos) {
+                       if ((rfc822[pos]=='\n')
+                          && (!isspace(rfc822[pos+1]))) {
+                               end = pos;
+                       }
+                       if ( (rfc822[pos]=='\n')        /* done w. headers? */
+                          && ( (rfc822[pos+1]=='\n')
+                             ||(rfc822[pos+1]=='\r'))) {
+                               end = pos;
+                               done = 1;
+                       }
 
-               
+               }
 
+               /* At this point we have a field.  Are we interested in it? */
+               converted = convert_field(msg, beg, end);
+               if (converted) {
+                       strcpy(&rfc822[beg], &rfc822[pos]);
+                       pos = beg;
+               }
 
+               /* If we've hit the end of the message, bail out */
+               if (pos > strlen(rfc822)) done = 1;
        }
 
 
-       /* Follow-up sanity check. */
+       /* Follow-up sanity checks... */
 
        /* If there's no timestamp on this message, set it to now. */
        if (msg->cm_fields['T'] == NULL) {
@@ -305,3 +423,4 @@ struct CtdlMessage *convert_internet_message(char *rfc822) {
 
        return msg;
 }
+