Merge branch 'mt/send-email-cc-match-fix'
Logic git-send-email used to suppress cc mishandled names like "A U. Thor" <author@example.xz>, where the human readable part needs to be quoted (the user input may not have the double quotes around the name, and comparison was done between quoted and unquoted strings). * mt/send-email-cc-match-fix: test-send-email: test for pre-sanitized self name t/send-email: test suppress-cc=self with non-ascii t/send-email: add test with quoted sender send-email: make --suppress-cc=self sanitize input t/send-email: test suppress-cc=self on cccmd send-email: fix suppress-cc=self on cccmd t/send-email.sh: add test for suppress-cc=self
This commit is contained in:
Junio C Hamano
commit
908b3601e6
@ -745,6 +745,11 @@ if (!defined $sender) {
|
||||
$sender = $repoauthor || $repocommitter || '';
|
||||
}
|
||||
|
||||
# $sender could be an already sanitized address
|
||||
# (e.g. sendemail.from could be manually sanitized by user).
|
||||
# But it's a no-op to run sanitize_address on an already sanitized address.
|
||||
$sender = sanitize_address($sender);
|
||||
|
||||
my $prompting = 0;
|
||||
if (!@initial_to && !defined $to_cmd) {
|
||||
my $to = ask("Who should the emails be sent to (if any)? ",
|
||||
@ -1098,10 +1103,9 @@ sub send_message {
|
||||
if ($cc ne '') {
|
||||
$ccline = "\nCc: $cc";
|
||||
}
|
||||
my $sanitized_sender = sanitize_address($sender);
|
||||
make_message_id() unless defined($message_id);
|
||||
|
||||
my $header = "From: $sanitized_sender
|
||||
my $header = "From: $sender
|
||||
To: $to${ccline}
|
||||
Subject: $subject
|
||||
Date: $date
|
||||
@ -1118,7 +1122,7 @@ X-Mailer: git-send-email $gitversion
|
||||
}
|
||||
|
||||
my @sendmail_parameters = ('-i', @recipients);
|
||||
my $raw_from = $sanitized_sender;
|
||||
my $raw_from = $sender;
|
||||
if (defined $envelope_sender && $envelope_sender ne "auto") {
|
||||
$raw_from = $envelope_sender;
|
||||
}
|
||||
@ -1293,8 +1297,9 @@ foreach my $t (@files) {
|
||||
}
|
||||
elsif (/^From:\s+(.*)$/i) {
|
||||
($author, $author_encoding) = unquote_rfc2047($1);
|
||||
my $sauthor = sanitize_address($author);
|
||||
next if $suppress_cc{'author'};
|
||||
next if $suppress_cc{'self'} and $author eq $sender;
|
||||
next if $suppress_cc{'self'} and $sauthor eq $sender;
|
||||
printf("(mbox) Adding cc: %s from line '%s'\n",
|
||||
$1, $_) unless $quiet;
|
||||
push @cc, $1;
|
||||
@ -1308,7 +1313,9 @@ foreach my $t (@files) {
|
||||
}
|
||||
elsif (/^Cc:\s+(.*)$/i) {
|
||||
foreach my $addr (parse_address_line($1)) {
|
||||
if (unquote_rfc2047($addr) eq $sender) {
|
||||
my $qaddr = unquote_rfc2047($addr);
|
||||
my $saddr = sanitize_address($qaddr);
|
||||
if ($saddr eq $sender) {
|
||||
next if ($suppress_cc{'self'});
|
||||
} else {
|
||||
next if ($suppress_cc{'cc'});
|
||||
@ -1355,7 +1362,8 @@ foreach my $t (@files) {
|
||||
chomp;
|
||||
my ($what, $c) = ($1, $2);
|
||||
chomp $c;
|
||||
if ($c eq $sender) {
|
||||
my $sc = sanitize_address($c);
|
||||
if ($sc eq $sender) {
|
||||
next if ($suppress_cc{'self'});
|
||||
} else {
|
||||
next if $suppress_cc{'sob'} and $what =~ /Signed-off-by/i;
|
||||
@ -1439,7 +1447,6 @@ foreach my $t (@files) {
|
||||
sub recipients_cmd {
|
||||
my ($prefix, $what, $cmd, $file) = @_;
|
||||
|
||||
my $sanitized_sender = sanitize_address($sender);
|
||||
my @addresses = ();
|
||||
open my $fh, "-|", "$cmd \Q$file\E"
|
||||
or die "($prefix) Could not execute '$cmd'";
|
||||
@ -1447,7 +1454,7 @@ sub recipients_cmd {
|
||||
$address =~ s/^\s*//g;
|
||||
$address =~ s/\s*$//g;
|
||||
$address = sanitize_address($address);
|
||||
next if ($address eq $sanitized_sender and $suppress_from);
|
||||
next if ($address eq $sender and $suppress_cc{'self'});
|
||||
push @addresses, $address;
|
||||
printf("($prefix) Adding %s: %s from: '%s'\n",
|
||||
$what, $address, $cmd) unless $quiet;
|
||||
|
||||
@ -171,6 +171,81 @@ Result: OK
|
||||
EOF
|
||||
"
|
||||
|
||||
test_suppress_self () {
|
||||
test_commit $3 &&
|
||||
test_when_finished "git reset --hard HEAD^" &&
|
||||
|
||||
write_script cccmd-sed <<-EOF &&
|
||||
sed -n -e s/^cccmd--//p "\$1"
|
||||
EOF
|
||||
|
||||
git commit --amend --author="$1 <$2>" -F - &&
|
||||
clean_fake_sendmail &&
|
||||
git format-patch --stdout -1 >"suppress-self-$3.patch" &&
|
||||
|
||||
git send-email --from="$1 <$2>" \
|
||||
--to=nobody@example.com \
|
||||
--cc-cmd=./cccmd-sed \
|
||||
--suppress-cc=self \
|
||||
--smtp-server="$(pwd)/fake.sendmail" \
|
||||
suppress-self-$3.patch &&
|
||||
|
||||
mv msgtxt1 msgtxt1-$3 &&
|
||||
sed -e '/^$/q' msgtxt1-$3 >"msghdr1-$3" &&
|
||||
>"expected-no-cc-$3" &&
|
||||
|
||||
(grep '^Cc:' msghdr1-$3 >"actual-no-cc-$3";
|
||||
test_cmp expected-no-cc-$3 actual-no-cc-$3)
|
||||
}
|
||||
|
||||
test_suppress_self_unquoted () {
|
||||
test_suppress_self "$1" "$2" "unquoted-$3" <<-EOF
|
||||
test suppress-cc.self unquoted-$3 with name $1 email $2
|
||||
|
||||
unquoted-$3
|
||||
|
||||
cccmd--$1 <$2>
|
||||
|
||||
Cc: $1 <$2>
|
||||
Signed-off-by: $1 <$2>
|
||||
EOF
|
||||
}
|
||||
|
||||
test_suppress_self_quoted () {
|
||||
test_suppress_self "$1" "$2" "quoted-$3" <<-EOF
|
||||
test suppress-cc.self quoted-$3 with name $1 email $2
|
||||
|
||||
quoted-$3
|
||||
|
||||
cccmd--"$1" <$2>
|
||||
|
||||
Cc: $1 <$2>
|
||||
Cc: "$1" <$2>
|
||||
Signed-off-by: $1 <$2>
|
||||
Signed-off-by: "$1" <$2>
|
||||
EOF
|
||||
}
|
||||
|
||||
test_expect_success $PREREQ 'self name is suppressed' "
|
||||
test_suppress_self_unquoted 'A U Thor' 'author@example.com' \
|
||||
'self_name_suppressed'
|
||||
"
|
||||
|
||||
test_expect_success $PREREQ 'self name with dot is suppressed' "
|
||||
test_suppress_self_quoted 'A U. Thor' 'author@example.com' \
|
||||
'self_name_dot_suppressed'
|
||||
"
|
||||
|
||||
test_expect_success $PREREQ 'non-ascii self name is suppressed' "
|
||||
test_suppress_self_quoted 'Füñný Nâmé' 'odd_?=mail@example.com' \
|
||||
'non_ascii_self_suppressed'
|
||||
"
|
||||
|
||||
test_expect_success $PREREQ 'sanitized self name is suppressed' "
|
||||
test_suppress_self_unquoted '\"A U. Thor\"' 'author@example.com' \
|
||||
'self_name_sanitized_suppressed'
|
||||
"
|
||||
|
||||
test_expect_success $PREREQ 'Show all headers' '
|
||||
git send-email \
|
||||
--dry-run \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user