X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Finternet_addressing.c;h=a3ef1f815d01bb5c59d6d61573f717b4c13603c2;hp=caca0806603056ada966702e8931edff4ce4613d;hb=e704ad0e3d1ecb2f5e0c46984cc8902fcdc0ec36;hpb=3403c39cad2dba8c99c587501f4663f6a288f75f

diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c
index caca08066..a3ef1f815 100644
--- a/citadel/internet_addressing.c
+++ b/citadel/internet_addressing.c
@@ -1,10 +1,19 @@
 /*
- * $Id$
- *
  * 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 <stdlib.h>
 #include <unistd.h>
@@ -15,18 +24,7 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
+#include <time.h>
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
@@ -43,13 +41,7 @@
 #include "room_ops.h"
 #include "parsedate.h"
 #include "database.h"
-
-
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
-
-
+#include "ctdl_module.h"
 #ifdef HAVE_ICONV
 #include <iconv.h>
 
@@ -202,7 +194,7 @@ void utf8ify_rfc822_string(char *buf) {
 		}
 		else if (!strcasecmp(encoding, "Q")) {	/**< quoted-printable */
 			size_t len;
-			long pos;
+			unsigned long pos;
 			
 			len = strlen(istr);
 			pos = 0;
@@ -300,8 +292,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');
@@ -334,10 +326,615 @@ int CtdlHostAlias(char *fqdn) {
 
 
 
+/*
+ * Determine whether a given Internet address belongs to the current user
+ */
+int CtdlIsMe(char *addr, int addr_buf_len)
+{
+	recptypes *recp;
+	int i;
+
+	recp = validate_recipients(addr, NULL, 0);
+	if (recp == NULL) return(0);
+
+	if (recp->num_local == 0) {
+		free_recipients(recp);
+		return(0);
+	}
+
+	for (i=0; i<recp->num_local; ++i) {
+		extract_token(addr, recp->recp_local, i, '|', addr_buf_len);
+		if (!strcasecmp(addr, CC->user.fullname)) {
+			free_recipients(recp);
+			return(1);
+		}
+	}
+
+	free_recipients(recp);
+	return(0);
+}
+
+
+/* If the last item in a list of recipients was truncated to a partial address,
+ * remove it completely in order to avoid choking libSieve
+ */
+void sanitize_truncated_recipient(char *str)
+{
+	if (!str) return;
+	if (num_tokens(str, ',') < 2) return;
+
+	int len = strlen(str);
+	if (len < 900) return;
+	if (len > 998) str[998] = 0;
+
+	char *cptr = strrchr(str, ',');
+	if (!cptr) return;
+
+	char *lptr = strchr(cptr, '<');
+	char *rptr = strchr(cptr, '>');
+
+	if ( (lptr) && (rptr) && (rptr > lptr) ) return;
+
+	*cptr = 0;
+}
+
+
+
+
+
+/*
+ * 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)
+{
+	unsigned int i;
+
+	for (i = 0; i < strlen(name); ++i) {
+		if (name[i] == '@') {
+			while (isspace(name[i - 1]) && i > 0) {
+				strcpy(&name[i - 1], &name[i]);
+				--i;
+			}
+			while (isspace(name[i + 1])) {
+				strcpy(&name[i + 1], &name[i + 2]);
+			}
+		}
+	}
+}
+
+
+/*
+ * 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 */
+	FILE *fp;
+	int a, i;
+	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);
+
+	striplt(name);
+	remove_any_whitespace_to_the_left_or_right_of_at_symbol(name);
+	stripallbut(name, '<', '>');
+
+	fp = fopen(file_mail_aliases, "r");
+	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 Global Address Book */
+	if (CtdlDirectoryLookup(aaa, name, sizeof aaa) == 0) {
+		strcpy(name, aaa);
+	}
+
+	if (strcasecmp(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; name[a] != '\0'; ++a) {
+		if (name[a] == '@') {
+			if (CtdlHostAlias(&name[a+1]) == hostalias_localhost) {
+				name[a] = 0;
+				syslog(LOG_DEBUG, "internet_addressing: changed to <%s>", name);
+				break;
+			}
+		}
+	}
+
+	/* determine local or remote type, see citadel.h */
+	at = haschar(name, '@');
+	if (at == 0) return(MES_LOCAL);		/* no @'s - local address */
+	if (at > 1) return(MES_ERROR);		/* >1 @'s - invalid address */
+	remove_any_whitespace_to_the_left_or_right_of_at_symbol(name);
 
+	/* figure out the delivery mode */
+	extract_token(node, name, 1, '@', sizeof node);
+
+	/* If there are one or more dots in the nodename, we assume that it
+	 * is an FQDN and will attempt SMTP delivery to the Internet.
+	 */
+	if (haschar(node, '.') > 0) {
+		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);
+}
 
 
 
