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

diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c
index 4bf5e0fe0..7c9bac07a 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.
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-
 #include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
@@ -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<len; ++i) {
@@ -286,12 +285,12 @@ int CtdlHostAlias(char *fqdn) {
 	char host[256], type[256];
 	int found = 0;
 
-	if (fqdn == NULL) return(hostalias_nomatch);
-	if (IsEmptyStr(fqdn)) return(hostalias_nomatch);
-	if (!strcasecmp(fqdn, "localhost")) 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);
+	if (fqdn == NULL)					return(hostalias_nomatch);
+	if (IsEmptyStr(fqdn))					return(hostalias_nomatch);
+	if (!strcasecmp(fqdn, "localhost"))			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');
 	for (i=0; i<config_lines; ++i) {
@@ -302,22 +301,24 @@ int CtdlHostAlias(char *fqdn) {
 		found = 0;
 
 		/* Process these in a specific order, in case there are multiple matches.
-		 * We want directory to override masq, for example.
+		 * We want localhost to override masq, for example.
 		 */
 
 		if ( (!strcasecmp(type, "masqdomain")) && (!strcasecmp(fqdn, host))) {
 			found = hostalias_masq;
 		}
+
 		if ( (!strcasecmp(type, "localhost")) && (!strcasecmp(fqdn, host))) {
 			found = hostalias_localhost;
 		}
+
+		// "directory" used to be a distributed version of "localhost" but they're both the same now
 		if ( (!strcasecmp(type, "directory")) && (!strcasecmp(fqdn, host))) {
-			found = hostalias_directory;
+			found = hostalias_localhost;
 		}
 
 		if (found) return(found);
 	}
-
 	return(hostalias_nomatch);
 }
 
@@ -403,14 +404,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;
+	int a;
 	char aaa[SIZ], bbb[SIZ];
-	char *ignetcfg = NULL;
-	char *ignetmap = NULL;
 	int at = 0;
 	char node[64];
-	char testnode[64];
-	char buf[SIZ];
 
 	char original_name[256];
 	safestrncpy(original_name, name, sizeof original_name);
@@ -419,7 +416,7 @@ int alias(char *name)
 	remove_any_whitespace_to_the_left_or_right_of_at_symbol(name);
 	stripallbut(name, '<', '>');
 
-	fp = fopen(file_mail_aliases, "r");
+	fp = fopen(file_mail_aliases, "r");		// when are we going to get rid of this?
 	if (fp == NULL) {
 		fp = fopen("/dev/null", "r");
 	}
@@ -445,7 +442,7 @@ int alias(char *name)
 	}
 	fclose(fp);
 
-	/* Hit the Global Address Book */
+	/* Hit the email address directory */
 	if (CtdlDirectoryLookup(aaa, name, sizeof aaa) == 0) {
 		strcpy(name, aaa);
 	}
@@ -481,34 +478,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; i<num_tokens(ignetcfg, '\n'); ++i) {
-		extract_token(buf, ignetcfg, i, '\n', sizeof buf);
-		extract_token(testnode, buf, 0, '|', sizeof testnode);
-		if (!strcasecmp(node, testnode)) {
-			free(ignetcfg);
-			return(MES_IGNET);
-		}
-	}
-	free(ignetcfg);
-
-	/*
-	 * Then try nodes that are two or more hops away.
-	 */
-	ignetmap = CtdlGetSysConfig(IGNETMAP);
-	for (i=0; i<num_tokens(ignetmap, '\n'); ++i) {
-		extract_token(buf, ignetmap, i, '\n', sizeof buf);
-		extract_token(testnode, buf, 0, '|', sizeof testnode);
-		if (!strcasecmp(node, testnode)) {
-			free(ignetmap);
-			return(MES_IGNET);
-		}
-	}
-	free(ignetmap);
-
 	/* If we get to this point it's an invalid node name */
 	return (MES_ERROR);
 }
