X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Finternet_addressing.c;h=a3ef1f815d01bb5c59d6d61573f717b4c13603c2;hb=e704ad0e3d1ecb2f5e0c46984cc8902fcdc0ec36;hp=362d6ccf3f8fe1b65d4530c44134b273e17a3faf;hpb=5ec417e35ec1eb0b1b0ed055157177d9a2163d61;p=citadel.git diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c index 362d6ccf3..a3ef1f815 100644 --- a/citadel/internet_addressing.c +++ b/citadel/internet_addressing.c @@ -1,8 +1,19 @@ /* * This file contains functions which handle the mapping of Internet addresses * to users on the Citadel system. + * + * Copyright (c) 1987-2017 by the citadel.org team + * + * This program is open source software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. */ + #include "sysdep.h" #include #include @@ -183,7 +194,7 @@ void utf8ify_rfc822_string(char *buf) { } else if (!strcasecmp(encoding, "Q")) { /**< quoted-printable */ size_t len; - long pos; + unsigned long pos; len = strlen(istr); pos = 0; @@ -281,8 +292,8 @@ int CtdlHostAlias(char *fqdn) { 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 (!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'); @@ -377,7 +388,7 @@ void sanitize_truncated_recipient(char *str) */ void remove_any_whitespace_to_the_left_or_right_of_at_symbol(char *name) { - int i; + unsigned int i; for (i = 0; i < strlen(name); ++i) { if (name[i] == '@') { @@ -399,7 +410,6 @@ void remove_any_whitespace_to_the_left_or_right_of_at_symbol(char *name) */ int alias(char *name) { /* process alias and routing info for mail */ - struct CitContext *CCC = CC; FILE *fp; int a, i; char aaa[SIZ], bbb[SIZ]; @@ -431,10 +441,11 @@ int alias(char *name) strcpy(name, &name[1]); aaa[strlen(aaa) - 1] = 0; strcpy(bbb, ""); - for (a = 0; a < strlen(aaa); ++a) { + for (a = 0; aaa[a] != '\0'; ++a) { if (aaa[a] == ',') { strcpy(bbb, &aaa[a + 1]); aaa[a] = 0; + break; } } if (!strcasecmp(name, aaa)) @@ -448,15 +459,16 @@ int alias(char *name) } if (strcasecmp(original_name, name)) { - MSG_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 */ - for (a=0; a\n", name); + syslog(LOG_DEBUG, "internet_addressing: changed to <%s>", name); + break; } } } @@ -608,7 +620,7 @@ recptypes *validate_recipients(const char *supplied_recipients, striplt(this_recp); if (IsEmptyStr(this_recp)) break; - MSG_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); @@ -631,7 +643,7 @@ recptypes *validate_recipients(const char *supplied_recipients, case MES_LOCAL: if (!strcasecmp(this_recp, "sysop")) { ++ret->num_room; - strcpy(this_recp, config.c_aideroom); + strcpy(this_recp, CtdlGetConfigStr("c_aideroom")); if (!IsEmptyStr(ret->recp_room)) { strcat(ret->recp_room, "|"); } @@ -761,12 +773,9 @@ recptypes *validate_recipients(const char *supplied_recipients, strcpy(ret->errormsg, "No recipients specified."); } - MSGM_syslog(LOG_DEBUG, "validate_recipients()\n"); - MSG_syslog(LOG_DEBUG, " local: %d <%s>\n", ret->num_local, ret->recp_local); - MSG_syslog(LOG_DEBUG, " room: %d <%s>\n", ret->num_room, ret->recp_room); - MSG_syslog(LOG_DEBUG, " inet: %d <%s>\n", ret->num_internet, ret->recp_internet); - MSG_syslog(LOG_DEBUG, " ignet: %d <%s>\n", ret->num_ignet, ret->recp_ignet); - MSG_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); @@ -783,8 +792,7 @@ void free_recipients(recptypes *valid) { } if (valid->recptypes_magic != RECPTYPES_MAGIC) { - struct CitContext *CCC = CC; - MSGM_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(); } @@ -804,7 +812,6 @@ void free_recipients(recptypes *valid) { char *qp_encode_email_addrs(char *source) { - struct CitContext *CCC = CC; char *user, *node, *name; const char headerStr[] = "=?UTF-8?Q?"; char *Encoded; @@ -823,8 +830,7 @@ char *qp_encode_email_addrs(char *source) if (source == NULL) return source; if (IsEmptyStr(source)) return source; - if (MessageDebugEnabled != 0) cit_backtrace(); - MSG_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); @@ -1023,7 +1029,7 @@ void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name) int a; strcpy(user, ""); - strcpy(node, config.c_fqdn); + strcpy(node, CtdlGetConfigStr("c_fqdn")); strcpy(name, ""); if (rfc822 == NULL) return; @@ -1037,11 +1043,15 @@ void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name) strcpy(name, &name[1]); /* and anything to the right of a @ or % */ - for (a = 0; a < strlen(name); ++a) { - if (name[a] == '@') + for (a = 0; name[a] != '\0'; ++a) { + if (name[a] == '@') { name[a] = 0; - if (name[a] == '%') + break; + } + if (name[a] == '%') { name[a] = 0; + break; + } } /* but if there are parentheses, that changes the rules... */ @@ -1057,9 +1067,11 @@ void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name) strcpy(&name[0], &name[1]); } strcpy(&name[0], &name[1]); - for (a = 0; a < strlen(name); ++a) - if (name[a] == 34) + for (a = 0; name[a] != '\0'; ++a) + if (name[a] == 34) { name[a] = 0; + break; + } } /* extract user id */ strcpy(user, rfc822); @@ -1077,11 +1089,15 @@ void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name) strcpy(user, &user[1]); /* and anything to the right of a @ or % */ - for (a = 0; a < strlen(user); ++a) { - if (user[a] == '@') + for (a = 0; user[a] != '\0'; ++a) { + if (user[a] == '@') { user[a] = 0; - if (user[a] == '%') + break; + } + if (user[a] == '%') { user[a] = 0; + break; + } } @@ -1102,7 +1118,7 @@ void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name) && (haschar(node, '%')==0) && (haschar(node, '!')==0) ) { - strcpy(node, config.c_nodename); + strcpy(node, CtdlGetConfigStr("c_nodename")); } else { @@ -1120,9 +1136,11 @@ void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name) 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] == '!') + for (a = 0; node[a] != '\0'; ++a) + if (node[a] == '!') { node[a] = 0; + break; + } } /* strip leading and trailing spaces in all strings */ @@ -1200,11 +1218,11 @@ 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)) + if (CM_IsEmpty(msg, eAuthor) && !IsEmptyStr(name)) CM_SetField(msg, eAuthor, name, strlen(name)); - if (CM_IsEmpty(msg, erFc822Addr)) + if (CM_IsEmpty(msg, erFc822Addr) && !IsEmptyStr(addr)) CM_SetField(msg, erFc822Addr, addr, strlen(addr)); processed = 1; } @@ -1235,7 +1253,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; @@ -1513,11 +1531,10 @@ 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 */ @@ -1558,7 +1575,7 @@ int CtdlDirectoryAddUser(char *internet_addr, char *citadel_addr) { 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; @@ -1573,8 +1590,8 @@ 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; }