+/*
+ * Validate recipients, count delivery types and errors, and handle aliasing
+ * FIXME check for dupes!!!!!
+ *
+ * Returns 0 if all addresses are ok, ret->num_error = -1 if no addresses 
+ * were specified, or the number of addresses found invalid.
+ *
+ * Caller needs to free the result using free_recipients()
+ */
+recptypes *validate_recipients(const char *supplied_recipients, 
+			       const char *RemoteIdentifier, 
+			       int Flags) {
+	struct CitContext *CCC = CC;
+	recptypes *ret;
+	char *recipients = NULL;
+	char *org_recp;
+	char this_recp[256];
+	char this_recp_cooked[256];
+	char append[SIZ];
+	long len;
+	int num_recps = 0;
+	int i, j;
+	int mailtype;
+	int invalid;
+	struct ctdluser tempUS;
+	struct ctdlroom tempQR;
+	struct ctdlroom tempQR2;
+	int err = 0;
+	char errmsg[SIZ];
+	int in_quotes = 0;
+
+	/* Initialize */
+	ret = (recptypes *) malloc(sizeof(recptypes));
+	if (ret == NULL) return(NULL);
+
+	/* Set all strings to null and numeric values to zero */
+	memset(ret, 0, sizeof(recptypes));
+
+	if (supplied_recipients == NULL) {
+		recipients = strdup("");
+	}
+	else {
+		recipients = strdup(supplied_recipients);
+	}
+
+	/* Allocate some memory.  Yes, this allocates 500% more memory than we will
+	 * actually need, but it's healthier for the heap than doing lots of tiny
+	 * realloc() calls instead.
+	 */
+	len = strlen(recipients) + 1024;
+	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);
+	org_recp = malloc(len);
+
+	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;
+
+	ret->recptypes_magic = RECPTYPES_MAGIC;
+
+	/* Change all valid separator characters to commas */
+	for (i=0; !IsEmptyStr(&recipients[i]); ++i) {
+		if ((recipients[i] == ';') || (recipients[i] == '|')) {
+			recipients[i] = ',';
+		}
+	}
+
+	/* Now start extracting recipients... */
+
+	while (!IsEmptyStr(recipients)) {
+		for (i=0; i<=strlen(recipients); ++i) {
+			if (recipients[i] == '\"') in_quotes = 1 - in_quotes;
+			if ( ( (recipients[i] == ',') && (!in_quotes) ) || (recipients[i] == 0) ) {
+				safestrncpy(this_recp, recipients, i+1);
+				this_recp[i] = 0;
+				if (recipients[i] == ',') {
+					strcpy(recipients, &recipients[i+1]);
+				}
+				else {
+					strcpy(recipients, "");
+				}
+				break;
+			}
+		}
+
+		striplt(this_recp);
+		if (IsEmptyStr(this_recp))
+			break;
+		syslog(LOG_DEBUG, "internet_addressing: evaluating recipient #%d: %s", num_recps, this_recp);
+		++num_recps;
+
+		strcpy(org_recp, this_recp);
+		alias(this_recp);
+		alias(this_recp);
+		mailtype = alias(this_recp);
+
+		for (j = 0; !IsEmptyStr(&this_recp[j]); ++j) {
+			if (this_recp[j]=='_') {
+				this_recp_cooked[j] = ' ';
+			}
+			else {
+				this_recp_cooked[j] = this_recp[j];
+			}
+		}
+		this_recp_cooked[j] = '\0';
+		invalid = 0;
+		errmsg[0] = 0;
+		switch(mailtype) {
+		case MES_LOCAL:
+			if (!strcasecmp(this_recp, "sysop")) {
+				++ret->num_room;
+				strcpy(this_recp, CtdlGetConfigStr("c_aideroom"));
+				if (!IsEmptyStr(ret->recp_room)) {
+					strcat(ret->recp_room, "|");
+				}
+				strcat(ret->recp_room, this_recp);
+			}
+			else if ( (!strncasecmp(this_recp, "room_", 5))
+				  && (!CtdlGetRoom(&tempQR, &this_recp_cooked[5])) ) {
+
+				/* Save room so we can restore it later */
+				tempQR2 = CCC->room;
+				CCC->room = tempQR;
+					
+				/* Check permissions to send mail to this room */
+				err = CtdlDoIHavePermissionToPostInThisRoom(
+					errmsg, 
+					sizeof errmsg, 
+					RemoteIdentifier,
+					Flags,
+					0			/* 0 = not a reply */
+					);
+				if (err)
+				{
+					++ret->num_error;
+					invalid = 1;
+				} 
+				else {
+					++ret->num_room;
+					if (!IsEmptyStr(ret->recp_room)) {
+						strcat(ret->recp_room, "|");
+					}
+					strcat(ret->recp_room, &this_recp_cooked[5]);
+
+					if (!IsEmptyStr(ret->recp_orgroom)) {
+						strcat(ret->recp_orgroom, "|");
+					}
+					strcat(ret->recp_orgroom, org_recp);
+
+				}
+					
+				/* Restore room in case something needs it */
+				CCC->room = tempQR2;
+
+			}
+			else if (CtdlGetUser(&tempUS, this_recp) == 0) {
+				++ret->num_local;
+				strcpy(this_recp, tempUS.fullname);
+				if (!IsEmptyStr(ret->recp_local)) {
+					strcat(ret->recp_local, "|");
+				}
+				strcat(ret->recp_local, this_recp);
+			}
+			else if (CtdlGetUser(&tempUS, this_recp_cooked) == 0) {
+				++ret->num_local;
+				strcpy(this_recp, tempUS.fullname);
+				if (!IsEmptyStr(ret->recp_local)) {
+					strcat(ret->recp_local, "|");
+				}
+				strcat(ret->recp_local, this_recp);
+			}
+			else {
+				++ret->num_error;
+				invalid = 1;
+			}
+			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
+			 * because if the address were valid, we would have
+			 * already translated it to a local address by now.
+			 */
+			if (IsDirectory(this_recp, 0)) {
+				++ret->num_error;
+				invalid = 1;
+			}
+			else {
+				++ret->num_internet;
+				if (!IsEmptyStr(ret->recp_internet)) {
+					strcat(ret->recp_internet, "|");
+				}
+				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;
+			break;
+		}
+		if (invalid) {
+			if (IsEmptyStr(errmsg)) {
+				snprintf(append, sizeof append, "Invalid recipient: %s", this_recp);
+			}
+			else {
+				snprintf(append, sizeof append, "%s", errmsg);
+			}
+			if ( (strlen(ret->errormsg) + strlen(append) + 3) < SIZ) {
+				if (!IsEmptyStr(ret->errormsg)) {
+					strcat(ret->errormsg, "; ");
+				}
+				strcat(ret->errormsg, append);
+			}
+		}
+		else {
+			if (IsEmptyStr(ret->display_recp)) {
+				strcpy(append, this_recp);
+			}
+			else {
+				snprintf(append, sizeof append, ", %s", this_recp);
+			}
+			if ( (strlen(ret->display_recp)+strlen(append)) < SIZ) {
+				strcat(ret->display_recp, append);
+			}
+		}
+	}
+	free(org_recp);
+
+	if ((ret->num_local + ret->num_internet + ret->num_ignet +
+	     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
+	);
+
+	free(recipients);
+	return(ret);
+}
+
+
+/*
+ * Destructor for recptypes
+ */
+void free_recipients(recptypes *valid) {
+
+	if (valid == NULL) {
+		return;
+	}
+
+	if (valid->recptypes_magic != RECPTYPES_MAGIC) {
+		syslog(LOG_ERR, "internet_addressing: attempt to call free_recipients() on some other data type!");
+		abort();
+	}
+
+	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);
+	if (valid->bounce_to != NULL)		free(valid->bounce_to);
+	if (valid->envelope_from != NULL)	free(valid->envelope_from);
+	if (valid->sending_room != NULL)	free(valid->sending_room);
+	free(valid);
+}
+
+
+char *qp_encode_email_addrs(char *source)
+{
+	char *user, *node, *name;
+	const char headerStr[] = "=?UTF-8?Q?";
+	char *Encoded;
+	char *EncodedName;
+	char *nPtr;
+	int need_to_encode = 0;
+	long SourceLen;
+	long EncodedMaxLen;
+	long nColons = 0;
+	long *AddrPtr;
+	long *AddrUtf8;
+	long nAddrPtrMax = 50;
+	long nmax;
+	int InQuotes = 0;
+	int i, n;
+
+	if (source == NULL) return source;
+	if (IsEmptyStr(source)) return source;
+	syslog(LOG_DEBUG, "internet_addressing: qp_encode_email_addrs <%s>", source);
+
+	AddrPtr = malloc (sizeof (long) * nAddrPtrMax);
+	AddrUtf8 = malloc (sizeof (long) * nAddrPtrMax);
+	memset(AddrUtf8, 0, sizeof (long) * nAddrPtrMax);
+	*AddrPtr = 0;
+	i = 0;
+	while (!IsEmptyStr (&source[i])) {
+		if (nColons >= nAddrPtrMax){
+			long *ptr;
+
+			ptr = (long *) malloc(sizeof (long) * nAddrPtrMax * 2);
+			memcpy (ptr, AddrPtr, sizeof (long) * nAddrPtrMax);
+			free (AddrPtr), AddrPtr = ptr;
+
+			ptr = (long *) malloc(sizeof (long) * nAddrPtrMax * 2);
+			memset(&ptr[nAddrPtrMax], 0, 
+			       sizeof (long) * nAddrPtrMax);
+
+			memcpy (ptr, AddrUtf8, sizeof (long) * nAddrPtrMax);
+			free (AddrUtf8), AddrUtf8 = ptr;
+			nAddrPtrMax *= 2;				
+		}
+		if (((unsigned char) source[i] < 32) || 
+		    ((unsigned char) source[i] > 126)) {
+			need_to_encode = 1;
+			AddrUtf8[nColons] = 1;
+		}
+		if (source[i] == '"')
+			InQuotes = !InQuotes;
+		if (!InQuotes && source[i] == ',') {
+			AddrPtr[nColons] = i;
+			nColons++;
+		}
+		i++;
+	}
+	if (need_to_encode == 0) {
+		free(AddrPtr);
+		free(AddrUtf8);
+		return source;
+	}
+
+	SourceLen = i;
+	EncodedMaxLen = nColons * (sizeof(headerStr) + 3) + SourceLen * 3;
+	Encoded = (char*) malloc (EncodedMaxLen);
+
+	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);
+	name = malloc(SourceLen + 1);
+
+	nPtr = Encoded;
+	*nPtr = '\0';
+	for (i = 0; i < nColons && nPtr != NULL; i++) {
+		nmax = EncodedMaxLen - (nPtr - Encoded);
+		if (AddrUtf8[i]) {
+			process_rfc822_addr(&source[AddrPtr[i]], 
+					    user,
+					    node,
+					    name);
+			/* TODO: libIDN here ! */
+			if (IsEmptyStr(name)) {
+				n = snprintf(nPtr, nmax, 
+					     (i==0)?"%s@%s" : ",%s@%s",
+					     user, node);
+			}
+			else {
+				EncodedName = rfc2047encode(name, strlen(name));			
+				n = snprintf(nPtr, nmax, 
+					     (i==0)?"%s <%s@%s>" : ",%s <%s@%s>",
+					     EncodedName, user, node);
+				free(EncodedName);
+			}
+		}
+		else { 
+			n = snprintf(nPtr, nmax, 
+				     (i==0)?"%s" : ",%s",
+				     &source[AddrPtr[i]]);
+		}
+		if (n > 0 )
+			nPtr += n;
+		else { 
+			char *ptr, *nnPtr;
+			ptr = (char*) malloc(EncodedMaxLen * 2);
+			memcpy(ptr, Encoded, EncodedMaxLen);
+			nnPtr = ptr + (nPtr - Encoded), nPtr = nnPtr;
+			free(Encoded), Encoded = ptr;
+			EncodedMaxLen *= 2;
+			i--; /* do it once more with properly lengthened buffer */
+		}
+	}
+	for (i = 0; i < nColons; i++)
+		source[--AddrPtr[i]] = ',';
+
+	free(user);
+	free(node);
+	free(name);
+	free(AddrUtf8);
+	free(AddrPtr);
+	return Encoded;
+}
+
+
 /*
  * Return 0 if a given string fuzzy-matches a Citadel user account
  *
@@ -366,22 +963,59 @@ int fuzzy_match(struct ctdluser *us, char *matchstring) {
 /*
  * Unfold a multi-line field into a single line, removing multi-whitespaces
  */
