From: Art Cancro Date: Sat, 11 Dec 1999 05:43:18 +0000 (+0000) Subject: * Implemented most of MAIL FROM: X-Git-Tag: v7.86~7392 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=e35fd881f52095521e354f19b97b3095fcf6c41d * Implemented most of MAIL FROM: --- diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c index 2965f1297..8881214d0 100644 --- a/citadel/internet_addressing.c +++ b/citadel/internet_addressing.c @@ -27,13 +27,13 @@ #include "config.h" #include "tools.h" #include "internet_addressing.h" +#include "user_ops.h" + /* * Return 0 if a given string fuzzy-matches a Citadel user account * - * FIX ... this needs to be updated to match any and all ways of addressing - * a user. It may even be appropriate to move this out of SMTP and - * into the server core. + * FIX ... this needs to be updated to match any and all address syntaxes. */ int fuzzy_match(struct usersupp *us, char *matchstring) { int a; @@ -48,3 +48,202 @@ int fuzzy_match(struct usersupp *us, char *matchstring) { } + + +/* + * 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) +{ + int a; + + /* extract full name - first, it's From minus */ + strcpy(name, rfc822); + for (a = 0; a < strlen(name); ++a) { + if (name[a] == '<') { + do { + strcpy(&name[a], &name[a + 1]); + } while ((strlen(name) > 0) && (name[a] != '>')); + strcpy(&name[a], &name[a + 1]); + } + } + /* strip anything to the left of a bang */ + while ((strlen(name) > 0) && (haschar(name, '!') > 0)) + strcpy(name, &name[1]); + + /* and anything to the right of a @ or % */ + for (a = 0; a < strlen(name); ++a) { + if (name[a] == '@') + name[a] = 0; + if (name[a] == '%') + name[a] = 0; + } + + /* but if there are parentheses, that changes the rules... */ + if ((haschar(rfc822, '(') == 1) && (haschar(rfc822, ')') == 1)) { + strcpy(name, rfc822); + while ((strlen(name) > 0) && (name[0] != '(')) { + strcpy(&name[0], &name[1]); + } + strcpy(&name[0], &name[1]); + for (a = 0; a < strlen(name); ++a) { + if (name[a] == ')') { + name[a] = 0; + } + } + } + /* but if there are a set of quotes, that supersedes everything */ + if (haschar(rfc822, 34) == 2) { + strcpy(name, rfc822); + while ((strlen(name) > 0) && (name[0] != 34)) { + strcpy(&name[0], &name[1]); + } + strcpy(&name[0], &name[1]); + for (a = 0; a < strlen(name); ++a) + if (name[a] == 34) + name[a] = 0; + } + /* extract user id */ + strcpy(user, rfc822); + + /* first get rid of anything in parens */ + for (a = 0; a < strlen(user); ++a) + if (user[a] == '(') { + do { + strcpy(&user[a], &user[a + 1]); + } while ((strlen(user) > 0) && (user[a] != ')')); + strcpy(&user[a], &user[a + 1]); + } + /* if there's a set of angle brackets, strip it down to that */ + if ((haschar(user, '<') == 1) && (haschar(user, '>') == 1)) { + while ((strlen(user) > 0) && (user[0] != '<')) { + strcpy(&user[0], &user[1]); + } + strcpy(&user[0], &user[1]); + for (a = 0; a < strlen(user); ++a) + if (user[a] == '>') + user[a] = 0; + } + /* strip anything to the left of a bang */ + while ((strlen(user) > 0) && (haschar(user, '!') > 0)) + strcpy(user, &user[1]); + + /* and anything to the right of a @ or % */ + for (a = 0; a < strlen(user); ++a) { + if (user[a] == '@') + user[a] = 0; + if (user[a] == '%') + user[a] = 0; + } + + + /* extract node name */ + strcpy(node, rfc822); + + /* first get rid of anything in parens */ + for (a = 0; a < strlen(node); ++a) + if (node[a] == '(') { + do { + strcpy(&node[a], &node[a + 1]); + } while ((strlen(node) > 0) && (node[a] != ')')); + strcpy(&node[a], &node[a + 1]); + } + /* if there's a set of angle brackets, strip it down to that */ + if ((haschar(node, '<') == 1) && (haschar(node, '>') == 1)) { + while ((strlen(node) > 0) && (node[0] != '<')) { + strcpy(&node[0], &node[1]); + } + strcpy(&node[0], &node[1]); + 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); + striplt(node); + striplt(name); +} + + + +/* + * Back end for convert_internet_address() + * (Compares an internet name [buffer1] and stores in [buffer2] if found) + */ +void try_name(struct usersupp *us) { + + if (!strncasecmp(CC->buffer1, "cit", 3)) + if (atol(&CC->buffer1[3]) == us->usernum) + strcpy(CC->buffer2, us->fullname); + + if (!collapsed_strcmp(CC->buffer1, us->fullname)) + strcpy(CC->buffer2, us->fullname); + + if (us->uid != BBSUID) + if (!strcasecmp(CC->buffer1, getpwuid(us->uid)->pw_name)) + strcpy(CC->buffer2, us->fullname); +} + + +/* + * Convert an Internet email address to a Citadel user/host combination + */ +int convert_internet_address(char *destuser, char *desthost, char *source) +{ + char user[256]; + char node[256]; + char name[256]; + + /* Split it up */ + process_rfc822_addr(source, user, node, name); + + /* Map the FQDN to a Citadel node name + * FIX ... we have to check for all known aliases for the local + * system, and also handle gateway domains, etc. etc. + */ + if (!strcasecmp(node, config.c_fqdn)) { + strcpy(node, config.c_nodename); + } + + /* Return an error condition if the node is not known. + * FIX ... make this work for non-local systems + */ + if (strcasecmp(node, config.c_nodename)) { + return(1); + } + + /* Now try to resolve the name + * FIX ... do the multiple-addresses thing + */ + if (!strcasecmp(node, config.c_nodename)) { + strcpy(destuser, user); + strcpy(desthost, config.c_nodename); + strcpy(CC->buffer1, user); + strcpy(CC->buffer2, ""); + ForEachUser(try_name); + if (strlen(CC->buffer2) == 0) return(2); + strcpy(destuser, CC->buffer2); + return(0); + } + + return(3); /* unknown error */ +} diff --git a/citadel/internet_addressing.h b/citadel/internet_addressing.h index 7a5841670..917e22700 100644 --- a/citadel/internet_addressing.h +++ b/citadel/internet_addressing.h @@ -1 +1,3 @@ int fuzzy_match(struct usersupp *us, char *matchstring); +void process_rfc822_addr(char *rfc822, char *user, char *node, char *name); +int convert_internet_address(char *destuser, char *desthost, char *source); diff --git a/citadel/network/mail.sysinfo b/citadel/network/mail.sysinfo index 65e6d18cc..c5c556f21 100644 --- a/citadel/network/mail.sysinfo +++ b/citadel/network/mail.sysinfo @@ -1,19 +1,14 @@ -internet -uum %s -humannode Internet Gateway -lastcontact 942634844 Sun Nov 14 22:00:44 1999 +test +bin Mail uncnsrd bin Mail phonenum US 914 244 3252 humannode Uncensored -lastcontact 942634845 Sun Nov 14 22:00:45 1999 +lastcontact 944890658 Sat Dec 11 00:37:38 1999 -test -bin Mail - -bin Mail -bin Mail -humannode 26711]: Adding neighbor system to map -lastcontact 940130533 Sat Oct 16 23:22:13 1999 +internet +uum %s +humannode Internet Gateway +lastcontact 944890658 Sat Dec 11 00:37:38 1999 diff --git a/citadel/routines.c b/citadel/routines.c index 636101250..903fe9ce1 100644 --- a/citadel/routines.c +++ b/citadel/routines.c @@ -67,17 +67,6 @@ int struncmp(char *lstr, char *rstr, int len) } -/* - * check for the presence of a character within a string (returns count) - */ -int haschar(char *st, int ch) -{ - int a,b; - b=0; - for (a=0; alogged_in) logout(CC); cprintf("250 Zap!\n"); } +/* + * Implements the "MAIL From:" command + */ +void smtp_mail(char *argbuf) { + char user[256]; + char node[256]; + int cvt; + + if (strlen(SMTP->from) != 0) { + cprintf("503 Only one sender permitted\n"); + return; + } + + if (strncasecmp(argbuf, "From:", 5)) { + cprintf("501 Syntax error\n"); + return; + } + + strcpy(SMTP->from, &argbuf[5]); + striplt(SMTP->from); + + if (strlen(SMTP->from) == 0) { + cprintf("501 Empty sender name is not permitted\n"); + return; + } + + + /* If this SMTP connection is from a logged-in user, make sure that + * the user only sends email from his/her own address. + */ + if (CC->logged_in) { + lprintf(9, "Me-checking <%s>\n", SMTP->from); + cvt = convert_internet_address(user, node, SMTP->from); + lprintf(9, "cvt=%d, citaddr=<%s@%s>\n", cvt, user, node); + if ( (cvt != 0) || (strcasecmp(user, CC->usersupp.fullname))) { + cprintf("550 <%s> is not your address.\n", SMTP->from); + strcpy(SMTP->from, ""); + return; + } + } + + cprintf("250 Sender ok. Groovy.\n"); +} + + + /* * Main command loop for SMTP sessions. */ @@ -296,6 +345,10 @@ void smtp_command_loop(void) { smtp_help(); } + else if (!strncasecmp(cmdbuf, "MAIL", 4)) { + smtp_mail(&cmdbuf[5]); + } + else if (!strncasecmp(cmdbuf, "NOOP", 4)) { cprintf("250 This command successfully did nothing.\n"); } diff --git a/citadel/server.h b/citadel/server.h index 662ef3ae9..0a7812c11 100644 --- a/citadel/server.h +++ b/citadel/server.h @@ -64,7 +64,7 @@ struct CitContext { char temp[32]; /* temp file name */ int nologin; /* not allowed to log in */ - char net_node[32]; + char net_node[32]; /* Is the client another Citadel server? */ int client_socket; int cs_pid; /* session ID */ time_t cs_lastupdt; /* time of last update */ @@ -72,7 +72,7 @@ struct CitContext { time_t lastidle; /* For computing idle time */ char lastcmdname[5]; /* name of last command executed */ unsigned cs_flags; /* miscellaneous flags */ - void (*h_command_function) (void) ; /* proto command function */ + void (*h_command_function) (void) ; /* service command function */ /* feeping creaturisms... */ int cs_clientdev; /* client developer ID */ @@ -99,7 +99,10 @@ struct CitContext { char fake_roomname[ROOMNAMELEN]; /* Name of the fake room */ int FloorBeingSearched; /* This is used by cmd_lrms() etc. */ - struct CtdlSessData *FirstSessData; + + struct CtdlSessData *FirstSessData; /* Allocated session data */ + char buffer1[256]; /* General-purpose workspace */ + char buffer2[256]; /* General-purpose workspace */ }; typedef struct CitContext t_context; diff --git a/citadel/tools.c b/citadel/tools.c index 0a87ebd5f..8117cf1d2 100644 --- a/citadel/tools.c +++ b/citadel/tools.c @@ -5,6 +5,7 @@ #include #include +#include #include #include "tools.h" @@ -214,3 +215,62 @@ void decode_base64(char *dest, char *source) } } } + + + +/* + * Strip leading and trailing spaces from a string + */ +void striplt(char *buf) +{ + while ((strlen(buf) > 0) && (buf[0] == 32)) + strcpy(buf, &buf[1]); + while (buf[strlen(buf) - 1] == 32) + buf[strlen(buf) - 1] = 0; +} + + + + + +/* + * Return the number of occurances of character ch in string st + */ +int haschar(char *st, int ch) +{ + int a, b; + b = 0; + for (a = 0; a < strlen(st); ++a) + if (st[a] == ch) + ++b; + return (b); +} + + + + +/* + * Compare two strings, insensitive to case, punctuation, and non-alnum chars + */ +int collapsed_strcmp(char *s1, char *s2) { + char *c1, *c2; + int i, ret; + + c1 = strdup(s1); + c2 = strdup(s2); + + for (i=0; i