Initial version of global alias table is in place. But it seems to have a Heisenbug.

[citadel.git] / citadel / internet_addressing.c

diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c
index 1972ec96d924a8a8afbd83cd9b708948aefef28e..1da58751440e0842b8176cff7f69f02e088d60e5 100644 (file)
--- a/citadel/internet_addressing.c
+++ b/citadel/internet_addressing.c
@@ -398,35 +398,38 @@ char *killo[] = {         // FIXME remove this when diags are complete
 };
 
 
-/*
- * Aliasing for network mail.
- */
-int expand_aliases(char *name) {                               /* process alias and routing info for mail */
+// Process alias and routing info for email addresses
+int expand_aliases(char *name) {
        int a;
        char aaa[SIZ];
        int at = 0;
        char node[64];
+       char *t;
 
+       char *aliases = CtdlGetSysConfig(GLOBAL_ALIASES);       // First hit the Global Alias Table
+       if (aliases) {
+               char *aptr = aliases;
+               while ((t = strtok_r(aptr, "\n", &aptr))) {
+                       char *bar = strchr(t, '|');
+                       if (bar) {
+                               bar[0] = 0;
+                               ++bar;
+                               if (!strcasecmp(name, t)) {
+                                       syslog(LOG_DEBUG, "\033[36mAliasing <%s> to <%s>\033[0m", name, bar);
+                                       strcpy(name, bar);
+                               }
+                       }
+               }
 
-
-
-       // FIXME write a "real" alias table here
-
-
-       // temporary test of expansion
-       if (!strcasecmp(name, "root")) {
-               strcpy(name, "root");
-               return(EA_MULTIPLE);
-       }
-       if (!strcasecmp(name, "qux")) {
-               strcpy(name, "eggroll,blat,fun@eek.boop");
-               return(EA_MULTIPLE);
+               free(aliases);
+               if (strchr(name, ',')) {
+                       return(EA_MULTIPLE);
+               }
        }
 
 
 
 
-
        char original_name[256];
        safestrncpy(original_name, name, sizeof original_name);
 
@@ -535,8 +538,7 @@ struct recptypes *validate_recipients(char *supplied_recipients, const char *Rem
        int mailtype;
        int invalid;
        struct ctdluser tempUS;
-       struct ctdlroom tempQR;
-       struct ctdlroom tempQR2;
+       struct ctdlroom original_room;
        int err = 0;
        char errmsg[SIZ];
        char *org_recp;
@@ -602,7 +604,9 @@ struct recptypes *validate_recipients(char *supplied_recipients, const char *Rem
                invalid = 0;
                errmsg[0] = 0;
                switch(mailtype) {
-               case EA_LOCAL:
+               case EA_LOCAL:                                  // There are several types of "local" recipients.
+
+                       // Old BBS conventions require mail to "sysop" to go somewhere.  Send it to the admin room.
                        if (!strcasecmp(this_recp, "sysop")) {
                                ++ret->num_room;
                                strcpy(this_recp, CtdlGetConfigStr("c_aideroom"));
@@ -611,42 +615,55 @@ struct recptypes *validate_recipients(char *supplied_recipients, const char *Rem
                                }
                                strcat(ret->recp_room, this_recp);
                        }
-                       else if ( (!strncasecmp(this_recp, "room_", 5)) && (!CtdlGetRoom(&tempQR, &this_recp[5])) ) {
 
-                               // FIXME -- handle the underscores here, strip them out for a room search.
+                       // This handles rooms which can receive posts via email.
+                       else if (!strncasecmp(this_recp, "room_", 5)) {
+                               original_room = CC->room;                               // Remember where we parked
 
-                               tempQR2 = CC->room;                                     // Remember where we parked
-                               CC->room = tempQR;
-                                       
-                               err = CtdlDoIHavePermissionToPostInThisRoom(            // check for write permissions to room
-                                       errmsg, 
-                                       sizeof errmsg, 
-                                       RemoteIdentifier,
-                                       Flags,
-                                       0                                               // 0 means "not a reply"
-                               );
-                               if (err) {
+                               char mail_to_room[ROOMNAMELEN];
+                               char *m;
+                               strncpy(mail_to_room, &this_recp[5], sizeof mail_to_room);
+                               for (m = mail_to_room; *m; ++m) {
+                                       if (m[0] == '_') m[0]=' ';
+                               }
+                               if (!CtdlGetRoom(&CC->room, mail_to_room)) {            // Find the room they asked for
+
+                                       err = CtdlDoIHavePermissionToPostInThisRoom(    // check for write permissions to room
+                                               errmsg, 
+                                               sizeof errmsg, 
+                                               RemoteIdentifier,
+                                               Flags,
+                                               0                                       // 0 means "this is not a reply"
+                                       );
+                                       if (err) {
+                                               ++ret->num_error;
+                                               invalid = 1;
+                                       } 
+                                       else {
+                                               ++ret->num_room;
+                                               if (!IsEmptyStr(ret->recp_room)) {
+                                                       strcat(ret->recp_room, "|");
+                                               }
+                                               strcat(ret->recp_room, &this_recp[5]);
+       
+                                               if (!IsEmptyStr(ret->recp_orgroom)) {
+                                                       strcat(ret->recp_orgroom, "|");
+                                               }
+                                               strcat(ret->recp_orgroom, org_recp);
+       
+                                       }
+                               }
+                               else {                                                  // no such room exists
                                        ++ret->num_error;
                                        invalid = 1;
-                               } 
-                               else {
-                                       ++ret->num_room;
-                                       if (!IsEmptyStr(ret->recp_room)) {
-                                               strcat(ret->recp_room, "|");
-                                       }
-                                       strcat(ret->recp_room, &this_recp[5]);
-
-                                       if (!IsEmptyStr(ret->recp_orgroom)) {
-                                               strcat(ret->recp_orgroom, "|");
-                                       }
-                                       strcat(ret->recp_orgroom, org_recp);
-
                                }
-                                       
-                               /* Restore room in case something needs it */
-                               CC->room = tempQR2;
+                                               
+                               // Restore this session's original room location.
+                               CC->room = original_room;
 
                        }
+
+                       // This handles the most common case, which is mail to a user's inbox.
                        else if (CtdlGetUser(&tempUS, this_recp) == 0) {
                                ++ret->num_local;
                                strcpy(this_recp, tempUS.fullname);
@@ -655,6 +672,8 @@ struct recptypes *validate_recipients(char *supplied_recipients, const char *Rem
                                }
                                strcat(ret->recp_local, this_recp);
                        }
+
+                       // No match for this recipient
                        else {
                                ++ret->num_error;
                                invalid = 1;