From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jay Soffian <jaysoffian@gmail.com>
Subject: [PATCH] send-email: ensure quoted addresses are rfc2047 encoded
Date: Sat,  4 Apr 2009 23:22:06 -0400
Message-ID: <1238901726-47026-1-git-send-email-jaysoffian@gmail.com>
Mime-Version: 1.0
Content-Type: TEXT/PLAIN; charset=ISO-8859-1
Content-Transfer-Encoding: QUOTED-PRINTABLE
Cc: Jay Soffian <jaysoffian@gmail.com>
To: git@vger.kernel.org
X-From: git-owner@vger.kernel.org Sun Apr 05 05:23:57 2009
Return-path: <git-owner@vger.kernel.org>
Envelope-to: gcvg-git-2@gmane.org
Received: from vger.kernel.org ([209.132.176.167])
	by lo.gmane.org with esmtp (Exim 4.50)
	id 1LqIxg-0001oP-Vl
	for gcvg-git-2@gmane.org; Sun, 05 Apr 2009 05:23:57 +0200
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1756779AbZDEDWY (ORCPT <rfc822;gcvg-git-2@m.gmane.org>);
	Sat, 4 Apr 2009 23:22:24 -0400
X-Warning: Original message contained 8-bit characters, however during
	   the SMTP transport session the receiving system did not announce
	   capability of receiving 8-bit SMTP (RFC 1651-1653), and as this
	   message does not have MIME headers (RFC 2045-2049) to enable
	   encoding change, we had very little choice.
X-Warning: We ASSUME it is less harmful to add the MIME headers, and
	   convert the text to Quoted-Printable, than not to do so,
	   and to strip the message to 7-bits.. (RFC 1428 Appendix A)
X-Warning: We don't know what character set the user used, thus we had to
	   write these MIME-headers with our local system default value.
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756740AbZDEDWX
	(ORCPT <rfc822;git-outgoing>); Sat, 4 Apr 2009 23:22:23 -0400
Received: from qw-out-2122.google.com ([74.125.92.24]:25238 "EHLO
	qw-out-2122.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1756726AbZDEDWW (ORCPT <rfc822;git@vger.kernel.org>);
	Sat, 4 Apr 2009 23:22:22 -0400
Received: by qw-out-2122.google.com with SMTP id 8so1935583qwh.37
        for <git@vger.kernel.org>; Sat, 04 Apr 2009 20:22:20 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=gamma;
        h=domainkey-signature:received:received:from:to:cc:subject:date
         :message-id:x-mailer;
        bh=s8/XTZOB2/b27+49EQTy0CBEdxBk00tWNEdabVlmyxI=;
        b=kE+FUI06wpky/dY/CLvxs/9xLB8cf6iJCtjKYOYsuwNo0PUVzdmbWsTsuqjxOH1o13
         asn3Ywr4BZVEwYxfxX344LnPqYawpeRqYY/o1MKS/ETis90n3w1js4eaLeOULPSDlxrL
         CBW6jAuyyWhPVultdl9qEA2ND0wmyj9p56PCQ=
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=from:to:cc:subject:date:message-id:x-mailer;
        b=rRxy2fh+adl1/KUS4wNwXos8xH+HM7K7NDJlzdkLEOYMyhmU5I/5U7Pe2HBvuQJFNK
         aqIYsTia7GX4TNyB+RxlESJsIMIC7pC7wji5mIhJwwauxYt19mPGEhdZAMgfbMceacau
         9+TTXdkOa9aW5O1/zarlT2BS/ttwG5YfiCvCQ=
Received: by 10.224.2.130 with SMTP id 2mr2671967qaj.303.1238901739919;
        Sat, 04 Apr 2009 20:22:19 -0700 (PDT)
Received: from localhost (cpe-075-182-093-216.nc.res.rr.com [75.182.93.216])
        by mx.google.com with ESMTPS id 7sm1621357qwb.1.2009.04.04.20.22.18
        (version=TLSv1/SSLv3 cipher=RC4-MD5);
        Sat, 04 Apr 2009 20:22:19 -0700 (PDT)
X-Mailer: git-send-email 1.6.2.2.405.g6d8cc4
Sender: git-owner@vger.kernel.org
Precedence: bulk
List-ID: <git.vger.kernel.org>
X-Mailing-List: git@vger.kernel.org
Archived-At: <http://permalink.gmane.org/gmane.comp.version-control.git/115623>

sanitize_address assumes that quoted addresses (e.g., "first last"
<first.last@example.com) do not need rfc2047 encoding, but this is
not always the case.

=46or example, various places in send-email extract addresses using
parse_address_line. parse_address_line returns the addresses already
quoted (e.g., "first last" <first.last@example.com), but not rfc2047
encoded.

This patch makes sanitize_address stricter about what needs rfc2047
encoding and adds a test demonstrating where I noticed the problem.
---
 git-send-email.perl   |    3 ++-
 t/t9001-send-email.sh |   13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/git-send-email.perl b/git-send-email.perl
index fc153f9..6bbdfec 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -776,12 +776,13 @@ sub sanitize_address
 	}
=20
 	# if recipient_name is already quoted, do nothing
-	if ($recipient_name =3D~ /^(".*"|=3D\?utf-8\?q\?.*\?=3D)$/) {
+	if ($recipient_name =3D~ /^("[[:ascii:]]*"|=3D\?utf-8\?q\?.*\?=3D)$/)=
 {
 		return $recipient;
 	}
=20
 	# rfc2047 is needed if a non-ascii char is included
 	if ($recipient_name =3D~ /[^[:ascii:]]/) {
+		$recipient_name =3D~ s/^"(.*)"$/$1/;
 		$recipient_name =3D quote_rfc2047($recipient_name);
 	}
=20
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index 84238f7..192b97b 100755
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -505,6 +505,19 @@ test_expect_success 'confirm doesnt loop forever' =
'
 	test $ret =3D "0"
 '
=20
+test_expect_success 'utf8 Cc is rfc2047 encoded' '
+	clean_fake_sendmail &&
+	rm -fr outdir &&
+	git format-patch -1 -o outdir --cc=3D"=C3=A0=C3=A9=C3=AC=C3=B6=C3=BA =
<utf8@example.com>" &&
+	git send-email \
+	--from=3D"Example <nobody@example.com>" \
+	--to=3Dnobody@example.com \
+	--smtp-server=3D"$(pwd)/fake.sendmail" \
+	outdir/*.patch &&
+	grep "^Cc:" msgtxt1 |
+	grep "=3D?utf-8?q?=3DC3=3DA0=3DC3=3DA9=3DC3=3DAC=3DC3=3DB6=3DC3=3DBA?=
=3D <utf8@example.com>"
+'
+
 test_expect_success '--compose adds MIME for utf8 body' '
 	clean_fake_sendmail &&
 	(echo "#!$SHELL_PATH" &&
--=20
1.6.2.1.427.g15408