global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-09 17:46:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mc/send-email-header-cmd'

Browse Source 
"git send-email" learned "--header-cmd=<cmd>" that can inject
arbitrary e-mail header lines to the outgoing messages.

* mc/send-email-header-cmd:
  send-email: detect empty blank lines in command output
  send-email: add --header-cmd, --no-header-cmd options
  send-email: extract execute_cmd from recipients_cmd
This commit is contained in:
Junio C Hamano
2023-05-15 13:59:03 -07:00
parent b14a73097c 3a7a18a045
commit 64477d20d7
4 changed files with 151 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -374,13 +374,16 @@ test_expect_success $PREREQ,!AUTOIDENT 'broken implicit ident aborts send-email'
)
'
test_expect_success $PREREQ 'setup tocmd and cccmd scripts' '
test_expect_success $PREREQ 'setup cmd scripts' '
write_script tocmd-sed <<-\EOF &&
sed -n -e "s/^tocmd--//p" "$1"
EOF
write_script cccmd-sed <<-\EOF
write_script cccmd-sed <<-\EOF &&
sed -n -e "s/^cccmd--//p" "$1"
EOF
write_script headercmd-sed <<-\EOF
sed -n -e "s/^headercmd--//p" "$1"
EOF
'
test_expect_success $PREREQ 'tocmd works' '
@@ -410,6 +413,70 @@ test_expect_success $PREREQ 'cccmd works' '
grep "^ cccmd@example.com" msgtxt1
'
test_expect_success $PREREQ 'headercmd works' '
clean_fake_sendmail &&
cp $patches headercmd.patch &&
echo "headercmd--X-Debbugs-CC: dummy@example.com" >>headercmd.patch &&
git send-email \
--from="Example <nobody@example.com>" \
--to=nobody@example.com \
--header-cmd=./headercmd-sed \
--smtp-server="$(pwd)/fake.sendmail" \
headercmd.patch \
&&
grep "^X-Debbugs-CC: dummy@example.com" msgtxt1
'
test_expect_success $PREREQ '--no-header-cmd works' '
clean_fake_sendmail &&
cp $patches headercmd.patch &&
echo "headercmd--X-Debbugs-CC: dummy@example.com" >>headercmd.patch &&
git send-email \
--from="Example <nobody@example.com>" \
--to=nobody@example.com \
--header-cmd=./headercmd-sed \
--no-header-cmd \
--smtp-server="$(pwd)/fake.sendmail" \
headercmd.patch \
&&
! grep "^X-Debbugs-CC: dummy@example.com" msgtxt1
'
test_expect_success $PREREQ 'multiline fields are correctly unfolded' '
clean_fake_sendmail &&
cp $patches headercmd.patch &&
write_script headercmd-multiline <<-\EOF &&
echo "X-Debbugs-CC: someone@example.com
FoldedField: This is a tale
best told using
multiple lines."
EOF
git send-email \
--from="Example <nobody@example.com>" \
--to=nobody@example.com \
--header-cmd=./headercmd-multiline \
--smtp-server="$(pwd)/fake.sendmail" \
headercmd.patch &&
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 &&