-void unfold_rfc822_field(char *field) {
-	int i;
+void unfold_rfc822_field(char **field, char **FieldEnd) 
+{
 	int quote = 0;
+	char *pField = *field;
+	char *sField;
+	char *pFieldEnd = *FieldEnd;
+
+	while (isspace(*pField))
+		pField++;
+	/* remove leading/trailing whitespace */
+	;
 
-	striplt(field);		/* remove leading/trailing whitespace */
+	while (isspace(*pFieldEnd))
+		pFieldEnd --;
 
+	*FieldEnd = pFieldEnd;
 	/* convert non-space whitespace to spaces, and remove double blanks */
-	for (i=0; i<strlen(field); ++i) {
-		if (field[i]=='\"') quote = 1 - quote;
-		if (!quote) {
-			if (isspace(field[i])) field[i] = ' ';
-			while (isspace(field[i]) && isspace(field[i+1])) {
-				strcpy(&field[i+1], &field[i+2]);
+	for (sField = *field = pField; 
+	     sField < pFieldEnd; 
+	     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;
+			if (!quote) {
+				if (isspace(*sField))
+				{
+					*pField = ' ';
+					pField++;
+					sField++;
+					
+					while ((sField < pFieldEnd) && 
+					       isspace(*sField))
+						sField++;
+					*pField = *sField;
+				}
+				else *pField = *sField;
 			}
+			else *pField = *sField;
 		}
 	}
+	*pField = '\0';
+	*FieldEnd = pField - 1;
 }
 
 
@@ -395,7 +1029,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;
@@ -409,11 +1043,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... */
@@ -429,9 +1067,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);
@@ -449,11 +1089,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;
+		}
 	}
 
 
