mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-05 12:56:11 +02:00
Code

send-email: detect empty blank lines in command output 

The email format does not allow blank lines in headers; detect such
input and report it as malformed and add a test for it.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Maxim Cournoyer 2023-05-01 10:38:48 -04:00 committed by Junio C Hamano
parent ba92106e93
commit 3a7a18a045
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
git-send-email.perl
View File

@ -2026,14 +2026,22 @@ sub process_file {
}
}
# Execute a command and return its output lines as an array.
# Execute a command and return its output lines as an array. Blank
# lines which do not appear at the end of the output are reported as
# errors.
sub execute_cmd {
my ($prefix, $cmd, $file) = @_;
my @lines = ();
my $seen_blank_line = 0;
open my $fh, "-|", "$cmd \Q$file\E"
or die sprintf(__("(%s) Could not execute '%s'"), $prefix, $cmd);
while (my $line = <$fh>) {
last if $line =~ /^$/;
die sprintf(__("(%s) Malformed output from '%s'"), $prefix, $cmd)
if $seen_blank_line;
if ($line =~ /^$/) {
$seen_blank_line = $line =~ /^$/;
next;
}
push @lines, $line;
}
close $fh

17
t/t9001-send-email.sh
View File

@ -460,6 +460,23 @@ FoldedField: This is a tale
grep "^FoldedField: This is a tale best told using multiple lines.$" msgtxt1
'
# Blank lines in the middle of the output of a command are invalid.
test_expect_success $PREREQ 'malform output reported on blank lines in command output' '
clean_fake_sendmail &&
cp $patches headercmd.patch &&
write_script headercmd-malformed-output <<-\EOF &&
echo "X-Debbugs-CC: someone@example.com
SomeOtherField: someone-else@example.com"
EOF
! git send-email \
--from="Example <nobody@example.com>" \
--to=nobody@example.com \
--header-cmd=./headercmd-malformed-output \
--smtp-server="$(pwd)/fake.sendmail" \
headercmd.patch
'
test_expect_success $PREREQ 'reject long lines' '
z8=zzzzzzzz &&
z64=$z8$z8$z8$z8$z8$z8$z8$z8 &&