X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Finternet_addressing.c;h=b517871620a14f8967aa5ad5464c6283db7e0d88;hb=aca7dd04d80f04b9cd61f740549ce370e76bc332;hp=7c9bac07aa3389405dccf4a3c505bbe212a15bed;hpb=2f84905fd53640a922efc4bf30618e96776d8b49;p=citadel.git

diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c
index 7c9bac07a..b51787162 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-2018 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.
@@ -134,8 +134,7 @@ void utf8ify_rfc822_string(char *buf) {
 	if (start != NULL) 
 		FindNextEnd (start, end);
 
-	while ((start != NULL) && (end != NULL))
-	{
+	while ((start != NULL) && (end != NULL)) {
 		next = strstr(end, "=?");
 		if (next != NULL)
 			FindNextEnd(next, nextend);
@@ -143,9 +142,7 @@ void utf8ify_rfc822_string(char *buf) {
 			next = NULL;
 
 		/* did we find two partitions */
-		if ((next != NULL) && 
-		    ((next - end) > 2))
-		{
+		if ((next != NULL) && ((next - end) > 2)) {
 			ptr = end + 2;
 			while ((ptr < next) && 
 			       (isspace(*ptr) ||
@@ -180,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);
@@ -197,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 {
@@ -353,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)
 {
@@ -380,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) {
@@ -403,9 +396,8 @@ 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;
-	char aaa[SIZ], bbb[SIZ];
+	char aaa[SIZ];
 	int at = 0;
 	char node[64];
 
@@ -416,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);
@@ -492,8 +458,7 @@ 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;
@@ -621,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;
 				} 
@@ -717,8 +681,7 @@ recptypes *validate_recipients(const char *supplied_recipients, const char *Remo
 	}
 	free(org_recp);
 
-	if ( (ret->num_local + ret->num_internet + 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.");
 	}
@@ -911,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 {
@@ -1519,7 +1480,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);
@@ -1530,7 +1493,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);
 	}
@@ -1611,58 +1576,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;
-
-	/* this is the calling mode where we add a user */
+	int j = 0;
+	struct ctdluser usbuf;
 
-	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<num_e; ++i) {
-		if ( (!IsEmptyStr(e[i].name)) && (!IsEmptyStr(e[i].emails)) ) {
-			for (j=0; j<num_tokens(e[i].emails, '|'); ++j) {
-				char one_email[512];
-				extract_token(one_email, e[i].emails, j, '|', sizeof one_email);
-				CtdlDirectoryAddUser(one_email, e[i].name);
-			}
+	if ( (!IsEmptyStr(usbuf.fullname)) && (!IsEmptyStr(usbuf.emailaddrs)) ) {
+		for (j=0; j<num_tokens(usbuf.emailaddrs, '|'); ++j) {
+			char one_email[512];
+			extract_token(one_email, usbuf.emailaddrs, j, '|', sizeof one_email);
+			CtdlDirectoryAddUser(one_email, usbuf.fullname);
 		}
 	}
-	free(e);
-	num_e = 0;
-	alloc_e = 0;
-	return;
 }
 
 
@@ -1673,7 +1603,6 @@ void CtdlRebuildDirectoryIndex(void) {
 	syslog(LOG_INFO, "internet_addressing: rebuilding email address directory index");
 	cdb_trunc(CDB_DIRECTORY);
 	ForEachUser(CtdlRebuildDirectoryIndex_backend, NULL);
-	CtdlRebuildDirectoryIndex_backend(NULL, NULL);
 }
 
 
@@ -1708,3 +1637,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);
+}