X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Finternet_addressing.c;h=74f69493f895964794835dd5951bc4aa19126f61;hb=8db8def130c7e0b01dfce85aa2bc207e22188b94;hp=ed160fae73f9d5166fd67dbf6e9f65a6f7879fe4;hpb=d56a1a82b06ed401324fc252dcd5f29e0c8b3ae5;p=citadel.git diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c index ed160fae7..74f69493f 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-2018 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. @@ -93,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; 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); @@ -576,7 +543,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; @@ -718,13 +684,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; @@ -758,14 +717,14 @@ 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); @@ -790,7 +749,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); @@ -1561,7 +1519,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); @@ -1572,7 +1532,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); } @@ -1750,3 +1712,40 @@ void CtdlSetEmailAddressesForUser(char *requested_user, char *new_emailaddrs) CtdlPutUserLock(&usbuf); } + + +/* + * Auto-generate an Internet email address for a user account + */ +void AutoGenerateEmailAddressForUser(struct ctdluser *user) +{ + char synthetic_email_addr[1024]; + int i, j; + int u = 0; + + for (i=0; u==0; ++i) { + if (i == 0) { + // first try just converting the user name to lowercase and replacing spaces with underscores + snprintf(synthetic_email_addr, sizeof synthetic_email_addr, "%s@%s", user->fullname, 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); + } + + 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); +}