@@ -474,7 +1118,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 {
@@ -492,9 +1136,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 */
@@ -522,31 +1168,37 @@ void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name)
  * structure, implying that the source field should be removed from the
  * message text.
  */
-int convert_field(struct CtdlMessage *msg, int beg, int end) {
-	char *rfc822;
-	char *key, *value;
+int convert_field(struct CtdlMessage *msg, const char *beg, const char *end) {
+	char *key, *value, *valueend;
+	long len;
+	const char *pos;
 	int i;
-	int colonpos = (-1);
+	const char *colonpos = NULL;
 	int processed = 0;
-	char buf[SIZ];
 	char user[1024];
 	char node[1024];
 	char name[1024];
 	char addr[1024];
 	time_t parsed_date;
+	long valuelen;
 
-	rfc822 = msg->cm_fields['M'];	/* M field contains rfc822 text */
-	for (i = end; i >= beg; --i) {
-		if (rfc822[i] == ':') colonpos = i;
+	for (pos = end; pos >= beg; pos--) {
+		if (*pos == ':') colonpos = pos;
 	}
 
-	if (colonpos < 0) return(0);	/* no colon? not a valid header line */
+	if (colonpos == NULL) return(0);	/* no colon? not a valid header line */
 
-	key = malloc((end - beg) + 2);
-	safestrncpy(key, &rfc822[beg], (end-beg)+1);
-	key[colonpos - beg] = 0;
+	len = end - beg;
+	key = malloc(len + 2);
+	memcpy(key, beg, len + 1);
+	key[len] = '\0';
+	valueend = key + len;
+	* ( key + (colonpos - beg) ) = '\0';
 	value = &key[(colonpos - beg) + 1];
-	unfold_rfc822_field(value);
+/*	printf("Header: [%s]\nValue: [%s]\n", key, value); */
+	unfold_rfc822_field(&value, &valueend);
+	valuelen = valueend - value + 1;
+/*	printf("UnfoldedValue: [%s]\n", value); */
 
 	/*
 	 * Here's the big rfc822-to-citadel loop.
@@ -558,93 +1210,100 @@ int convert_field(struct CtdlMessage *msg, int beg, int end) {
 	if (!strcasecmp(key, "Date")) {
 		parsed_date = parsedate(value);
 		if (parsed_date < 0L) parsed_date = time(NULL);
-		snprintf(buf, sizeof buf, "%ld", (long)parsed_date );
-		if (msg->cm_fields['T'] == NULL)
-			msg->cm_fields['T'] = strdup(buf);
+
+		if (CM_IsEmpty(msg, eTimestamp))
+			CM_SetFieldLONG(msg, eTimestamp, parsed_date);
 		processed = 1;
 	}
 
 	else if (!strcasecmp(key, "From")) {
 		process_rfc822_addr(value, user, node, name);
-		CtdlLogPrintf(CTDL_DEBUG, "Converted to <%s@%s> (%s)\n", user, node, name);
-		snprintf(addr, sizeof addr, "%s@%s", user, node);
-		if (msg->cm_fields['A'] == NULL)
-			msg->cm_fields['A'] = strdup(name);
-		processed = 1;
-		if (msg->cm_fields['F'] == NULL)
-			msg->cm_fields['F'] = strdup(addr);
+		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));
 		processed = 1;
 	}
 
 	else if (!strcasecmp(key, "Subject")) {
-		if (msg->cm_fields['U'] == NULL)
-			msg->cm_fields['U'] = strdup(value);
+		if (CM_IsEmpty(msg, eMsgSubject))
+			CM_SetField(msg, eMsgSubject, value, valuelen);
 		processed = 1;
 	}
 
 	else if (!strcasecmp(key, "List-ID")) {
-		if (msg->cm_fields['L'] == NULL)
-			msg->cm_fields['L'] = strdup(value);
+		if (CM_IsEmpty(msg, eListID))
+			CM_SetField(msg, eListID, value, valuelen);
 		processed = 1;
 	}
 
 	else if (!strcasecmp(key, "To")) {
-		if (msg->cm_fields['R'] == NULL)
-			msg->cm_fields['R'] = strdup(value);
+		if (CM_IsEmpty(msg, eRecipient))
+			CM_SetField(msg, eRecipient, value, valuelen);
 		processed = 1;
 	}
 
 	else if (!strcasecmp(key, "CC")) {
-		if (msg->cm_fields['Y'] == NULL)
-			msg->cm_fields['Y'] = strdup(value);
+		if (CM_IsEmpty(msg, eCarbonCopY))
+			CM_SetField(msg, eCarbonCopY, value, valuelen);
 		processed = 1;
 	}
 
 	else if (!strcasecmp(key, "Message-ID")) {
-		if (msg->cm_fields['I'] != NULL) {
-			CtdlLogPrintf(CTDL_WARNING, "duplicate message id\n");
+		if (!CM_IsEmpty(msg, emessageId)) {
+			syslog(LOG_WARNING, "internet_addressing: duplicate message id");
 		}
+		else {
+			char *pValue;
+			long pValueLen;
 
-		if (msg->cm_fields['I'] == NULL) {
-			msg->cm_fields['I'] = strdup(value);
-
+			pValue = value;
+			pValueLen = valuelen;
 			/* Strip angle brackets */
-			while (haschar(msg->cm_fields['I'], '<') > 0) {
-				strcpy(&msg->cm_fields['I'][0],
-					&msg->cm_fields['I'][1]);
+			while (haschar(pValue, '<') > 0) {
+				pValue ++;
+				pValueLen --;
 			}
-			for (i = 0; i<strlen(msg->cm_fields['I']); ++i)
-				if (msg->cm_fields['I'][i] == '>')
-					msg->cm_fields['I'][i] = 0;
+
+			for (i = 0; i <= pValueLen; ++i)
+				if (pValue[i] == '>') {
+					pValueLen = i;
+					break;
+				}
+
+			CM_SetField(msg, emessageId, pValue, pValueLen);
 		}
 
 		processed = 1;
 	}
 
 	else if (!strcasecmp(key, "Return-Path")) {
-		if (msg->cm_fields['P'] == NULL)
-			msg->cm_fields['P'] = strdup(value);
+		if (CM_IsEmpty(msg, eMessagePath))
+			CM_SetField(msg, eMessagePath, value, valuelen);
 		processed = 1;
 	}
 
 	else if (!strcasecmp(key, "Envelope-To")) {
-		if (msg->cm_fields['V'] == NULL)
-			msg->cm_fields['V'] = strdup(value);
+		if (CM_IsEmpty(msg, eenVelopeTo))
+			CM_SetField(msg, eenVelopeTo, value, valuelen);
 		processed = 1;
 	}
 
 	else if (!strcasecmp(key, "References")) {
-		if (msg->cm_fields['W'] != NULL) {
-			free(msg->cm_fields['W']);
-		}
-		msg->cm_fields['W'] = strdup(value);
+		CM_SetField(msg, eWeferences, value, valuelen);
+		processed = 1;
+	}
+
+	else if (!strcasecmp(key, "Reply-To")) {
+		CM_SetField(msg, eReplyTo, value, valuelen);
 		processed = 1;
 	}
 
 	else if (!strcasecmp(key, "In-reply-to")) {
-		if (msg->cm_fields['W'] == NULL) {		/* References: supersedes In-reply-to: */
-			msg->cm_fields['W'] = strdup(value);
-		}
+		if (CM_IsEmpty(msg, eWeferences)) /* References: supersedes In-reply-to: */
+			CM_SetField(msg, eWeferences, value, valuelen);
 		processed = 1;
 	}
 
@@ -652,7 +1311,7 @@ int convert_field(struct CtdlMessage *msg, int beg, int end) {
 
 	/* Clean up and move on. */
 	free(key);	/* Don't free 'value', it's actually the same buffer */
-	return(processed);
+	return processed;
 }
 
 
@@ -694,17 +1353,25 @@ void convert_references_to_wefewences(char *str) {
 /*
  * Convert an RFC822 message (headers + body) to a CtdlMessage structure.
  * NOTE: the supplied buffer becomes part of the CtdlMessage structure, and
- * will be deallocated when CtdlFreeMessage() is called.  Therefore, the
+ * will be deallocated when CM_Free() is called.  Therefore, the
  * supplied buffer should be DEREFERENCED.  It should not be freed or used
  * again.
  */
 struct CtdlMessage *convert_internet_message(char *rfc822) {
+	StrBuf *RFCBuf = NewStrBufPlain(rfc822, -1);
+	free (rfc822);
+	return convert_internet_message_buf(&RFCBuf);
+}
+
 
+
+struct CtdlMessage *convert_internet_message_buf(StrBuf **rfc822)
+{
 	struct CtdlMessage *msg;
-	int pos, beg, end, msglen;
-	int done;
-	char buf[SIZ];
+	const char *pos, *beg, *end, *totalend;
+	int done, alldone = 0;
 	int converted;
+	StrBuf *OtherHeaders;
 
 	msg = malloc(sizeof(struct CtdlMessage));
 	if (msg == NULL) return msg;
@@ -713,36 +1380,39 @@ struct CtdlMessage *convert_internet_message(char *rfc822) {
 	msg->cm_magic = CTDLMESSAGE_MAGIC;	/* self check */
 	msg->cm_anon_type = 0;			/* never anonymous */
 	msg->cm_format_type = FMT_RFC822;	/* internet message */
-	msg->cm_fields['M'] = rfc822;
 
-	pos = 0;
+	pos = ChrPtr(*rfc822);
+	totalend = pos + StrLength(*rfc822);
 	done = 0;
+	OtherHeaders = NewStrBufPlain(NULL, StrLength(*rfc822));
 
-	while (!done) {
+	while (!alldone) {
 
 		/* Locate beginning and end of field, keeping in mind that
 		 * some fields might be multiline
 		 */
-		beg = pos;
-		end = (-1);
+		end = beg = pos;
 
-		msglen = strlen(rfc822);	
-		while ( (end < 0) && (done == 0) ) {
+		while ((end < totalend) && 
+		       (end == beg) && 
+		       (done == 0) ) 
+		{
 
-			if ((rfc822[pos]=='\n')
-			   && (!isspace(rfc822[pos+1]))) {
+			if ( (*pos=='\n') && ((*(pos+1))!=0x20) && ((*(pos+1))!=0x09) )
+			{
 				end = pos;
 			}
 
 			/* done with headers? */
-			if (   (rfc822[pos]=='\n')
-			   && ( (rfc822[pos+1]=='\n')
-			      ||(rfc822[pos+1]=='\r')) ) {
-				end = pos;
-				done = 1;
+			if ((*pos=='\n') &&
+			    ( (*(pos+1)=='\n') ||
+			      (*(pos+1)=='\r')) ) 
+			{
+				alldone = 1;
 			}
 
-			if (pos >= (msglen-1) ) {
+			if (pos >= (totalend - 1) )
+			{
 				end = pos;
 				done = 1;
 			}
@@ -755,28 +1425,34 @@ struct CtdlMessage *convert_internet_message(char *rfc822) {
 		converted = convert_field(msg, beg, end);
 
 		/* Strip the field out of the RFC822 header if we used it */
-		if (converted) {
-			strcpy(&rfc822[beg], &rfc822[pos]);
-			pos = beg;
+		if (!converted) {
+			StrBufAppendBufPlain(OtherHeaders, beg, end - beg, 0);
+			StrBufAppendBufPlain(OtherHeaders, HKEY("\n"), 0);
 		}
 
 		/* If we've hit the end of the message, bail out */
-		if (pos > strlen(rfc822)) done = 1;
+		if (pos >= totalend)
+			alldone = 1;
 	}
+	StrBufAppendBufPlain(OtherHeaders, HKEY("\n"), 0);
+	if (pos < totalend)
+		StrBufAppendBufPlain(OtherHeaders, pos, totalend - pos, 0);
+	FreeStrBuf(rfc822);
+	CM_SetAsFieldSB(msg, eMesageText, &OtherHeaders);
 
 	/* Follow-up sanity checks... */
 
 	/* If there's no timestamp on this message, set it to now. */
-	if (msg->cm_fields['T'] == NULL) {
-		snprintf(buf, sizeof buf, "%ld", (long)time(NULL));
-		msg->cm_fields['T'] = strdup(buf);
+	if (CM_IsEmpty(msg, eTimestamp)) {
+		CM_SetFieldLONG(msg, eTimestamp, time(NULL));
 	}
 
 	/* If a W (references, or rather, Wefewences) field is present, we
 	 * have to convert it from RFC822 format to Citadel format.
 	 */
-	if (msg->cm_fields['W'] != NULL) {
-		convert_references_to_wefewences(msg->cm_fields['W']);
+	if (!CM_IsEmpty(msg, eWeferences)) {
+		/// todo: API!
+		convert_references_to_wefewences(msg->cm_fields[eWeferences]);
 	}
 
 	return msg;
@@ -791,11 +1467,11 @@ struct CtdlMessage *convert_internet_message(char *rfc822) {
  * The caller is responsible for freeing the returned buffer.  If the requested
  * field is not present, or anything else goes wrong, it returns NULL.
  */
-char *rfc822_fetch_field(char *rfc822, char *fieldname) {
+char *rfc822_fetch_field(const char *rfc822, const char *fieldname) {
 	char *fieldbuf = NULL;
-	char *end_of_headers;
-	char *field_start;
-	char *ptr;
+	const char *end_of_headers;
+	const char *field_start;
+	const char *ptr;
 	char *cont;
 	char fieldhdr[SIZ];
 
@@ -806,13 +1482,13 @@ char *rfc822_fetch_field(char *rfc822, char *fieldname) {
 	snprintf(fieldhdr, sizeof fieldhdr, "%s:", fieldname);
 
 	/* Locate the end of the headers, so we don't run past that point */
-	end_of_headers = bmstrcasestr(rfc822, "\n\r\n");
+	end_of_headers = cbmstrcasestr(rfc822, "\n\r\n");
 	if (end_of_headers == NULL) {
-		end_of_headers = bmstrcasestr(rfc822, "\n\n");
+		end_of_headers = cbmstrcasestr(rfc822, "\n\n");
 	}
 	if (end_of_headers == NULL) return (NULL);
 
-	field_start = bmstrcasestr(rfc822, fieldhdr);
+	field_start = cbmstrcasestr(rfc822, fieldhdr);
 	if (field_start == NULL) return(NULL);
 	if (field_start > end_of_headers) return(NULL);
 
@@ -820,11 +1496,11 @@ char *rfc822_fetch_field(char *rfc822, char *fieldname) {
 	strcpy(fieldbuf, "");
 
 	ptr = field_start;
-	ptr = memreadline(ptr, fieldbuf, SIZ-strlen(fieldbuf) );
+	ptr = cmemreadline(ptr, fieldbuf, SIZ-strlen(fieldbuf) );
 	while ( (isspace(ptr[0])) && (ptr < end_of_headers) ) {
 		strcat(fieldbuf, " ");
 		cont = &fieldbuf[strlen(fieldbuf)];
-		ptr = memreadline(ptr, cont, SIZ-strlen(fieldbuf) );
+		ptr = cmemreadline(ptr, cont, SIZ-strlen(fieldbuf) );
 		striplt(cont);
 	}
 
@@ -855,11 +1531,10 @@ void directory_key(char *key, char *addr) {
 	}
 	key[keylen++] = 0;
 
-	CtdlLogPrintf(CTDL_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
  */
@@ -895,13 +1570,15 @@ void CtdlDirectoryInit(void) {
 /*
  * Add an Internet e-mail address to the directory for a user
  */
-void CtdlDirectoryAddUser(char *internet_addr, char *citadel_addr) {
+int CtdlDirectoryAddUser(char *internet_addr, char *citadel_addr) {
 	char key[SIZ];
 
-	if (IsDirectory(internet_addr, 0) == 0) return;
-	CtdlLogPrintf(CTDL_DEBUG, "Create directory entry: %s --> %s\n", internet_addr, citadel_addr);
+	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 );
+	return 1;
 }
 
 
@@ -911,12 +1588,12 @@ void CtdlDirectoryAddUser(char *internet_addr, char *citadel_addr) {
  * (NOTE: we don't actually use or need the citadel_addr variable; it's merely
  * here because the callback API expects to be able to send it.)
  */
-void CtdlDirectoryDelUser(char *internet_addr, char *citadel_addr) {
+int CtdlDirectoryDelUser(char *internet_addr, char *citadel_addr) {
 	char key[SIZ];
-
-	CtdlLogPrintf(CTDL_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);
-	cdb_delete(CDB_DIRECTORY, key, strlen(key) );
+	return cdb_delete(CDB_DIRECTORY, key, strlen(key) ) == 0;
 }
 
 
@@ -960,20 +1637,20 @@ char *harvest_collected_addresses(struct CtdlMessage *msg) {
 	char user[256], node[256], name[256];
 	int is_harvestable;
 	int i, j, h;
-	int field = 0;
+	eMsgField field = 0;
 
 	if (msg == NULL) return(NULL);
 
 	is_harvestable = 1;
 	strcpy(addr, "");	
-	if (msg->cm_fields['A'] != NULL) {
-		strcat(addr, msg->cm_fields['A']);
+	if (!CM_IsEmpty(msg, eAuthor)) {
+		strcat(addr, msg->cm_fields[eAuthor]);
 	}
-	if (msg->cm_fields['F'] != NULL) {
+	if (!CM_IsEmpty(msg, erFc822Addr)) {
 		strcat(addr, " <");
-		strcat(addr, msg->cm_fields['F']);
+		strcat(addr, msg->cm_fields[erFc822Addr]);
 		strcat(addr, ">");
-		if (IsDirectory(msg->cm_fields['F'], 0)) {
+		if (IsDirectory(msg->cm_fields[erFc822Addr], 0)) {
 			is_harvestable = 0;
 		}
 	}
@@ -989,10 +1666,10 @@ char *harvest_collected_addresses(struct CtdlMessage *msg) {
 
 	/* Scan both the R (To) and Y (CC) fields */
 	for (i = 0; i < 2; ++i) {
-		if (i == 0) field = 'R' ;
-		if (i == 1) field = 'Y' ;
+		if (i == 0) field = eRecipient;
+		if (i == 1) field = eCarbonCopY;
 
-		if (msg->cm_fields[field] != NULL) {
+		if (!CM_IsEmpty(msg, field)) {
 			for (j=0; j<num_tokens(msg->cm_fields[field], ','); ++j) {
 				extract_token(addr, msg->cm_fields[field], j, ',', sizeof addr);
 				if (strstr(addr, "=?") != NULL)