* Changes to message base and networker to support Internet-style message

[citadel.git] / citadel / internet_addressing.c

diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c
index a4f8218f521e471f61f73999befc7f2ab10fcd0a..32114261d823ee99dc02d45fd5bc675ebf01ee8d 100644 (file)
--- a/citadel/internet_addressing.c
+++ b/citadel/internet_addressing.c
@@ -27,6 +27,7 @@
 #include "support.h"
 #include "config.h"
 #include "tools.h"
+#include "msgbase.h"
 #include "internet_addressing.h"
 #include "user_ops.h"
 #include "room_ops.h"
@@ -129,7 +130,6 @@ void unfold_rfc822_field(char *field) {
 
 /*
  * Split an RFC822-style address into userid, host, and full name
- * (Originally from citmail.c, and unchanged so far)
  *
  */
 void process_rfc822_addr(char *rfc822, char *user, char *node, char *name)
@@ -241,22 +241,35 @@ void process_rfc822_addr(char *rfc822, char *user, char *node, char *name)
                        if (node[a] == '>')
                                node[a] = 0;
        }
-       /* strip anything to the left of a @ */
-       while ((strlen(node) > 0) && (haschar(node, '@') > 0))
-               strcpy(node, &node[1]);
 
-       /* strip anything to the left of a % */
-       while ((strlen(node) > 0) && (haschar(node, '%') > 0))
-               strcpy(node, &node[1]);
+       /* If no node specified, tack ours on instead */
+       if (
+               (haschar(node, '@')==0)
+               && (haschar(node, '%')==0)
+               && (haschar(node, '!')==0)
+       ) {
+               strcpy(node, config.c_nodename);
+       }
 
-       /* reduce multiple system bang paths to node!user */
-       while ((strlen(node) > 0) && (haschar(node, '!') > 1))
-               strcpy(node, &node[1]);
+       else {
 
-       /* now get rid of the user portion of a node!user string */
-       for (a = 0; a < strlen(node); ++a)
-               if (node[a] == '!')
-                       node[a] = 0;
+               /* strip anything to the left of a @ */
+               while ((strlen(node) > 0) && (haschar(node, '@') > 0))
+                       strcpy(node, &node[1]);
+       
+               /* strip anything to the left of a % */
+               while ((strlen(node) > 0) && (haschar(node, '%') > 0))
+                       strcpy(node, &node[1]);
+       
+               /* reduce multiple system bang paths to node!user */
+               while ((strlen(node) > 0) && (haschar(node, '!') > 1))
+                       strcpy(node, &node[1]);
+       
+               /* now get rid of the user portion of a node!user string */
+               for (a = 0; a < strlen(node); ++a)
+                       if (node[a] == '!')
+                               node[a] = 0;
+       }
 
        /* strip leading and trailing spaces in all strings */
        striplt(user);
@@ -300,9 +313,17 @@ int convert_internet_address(char *destuser, char *desthost, char *source)
        int hostalias;
        struct trynamebuf tnb;
        char buf[256];
+       int passes = 0;
+       char sourcealias[1024];
+
+       safestrncpy(sourcealias, source, sizeof(sourcealias) );
+       alias(sourcealias);
 
+REALIAS:
        /* Split it up */
-       process_rfc822_addr(source, user, node, name);
+       process_rfc822_addr(sourcealias, user, node, name);
+       lprintf(9, "process_rfc822_addr() converted to <%s@%s> (%s)\n",
+               user, node, name);
 
        /* Map the FQDN to a Citadel node name
         */
