Mercurial > masqmail

changeset 388:aa40710f09fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Refactoring and code layouting.
author markus schnalke <meillo@marmaro.de>
date Sat, 18 Feb 2012 13:37:40 +0100 (2012-02-18)
parents a408411ff8df
children bc9a7845b53a
files src/accept.c
diffstat 1 files changed, 280 insertions(+), 227 deletions(-) [+]
line wrap: on
line diff
--- a/src/accept.c	Sat Feb 18 12:35:12 2012 +0100
+++ b/src/accept.c	Sat Feb 18 13:37:40 2012 +0100
@@ -32,7 +32,8 @@
 static gchar*
 string_base62(gchar *res, guint value, gchar len)
 {
-	static gchar base62_chars[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+	static gchar base62_chars[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+			"abcdefghijklmnopqrstuvwxyz";
 	gchar *p = res + len;
 	*p = '\0';
 	while (p > res) {
@@ -49,7 +50,6 @@
 **  The -t option: With the ACC_RCPT_FROM_HEAD flag the addrs found found
 **  in To/Cc/Bcc headers are added to the recipient list.
 */
-
 accept_error
 accept_message_stream(FILE *in, message *msg, guint flags)
 {
@@ -60,14 +60,14 @@
 	gint line_cnt = 0, data_size = 0;
 
 	line = g_malloc(line_size);
-	line[0] = '\0';
+	*line = '\0';
 
-	while (TRUE) {
-		int len = read_sockline1(in, &line, &line_size, 5 * 60, READSOCKL_CVT_CRLF);
-
+	while (1) {
+		int len = read_sockline1(in, &line, &line_size, 5 * 60,
+				READSOCKL_CVT_CRLF);
 		line1 = line;
 
-		if ((line[0] == '.') && (!(flags & ACC_DOT_IGNORE))) {
+		if ((*line == '.') && (!(flags & ACC_DOT_IGNORE))) {
 			if (line[1] == '\n') {
 				g_free(line);
 				break;
@@ -75,17 +75,17 @@
 			line1++;
 		}
 
-		if ((len == -1) && (flags & (ACC_DOT_IGNORE | ACC_NODOT_RELAX))) {
-			/* we got an EOF, and the last line was not terminated by a CR */
+		if (len==-1 && (flags & (ACC_DOT_IGNORE | ACC_NODOT_RELAX))) {
+			/* at EOF but last line was not terminated by CR */
+			/* some MUAs allow unterminated lines */
 			gint len1 = strlen(line1);
-			if (len1 > 0) {  /* == 0 is 'normal' (EOF after a CR) */
-				if (line1[len1 - 1] != '\n') {  /* some mail clients allow unterminated lines */
-					line1[len1] = '\n';
-					line1[len1 + 1] = '\0';
-					msg->data_list = g_list_prepend(msg->data_list, g_strdup(line1));
-					data_size += strlen(line1);
-					line_cnt++;
-				}
+			if (len1 > 0 && line1[len1-1] != '\n') {
+				line1[len1] = '\n';
+				line1[len1+1] = '\0';
+				msg->data_list = g_list_prepend(msg->data_list,
+						g_strdup(line1));
+				data_size += strlen(line1);
+				line_cnt++;
 			}
 			break;
 
@@ -111,45 +111,44 @@
 		}
 
 		if (in_headers) {
-
 			/* some pop servers send the 'From ' line, skip it: */
-			if (!msg->hdr_list && strncmp(line1, "From ", 5) == 0) {
+			if (!msg->hdr_list && strncmp(line1, "From ", 5)==0) {
 				continue;
 			}
 
-			if (line1[0] == ' ' || line1[0] == '\t') {
+			if (*line1 == ' ' || *line1 == '\t') {
 				/* continuation of 'folded' header: */
 				if (hdr) {
 					char *cp;
-					cp = g_strconcat(hdr->header, line1, NULL);
-					hdr->value = cp + (hdr->value - hdr->header);
+					cp = g_strconcat(hdr->header, line1,
+							NULL);
+					hdr->value = cp + (hdr->value -
+							hdr->header);
 					free(hdr->header);
 					hdr->header = cp;
 				}
-
-			} else if (line1[0] == '\n') {
+			} else if (*line1 == '\n') {
 				/* an empty line marks end of headers */
 				in_headers = FALSE;
+
+			} else if ((hdr = get_header(line1))) {
+				/* another header */
+				msg->hdr_list = g_list_append(msg->hdr_list, hdr);
 			} else {
-				/* in all other cases we expect another header */
-				if ((hdr = get_header(line1))) {
-					msg->hdr_list = g_list_append(msg->hdr_list, hdr);
-				} else {
-					/*
-					**  if get_header() returns NULL,
-					**  no header was recognized,
-					**  so this seems to be the first
-					**  data line of a broken mailer
-					**  which does not send an empty
-					**  line after the headers
-					*/
-					in_headers = FALSE;
-					msg->data_list = g_list_prepend(msg->data_list, g_strdup(line1));
-				}
+				/*
+				**  Should be another header but none was
+				**  recognized, so this seems to be the first
+				**  data line of a broken mailer which does
+				**  not add an empty line after the headers.
+				*/
+				in_headers = FALSE;
+				msg->data_list = g_list_prepend(msg->data_list,
+						g_strdup(line1));
 			}
 		} else {
 			/* message body */
-			msg->data_list = g_list_prepend(msg->data_list, g_strdup(line1));
+			msg->data_list = g_list_prepend(msg->data_list,
+					g_strdup(line1));
 			data_size += strlen(line1);
 			line_cnt++;
 		}
@@ -160,18 +159,17 @@
 			                data_size, conf.max_msg_size);
 			return AERR_SIZE;
 		}
-
 	}
-
-	DEBUG(4) debugf("received %d lines of data (%d bytes)\n", line_cnt, data_size);
+	DEBUG(4) debugf("received %d lines of data (%d bytes)\n",
+			line_cnt, data_size);
 
 	if (!msg->data_list) {
-		/* make sure data list is not NULL: */
+		/* make sure data list is not NULL */
 		msg->data_list = g_list_append(NULL, g_strdup(""));
 	}
 	msg->data_list = g_list_reverse(msg->data_list);
 
-	/* we get here after we succesfully received the mail data */
+	/* we have succesfully received the mail data */
 
 	msg->data_size = data_size;
 	msg->received_time = time(NULL);
@@ -179,17 +177,239 @@
 	return AERR_OK;
 }
 
+static void
+ensure_return_path(message *msg)
+{
+	GList *hdr_list;
+	header *hdr;
+	gchar *addr;
+
+	if (msg->return_path) {
+		return;
+	}
+
+	DEBUG(3) debugf("return_path == NULL\n");
+
+	hdr_list = find_header(msg->hdr_list, HEAD_SENDER, NULL);
+	if (!hdr_list) {
+		hdr_list = find_header(msg->hdr_list, HEAD_FROM, NULL);
+	}
+	if (hdr_list) {
+		hdr = (header *) (g_list_first(hdr_list)->data);
+
+		DEBUG(5) debugf("hdr->value = '%s'\n", hdr->value);
+
+		addr = g_strdup(hdr->value);
+		g_strchomp(addr);
+		msg->return_path = create_address_qualified(addr,
+				FALSE, msg->received_host);
+		if (msg->return_path) {
+			DEBUG(3) debugf("setting return_path to %s\n",
+					addr_string(msg->return_path));
+			msg->hdr_list = g_list_append(msg->hdr_list,
+					create_header(HEAD_UNKNOWN,
+					"X-Warning: return path set from %s "
+					"address\n",
+					(hdr->id == HEAD_SENDER) ?
+					"Sender:" : "From:"));
+		}
+		g_free(addr);
+	}
+	if (!msg->return_path) {
+		/* no Sender: or From: or create_address_qualified failed */
+		msg->return_path = create_address_qualified("postmaster",
+				TRUE, conf.host_name);
+		DEBUG(3) debugf("setting return_path to %s\n",
+				addr_string(msg->return_path));
+		msg->hdr_list = g_list_append(msg->hdr_list,
+				create_header(HEAD_UNKNOWN,
+				"X-Warning: real return path is unknown\n"));
+	}
+}
+
+static accept_error
+scan_headers(message *msg, guint flags)
+{
+	gboolean has_id = FALSE;
+	gboolean has_date = FALSE;
+	gboolean has_sender = FALSE;
+	gboolean has_from = FALSE;
+	gboolean has_to_or_cc = FALSE;
+	GList *hdr_node, *hdr_node_next;
+	header *hdr;
+
+	for (hdr_node = g_list_first(msg->hdr_list); hdr_node;
+			hdr_node = hdr_node_next) {
+		hdr_node_next = g_list_next(hdr_node);
+		hdr = ((header *) (hdr_node->data));
+		DEBUG(5) debugf("scanning headers: %s", hdr->header);
+		switch (hdr->id) {
+		case HEAD_MESSAGE_ID:
+			has_id = TRUE;
+			break;
+		case HEAD_DATE:
+			has_date = TRUE;
+			break;
+		case HEAD_FROM:
+			has_from = TRUE;
+			break;
+		case HEAD_SENDER:
+			has_sender = TRUE;
+			break;
+		case HEAD_TO:
+		case HEAD_CC:
+			has_to_or_cc = TRUE;
+			/* fall through */
+		case HEAD_BCC:
+			if (flags & ACC_RCPT_FROM_HEAD) {
+				/* -t option (see comment above) */
+				DEBUG(5) debugf("hdr->value = %s\n",
+						hdr->value);
+				if (hdr->value) {
+					msg->rcpt_list = addr_list_append_rfc822(msg->rcpt_list, hdr->value, conf.host_name);
+				}
+			}
+			if (hdr->id == HEAD_BCC) {
+				DEBUG(3) debugf("removing 'Bcc' header\n");
+				msg->hdr_list = g_list_remove_link(msg->hdr_list, hdr_node);
+				g_list_free_1(hdr_node);
+				destroy_header(hdr);
+			}
+			break;
+		case HEAD_ENVELOPE_TO:
+			if (flags & ACC_SAVE_ENVELOPE_TO) {
+				DEBUG(3) debugf("creating 'X-Orig-Envelope-To' header\n");
+				msg->hdr_list = g_list_prepend(msg->hdr_list,
+						create_header(HEAD_UNKNOWN,
+						"X-Orig-Envelope-To: %s",
+						hdr->value));
+			}
+			DEBUG(3) debugf("removing 'Envelope-To' header\n");
+			msg->hdr_list = g_list_remove_link(msg->hdr_list,
+					hdr_node);
+			g_list_free_1(hdr_node);
+			destroy_header(hdr);
+			break;
+		case HEAD_RETURN_PATH:
+			if (flags & ACC_MAIL_FROM_HEAD) {
+				/* usually POP3 accept */
+				msg->return_path = create_address_qualified(hdr->value, TRUE, msg->received_host);
+				DEBUG(3) debugf("setting return_path to %s\n",
+						addr_string(msg->return_path));
+			}
+			DEBUG(3) debugf("removing 'Return-Path' header\n");
+			msg->hdr_list = g_list_remove_link(msg->hdr_list,
+					hdr_node);
+			g_list_free_1(hdr_node);
+			destroy_header(hdr);
+			break;
+		default:
+			break;  /* make compiler happy */
+		}
+	}
+
+	/*
+	**  TODO: do we still need this as we don't fetch
+	**        mail anymore?
+	**  This can happen for pop3 accept only and if no
+	**  Return-Path: header was given
+	*/
+	ensure_return_path(msg);
+
+	/* here we should have our recipients, fail if not: */
+	if (!msg->rcpt_list) {
+		logwrite(LOG_WARNING, "no recipients found in message\n");
+		return AERR_NORCPT;
+	}
+
+	if (!has_sender && !has_from) {
+		DEBUG(3) debugf("adding 'From:' header\n");
+		if (msg->full_sender_name) {
+			msg->hdr_list = g_list_append(msg->hdr_list,
+					create_header(HEAD_FROM,
+					"From: \"%s\" <%s@%s>\n",
+					msg->full_sender_name,
+					msg->return_path->local_part,
+					msg->return_path->domain));
+		} else {
+			msg->hdr_list = g_list_append(msg->hdr_list,
+					create_header(HEAD_FROM,
+					"From: <%s@%s>\n",
+					msg->return_path->local_part,
+					msg->return_path->domain));
+		}
+	}
+	if (!has_to_or_cc) {
+		DEBUG(3) debugf("no To: or Cc: header, hence adding "
+				"`To: undisclosed recipients:;'\n");
+		msg->hdr_list = g_list_append(msg->hdr_list,
+				create_header(HEAD_TO,
+				"To: undisclosed-recipients:;\n"));
+	}
+	if (!has_date) {
+		DEBUG(3) debugf("adding 'Date:' header\n");
+		msg->hdr_list = g_list_append(msg->hdr_list,
+				create_header(HEAD_DATE, "Date: %s\n",
+				rec_timestamp()));
+	}
+	if (!has_id) {
+		DEBUG(3) debugf("adding 'Message-ID:' header\n");
+		msg->hdr_list = g_list_append(msg->hdr_list,
+				create_header(HEAD_MESSAGE_ID,
+				"Message-ID: <%s@%s>\n",
+				msg->uid, conf.host_name));
+	}
+
+	return AERR_OK;
+}
+
+static void
+add_received_hdr(message *msg)
+{
+	gchar *for_string = NULL;
+	header *hdr = NULL;
+	address *addr;
+
+	DEBUG(3) debugf("adding 'Received:' header\n");
+	if (g_list_length(msg->rcpt_list) == 1) {
+		/* The `for' part only if exactly one rcpt is present */
+		addr = (address *) (g_list_first(msg->rcpt_list)->data);
+		for_string = g_strdup_printf("\n\tfor %s", addr_string(addr));
+	}
+	if (!msg->received_host) {
+		/* received locally */
+		hdr = create_header(HEAD_RECEIVED,
+				"Received: by %s (%s %s, from userid %d)\n"
+				"\tid %s%s; %s\n",
+				conf.host_name, PACKAGE, VERSION, geteuid(),
+				msg->uid,
+				for_string ? for_string : "", rec_timestamp());
+	} else {
+		/* received from remote */
+		DEBUG(5) debugf("adding 'Received:' header (5)\n");
+		hdr = create_header(HEAD_RECEIVED,
+				"Received: from %s\n"
+				"\tby %s with %s (%s %s)\n"
+				"\tid %s%s; %s\n",
+				msg->received_host, conf.host_name,
+				prot_names[msg->received_prot], PACKAGE,
+				VERSION, msg->uid,
+				for_string ? for_string : "", rec_timestamp());
+	}
+	msg->hdr_list = g_list_prepend(msg->hdr_list, hdr);
+	if (for_string) {
+		g_free(for_string);
+	}
+}
+
 accept_error
 accept_message_prepare(message *msg, guint flags)
 {
-	struct passwd *passwd = NULL;
-	time_t rec_time = time(NULL);
-
 	DEBUG(5) debugf("accept_message_prepare()\n");
 
-	/* create unique message id */
+	/* generate unique message id */
 	msg->uid = g_malloc(14);
-	string_base62(msg->uid, rec_time, 6);
+	string_base62(msg->uid, time(NULL), 6);
 	msg->uid[6] = '-';
 	string_base62(msg->uid + 7, getpid(), 3);
 	msg->uid[10] = '-';
@@ -198,193 +418,26 @@
 
 	/* if local, get password entry and set return path if missing */
 	if (!msg->received_host) {
+		struct passwd *passwd = NULL;
+
 		passwd = g_memdup(getpwuid(geteuid()), sizeof(struct passwd));
 		msg->ident = g_strdup(passwd->pw_name);
 		if (!msg->return_path) {
-			gchar *path = g_strdup_printf("<%s@%s>", passwd->pw_name, conf.host_name);
-			DEBUG(3) debugf("setting return_path for local accept: %s\n", path);
+			gchar *path = g_strdup_printf("<%s@%s>",
+					passwd->pw_name, conf.host_name);
+			DEBUG(3) debugf("setting return_path for local "
+					"accept: %s\n", path);
 			msg->return_path = create_address(path, TRUE);
 			g_free(path);
 		}
 	}
 
-	/* scan headers */
-	{
-		gboolean has_id = FALSE;
-		gboolean has_date = FALSE;
-		gboolean has_sender = FALSE;
-		gboolean has_from = FALSE;
-		gboolean has_to_or_cc = FALSE;
-		GList *hdr_node, *hdr_node_next;
-		header *hdr;
-
-		for (hdr_node = g_list_first(msg->hdr_list);
-		     hdr_node;
-		     hdr_node = hdr_node_next) {
-			hdr_node_next = g_list_next(hdr_node);
-			hdr = ((header *) (hdr_node->data));
-			DEBUG(5) debugf("scanning headers: %s", hdr->header);
-			switch (hdr->id) {
-			case HEAD_MESSAGE_ID:
-				has_id = TRUE;
-				break;
-			case HEAD_DATE:
-				has_date = TRUE;
-				break;
-			case HEAD_FROM:
-				has_from = TRUE;
-				break;
-			case HEAD_SENDER:
-				has_sender = TRUE;
-				break;
-			case HEAD_TO:
-			case HEAD_CC:
-				has_to_or_cc = TRUE;
-				/* fall through */
-			case HEAD_BCC:
-				if (flags & ACC_RCPT_FROM_HEAD) {
-					/* -t option (see comment above) */
-					DEBUG(5) debugf("hdr->value = %s\n", hdr->value);
-					if (hdr->value) {
-						msg->rcpt_list = addr_list_append_rfc822(msg->rcpt_list, hdr->value, conf.host_name);
-					}
-				}
-				if (hdr->id == HEAD_BCC) {
-					DEBUG(3) debugf("removing 'Bcc' header\n");
-					msg->hdr_list = g_list_remove_link(msg->hdr_list, hdr_node);
-					g_list_free_1(hdr_node);
-					destroy_header(hdr);
-				}
-				break;
-			case HEAD_ENVELOPE_TO:
-				if (flags & ACC_SAVE_ENVELOPE_TO) {
-					DEBUG(3) debugf("creating 'X-Orig-Envelope-To' header\n");
-					msg->hdr_list = g_list_prepend(msg->hdr_list, create_header(HEAD_UNKNOWN,
-					                               "X-Orig-Envelope-To: %s", hdr->value));
-				}
-				DEBUG(3) debugf("removing 'Envelope-To' header\n");
-				msg->hdr_list = g_list_remove_link(msg->hdr_list, hdr_node);
-				g_list_free_1(hdr_node);
-				destroy_header(hdr);
-				break;
-			case HEAD_RETURN_PATH:
-				if (flags & ACC_MAIL_FROM_HEAD) {
-					/* usually POP3 accept */
-					msg->return_path = create_address_qualified(hdr->value, TRUE, msg->received_host);
-					DEBUG(3) debugf("setting return_path to %s\n", addr_string(msg->return_path));
-				}
-				DEBUG(3) debugf("removing 'Return-Path' header\n");
-				msg->hdr_list = g_list_remove_link(msg->hdr_list, hdr_node);
-				g_list_free_1(hdr_node);
-				destroy_header(hdr);
-				break;
-			default:
-				break;  /* make compiler happy */
-			}
-		}
-
-		if (!msg->return_path) {
-			/*
-			**  TODO: do we still need this as we don't fetch
-			**        mail anymore?
-			**  This can happen for pop3 accept only and if no
-			**  Return-Path: header was given
-			*/
-			GList *hdr_list;
-			header *hdr;
-
-			DEBUG(3) debugf("return_path == NULL\n");
-
-			hdr_list = find_header(msg->hdr_list, HEAD_SENDER, NULL);
-			if (!hdr_list) {
-				hdr_list = find_header(msg->hdr_list, HEAD_FROM, NULL);
-			}
-			if (hdr_list) {
-				gchar *addr;
-				hdr = (header *) (g_list_first(hdr_list)->data);
-
-				DEBUG(5) debugf("hdr->value = '%s'\n", hdr->value);
-
-				addr = g_strdup(hdr->value);
-				g_strchomp(addr);
-
-				msg->return_path = create_address_qualified(addr, FALSE, msg->received_host);
-				if (msg->return_path) {
-					DEBUG(3) debugf("setting return_path to %s\n", addr_string(msg->return_path));
-					msg->hdr_list = g_list_append( msg->hdr_list, create_header(HEAD_UNKNOWN, "X-Warning: return path set from %s address\n", hdr->id == HEAD_SENDER ? "Sender:" : "From:"));
-				}
-				g_free(addr);
-			}
-			if (!msg->return_path) {
-				/* no Sender: or From: or
-				   create_address_qualified failed */
-				msg->return_path = create_address_qualified("postmaster", TRUE, conf.host_name);
-				DEBUG(3) debugf("setting return_path to %s\n", addr_string(msg->return_path));
-				msg->hdr_list = g_list_append(msg->hdr_list, create_header(HEAD_UNKNOWN, "X-Warning: real return path is unknown\n"));
-			}
-		}
-
-		/* here we should have our recipients, fail if not: */
-		if (!msg->rcpt_list) {
-			logwrite(LOG_WARNING, "no recipients found in message\n");
-			return AERR_NORCPT;
-		}
-
-		if (!has_sender && !has_from) {
-			DEBUG(3) debugf("adding 'From:' header\n");
-			if (msg->full_sender_name) {
-				msg->hdr_list = g_list_append(msg->hdr_list, create_header(HEAD_FROM, "From: \"%s\" <%s@%s>\n", msg->full_sender_name, msg->return_path->local_part, msg->return_path->domain));
-			} else {
-				msg->hdr_list = g_list_append(msg->hdr_list, create_header(HEAD_FROM, "From: <%s@%s>\n", msg->return_path->local_part, msg->return_path->domain));
-			}
-		}
-		if (!has_to_or_cc) {
-			DEBUG(3) debugf("no To: or Cc: header, hence adding `To: undisclosed recipients:;'\n");
-			msg->hdr_list = g_list_append(msg->hdr_list, create_header(HEAD_TO, "To: undisclosed-recipients:;\n"));
-		}
-		if (!has_date) {
-			DEBUG(3) debugf("adding 'Date:' header\n");
-			msg->hdr_list = g_list_append(msg->hdr_list, create_header(HEAD_DATE, "Date: %s\n", rec_timestamp()));
-		}
-		if (!has_id) {
-			DEBUG(3) debugf("adding 'Message-ID:' header\n");
-			msg->hdr_list = g_list_append(msg->hdr_list, create_header(HEAD_MESSAGE_ID, "Message-ID: <%s@%s>\n", msg->uid, conf.host_name));
-		}
+	if (scan_headers(msg, flags) == AERR_NORCPT) {
+		return AERR_NORCPT;
 	}
 
-	/* Received header: */
-	/* At this point because we have to know the rcpts for the 'for' part */
-	/* The `for' part will only be used if exactly one rcpt is present. */
-	gchar *for_string = NULL;
-	header *hdr = NULL;
-
-	DEBUG(3) debugf("adding 'Received:' header\n");
-
-	if (g_list_length(msg->rcpt_list) == 1) {
-		address *addr = (address *) (g_list_first(msg->rcpt_list)->data);
-		for_string = g_strdup_printf("\n\tfor %s", addr_string(addr));
-	}
-
-	if (!msg->received_host) {
-		/* received locally */
-		hdr = create_header(HEAD_RECEIVED,
-		    "Received: by %s (%s %s, from userid %d)\n\tid %s%s; %s\n",
-		    conf.host_name, PACKAGE, VERSION, geteuid(),
-		    msg->uid, for_string ? for_string : "", rec_timestamp());
-	} else {
-		/* received from remote */
-		DEBUG(5) debugf("adding 'Received:' header (5)\n");
-		hdr = create_header(HEAD_RECEIVED,
-		    "Received: from %s\n\tby %s with %s (%s %s)\n\tid %s%s; %s\n",
-		    msg->received_host,
-		    conf.host_name, prot_names[msg->received_prot], PACKAGE,
-		    VERSION, msg->uid, for_string ? for_string : "",
-		    rec_timestamp());
-	}
-	msg->hdr_list = g_list_prepend(msg->hdr_list, hdr);
-
-	if (for_string)
-		g_free(for_string);
+	/* after the hdrs are scanned because we need to know the rcpts */
+	add_received_hdr(msg);
 
 	return AERR_OK;
 }