@@ -523,9 +492,8 @@ 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;
@@ -567,7 +535,6 @@ recptypes *validate_recipients(const char *supplied_recipients,
 	ret->errormsg = 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,
 	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;
@@ -701,8 +667,8 @@ recptypes *validate_recipients(const char *supplied_recipients,
 			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.
 			 */
@@ -718,13 +684,6 @@ recptypes *validate_recipients(const char *supplied_recipients,
 				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,
 	}
 	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);
@@ -1497,8 +1455,7 @@ void directory_key(char *key, char *addr) {
 }
 
 
-/* Return nonzero if the supplied address is in a domain we keep in
- * the directory
+/* Return nonzero if the supplied address is in one of "our" domains
  */
 int IsDirectory(char *addr, int allow_masq_domains) {
 	char domain[256];
@@ -1512,7 +1469,7 @@ int IsDirectory(char *addr, int allow_masq_domains) {
 	if ( (h == hostalias_masq) && allow_masq_domains)
 		return(1);
 	
-	if ( (h == hostalias_localhost) || (h == hostalias_directory) ) {
+	if (h == hostalias_localhost) {
 		return(1);
 	}
 	else {
@@ -1521,22 +1478,15 @@ int IsDirectory(char *addr, int allow_masq_domains) {
 }
 
 
-/*
- * Initialize the directory database (erasing anything already there)
- */
-void CtdlRebuildDirectoryIndex(void) {
-	cdb_trunc(CDB_DIRECTORY);
-}
-
-
 /*
  * Add an Internet e-mail address to the directory for a user
  */
 int CtdlDirectoryAddUser(char *internet_addr, char *citadel_addr) {
 	char key[SIZ];
 
-	if (IsDirectory(internet_addr, 0) == 0) 
+	if (IsDirectory(internet_addr, 0) == 0) {
 		return 0;
+	}
 	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 );
@@ -1638,7 +1588,7 @@ char *harvest_collected_addresses(struct CtdlMessage *msg) {
 					utf8ify_rfc822_string(addr);
 				process_rfc822_addr(addr, user, node, name);
 				h = CtdlHostAlias(node);
-				if ( (h != hostalias_localhost) && (h != hostalias_directory) ) {
+				if (h != hostalias_localhost) {
 					coll = realloc(coll, strlen(coll) + strlen(addr) + 4);
 					if (coll == NULL) return(NULL);
 					if (!IsEmptyStr(coll)) {
@@ -1657,3 +1607,104 @@ char *harvest_collected_addresses(struct CtdlMessage *msg) {
 	}
 	return(coll);
 }
+
+
+/*
+ * 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];
+	};
+
+	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 */
+
+	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;
+		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);
+			}
+		}
+	}
+	free(e);
+	num_e = 0;
+	alloc_e = 0;
+	return;
+}
+
+
+/*
+ * Initialize the directory database (erasing anything already there)
+ */
+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);
+}
+
+
+/*
+ * Configure Internet email addresses for a user account, updating the Directory Index in the process
+ */
+void CtdlSetEmailAddressesForUser(char *requested_user, char *new_emailaddrs)
+{
+	struct ctdluser usbuf;
+	int i;
+	char buf[SIZ];
+
+	if (CtdlGetUserLock(&usbuf, requested_user) != 0) {	// We are relying on the fact that the DirectoryIndex functions don't lock.
+		return;						// Silently fail here if we can't acquire a lock on the user record.
+	}
+
+	syslog(LOG_DEBUG, "internet_addressing: setting email addresses for <%s> to <%s>", usbuf.fullname, new_emailaddrs);
+
+	/* Delete all of the existing directory index records for the user (easier this way) */
+	for (i=0; i<num_tokens(usbuf.emailaddrs, '|'); ++i) {
+		extract_token(buf, usbuf.emailaddrs, i, '|', sizeof buf);
+		CtdlDirectoryDelUser(buf, requested_user);
+	}
+
+	strcpy(usbuf.emailaddrs, new_emailaddrs);		// make it official.
+
+	/* Index all of the new email addresses (they've already been sanitized) */
+	for (i=0; i<num_tokens(usbuf.emailaddrs, '|'); ++i) {
+		extract_token(buf, usbuf.emailaddrs, i, '|', sizeof buf);
+		CtdlDirectoryAddUser(buf, requested_user);
+	}
+
+	CtdlPutUserLock(&usbuf);
+}