X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Finternet_addressing.c;h=ca1dffd194acdae57a6c2f1bedf71739d176572b;hb=38b3aec67e67dfaff67670494e6e570bff2246aa;hp=53067543a51bc29608d58e1fbb7cc92fdf2cd1ac;hpb=9772749e4e8830823222d55487c28270494aa202;p=citadel.git diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c index 53067543a..ca1dffd19 100644 --- a/citadel/internet_addressing.c +++ b/citadel/internet_addressing.c @@ -15,35 +15,348 @@ #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 #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" + +#include "ctdl_module.h" + +#ifndef HAVE_SNPRINTF +#include "snprintf.h" +#endif + + +#ifdef HAVE_ICONV +#include + +#if 0 +/* This is the non-define version in case of s.b. needing to debug */ +inline void FindNextEnd (char *bptr, char *end) +{ + /* Find the next ?Q? */ + end = strchr(bptr + 2, '?'); + if (end == NULL) return NULL; + if (((*(end + 1) == 'B') || (*(end + 1) == 'Q')) && + (*(end + 2) == '?')) { + /* skip on to the end of the cluster, the next ?= */ + end = strstr(end + 3, "?="); + } + else + /* sort of half valid encoding, try to find an end. */ + end = strstr(bptr, "?="); +} +#endif + +#define FindNextEnd(bptr, end) { \ + end = strchr(bptr + 2, '?'); \ + if (end != NULL) { \ + if (((*(end + 1) == 'B') || (*(end + 1) == 'Q')) && (*(end + 2) == '?')) { \ + end = strstr(end + 3, "?="); \ + } else end = strstr(bptr, "?="); \ + } \ +} + +/* + * Handle subjects with RFC2047 encoding such as: + * =?koi8-r?B?78bP0s3Mxc7JxSDXz9rE1dvO2c3JINvB0sHNySDP?= + */ +void utf8ify_rfc822_string(char *buf) { + char *start, *end, *next, *nextend, *ptr; + char newbuf[1024]; + char charset[128]; + char encoding[16]; + char istr[1024]; + iconv_t ic = (iconv_t)(-1) ; + char *ibuf; /**< Buffer of characters to be converted */ + char *obuf; /**< Buffer for converted characters */ + size_t ibuflen; /**< Length of input buffer */ + size_t obuflen; /**< Length of output buffer */ + char *isav; /**< Saved pointer to input buffer */ + char *osav; /**< Saved pointer to output buffer */ + int passes = 0; + int i, len, delta; + int illegal_non_rfc2047_encoding = 0; + + /* Sometimes, badly formed messages contain strings which were simply + * written out directly in some foreign character set instead of + * using RFC2047 encoding. This is illegal but we will attempt to + * handle it anyway by converting from a user-specified default + * charset to UTF-8 if we see any nonprintable characters. + */ + len = strlen(buf); + for (i=0; i 126)) { + illegal_non_rfc2047_encoding = 1; + i = len; ///< take a shortcut, it won't be more than one. + } + } + if (illegal_non_rfc2047_encoding) { + const char *default_header_charset = "iso-8859-1"; + if ( (strcasecmp(default_header_charset, "UTF-8")) && (strcasecmp(default_header_charset, "us-ascii")) ) { + ctdl_iconv_open("UTF-8", default_header_charset, &ic); + if (ic != (iconv_t)(-1) ) { + ibuf = malloc(1024); + isav = ibuf; + safestrncpy(ibuf, buf, 1024); + ibuflen = strlen(ibuf); + obuflen = 1024; + obuf = (char *) malloc(obuflen); + osav = obuf; + iconv(ic, &ibuf, &ibuflen, &obuf, &obuflen); + osav[1024-obuflen] = 0; + strcpy(buf, osav); + free(osav); + iconv_close(ic); + free(isav); + } + } + } + + /* pre evaluate the first pair */ + nextend = end = NULL; + len = strlen(buf); + start = strstr(buf, "=?"); + if (start != NULL) + FindNextEnd (start, end); + + while ((start != NULL) && (end != NULL)) + { + next = strstr(end, "=?"); + if (next != NULL) + FindNextEnd(next, nextend); + if (nextend == NULL) + next = NULL; + + /* did we find two partitions */ + if ((next != NULL) && + ((next - end) > 2)) + { + ptr = end + 2; + while ((ptr < next) && + (isspace(*ptr) || + (*ptr == '\r') || + (*ptr == '\n') || + (*ptr == '\t'))) + ptr ++; + /* did we find a gab just filled with blanks? */ + if (ptr == next) + { + memmove (end + 2, + next, + len - (next - start)); + + /* now terminate the gab at the end */ + delta = (next - end) - 2; + len -= delta; + buf[len] = '\0'; + + /* move next to its new location. */ + next -= delta; + nextend -= delta; + } + } + /* our next-pair is our new first pair now. */ + start = next; + end = nextend; + } + + /* Now we handle foreign character sets properly encoded + * in RFC2047 format. + */ + start = strstr(buf, "=?"); + FindNextEnd((start != NULL)? start : buf, end); + while (start != NULL && end != NULL && end > start) + { + extract_token(charset, start, 1, '?', sizeof charset); + extract_token(encoding, start, 2, '?', sizeof encoding); + extract_token(istr, start, 3, '?', sizeof istr); + + ibuf = malloc(1024); + isav = ibuf; + if (!strcasecmp(encoding, "B")) { /**< base64 */ + ibuflen = CtdlDecodeBase64(ibuf, istr, strlen(istr)); + } + else if (!strcasecmp(encoding, "Q")) { /**< quoted-printable */ + size_t len; + long pos; + + len = strlen(istr); + pos = 0; + while (pos < len) + { + if (istr[pos] == '_') istr[pos] = ' '; + pos++; + } + + ibuflen = CtdlDecodeQuotedPrintable(ibuf, istr, len); + } + else { + strcpy(ibuf, istr); /**< unknown encoding */ + ibuflen = strlen(istr); + } + + ctdl_iconv_open("UTF-8", charset, &ic); + if (ic != (iconv_t)(-1) ) { + obuflen = 1024; + obuf = (char *) malloc(obuflen); + osav = obuf; + iconv(ic, &ibuf, &ibuflen, &obuf, &obuflen); + osav[1024-obuflen] = 0; + + end = start; + end++; + strcpy(start, ""); + remove_token(end, 0, '?'); + remove_token(end, 0, '?'); + remove_token(end, 0, '?'); + remove_token(end, 0, '?'); + strcpy(end, &end[1]); + + snprintf(newbuf, sizeof newbuf, "%s%s%s", buf, osav, end); + strcpy(buf, newbuf); + free(osav); + iconv_close(ic); + } + else { + end = start; + end++; + strcpy(start, ""); + remove_token(end, 0, '?'); + remove_token(end, 0, '?'); + remove_token(end, 0, '?'); + remove_token(end, 0, '?'); + strcpy(end, &end[1]); + + snprintf(newbuf, sizeof newbuf, "%s(unreadable)%s", buf, end); + strcpy(buf, newbuf); + } + + free(isav); + + /* + * Since spammers will go to all sorts of absurd lengths to get their + * messages through, there are LOTS of corrupt headers out there. + * So, prevent a really badly formed RFC2047 header from throwing + * this function into an infinite loop. + */ + ++passes; + if (passes > 20) return; + + start = strstr(buf, "=?"); + FindNextEnd((start != NULL)? start : buf, end); + } + +} +#else +inline void utf8ify_rfc822_string(char *a){}; + +#endif + + + +struct trynamebuf { + char buffer1[SIZ]; + char buffer2[SIZ]; +}; + +char *inetcfg = NULL; +struct spamstrings_t *spamstrings = NULL; + + +/* + * Return nonzero if the supplied name is an alias for this host. + */ +int CtdlHostAlias(char *fqdn) { + int config_lines; + int i; + char buf[256]; + char host[256], type[256]; + int found = 0; + + 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; ifullname); ++a) { + if ( (!strncasecmp(matchstring, "cit", 3)) + && (atol(&matchstring[3]) == us->usernum)) { + return 0; + } + + len = strlen(matchstring); + for (a=0; !IsEmptyStr(&us->fullname[a]); ++a) { if (!strncasecmp(&us->fullname[a], - matchstring, strlen(matchstring))) { + matchstring, len)) { return 0; } } @@ -76,10 +389,9 @@ 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) +void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name) { int a; @@ -87,18 +399,14 @@ void process_rfc822_addr(char *rfc822, char *user, char *node, char *name) strcpy(node, config.c_fqdn); strcpy(name, ""); + if (rfc822 == NULL) return; + /* 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]); - } - } + 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 % */ @@ -112,20 +420,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]); @@ -137,25 +438,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 % */ @@ -171,116 +462,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) { - - 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]; - struct quickroom qrbuf; - - /* 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); - } - - /* Now try to resolve the name - * FIX ... do the multiple-addresses thing + /* 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. */ - if (!strcasecmp(node, config.c_nodename)) { - /* Try all local rooms */ - if (!strncasecmp(destuser, "room_", 5)) { - /* FIX do this here */ - } - - /* Try all local users */ - strcpy(destuser, user); - strcpy(desthost, config.c_nodename); - strcpy(CC->buffer1, user); - strcpy(CC->buffer2, ""); - ForEachUser(try_name); - if (strlen(CC->buffer2) == 0) return(rfc822_no_such_user); - strcpy(destuser, CC->buffer2); - return(rfc822_address_locally_validated); + if ((IsEmptyStr(name)) && (!IsEmptyStr(user))) { + strcpy(name, user); } - - strcpy(destuser, user); - strcpy(desthost, node); - return(rfc822_address_invalid); /* unknown error */ } - /* * convert_field() is a helper function for convert_internet_message(). * Given start/end positions for an rfc822 field, it converts it to a Citadel @@ -296,8 +529,12 @@ int convert_field(struct CtdlMessage *msg, int beg, int end) { int i; int colonpos = (-1); int processed = 0; - char buf[256]; - char *user, *node, *name; + char buf[SIZ]; + char user[1024]; + char node[1024]; + char name[1024]; + char addr[1024]; + time_t parsed_date; rfc822 = msg->cm_fields['M']; /* M field contains rfc822 text */ for (i = end; i >= beg; --i) { @@ -306,68 +543,171 @@ int convert_field(struct CtdlMessage *msg, int beg, int end) { if (colonpos < 0) return(0); /* no colon? not a valid header line */ - key = mallok((end - beg) + 2); + key = malloc((end - beg) + 2); safestrncpy(key, &rfc822[beg], (end-beg)+1); key[colonpos - beg] = 0; value = &key[(colonpos - beg) + 1]; unfold_rfc822_field(value); - lprintf(9, "Key=<%s> Value=<%s>\n", key, value); - - /* Here's the big rfc822-to-citadel loop. */ + /* + * Here's the big rfc822-to-citadel loop. + */ + /* Date/time is converted into a unix timestamp. If the conversion + * fails, we replace it with the time the message arrived locally. + */ if (!strcasecmp(key, "Date")) { - sprintf(buf, "%ld", parsedate(value) ); + parsed_date = parsedate(value); + if (parsed_date < 0L) parsed_date = time(NULL); + 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")) { - user = mallok(strlen(value)); - node = mallok(strlen(value)); - name = mallok(strlen(value)); process_rfc822_addr(value, user, node, name); - lprintf(9, "Converted to <%s@%s> (%s)\n", user, node, name); + CtdlLogPrintf(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'] = user; - else - phree(user); - if (msg->cm_fields['N'] == NULL) - msg->cm_fields['N'] = node; - else - phree(node); - if (msg->cm_fields['H'] == NULL) - msg->cm_fields['H'] = name; - else - phree(name); + msg->cm_fields['A'] = strdup(name); + processed = 1; + if (msg->cm_fields['F'] == NULL) + 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, "List-ID")) { + if (msg->cm_fields['L'] == NULL) + msg->cm_fields['L'] = 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) { + CtdlLogPrintf(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; + } + + else if (!strcasecmp(key, "References")) { + if (msg->cm_fields['W'] != NULL) { + free(msg->cm_fields['W']); + } + msg->cm_fields['W'] = strdup(value); + processed = 1; + } + + else if (!strcasecmp(key, "In-reply-to")) { + if (msg->cm_fields['W'] == NULL) { /* References: supersedes In-reply-to: */ + msg->cm_fields['W'] = 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 RFC822 references format (References) to Citadel references format (Weferences) + */ +void convert_references_to_wefewences(char *str) { + int bracket_nesting = 0; + char *ptr = str; + char *moveptr = NULL; + char ch; + + while(*ptr) { + ch = *ptr; + if (ch == '>') { + --bracket_nesting; + if (bracket_nesting < 0) bracket_nesting = 0; + } + if ((ch == '>') && (bracket_nesting == 0) && (*(ptr+1)) && (ptr>str) ) { + *ptr = '|'; + ++ptr; + } + else if (bracket_nesting > 0) { + ++ptr; + } + else { + moveptr = ptr; + while (*moveptr) { + *moveptr = *(moveptr+1); + ++moveptr; + } + } + if (ch == '<') ++bracket_nesting; + } + +} + + /* * 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)); @@ -376,7 +716,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; @@ -387,29 +726,40 @@ 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? */ converted = convert_field(msg, beg, end); - /****** + /* Strip the field out of the RFC822 header if we used it */ 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; @@ -419,12 +769,253 @@ 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); + } + + /* If a W (references, or rather, Wefewences) field is present, we + * have to convert it from RFC822 format to Citadel format. + */ + if (msg->cm_fields['W'] != NULL) { + convert_references_to_wefewences(msg->cm_fields['W']); } - 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; !IsEmptyStr(&addr[i]); ++i) { + if (!isspace(addr[i])) { + key[keylen++] = tolower(addr[i]); + } + } + key[keylen++] = 0; + + CtdlLogPrintf(CTDL_DEBUG, "Directory key is <%s>\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]; + + if (IsDirectory(internet_addr, 0) == 0) return; + CtdlLogPrintf(CTDL_DEBUG, "Create directory entry: %s --> %s\n", internet_addr, citadel_addr); + 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]; + + CtdlLogPrintf(CTDL_DEBUG, "Delete directory entry: %s --> %s\n", internet_addr, citadel_addr); + 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); + if (strstr(addr, "=?") != NULL) + utf8ify_rfc822_string(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); +}