Commas and other punctuation marks in 'Cc: ', 'Signed-off-by: '
etc. lines mess with git-send-email. This is handled by calling
`sanitize_address()` before adding addresses to @cc. This function
was already being called, but was only used for comparing it to
$author for suppression purposes.
Note that sanitization is only done for the message body, as
`git format-patch` already RFC 2047-encodes mbox headers, so
those are generally trusted to be sane. Also note that
`sanitize_address()` does not process the mailbox addresses,
so it is up to `sendmail` to handle special characters there
(e.g. there are mailboxes in regular use with '+'-es in them).
Signed-off-by: Csókás, Bence <csokas.bence@xxxxxxxxx>
---
[ sorry, I forgot the --notes: ]
Notes:
Changes in v2:
* added testcase to t9001
* added rationale behind trusting mbox headers and the address-parts
Changes in v3:
* more testcases
* clarified wording in message
git-send-email.perl | 4 ++--
t/t9001-send-email.sh | 51 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 53 insertions(+), 2 deletions(-)
diff --git a/git-send-email.perl b/git-send-email.perl
index f0be4b4560..72044e5ef3 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -1847,9 +1847,9 @@ sub pre_process_file {
$what, $_) unless $quiet;
next;
}
- push @cc, $c;
+ push @cc, $sc;
printf(__("(body) Adding cc: %s from line '%s'\n"),
- $c, $_) unless $quiet;
+ $sc, $_) unless $quiet;
}
}
close $fh;
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index 58699f8e4e..8bbbf20855 100755
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -1299,6 +1299,57 @@ test_expect_success $PREREQ 'utf8 sender is not duplicated' '
test_line_count = 1 msgfrom
'
+test_expect_success $PREREQ 'setup expect for cc list' "
+cat >expected-cc <<\EOF
+!recipient@xxxxxxxxxxx!
+!author@xxxxxxxxxxx!
+!one@xxxxxxxxxxx!
+!odd_?=mail@xxxxxxxxxxx!
+!doug@xxxxxxxxxxx!
+!thor.au@xxxxxxxxxxx!
+EOF
+"
+
+test_expect_success $PREREQ 'cc list is sanitized' '
+ clean_fake_sendmail &&
+ test_commit weird_cc_body &&
+ test_when_finished "git reset --hard HEAD^" &&
+ git commit --amend -F - <<-EOF &&
+ Test Cc: sanitization.
+
+ Cc: Person, One <one@xxxxxxxxxxx>
+ Reviewed-by: Füñný Nâmé <odd_?=mail@xxxxxxxxxxx>
+ Reported-by: bugger on Jira
+ Reported-by: Douglas Reporter <doug@xxxxxxxxxxx> [from Jira profile]
+ BugID: 12345
+ Signed-off-by: A. U. Thor <thor.au@xxxxxxxxxxx>
+ EOF
+ git send-email -1 --to=recipient@xxxxxxxxxxx \
+ --smtp-server="$(pwd)/fake.sendmail" >actual-show-all-headers &&
+ test_cmp expected-cc commandline1 &&
+ test_grep "^(body) Adding cc: \"Person, One\" <one@xxxxxxxxxxx>" actual-show-all-headers &&
+ test_grep "^(body) Adding cc: =?UTF-8?q?F=C3=BC=C3=B1n=C3=BD=20N=C3=A2m=C3=A9?="\
+" <odd_?=mail@xxxxxxxxxxx>" actual-show-all-headers &&
+ test_grep "^(body) Adding cc: Douglas Reporter <doug@xxxxxxxxxxx>" actual-show-all-headers &&
+ test_grep "^(body) Adding cc: \"A. U. Thor\" <thor.au@xxxxxxxxxxx>" actual-show-all-headers
+'
+
+test_expect_success $PREREQ 'quotes are sanitized in cc list' "
+ clean_fake_sendmail &&
+ test_commit quote_in_cc_body &&
+ test_when_finished \"git reset --hard HEAD^\" &&
+ git commit --amend -F - <<-EOF &&
+ Quotation marks sanitization in Cc:.
+
+ Cc: P'erson, One <one@xxxxxxxxxxx>
+ Reported-by: \"Douglas 'Bug' Reporter\" <doug@xxxxxxxxxxx>
+ EOF
+ git send-email -1 --to=recipient@xxxxxxxxxxx \
+ --smtp-server=\"$(pwd)/fake.sendmail\" >actual-show-all-headers &&
+ test_grep \"^(body) Adding cc: \\\"P'erson, One\\\" <one@xxxxxxxxxxx>\" actual-show-all-headers &&
+ test_grep \"^(body) Adding cc: \\\"Douglas 'Bug' Reporter\\\" <doug@xxxxxxxxxxx>\" actual-show-all-headers
+"
+
test_expect_success $PREREQ 'sendemail.composeencoding works' '
clean_fake_sendmail &&
git config sendemail.composeencoding iso-8859-1 &&
--
2.34.1
