This is a followup over 9d33439 (send-email: only allow one address per body tag, 2017-02-20). The first iteration did allow writting Cc: <foo@xxxxxxxxxxx> # garbage but did so by matching the regex ([^>]*>?), i.e. stop after the first instance of '>'. However, it did not properly deal with Cc: foo@xxxxxxxxxxx # garbage Fix this using a new function strip_garbage_one_address, which does essentially what the old ([^>]*>?) was doing, but dealing with more corner-cases. Since we've allowed Cc: "Foo # Bar" <foobar@xxxxxxxxxxx> in previous versions, it makes sense to continue allowing it (but we still remove any garbage after it). OTOH, when an address is given without quoting, we just take the first word and ignore everything after. Signed-off-by: Matthieu Moy <git@xxxxxxxxxxxxxxx> --- Also available as: https://github.com/git/git/pull/398 git-send-email.perl | 26 ++++++++++++++++++++++++-- t/t9001-send-email.sh | 4 ++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/git-send-email.perl b/git-send-email.perl index fa6526986e..33a69ffe5d 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -1089,6 +1089,26 @@ sub sanitize_address { } +sub strip_garbage_one_address { + my ($addr) = @_; + chomp $addr; + if ($addr =~ /^(("[^"]*"|[^"<]*)? *<[^>]*>).*/) { + # "Foo Bar" <foobar@xxxxxxxxxxx> [possibly garbage here] + # Foo Bar <foobar@xxxxxxxxxxx> [possibly garbage here] + return $1; + } + if ($addr =~ /^(<[^>]*>).*/) { + # <foo@xxxxxxxxxxx> [possibly garbage here] + # if garbage contains other addresses, they are ignored. + return $1; + } + if ($addr =~ /^([^"#,\s]*)/) { + # address without quoting: remove anything after the address + return $1; + } + return $addr; +} + sub sanitize_address_list { return (map { sanitize_address($_) } @_); } @@ -1590,10 +1610,12 @@ foreach my $t (@files) { # Now parse the message body while(<$fh>) { $message .= $_; - if (/^(Signed-off-by|Cc): ([^>]*>?)/i) { + if (/^(Signed-off-by|Cc): (.*)/i) { chomp; my ($what, $c) = ($1, $2); - chomp $c; + # strip garbage for the address we'll use: + $c = strip_garbage_one_address($c); + # sanitize a bit more to decide whether to suppress the address: my $sc = sanitize_address($c); if ($sc eq $sender) { next if ($suppress_cc{'self'}); diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index d1e4e8ad19..f30980895c 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -148,6 +148,8 @@ cat >expected-cc <<\EOF !two@xxxxxxxxxxx! !three@xxxxxxxxxxx! !four@xxxxxxxxxxx! +!five@xxxxxxxxxxx! +!six@xxxxxxxxxxx! EOF " @@ -161,6 +163,8 @@ test_expect_success $PREREQ 'cc trailer with various syntax' ' Cc: <two@xxxxxxxxxxx> # trailing comments are ignored Cc: <three@xxxxxxxxxxx>, <not.four@xxxxxxxxxxx> one address per line Cc: "Some # Body" <four@xxxxxxxxxxx> [ <also.a.comment> ] + Cc: five@xxxxxxxxxxx # not.six@xxxxxxxxxxx + Cc: six@xxxxxxxxxxx, not.seven@xxxxxxxxxxx EOF clean_fake_sendmail && git send-email -1 --to=recipient@xxxxxxxxxxx \ -- 2.14.0.rc0.dirty
