X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Finternet_addressing.c;h=11cefd808ee6ba52bdfd10a1a381d90326dc0ccf;hb=2d01d13e76adb74e80c1a9e7eb8810686b3d5029;hp=8902befbdfdbf37dedc21f5a1b389fd17d431949;hpb=727b303736cc95e8be9c7e28c3622eda152584ce;p=citadel.git diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c index 8902befbd..11cefd808 100644 --- a/citadel/internet_addressing.c +++ b/citadel/internet_addressing.c @@ -2,7 +2,7 @@ * 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 + * Copyright (c) 1987-2020 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. @@ -13,7 +13,6 @@ * GNU General Public License for more details. */ - #include "sysdep.h" #include #include @@ -94,10 +93,10 @@ void utf8ify_rfc822_string(char *buf) { 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. + * 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 2)) - { + if ((next != NULL) && ((next - end) > 2)) { ptr = end + 2; while ((ptr < next) && (isspace(*ptr) || @@ -181,8 +177,7 @@ void utf8ify_rfc822_string(char *buf) { */ start = strstr(buf, "=?"); FindNextEnd((start != NULL)? start : buf, end); - while (start != NULL && end != NULL && end > start) - { + 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); @@ -198,12 +193,10 @@ void utf8ify_rfc822_string(char *buf) { len = strlen(istr); pos = 0; - while (pos < len) - { + while (pos < len) { if (istr[pos] == '_') istr[pos] = ' '; pos++; } - ibuflen = CtdlDecodeQuotedPrintable(ibuf, istr, len); } else { @@ -354,7 +347,7 @@ int CtdlIsMe(char *addr, int addr_buf_len) /* If the last item in a list of recipients was truncated to a partial address, - * remove it completely in order to avoid choking libSieve + * remove it completely in order to avoid choking library functions. */ void sanitize_truncated_recipient(char *str) { @@ -381,8 +374,7 @@ 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) -{ +void remove_any_whitespace_to_the_left_or_right_of_at_symbol(char *name) { unsigned int i; for (i = 0; i < strlen(name); ++i) { @@ -404,15 +396,10 @@ 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 */ - FILE *fp; - int a, i; - char aaa[SIZ], bbb[SIZ]; - char *ignetcfg = NULL; - char *ignetmap = NULL; + int a; + char aaa[SIZ]; int at = 0; char node[64]; - char testnode[64]; - char buf[SIZ]; char original_name[256]; safestrncpy(original_name, name, sizeof original_name); @@ -421,32 +408,6 @@ int alias(char *name) remove_any_whitespace_to_the_left_or_right_of_at_symbol(name); stripallbut(name, '<', '>'); - fp = fopen(file_mail_aliases, "r"); // when are we going to get rid of this? - if (fp == NULL) { - fp = fopen("/dev/null", "r"); - } - if (fp == NULL) { - return (MES_ERROR); - } - strcpy(aaa, ""); - strcpy(bbb, ""); - while (fgets(aaa, sizeof aaa, fp) != NULL) { - while (isspace(name[0])) - strcpy(name, &name[1]); - aaa[strlen(aaa) - 1] = 0; - strcpy(bbb, ""); - for (a = 0; aaa[a] != '\0'; ++a) { - if (aaa[a] == ',') { - strcpy(bbb, &aaa[a + 1]); - aaa[a] = 0; - break; - } - } - if (!strcasecmp(name, aaa)) - strcpy(name, bbb); - } - fclose(fp); - /* Hit the email address directory */ if (CtdlDirectoryLookup(aaa, name, sizeof aaa) == 0) { strcpy(name, aaa); @@ -483,34 +444,6 @@ int alias(char *name) return(MES_INTERNET); } - /* Otherwise we look in the IGnet maps for a valid Citadel node. - * Try directly-connected nodes first... - */ - ignetcfg = CtdlGetSysConfig(IGNETCFG); - for (i=0; ierrormsg = malloc(len); ret->recp_local = malloc(len); ret->recp_internet = malloc(len); - ret->recp_ignet = malloc(len); ret->recp_room = malloc(len); ret->display_recp = malloc(len); ret->recp_orgroom = malloc(len); @@ -577,7 +508,6 @@ recptypes *validate_recipients(const char *supplied_recipients, const char *Remo ret->errormsg[0] = 0; ret->recp_local[0] = 0; ret->recp_internet[0] = 0; - ret->recp_ignet[0] = 0; ret->recp_room[0] = 0; ret->recp_orgroom[0] = 0; ret->display_recp[0] = 0; @@ -656,8 +586,7 @@ recptypes *validate_recipients(const char *supplied_recipients, const char *Remo Flags, 0 /* 0 = not a reply */ ); - if (err) - { + if (err) { ++ret->num_error; invalid = 1; } @@ -702,8 +631,8 @@ recptypes *validate_recipients(const char *supplied_recipients, const char *Remo 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. */ @@ -719,13 +648,6 @@ recptypes *validate_recipients(const char *supplied_recipients, const char *Remo strcat(ret->recp_internet, this_recp); } break; - case MES_IGNET: - ++ret->num_ignet; - if (!IsEmptyStr(ret->recp_ignet)) { - strcat(ret->recp_ignet, "|"); - } - strcat(ret->recp_ignet, this_recp); - break; case MES_ERROR: ++ret->num_error; invalid = 1; @@ -759,14 +681,13 @@ recptypes *validate_recipients(const char *supplied_recipients, const char *Remo } free(org_recp); - if ((ret->num_local + ret->num_internet + ret->num_ignet + - ret->num_room + ret->num_error) == 0) { + if ( (ret->num_local + ret->num_internet + ret->num_room + ret->num_error) == 0) { ret->num_error = (-1); strcpy(ret->errormsg, "No recipients specified."); } - 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 + syslog(LOG_DEBUG, "internet_addressing: validate_recipients() = %d local, %d room, %d SMTP, %d error", + ret->num_local, ret->num_room, ret->num_internet, ret->num_error ); free(recipients); @@ -791,7 +712,6 @@ void free_recipients(recptypes *valid) { if (valid->errormsg != NULL) free(valid->errormsg); if (valid->recp_local != NULL) free(valid->recp_local); if (valid->recp_internet != NULL) free(valid->recp_internet); - if (valid->recp_ignet != NULL) free(valid->recp_ignet); if (valid->recp_room != NULL) free(valid->recp_room); if (valid->recp_orgroom != NULL) free(valid->recp_orgroom); if (valid->display_recp != NULL) free(valid->display_recp); @@ -954,13 +874,11 @@ void unfold_rfc822_field(char **field, char **FieldEnd) { if ((*sField=='\r') || (*sField=='\n')) { - int Offset = 1; - while (((*(sField + Offset) == '\r') || - (*(sField + Offset) == '\n') || - (isspace(*(sField + Offset)))) && - (sField + Offset < pFieldEnd)) - Offset ++; - sField += Offset; + int offset = 1; + while ( ( (*(sField + offset) == '\r') || (*(sField + offset) == '\n' )) && (sField + offset < pFieldEnd) ) { + offset ++; + } + sField += offset; *pField = *sField; } else { @@ -1186,10 +1104,12 @@ int convert_field(struct CtdlMessage *msg, const char *beg, const char *end) { process_rfc822_addr(value, 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)); - if (CM_IsEmpty(msg, erFc822Addr) && !IsEmptyStr(addr)) - CM_SetField(msg, erFc822Addr, addr, strlen(addr)); + if (CM_IsEmpty(msg, eAuthor) && !IsEmptyStr(name)) { + CM_SetField(msg, eAuthor, name, -1); + } + if (CM_IsEmpty(msg, erFc822Addr) && !IsEmptyStr(addr)) { + CM_SetField(msg, erFc822Addr, addr, -1); + } processed = 1; } @@ -1498,7 +1418,8 @@ void directory_key(char *key, char *addr) { } -/* Return nonzero if the supplied address is in one of "our" domains +/* + * Return nonzero if the supplied address is in one of "our" domains */ int IsDirectory(char *addr, int allow_masq_domains) { char domain[256]; @@ -1562,7 +1483,9 @@ int CtdlDirectoryLookup(char *target, char *internet_addr, size_t targbuflen) { char key[SIZ]; /* Dump it in there unchanged, just for kicks */ - safestrncpy(target, internet_addr, targbuflen); + if (target != NULL) { + safestrncpy(target, internet_addr, targbuflen); + } /* Only do lookups for addresses with hostnames in them */ if (num_tokens(internet_addr, '@') != 2) return(-1); @@ -1573,7 +1496,9 @@ int CtdlDirectoryLookup(char *target, char *internet_addr, size_t targbuflen) { directory_key(key, internet_addr); cdbrec = cdb_fetch(CDB_DIRECTORY, key, strlen(key) ); if (cdbrec != NULL) { - safestrncpy(target, cdbrec->ptr, targbuflen); + if (target != NULL) { + safestrncpy(target, cdbrec->ptr, targbuflen); + } cdb_free(cdbrec); return(0); } @@ -1654,58 +1579,23 @@ char *harvest_collected_addresses(struct CtdlMessage *msg) { /* * 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]; - }; +void CtdlRebuildDirectoryIndex_backend(char *username, void *data) { - static struct crdib *e = NULL; - static int num_e = 0; - static int alloc_e = 0; + int j = 0; + struct ctdluser usbuf; - /* 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; + if (CtdlGetUser(&usbuf, username) != 0) { 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; ifullname, CtdlGetConfigStr("c_fqdn")); + for (j=0; ((synthetic_email_addr[j] != '\0')&&(synthetic_email_addr[j] != '@')); j++) { + synthetic_email_addr[j] = tolower(synthetic_email_addr[j]); + if (!isalnum(synthetic_email_addr[j])) { + synthetic_email_addr[j] = '_'; + } + } + } + else if (i == 1) { + // then try 'ctdl' followed by the user number + snprintf(synthetic_email_addr, sizeof synthetic_email_addr, "ctdl%08lx@%s", user->usernum, CtdlGetConfigStr("c_fqdn")); + } + else if (i > 1) { + // oof. just keep trying other numbers until we find one + snprintf(synthetic_email_addr, sizeof synthetic_email_addr, "ctdl%08x@%s", i, CtdlGetConfigStr("c_fqdn")); + } + u = CtdlDirectoryLookup(NULL, synthetic_email_addr, 0); + syslog(LOG_DEBUG, "\033[33mAddress <%s> lookup <%d>\033[0m", synthetic_email_addr, u); + } + + CtdlSetEmailAddressesForUser(user->fullname, synthetic_email_addr); + strncpy(CC->user.emailaddrs, synthetic_email_addr, sizeof(user->emailaddrs)); + syslog(LOG_DEBUG, "user_ops: auto-generated email address <%s> for <%s>", synthetic_email_addr, user->fullname); }