2013-03-31 16:02:24 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='merge signature verification tests'
|
|
|
|
. ./test-lib.sh
|
|
|
|
. "$TEST_DIRECTORY/lib-gpg.sh"
|
|
|
|
|
|
|
|
test_expect_success GPG 'create signed commits' '
|
|
|
|
echo 1 >file && git add file &&
|
|
|
|
test_tick && git commit -m initial &&
|
|
|
|
git tag initial &&
|
|
|
|
|
|
|
|
git checkout -b side-signed &&
|
|
|
|
echo 3 >elif && git add elif &&
|
|
|
|
test_tick && git commit -S -m "signed on side" &&
|
|
|
|
git checkout initial &&
|
|
|
|
|
|
|
|
git checkout -b side-unsigned &&
|
|
|
|
echo 3 >foo && git add foo &&
|
|
|
|
test_tick && git commit -m "unsigned on side" &&
|
|
|
|
git checkout initial &&
|
|
|
|
|
|
|
|
git checkout -b side-bad &&
|
|
|
|
echo 3 >bar && git add bar &&
|
|
|
|
test_tick && git commit -S -m "bad on side" &&
|
|
|
|
git cat-file commit side-bad >raw &&
|
|
|
|
sed -e "s/bad/forged bad/" raw >forged &&
|
|
|
|
git hash-object -w -t commit forged >forged.commit &&
|
|
|
|
git checkout initial &&
|
|
|
|
|
2013-03-31 16:02:46 +00:00
|
|
|
git checkout -b side-untrusted &&
|
|
|
|
echo 3 >baz && git add baz &&
|
2015-03-20 10:07:15 +00:00
|
|
|
test_tick && git commit -SB7227189 -m "untrusted on side" &&
|
2013-03-31 16:02:46 +00:00
|
|
|
|
2013-03-31 16:02:24 +00:00
|
|
|
git checkout master
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success GPG 'merge unsigned commit with verification' '
|
2017-12-15 19:42:36 +00:00
|
|
|
test_when_finished "git reset --hard && git checkout initial" &&
|
2013-03-31 16:02:24 +00:00
|
|
|
test_must_fail git merge --ff-only --verify-signatures side-unsigned 2>mergeerror &&
|
|
|
|
test_i18ngrep "does not have a GPG signature" mergeerror
|
|
|
|
'
|
|
|
|
|
2017-12-10 06:53:57 +00:00
|
|
|
test_expect_success GPG 'merge unsigned commit with merge.verifySignatures=true' '
|
2017-12-15 19:42:36 +00:00
|
|
|
test_when_finished "git reset --hard && git checkout initial" &&
|
2017-12-10 06:53:57 +00:00
|
|
|
test_config merge.verifySignatures true &&
|
|
|
|
test_must_fail git merge --ff-only side-unsigned 2>mergeerror &&
|
|
|
|
test_i18ngrep "does not have a GPG signature" mergeerror
|
|
|
|
'
|
|
|
|
|
2013-03-31 16:02:24 +00:00
|
|
|
test_expect_success GPG 'merge commit with bad signature with verification' '
|
2017-12-15 19:42:36 +00:00
|
|
|
test_when_finished "git reset --hard && git checkout initial" &&
|
2013-03-31 16:02:24 +00:00
|
|
|
test_must_fail git merge --ff-only --verify-signatures $(cat forged.commit) 2>mergeerror &&
|
|
|
|
test_i18ngrep "has a bad GPG signature" mergeerror
|
|
|
|
'
|
|
|
|
|
2017-12-10 06:53:57 +00:00
|
|
|
test_expect_success GPG 'merge commit with bad signature with merge.verifySignatures=true' '
|
2017-12-15 19:42:36 +00:00
|
|
|
test_when_finished "git reset --hard && git checkout initial" &&
|
2017-12-10 06:53:57 +00:00
|
|
|
test_config merge.verifySignatures true &&
|
|
|
|
test_must_fail git merge --ff-only $(cat forged.commit) 2>mergeerror &&
|
|
|
|
test_i18ngrep "has a bad GPG signature" mergeerror
|
|
|
|
'
|
|
|
|
|
2013-03-31 16:02:46 +00:00
|
|
|
test_expect_success GPG 'merge commit with untrusted signature with verification' '
|
2017-12-15 19:42:36 +00:00
|
|
|
test_when_finished "git reset --hard && git checkout initial" &&
|
2013-03-31 16:02:46 +00:00
|
|
|
test_must_fail git merge --ff-only --verify-signatures side-untrusted 2>mergeerror &&
|
|
|
|
test_i18ngrep "has an untrusted GPG signature" mergeerror
|
|
|
|
'
|
|
|
|
|
2017-12-10 06:53:57 +00:00
|
|
|
test_expect_success GPG 'merge commit with untrusted signature with merge.verifySignatures=true' '
|
2017-12-15 19:42:36 +00:00
|
|
|
test_when_finished "git reset --hard && git checkout initial" &&
|
2017-12-10 06:53:57 +00:00
|
|
|
test_config merge.verifySignatures true &&
|
|
|
|
test_must_fail git merge --ff-only side-untrusted 2>mergeerror &&
|
|
|
|
test_i18ngrep "has an untrusted GPG signature" mergeerror
|
|
|
|
'
|
|
|
|
|
2013-03-31 16:02:24 +00:00
|
|
|
test_expect_success GPG 'merge signed commit with verification' '
|
2017-12-15 19:42:36 +00:00
|
|
|
test_when_finished "git reset --hard && git checkout initial" &&
|
2013-03-31 16:02:24 +00:00
|
|
|
git merge --verbose --ff-only --verify-signatures side-signed >mergeoutput &&
|
|
|
|
test_i18ngrep "has a good GPG signature" mergeoutput
|
|
|
|
'
|
|
|
|
|
2017-12-10 06:53:57 +00:00
|
|
|
test_expect_success GPG 'merge signed commit with merge.verifySignatures=true' '
|
2017-12-15 19:42:36 +00:00
|
|
|
test_when_finished "git reset --hard && git checkout initial" &&
|
2017-12-10 06:53:57 +00:00
|
|
|
test_config merge.verifySignatures true &&
|
|
|
|
git merge --verbose --ff-only side-signed >mergeoutput &&
|
|
|
|
test_i18ngrep "has a good GPG signature" mergeoutput
|
|
|
|
'
|
|
|
|
|
2013-03-31 16:02:24 +00:00
|
|
|
test_expect_success GPG 'merge commit with bad signature without verification' '
|
2017-12-15 19:42:36 +00:00
|
|
|
test_when_finished "git reset --hard && git checkout initial" &&
|
2017-12-10 06:53:57 +00:00
|
|
|
git merge $(cat forged.commit)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success GPG 'merge commit with bad signature with merge.verifySignatures=false' '
|
2017-12-15 19:42:36 +00:00
|
|
|
test_when_finished "git reset --hard && git checkout initial" &&
|
2017-12-10 06:53:57 +00:00
|
|
|
test_config merge.verifySignatures false &&
|
2013-03-31 16:02:24 +00:00
|
|
|
git merge $(cat forged.commit)
|
|
|
|
'
|
|
|
|
|
2017-12-10 06:53:57 +00:00
|
|
|
test_expect_success GPG 'merge commit with bad signature with merge.verifySignatures=true and --no-verify-signatures' '
|
2017-12-15 19:42:36 +00:00
|
|
|
test_when_finished "git reset --hard && git checkout initial" &&
|
2017-12-10 06:53:57 +00:00
|
|
|
test_config merge.verifySignatures true &&
|
|
|
|
git merge --no-verify-signatures $(cat forged.commit)
|
|
|
|
'
|
|
|
|
|
2013-03-31 16:02:24 +00:00
|
|
|
test_done
|