From: Aaro Koskinen <aaro.koskinen@iki.fi>
Date: Sun, 24 Feb 2013 22:45:06 +0000 (+0200)
Subject: sendmail: avoid sending mail to wrong addresses
X-Git-Tag: 1_22_0~225
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=14285d14a5826eb172e02cf2f6f1ec096add01b0;p=oweals%2Fbusybox.git

sendmail: avoid sending mail to wrong addresses

If we get an address we cannot parse properly, we currently just strip
the unknown characters and still try to send it. This is considered
harmful as the resulting address may still be valid but different from
what the user originally intended.

Instead, skip sending to an address we cannot fully understand and
print the characters what we have scanned so far. Leading and trailing
whitespace is allowed and silently stripped.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/mailutils/sendmail.c b/mailutils/sendmail.c
index c426e9d85..4f73512e9 100644
--- a/mailutils/sendmail.c
+++ b/mailutils/sendmail.c
@@ -94,9 +94,22 @@ static char *sane_address(char *str)
 {
 	char *s = str;
 	char *p = s;
+	int leading_space = 1;
+	int trailing_space = 0;
+
 	while (*s) {
-		if (isalnum(*s) || '_' == *s || '-' == *s || '.' == *s || '@' == *s) {
+		if (isspace(*s)) {
+			trailing_space = !leading_space;
+		} else {
 			*p++ = *s;
+			if ((!isalnum(*s) && !strchr("_-.@", *s)) ||
+			    trailing_space) {
+				*p = '\0';
+				bb_error_msg("Bad address: %s", str);
+				*str = '\0';
+				return str;
+			}
+			leading_space = 0;
 		}
 		s++;
 	}
@@ -106,6 +119,8 @@ static char *sane_address(char *str)
 
 static void rcptto(const char *s)
 {
+	if (!*s)
+		return;
 	// N.B. we don't die if recipient is rejected, for the other recipients may be accepted
 	if (250 != smtp_checkp("RCPT TO:<%s>", s, -1))
 		bb_error_msg("Bad recipient: <%s>", s);