@@ -321,6 +342,16 @@ int convert_internet_address(char *destuser, char *desthost, char *source)
         * FIXME ... do the multiple-addresses thing
         */
        if (!strcasecmp(node, config.c_nodename)) {
+
+
+               /* First, see if we hit an alias.  Don't do this more than
+                * a few times, in case we accidentally hit an alias loop
+                */
+               strcpy(sourcealias, user);
+               alias(user);
+               if ( (strcasecmp(user, sourcealias)) && (++passes < 3) )
+                       goto REALIAS;
+
                /* Try all local rooms */
                if (!strncasecmp(user, "room_", 5)) {
                        strcpy(name, &user[5]);
@@ -346,7 +377,9 @@ int convert_internet_address(char *destuser, char *desthost, char *source)
 
        strcpy(destuser, user);
        strcpy(desthost, node);
-       return(rfc822_address_invalid); /* unknown error */
+       if (hostalias == hostalias_gatewaydomain)
+               return(rfc822_address_on_citadel_network);
+       return(rfc822_address_nonlocal);
 }
 
 
@@ -401,7 +434,7 @@ int convert_field(struct CtdlMessage *msg, int beg, int end) {
                if (parsed_date < 0L) parsed_date = time(NULL);
                lprintf(9, "Parsed date is %s",
                        asctime(localtime(&parsed_date)));
-               sprintf(buf, "%ld", parsed_date );
+               snprintf(buf, sizeof buf, "%ld", parsed_date );
                if (msg->cm_fields['T'] == NULL)
                        msg->cm_fields['T'] = strdoop(buf);
                processed = 1;
@@ -410,7 +443,7 @@ int convert_field(struct CtdlMessage *msg, int beg, int end) {
        else if (!strcasecmp(key, "From")) {
                process_rfc822_addr(value, user, node, name);
                lprintf(9, "Converted to <%s@%s> (%s)\n", user, node, name);
-               sprintf(addr, "%s@%s", user, node);
+               snprintf(addr, sizeof addr, "%s@%s", user, node);
                if (msg->cm_fields['A'] == NULL)
                        msg->cm_fields['A'] = strdoop(name);
                processed = 1;
@@ -425,6 +458,38 @@ int convert_field(struct CtdlMessage *msg, int beg, int end) {
                processed = 1;
        }
 
+       else if (!strcasecmp(key, "Message-ID")) {
+               if (msg->cm_fields['I'] != NULL) {
+                       lprintf(5, "duplicate message id\n");
+               }
+
+               if (msg->cm_fields['I'] == NULL) {
+                       msg->cm_fields['I'] = strdoop(value);
+
+                       /* Strip angle brackets */
+                       if ((haschar(msg->cm_fields['I'], '<') == 1)
+                          && (haschar(msg->cm_fields['I'], '>') == 1)) {
+                               while ((strlen(msg->cm_fields['I']) > 0)
+                                     && (msg->cm_fields['I'][0] != '<')) {
+                                       strcpy(&msg->cm_fields['I'][0],
+                                               &msg->cm_fields['I'][1]);
+                               }
+                               strcpy(&msg->cm_fields['I'][0],
+                                       &msg->cm_fields['I'][1]);
+                               for (i = 0; i<strlen(msg->cm_fields['I']); ++i)
+                                       if (msg->cm_fields['I'][i] == '>')
+                                               msg->cm_fields['I'][i] = 0;
+                       }
+               }
+
+               if (msg->cm_fields['I'] != NULL) {
+                       TRACE;
+                       lprintf(9, "Converted message id <%s>\n",
+                               msg->cm_fields['I'] );
+               }
+               processed = 1;
+       }
+
        /* Clean up and move on. */
        phree(key);     /* Don't free 'value', it's actually the same buffer */
        return(processed);
@@ -457,6 +522,7 @@ struct CtdlMessage *convert_internet_message(char *rfc822) {
 
        while (!done) {
 
+               TRACE; lprintf(9, "I field is %s\n", msg->cm_fields['I']);
                /* Locate beginning and end of field, keeping in mind that
                 * some fields might be multiline
                 */
@@ -490,13 +556,15 @@ struct CtdlMessage *convert_internet_message(char *rfc822) {
        }
 
        /* Follow-up sanity checks... */
+       TRACE; lprintf(9, "I field is %s\n", msg->cm_fields['I']);
 
        /* If there's no timestamp on this message, set it to now. */
        if (msg->cm_fields['T'] == NULL) {
-               sprintf(buf, "%ld", time(NULL));
+               snprintf(buf, sizeof buf, "%ld", time(NULL));
                msg->cm_fields['T'] = strdoop(buf);
        }
 
+       TRACE; lprintf(9, "I field is %s\n", msg->cm_fields['I']);
        lprintf(9, "RFC822 length remaining after conversion = %d\n",
                strlen(rfc822));
        return msg;