X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Finternet_addressing.c;h=355656ab52d888ee93297c9771a7285ca730a6f7;hb=83f6f54ff172d43c9ab0fab87b10280d0c99ccec;hp=a1b0a37e176c84748abdb35f90d6202a5b2a5720;hpb=154ecc9117291889ed20b392e65725f883a2d962;p=citadel.git diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c index a1b0a37e1..355656ab5 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 @@ -13,18 +24,7 @@ #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 @@ -83,12 +83,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 +103,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,12 +189,12 @@ 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; - long pos; + unsigned long pos; len = strlen(istr); pos = 0; @@ -207,7 +207,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,7 +269,6 @@ inline void utf8ify_rfc822_string(char *a){}; #endif - struct trynamebuf { char buffer1[SIZ]; char buffer2[SIZ]; @@ -292,8 +291,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'); @@ -325,13 +324,12 @@ int CtdlHostAlias(char *fqdn) { } - /* * Determine whether a given Internet address belongs to the current user */ int CtdlIsMe(char *addr, int addr_buf_len) { - struct recptypes *recp; + recptypes *recp; int i; recp = validate_recipients(addr, NULL, 0); @@ -355,25 +353,6 @@ int CtdlIsMe(char *addr, int addr_buf_len) } -/* - * Citadel protocol command to do the same - */ -void cmd_isme(char *argbuf) { - char addr[256]; - - if (CtdlAccessCheck(ac_logged_in)) return; - extract_token(addr, argbuf, 0, '|', sizeof addr); - - if (CtdlIsMe(addr, sizeof addr)) { - cprintf("%d %s\n", CIT_OK, addr); - } - else { - cprintf("%d Not you.\n", ERROR + ILLEGAL_VALUE); - } - -} - - /* If the last item in a list of recipients was truncated to a partial address, * remove it completely in order to avoid choking libSieve */ @@ -398,16 +377,13 @@ void sanitize_truncated_recipient(char *str) } - - - /* * This function is self explanatory. * (What can I say, I'm in a weird mood today...) */ 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] == '@') { @@ -425,11 +401,9 @@ void remove_any_whitespace_to_the_left_or_right_of_at_symbol(char *name) /* * Aliasing for network mail. - * (Error messages have been commented out, because this is a server.) */ 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]; @@ -461,10 +435,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)) @@ -478,15 +453,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; } } } @@ -540,7 +516,6 @@ int alias(char *name) } - /* * Validate recipients, count delivery types and errors, and handle aliasing * FIXME check for dupes!!!!! @@ -550,11 +525,11 @@ int alias(char *name) * * Caller needs to free the result using free_recipients() */ -struct 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; - struct recptypes *ret; + recptypes *ret; char *recipients = NULL; char *org_recp; char this_recp[256]; @@ -573,11 +548,11 @@ struct recptypes *validate_recipients(const char *supplied_recipients, int in_quotes = 0; /* Initialize */ - ret = (struct recptypes *) malloc(sizeof(struct recptypes)); + ret = (recptypes *) malloc(sizeof(recptypes)); if (ret == NULL) return(NULL); /* Set all strings to null and numeric values to zero */ - memset(ret, 0, sizeof(struct recptypes)); + memset(ret, 0, sizeof(recptypes)); if (supplied_recipients == NULL) { recipients = strdup(""); @@ -638,7 +613,7 @@ struct 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); @@ -661,7 +636,7 @@ struct 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, "|"); } @@ -791,12 +766,9 @@ struct 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); @@ -804,17 +776,16 @@ struct recptypes *validate_recipients(const char *supplied_recipients, /* - * Destructor for struct recptypes + * Destructor for recptypes */ -void free_recipients(struct recptypes *valid) { +void free_recipients(recptypes *valid) { if (valid == NULL) { return; } 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(); } @@ -834,7 +805,6 @@ void free_recipients(struct 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; @@ -853,8 +823,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); @@ -900,8 +869,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); @@ -959,31 +929,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 */ @@ -1008,11 +953,16 @@ void unfold_rfc822_field(char **field, char **FieldEnd) sField < pFieldEnd; pField++, sField++) { - if ((*sField=='\r') || (*sField=='\n')) { - sField++; - if (*sField == '\n') - sField++; - *pField = *sField; + if ((*sField=='\r') || (*sField=='\n')) + { + int Offset = 1; + while (((*(sField + Offset) == '\r') || + (*(sField + Offset) == '\n') || + (isspace(*(sField + Offset)))) && + (sField + Offset < pFieldEnd)) + Offset ++; + sField += Offset; + *pField = *sField; } else { if (*sField=='\"') quote = 1 - quote; @@ -1038,7 +988,6 @@ void unfold_rfc822_field(char **field, char **FieldEnd) } - /* * Split an RFC822-style address into userid, host, and full name * @@ -1048,7 +997,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; @@ -1062,11 +1011,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... */ @@ -1082,9 +1035,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); @@ -1102,11 +1057,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; + } } @@ -1127,7 +1086,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 { @@ -1145,9 +1104,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 */ @@ -1165,7 +1126,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 @@ -1225,11 +1185,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; } @@ -1260,7 +1220,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; @@ -1371,7 +1331,6 @@ struct CtdlMessage *convert_internet_message(char *rfc822) { } - struct CtdlMessage *convert_internet_message_buf(StrBuf **rfc822) { struct CtdlMessage *msg; @@ -1466,7 +1425,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 @@ -1518,7 +1476,6 @@ char *rfc822_fetch_field(const char *rfc822, const char *fieldname) { } - /***************************************************************************** * DIRECTORY MANAGEMENT FUNCTIONS * *****************************************************************************/ @@ -1538,11 +1495,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 */ @@ -1583,7 +1539,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; @@ -1598,8 +1554,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; } @@ -1703,12 +1659,3 @@ char *harvest_collected_addresses(struct CtdlMessage *msg) { } return(coll); } - - -CTDL_MODULE_INIT(internet_addressing) -{ - if (!threading) { - CtdlRegisterProtoHook(cmd_isme, "ISME", "Determine whether an email address belongs to a user"); - } - return "internet_addressing"; -}