X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Finternet_addressing.c;h=c4bfc9b51210b9ceeccec77037f3f304bc680883;hb=a2a06e5d6767d0e45eeccf4032153764e8a5520f;hp=e1878423986b1efbc8898c41d6719208e9c38d2a;hpb=2579891f090700c01844dff9a29e249eece3e529;p=citadel.git diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c index e18784239..c4bfc9b51 100644 --- a/citadel/internet_addressing.c +++ b/citadel/internet_addressing.c @@ -15,31 +15,48 @@ #include #include #include -#include + +#if TIME_WITH_SYS_TIME +# include +# include +#else +# if HAVE_SYS_TIME_H +# include +# else +# include +# endif +#endif + #include #include #include #include "citadel.h" #include "server.h" -#include #include "sysdep_decls.h" #include "citserver.h" #include "support.h" #include "config.h" #include "tools.h" +#include "msgbase.h" #include "internet_addressing.h" #include "user_ops.h" #include "room_ops.h" #include "parsedate.h" +#include "database.h" + + +#ifndef HAVE_SNPRINTF +#include "snprintf.h" +#endif struct trynamebuf { - char buffer1[256]; - char buffer2[256]; + char buffer1[SIZ]; + char buffer2[SIZ]; }; char *inetcfg = NULL; - +struct spamstrings_t *spamstrings = NULL; /* @@ -51,14 +68,18 @@ int CtdlHostAlias(char *fqdn) { char buf[256]; char host[256], type[256]; + if (fqdn == NULL) return(hostalias_nomatch); + if (IsEmptyStr(fqdn)) return(hostalias_nomatch); + if (!strcasecmp(fqdn, "localhost")) return(hostalias_localhost); if (!strcasecmp(fqdn, config.c_fqdn)) return(hostalias_localhost); + if (!strcasecmp(fqdn, config.c_nodename)) return(hostalias_localhost); if (inetcfg == NULL) return(hostalias_nomatch); config_lines = num_tokens(inetcfg, '\n'); for (i=0; i */ 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]); - } - } + stripout(name, '<', '>'); + /* strip anything to the left of a bang */ - while ((strlen(name) > 0) && (haschar(name, '!') > 0)) + while ((!IsEmptyStr(name)) && (haschar(name, '!') > 0)) strcpy(name, &name[1]); /* and anything to the right of a @ or % */ @@ -164,20 +188,13 @@ void process_rfc822_addr(char *rfc822, char *user, char *node, char *name) /* 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; - } - } + stripallbut(name, '(', ')'); } + /* 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)) { + while ((!IsEmptyStr(name)) && (name[0] != 34)) { strcpy(&name[0], &name[1]); } strcpy(&name[0], &name[1]); @@ -189,25 +206,15 @@ void process_rfc822_addr(char *rfc822, char *user, char *node, char *name) 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]); - } + stripout(user, '(', ')'); + /* 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; + stripallbut(user, '<', '>'); } + /* strip anything to the left of a bang */ - while ((strlen(user) > 0) && (haschar(user, '!') > 0)) + while ((!IsEmptyStr(user)) && (haschar(user, '!') > 0)) strcpy(user, &user[1]); /* and anything to the right of a @ or % */ @@ -223,134 +230,58 @@ void process_rfc822_addr(char *rfc822, char *user, char *node, char *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]); - } + stripout(node, '(', ')'); + /* 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; + stripallbut(node, '<', '>'); } - /* 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 ((!IsEmptyStr(node)) && (haschar(node, '@') > 0)) + strcpy(node, &node[1]); + + /* strip anything to the left of a % */ + while ((!IsEmptyStr(node)) && (haschar(node, '%') > 0)) + strcpy(node, &node[1]); + + /* reduce multiple system bang paths to node!user */ + while ((!IsEmptyStr(node)) && (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, void *data) { - struct trynamebuf *tnb; - tnb = (struct trynamebuf *)data; - - if (!strncasecmp(tnb->buffer1, "cit", 3)) - if (atol(&tnb->buffer1[3]) == us->usernum) - strcpy(tnb->buffer2, us->fullname); - if (!collapsed_strcmp(tnb->buffer1, us->fullname)) - strcpy(tnb->buffer2, us->fullname); - - if (us->uid != BBSUID) - if (!strcasecmp(tnb->buffer1, getpwuid(us->uid)->pw_name)) - strcpy(tnb->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]; - struct quickroom qrbuf; - int i; - int hostalias; - struct trynamebuf tnb; - char buf[256]; - - /* Split it up */ - process_rfc822_addr(source, user, node, name); - - /* Map the FQDN to a Citadel node name + /* If we processed a string that had the address in angle brackets + * but no name outside the brackets, we now have an empty name. In + * this case, use the user portion of the address as the name. */ - hostalias = CtdlHostAlias(node); - switch(hostalias) { - case hostalias_localhost: - strcpy(node, config.c_nodename); - break; - - case hostalias_gatewaydomain: - extract_token(buf, node, 0, '.'); - safestrncpy(node, buf, sizeof buf); + if ((IsEmptyStr(name)) && (!IsEmptyStr(user))) { + strcpy(name, user); } - - /* Now try to resolve the name - * FIX ... do the multiple-addresses thing - */ - if (!strcasecmp(node, config.c_nodename)) { - /* Try all local rooms */ - if (!strncasecmp(user, "room_", 5)) { - strcpy(name, &user[5]); - for (i=0; i Value=<%s>\n", key, value); - /* * Here's the big rfc822-to-citadel loop. */ @@ -398,50 +327,97 @@ int convert_field(struct CtdlMessage *msg, int beg, int end) { if (!strcasecmp(key, "Date")) { parsed_date = parsedate(value); 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", (long)parsed_date ); if (msg->cm_fields['T'] == NULL) - msg->cm_fields['T'] = strdoop(buf); + msg->cm_fields['T'] = strdup(buf); processed = 1; } 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); + lprintf(CTDL_DEBUG, "Converted to <%s@%s> (%s)\n", user, node, name); + snprintf(addr, sizeof addr, "%s@%s", user, node); if (msg->cm_fields['A'] == NULL) - msg->cm_fields['A'] = strdoop(name); + msg->cm_fields['A'] = strdup(name); processed = 1; if (msg->cm_fields['F'] == NULL) - msg->cm_fields['F'] = strdoop(addr); + msg->cm_fields['F'] = strdup(addr); processed = 1; } else if (!strcasecmp(key, "Subject")) { if (msg->cm_fields['U'] == NULL) - msg->cm_fields['U'] = strdoop(value); + msg->cm_fields['U'] = strdup(value); + processed = 1; + } + + else if (!strcasecmp(key, "To")) { + if (msg->cm_fields['R'] == NULL) + msg->cm_fields['R'] = strdup(value); + processed = 1; + } + + else if (!strcasecmp(key, "CC")) { + if (msg->cm_fields['Y'] == NULL) + msg->cm_fields['Y'] = strdup(value); + processed = 1; + } + + else if (!strcasecmp(key, "Message-ID")) { + if (msg->cm_fields['I'] != NULL) { + lprintf(CTDL_WARNING, "duplicate message id\n"); + } + + if (msg->cm_fields['I'] == NULL) { + msg->cm_fields['I'] = strdup(value); + + /* Strip angle brackets */ + while (haschar(msg->cm_fields['I'], '<') > 0) { + strcpy(&msg->cm_fields['I'][0], + &msg->cm_fields['I'][1]); + } + for (i = 0; icm_fields['I']); ++i) + if (msg->cm_fields['I'][i] == '>') + msg->cm_fields['I'][i] = 0; + } + + processed = 1; + } + + else if (!strcasecmp(key, "Return-Path")) { + if (msg->cm_fields['P'] == NULL) + msg->cm_fields['P'] = strdup(value); + processed = 1; + } + + else if (!strcasecmp(key, "Envelope-To")) { + if (msg->cm_fields['V'] == NULL) + msg->cm_fields['V'] = strdup(value); processed = 1; } /* Clean up and move on. */ - phree(key); /* Don't free 'value', it's actually the same buffer */ + free(key); /* Don't free 'value', it's actually the same buffer */ return(processed); } /* * Convert an RFC822 message (headers + body) to a CtdlMessage structure. + * NOTE: the supplied buffer becomes part of the CtdlMessage structure, and + * will be deallocated when CtdlFreeMessage() is called. Therefore, the + * supplied buffer should be DEREFERENCED. It should not be freed or used + * again. */ struct CtdlMessage *convert_internet_message(char *rfc822) { struct CtdlMessage *msg; - int pos, beg, end; + int pos, beg, end, msglen; int done; - char buf[256]; + char buf[SIZ]; int converted; - msg = mallok(sizeof(struct CtdlMessage)); + msg = malloc(sizeof(struct CtdlMessage)); if (msg == NULL) return msg; memset(msg, 0, sizeof(struct CtdlMessage)); @@ -450,7 +426,6 @@ struct CtdlMessage *convert_internet_message(char *rfc822) { msg->cm_format_type = FMT_RFC822; /* internet message */ msg->cm_fields['M'] = rfc822; - lprintf(9, "Unconverted RFC822 message length = %d\n", strlen(rfc822)); pos = 0; done = 0; @@ -461,18 +436,30 @@ struct CtdlMessage *convert_internet_message(char *rfc822) { */ beg = pos; end = (-1); - for (pos=beg; ((pos<=strlen(rfc822))&&(end<0)); ++pos) { + + msglen = strlen(rfc822); + while ( (end < 0) && (done == 0) ) { + if ((rfc822[pos]=='\n') && (!isspace(rfc822[pos+1]))) { end = pos; } - if ( (rfc822[pos]=='\n') /* done w. headers? */ + + /* done with headers? */ + if ( (rfc822[pos]=='\n') && ( (rfc822[pos+1]=='\n') - ||(rfc822[pos+1]=='\r'))) { + ||(rfc822[pos+1]=='\r')) ) { end = pos; done = 1; } + if (pos >= (msglen-1) ) { + end = pos; + done = 1; + } + + ++pos; + } /* At this point we have a field. Are we interested in it? */ @@ -492,12 +479,247 @@ struct CtdlMessage *convert_internet_message(char *rfc822) { /* If there's no timestamp on this message, set it to now. */ if (msg->cm_fields['T'] == NULL) { - sprintf(buf, "%ld", time(NULL)); - msg->cm_fields['T'] = strdoop(buf); + snprintf(buf, sizeof buf, "%ld", (long)time(NULL)); + msg->cm_fields['T'] = strdup(buf); } - lprintf(9, "RFC822 length remaining after conversion = %d\n", - strlen(rfc822)); return msg; } + + +/* + * Look for a particular header field in an RFC822 message text. If the + * requested field is found, it is unfolded (if necessary) and returned to + * the caller. The field name is stripped out, leaving only its contents. + * The caller is responsible for freeing the returned buffer. If the requested + * field is not present, or anything else goes wrong, it returns NULL. + */ +char *rfc822_fetch_field(char *rfc822, char *fieldname) { + char *fieldbuf = NULL; + char *end_of_headers; + char *field_start; + char *ptr; + char *cont; + char fieldhdr[SIZ]; + + /* Should never happen, but sometimes we get stupid */ + if (rfc822 == NULL) return(NULL); + if (fieldname == NULL) return(NULL); + + snprintf(fieldhdr, sizeof fieldhdr, "%s:", fieldname); + + /* Locate the end of the headers, so we don't run past that point */ + end_of_headers = bmstrcasestr(rfc822, "\n\r\n"); + if (end_of_headers == NULL) { + end_of_headers = bmstrcasestr(rfc822, "\n\n"); + } + if (end_of_headers == NULL) return (NULL); + + field_start = bmstrcasestr(rfc822, fieldhdr); + if (field_start == NULL) return(NULL); + if (field_start > end_of_headers) return(NULL); + + fieldbuf = malloc(SIZ); + strcpy(fieldbuf, ""); + + ptr = field_start; + ptr = memreadline(ptr, fieldbuf, SIZ-strlen(fieldbuf) ); + while ( (isspace(ptr[0])) && (ptr < end_of_headers) ) { + strcat(fieldbuf, " "); + cont = &fieldbuf[strlen(fieldbuf)]; + ptr = memreadline(ptr, cont, SIZ-strlen(fieldbuf) ); + striplt(cont); + } + + strcpy(fieldbuf, &fieldbuf[strlen(fieldhdr)]); + striplt(fieldbuf); + + return(fieldbuf); +} + + + +/***************************************************************************** + * DIRECTORY MANAGEMENT FUNCTIONS * + *****************************************************************************/ + +/* + * Generate the index key for an Internet e-mail address to be looked up + * in the database. + */ +void directory_key(char *key, char *addr) { + int i; + int keylen = 0; + + for (i=0; i\n", key); +} + + + +/* Return nonzero if the supplied address is in a domain we keep in + * the directory + */ +int IsDirectory(char *addr, int allow_masq_domains) { + char domain[256]; + int h; + + extract_token(domain, addr, 1, '@', sizeof domain); + striplt(domain); + + h = CtdlHostAlias(domain); + + if ( (h == hostalias_masq) && allow_masq_domains) + return(1); + + if ( (h == hostalias_localhost) || (h == hostalias_directory) ) { + return(1); + } + else { + return(0); + } +} + + +/* + * Initialize the directory database (erasing anything already there) + */ +void CtdlDirectoryInit(void) { + cdb_trunc(CDB_DIRECTORY); +} + + +/* + * Add an Internet e-mail address to the directory for a user + */ +void CtdlDirectoryAddUser(char *internet_addr, char *citadel_addr) { + char key[SIZ]; + + lprintf(CTDL_DEBUG, "Dir: %s --> %s\n", + internet_addr, citadel_addr); + if (IsDirectory(internet_addr, 0) == 0) return; + + directory_key(key, internet_addr); + + cdb_store(CDB_DIRECTORY, key, strlen(key), + citadel_addr, strlen(citadel_addr)+1 ); +} + + +/* + * Delete an Internet e-mail address from the directory. + * + * (NOTE: we don't actually use or need the citadel_addr variable; it's merely + * here because the callback API expects to be able to send it.) + */ +void CtdlDirectoryDelUser(char *internet_addr, char *citadel_addr) { + char key[SIZ]; + + directory_key(key, internet_addr); + cdb_delete(CDB_DIRECTORY, key, strlen(key) ); +} + + +/* + * Look up an Internet e-mail address in the directory. + * On success: returns 0, and Citadel address stored in 'target' + * On failure: returns nonzero + */ +int CtdlDirectoryLookup(char *target, char *internet_addr, size_t targbuflen) { + struct cdbdata *cdbrec; + char key[SIZ]; + + /* Dump it in there unchanged, just for kicks */ + safestrncpy(target, internet_addr, targbuflen); + + /* Only do lookups for addresses with hostnames in them */ + if (num_tokens(internet_addr, '@') != 2) return(-1); + + /* Only do lookups for domains in the directory */ + if (IsDirectory(internet_addr, 0) == 0) return(-1); + + directory_key(key, internet_addr); + cdbrec = cdb_fetch(CDB_DIRECTORY, key, strlen(key) ); + if (cdbrec != NULL) { + safestrncpy(target, cdbrec->ptr, targbuflen); + cdb_free(cdbrec); + return(0); + } + + return(-1); +} + + +/* + * Harvest any email addresses that someone might want to have in their + * "collected addresses" book. + */ +char *harvest_collected_addresses(struct CtdlMessage *msg) { + char *coll = NULL; + char addr[256]; + char user[256], node[256], name[256]; + int is_harvestable; + int i, j, h; + int field = 0; + + if (msg == NULL) return(NULL); + + is_harvestable = 1; + strcpy(addr, ""); + if (msg->cm_fields['A'] != NULL) { + strcat(addr, msg->cm_fields['A']); + } + if (msg->cm_fields['F'] != NULL) { + strcat(addr, " <"); + strcat(addr, msg->cm_fields['F']); + strcat(addr, ">"); + if (IsDirectory(msg->cm_fields['F'], 0)) { + is_harvestable = 0; + } + } + + if (is_harvestable) { + coll = strdup(addr); + } + else { + coll = strdup(""); + } + + if (coll == NULL) return(NULL); + + /* Scan both the R (To) and Y (CC) fields */ + for (i = 0; i < 2; ++i) { + if (i == 0) field = 'R' ; + if (i == 1) field = 'Y' ; + + if (msg->cm_fields[field] != NULL) { + for (j=0; jcm_fields[field], ','); ++j) { + extract_token(addr, msg->cm_fields[field], j, ',', sizeof addr); + process_rfc822_addr(addr, user, node, name); + h = CtdlHostAlias(node); + if ( (h != hostalias_localhost) && (h != hostalias_directory) ) { + coll = realloc(coll, strlen(coll) + strlen(addr) + 4); + if (coll == NULL) return(NULL); + if (!IsEmptyStr(coll)) { + strcat(coll, ","); + } + striplt(addr); + strcat(coll, addr); + } + } + } + } + + if (IsEmptyStr(coll)) { + free(coll); + return(NULL); + } + return(coll); +}