X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Finternet_addressing.c;h=ed160fae73f9d5166fd67dbf6e9f65a6f7879fe4;hb=d56a1a82b06ed401324fc252dcd5f29e0c8b3ae5;hp=c18f8b3643d28ad77ab794cf7d32915a2147bbe9;hpb=964604f73db61b2c82421eef207e05d0e9db0f82;p=citadel.git diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c index c18f8b364..ed160fae7 100644 --- a/citadel/internet_addressing.c +++ b/citadel/internet_addressing.c @@ -13,7 +13,6 @@ * GNU General Public License for more details. */ - #include "sysdep.h" #include #include @@ -46,7 +45,7 @@ #include #if 0 -/* This is the non-define version in case of s.b. needing to debug */ +/* This is the non-define version in case it is needed for debugging */ inline void FindNextEnd (char *bptr, char *end) { /* Find the next ?Q? */ @@ -83,12 +82,12 @@ void utf8ify_rfc822_string(char *buf) { 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 */ + 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; @@ -103,7 +102,7 @@ void utf8ify_rfc822_string(char *buf) { for (i=0; i 126)) { illegal_non_rfc2047_encoding = 1; - i = len; ///< take a shortcut, it won't be more than one. + i = len; // take a shortcut, it won't be more than one. } } if (illegal_non_rfc2047_encoding) { @@ -189,10 +188,10 @@ void utf8ify_rfc822_string(char *buf) { ibuf = malloc(1024); isav = ibuf; - if (!strcasecmp(encoding, "B")) { /**< base64 */ + if (!strcasecmp(encoding, "B")) { // base64 ibuflen = CtdlDecodeBase64(ibuf, istr, strlen(istr)); } - else if (!strcasecmp(encoding, "Q")) { /**< quoted-printable */ + else if (!strcasecmp(encoding, "Q")) { // quoted-printable size_t len; unsigned long pos; @@ -207,7 +206,7 @@ void utf8ify_rfc822_string(char *buf) { ibuflen = CtdlDecodeQuotedPrintable(ibuf, istr, len); } else { - strcpy(ibuf, istr); /**< unknown encoding */ + strcpy(ibuf, istr); // unknown encoding ibuflen = strlen(istr); } @@ -269,15 +268,12 @@ 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. @@ -289,12 +285,12 @@ int CtdlHostAlias(char *fqdn) { 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, CtdlGetConfigStr("c_fqdn"))) return(hostalias_localhost); - if (!strcasecmp(fqdn, CtdlGetConfigStr("c_nodename"))) return(hostalias_localhost); - if (inetcfg == NULL) return(hostalias_nomatch); + if (fqdn == NULL) return(hostalias_nomatch); + if (IsEmptyStr(fqdn)) return(hostalias_nomatch); + if (!strcasecmp(fqdn, "localhost")) return(hostalias_localhost); + if (!strcasecmp(fqdn, CtdlGetConfigStr("c_fqdn"))) return(hostalias_localhost); + if (!strcasecmp(fqdn, CtdlGetConfigStr("c_nodename"))) return(hostalias_localhost); + if (inetcfg == NULL) return(hostalias_nomatch); config_lines = num_tokens(inetcfg, '\n'); for (i=0; i'); - fp = fopen(file_mail_aliases, "r"); + fp = fopen(file_mail_aliases, "r"); // when are we going to get rid of this? if (fp == NULL) { fp = fopen("/dev/null", "r"); } @@ -453,13 +446,13 @@ int alias(char *name) } fclose(fp); - /* Hit the Global Address Book */ + /* Hit the email address directory */ if (CtdlDirectoryLookup(aaa, name, sizeof aaa) == 0) { strcpy(name, aaa); } if (strcasecmp(original_name, name)) { - syslog(LOG_INFO, "%s is being forwarded to %s\n", original_name, name); + syslog(LOG_INFO, "internet_addressing: %s is being forwarded to %s", original_name, name); } /* Change "user @ xxx" to "user" if xxx is an alias for this host */ @@ -467,7 +460,7 @@ int alias(char *name) if (name[a] == '@') { if (CtdlHostAlias(&name[a+1]) == hostalias_localhost) { name[a] = 0; - syslog(LOG_INFO, "Changed to <%s>\n", name); + syslog(LOG_DEBUG, "internet_addressing: changed to <%s>", name); break; } } @@ -522,7 +515,6 @@ int alias(char *name) } - /* * Validate recipients, count delivery types and errors, and handle aliasing * FIXME check for dupes!!!!! @@ -532,9 +524,8 @@ int alias(char *name) * * Caller needs to free the result using free_recipients() */ -recptypes *validate_recipients(const char *supplied_recipients, - const char *RemoteIdentifier, - int Flags) { +recptypes *validate_recipients(const char *supplied_recipients, const char *RemoteIdentifier, int Flags) +{ struct CitContext *CCC = CC; recptypes *ret; char *recipients = NULL; @@ -620,7 +611,7 @@ recptypes *validate_recipients(const char *supplied_recipients, striplt(this_recp); if (IsEmptyStr(this_recp)) break; - syslog(LOG_DEBUG, "Evaluating recipient #%d: %s\n", num_recps, this_recp); + syslog(LOG_DEBUG, "internet_addressing: evaluating recipient #%d: %s", num_recps, this_recp); ++num_recps; strcpy(org_recp, this_recp); @@ -710,8 +701,8 @@ recptypes *validate_recipients(const char *supplied_recipients, break; case MES_INTERNET: /* Yes, you're reading this correctly: if the target - * domain points back to the local system or an attached - * Citadel directory, the address is invalid. That's + * domain points back to the local system, + * the address is invalid. That's * because if the address were valid, we would have * already translated it to a local address by now. */ @@ -773,12 +764,9 @@ recptypes *validate_recipients(const char *supplied_recipients, strcpy(ret->errormsg, "No recipients specified."); } - syslog(LOG_DEBUG, "validate_recipients()\n"); - syslog(LOG_DEBUG, " local: %d <%s>\n", ret->num_local, ret->recp_local); - syslog(LOG_DEBUG, " room: %d <%s>\n", ret->num_room, ret->recp_room); - syslog(LOG_DEBUG, " inet: %d <%s>\n", ret->num_internet, ret->recp_internet); - syslog(LOG_DEBUG, " ignet: %d <%s>\n", ret->num_ignet, ret->recp_ignet); - syslog(LOG_DEBUG, " error: %d <%s>\n", ret->num_error, ret->errormsg); + syslog(LOG_DEBUG, "internet_addressing: validate_recipients() = %d local, %d room, %d SMTP, %d IGnet, %d error", + ret->num_local, ret->num_room, ret->num_internet, ret->num_ignet, ret->num_error + ); free(recipients); return(ret); @@ -795,7 +783,7 @@ void free_recipients(recptypes *valid) { } if (valid->recptypes_magic != RECPTYPES_MAGIC) { - syslog(LOG_EMERG, "Attempt to call free_recipients() on some other data type!\n"); + syslog(LOG_ERR, "internet_addressing: attempt to call free_recipients() on some other data type!"); abort(); } @@ -833,7 +821,7 @@ char *qp_encode_email_addrs(char *source) if (source == NULL) return source; if (IsEmptyStr(source)) return source; - syslog(LOG_DEBUG, "qp_encode_email_addrs: [%s]\n", source); + syslog(LOG_DEBUG, "internet_addressing: qp_encode_email_addrs <%s>", source); AddrPtr = malloc (sizeof (long) * nAddrPtrMax); AddrUtf8 = malloc (sizeof (long) * nAddrPtrMax); @@ -879,8 +867,9 @@ char *qp_encode_email_addrs(char *source) EncodedMaxLen = nColons * (sizeof(headerStr) + 3) + SourceLen * 3; Encoded = (char*) malloc (EncodedMaxLen); - for (i = 0; i < nColons; i++) + for (i = 0; i < nColons; i++) { source[AddrPtr[i]++] = '\0'; + } /* TODO: if libidn, this might get larger*/ user = malloc(SourceLen + 1); node = malloc(SourceLen + 1); @@ -938,31 +927,6 @@ char *qp_encode_email_addrs(char *source) } -/* - * Return 0 if a given string fuzzy-matches a Citadel user account - * - * FIXME ... this needs to be updated to handle aliases. - */ -int fuzzy_match(struct ctdluser *us, char *matchstring) { - int a; - long len; - - 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, len)) { - return 0; - } - } - return -1; -} - - /* * Unfold a multi-line field into a single line, removing multi-whitespaces */ @@ -1022,7 +986,6 @@ void unfold_rfc822_field(char **field, char **FieldEnd) } - /* * Split an RFC822-style address into userid, host, and full name * @@ -1161,7 +1124,6 @@ void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name) } - /* * convert_field() is a helper function for convert_internet_message(). * Given start/end positions for an rfc822 field, it converts it to a Citadel @@ -1221,7 +1183,7 @@ int convert_field(struct CtdlMessage *msg, const char *beg, const char *end) { else if (!strcasecmp(key, "From")) { process_rfc822_addr(value, user, node, name); - syslog(LOG_DEBUG, "Converted to <%s@%s> (%s)\n", user, node, name); + syslog(LOG_DEBUG, "internet_addressing: converted to <%s@%s> (%s)", user, node, name); snprintf(addr, sizeof(addr), "%s@%s", user, node); if (CM_IsEmpty(msg, eAuthor) && !IsEmptyStr(name)) CM_SetField(msg, eAuthor, name, strlen(name)); @@ -1256,7 +1218,7 @@ int convert_field(struct CtdlMessage *msg, const char *beg, const char *end) { else if (!strcasecmp(key, "Message-ID")) { if (!CM_IsEmpty(msg, emessageId)) { - syslog(LOG_WARNING, "duplicate message id\n"); + syslog(LOG_WARNING, "internet_addressing: duplicate message id"); } else { char *pValue; @@ -1367,7 +1329,6 @@ struct CtdlMessage *convert_internet_message(char *rfc822) { } - struct CtdlMessage *convert_internet_message_buf(StrBuf **rfc822) { struct CtdlMessage *msg; @@ -1462,7 +1423,6 @@ struct CtdlMessage *convert_internet_message_buf(StrBuf **rfc822) } - /* * 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 @@ -1514,7 +1474,6 @@ char *rfc822_fetch_field(const char *rfc822, const char *fieldname) { } - /***************************************************************************** * DIRECTORY MANAGEMENT FUNCTIONS * *****************************************************************************/ @@ -1534,13 +1493,11 @@ void directory_key(char *key, char *addr) { } key[keylen++] = 0; - syslog(LOG_DEBUG, "Directory key is <%s>\n", key); + syslog(LOG_DEBUG, "internet_addressing: directory key is <%s>", key); } - -/* Return nonzero if the supplied address is in a domain we keep in - * the directory +/* Return nonzero if the supplied address is in one of "our" domains */ int IsDirectory(char *addr, int allow_masq_domains) { char domain[256]; @@ -1554,7 +1511,7 @@ int IsDirectory(char *addr, int allow_masq_domains) { if ( (h == hostalias_masq) && allow_masq_domains) return(1); - if ( (h == hostalias_localhost) || (h == hostalias_directory) ) { + if (h == hostalias_localhost) { return(1); } else { @@ -1563,23 +1520,16 @@ int IsDirectory(char *addr, int allow_masq_domains) { } -/* - * 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 */ int CtdlDirectoryAddUser(char *internet_addr, char *citadel_addr) { char key[SIZ]; - if (IsDirectory(internet_addr, 0) == 0) + if (IsDirectory(internet_addr, 0) == 0) { return 0; - syslog(LOG_DEBUG, "Create directory entry: %s --> %s\n", internet_addr, citadel_addr); + } + syslog(LOG_DEBUG, "internet_addressing: create directory entry: %s --> %s", internet_addr, citadel_addr); directory_key(key, internet_addr); cdb_store(CDB_DIRECTORY, key, strlen(key), citadel_addr, strlen(citadel_addr)+1 ); return 1; @@ -1595,7 +1545,7 @@ int CtdlDirectoryAddUser(char *internet_addr, char *citadel_addr) { int CtdlDirectoryDelUser(char *internet_addr, char *citadel_addr) { char key[SIZ]; - syslog(LOG_DEBUG, "Delete directory entry: %s --> %s\n", internet_addr, citadel_addr); + syslog(LOG_DEBUG, "internet_addressing: delete directory entry: %s --> %s", internet_addr, citadel_addr); directory_key(key, internet_addr); return cdb_delete(CDB_DIRECTORY, key, strlen(key) ) == 0; } @@ -1680,7 +1630,7 @@ char *harvest_collected_addresses(struct CtdlMessage *msg) { utf8ify_rfc822_string(addr); process_rfc822_addr(addr, user, node, name); h = CtdlHostAlias(node); - if ( (h != hostalias_localhost) && (h != hostalias_directory) ) { + if (h != hostalias_localhost) { coll = realloc(coll, strlen(coll) + strlen(addr) + 4); if (coll == NULL) return(NULL); if (!IsEmptyStr(coll)) { @@ -1699,3 +1649,104 @@ char *harvest_collected_addresses(struct CtdlMessage *msg) { } return(coll); } + + +/* + * Helper function for CtdlRebuildDirectoryIndex() + * + * Call this function as a ForEachUser backend in order to queue up + * user names, or call it with a null user to make it do the processing. + * This allows us to maintain the list as a static instead of passing + * pointers around. + */ +void CtdlRebuildDirectoryIndex_backend(struct ctdluser *usbuf, void *data) { + + struct crdib { + char name[64]; + char emails[512]; + }; + + static struct crdib *e = NULL; + static int num_e = 0; + static int alloc_e = 0; + + /* this is the calling mode where we add a user */ + + if (usbuf != NULL) { + if (num_e >= alloc_e) { + if (alloc_e == 0) { + alloc_e = 100; + e = malloc(sizeof(struct crdib) * alloc_e); + } + else { + alloc_e *= 2; + e = realloc(e, (sizeof(struct crdib) * alloc_e)); + } + } + strcpy(e[num_e].name, usbuf->fullname); + strcpy(e[num_e].emails, usbuf->emailaddrs); + ++num_e; + return; + } + + /* this is the calling mode where we do the processing */ + + int i, j; + for (i=0; i to <%s>", usbuf.fullname, new_emailaddrs); + + /* Delete all of the existing directory index records for the user (easier this way) */ + for (i=0; i