f4609b896f
This also bumps the stable nixpkgs to 20.09 as of 2020-11-21, because there is some breakage in the git build related to the netrc credentials helper which someone has taken care of in nixpkgs. The stable channel is not used for anything other than git, so this should be fine. Change-Id: I3575a19dab09e1e9556cf8231d717de9890484fb
298 lines
8 KiB
Bash
Executable file
298 lines
8 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='signed push'
|
|
|
|
. ./test-lib.sh
|
|
. "$TEST_DIRECTORY"/lib-gpg.sh
|
|
|
|
prepare_dst () {
|
|
rm -fr dst &&
|
|
test_create_repo dst &&
|
|
|
|
git push dst master:noop master:ff master:noff
|
|
}
|
|
|
|
test_expect_success setup '
|
|
# master, ff and noff branches pointing at the same commit
|
|
test_tick &&
|
|
git commit --allow-empty -m initial &&
|
|
|
|
git checkout -b noop &&
|
|
git checkout -b ff &&
|
|
git checkout -b noff &&
|
|
|
|
# noop stays the same, ff advances, noff rewrites
|
|
test_tick &&
|
|
git commit --allow-empty --amend -m rewritten &&
|
|
git checkout ff &&
|
|
|
|
test_tick &&
|
|
git commit --allow-empty -m second
|
|
'
|
|
|
|
test_expect_success 'unsigned push does not send push certificate' '
|
|
prepare_dst &&
|
|
mkdir -p dst/.git/hooks &&
|
|
write_script dst/.git/hooks/post-receive <<-\EOF &&
|
|
# discard the update list
|
|
cat >/dev/null
|
|
# record the push certificate
|
|
if test -n "${GIT_PUSH_CERT-}"
|
|
then
|
|
git cat-file blob $GIT_PUSH_CERT >../push-cert
|
|
fi
|
|
EOF
|
|
|
|
git push dst noop ff +noff &&
|
|
! test -f dst/push-cert
|
|
'
|
|
|
|
test_expect_success 'talking with a receiver without push certificate support' '
|
|
prepare_dst &&
|
|
mkdir -p dst/.git/hooks &&
|
|
write_script dst/.git/hooks/post-receive <<-\EOF &&
|
|
# discard the update list
|
|
cat >/dev/null
|
|
# record the push certificate
|
|
if test -n "${GIT_PUSH_CERT-}"
|
|
then
|
|
git cat-file blob $GIT_PUSH_CERT >../push-cert
|
|
fi
|
|
EOF
|
|
|
|
git push dst noop ff +noff &&
|
|
! test -f dst/push-cert
|
|
'
|
|
|
|
test_expect_success 'push --signed fails with a receiver without push certificate support' '
|
|
prepare_dst &&
|
|
mkdir -p dst/.git/hooks &&
|
|
test_must_fail git push --signed dst noop ff +noff 2>err &&
|
|
test_i18ngrep "the receiving end does not support" err
|
|
'
|
|
|
|
test_expect_success 'push --signed=1 is accepted' '
|
|
prepare_dst &&
|
|
mkdir -p dst/.git/hooks &&
|
|
test_must_fail git push --signed=1 dst noop ff +noff 2>err &&
|
|
test_i18ngrep "the receiving end does not support" err
|
|
'
|
|
|
|
test_expect_success GPG 'no certificate for a signed push with no update' '
|
|
prepare_dst &&
|
|
mkdir -p dst/.git/hooks &&
|
|
write_script dst/.git/hooks/post-receive <<-\EOF &&
|
|
if test -n "${GIT_PUSH_CERT-}"
|
|
then
|
|
git cat-file blob $GIT_PUSH_CERT >../push-cert
|
|
fi
|
|
EOF
|
|
git push dst noop &&
|
|
! test -f dst/push-cert
|
|
'
|
|
|
|
test_expect_success GPG 'signed push sends push certificate' '
|
|
prepare_dst &&
|
|
mkdir -p dst/.git/hooks &&
|
|
git -C dst config receive.certnonceseed sekrit &&
|
|
write_script dst/.git/hooks/post-receive <<-\EOF &&
|
|
# discard the update list
|
|
cat >/dev/null
|
|
# record the push certificate
|
|
if test -n "${GIT_PUSH_CERT-}"
|
|
then
|
|
git cat-file blob $GIT_PUSH_CERT >../push-cert
|
|
fi &&
|
|
|
|
cat >../push-cert-status <<E_O_F
|
|
SIGNER=${GIT_PUSH_CERT_SIGNER-nobody}
|
|
KEY=${GIT_PUSH_CERT_KEY-nokey}
|
|
STATUS=${GIT_PUSH_CERT_STATUS-nostatus}
|
|
NONCE_STATUS=${GIT_PUSH_CERT_NONCE_STATUS-nononcestatus}
|
|
NONCE=${GIT_PUSH_CERT_NONCE-nononce}
|
|
E_O_F
|
|
|
|
EOF
|
|
|
|
git push --signed dst noop ff +noff &&
|
|
|
|
(
|
|
cat <<-\EOF &&
|
|
SIGNER=C O Mitter <committer@example.com>
|
|
KEY=13B6F51ECDDE430D
|
|
STATUS=G
|
|
NONCE_STATUS=OK
|
|
EOF
|
|
sed -n -e "s/^nonce /NONCE=/p" -e "/^$/q" dst/push-cert
|
|
) >expect &&
|
|
|
|
noop=$(git rev-parse noop) &&
|
|
ff=$(git rev-parse ff) &&
|
|
noff=$(git rev-parse noff) &&
|
|
grep "$noop $ff refs/heads/ff" dst/push-cert &&
|
|
grep "$noop $noff refs/heads/noff" dst/push-cert &&
|
|
test_cmp expect dst/push-cert-status
|
|
'
|
|
|
|
test_expect_success GPG 'inconsistent push options in signed push not allowed' '
|
|
# First, invoke receive-pack with dummy input to obtain its preamble.
|
|
prepare_dst &&
|
|
git -C dst config receive.certnonceseed sekrit &&
|
|
git -C dst config receive.advertisepushoptions 1 &&
|
|
printf xxxx | test_might_fail git receive-pack dst >preamble &&
|
|
|
|
# Then, invoke push. Simulate a receive-pack that sends the preamble we
|
|
# obtained, followed by a dummy packet.
|
|
write_script myscript <<-\EOF &&
|
|
cat preamble &&
|
|
printf xxxx &&
|
|
cat >push
|
|
EOF
|
|
test_might_fail git push --push-option="foo" --push-option="bar" \
|
|
--receive-pack="\"$(pwd)/myscript\"" --signed dst --delete ff &&
|
|
|
|
# Replay the push output on a fresh dst, checking that ff is truly
|
|
# deleted.
|
|
prepare_dst &&
|
|
git -C dst config receive.certnonceseed sekrit &&
|
|
git -C dst config receive.advertisepushoptions 1 &&
|
|
git receive-pack dst <push &&
|
|
test_must_fail git -C dst rev-parse ff &&
|
|
|
|
# Tweak the push output to make the push option outside the cert
|
|
# different, then replay it on a fresh dst, checking that ff is not
|
|
# deleted.
|
|
perl -pe "s/([^ ])bar/\$1baz/" push >push.tweak &&
|
|
prepare_dst &&
|
|
git -C dst config receive.certnonceseed sekrit &&
|
|
git -C dst config receive.advertisepushoptions 1 &&
|
|
git receive-pack dst <push.tweak >out &&
|
|
git -C dst rev-parse ff &&
|
|
grep "inconsistent push options" out
|
|
'
|
|
|
|
test_expect_success GPG 'fail without key and heed user.signingkey' '
|
|
prepare_dst &&
|
|
mkdir -p dst/.git/hooks &&
|
|
git -C dst config receive.certnonceseed sekrit &&
|
|
write_script dst/.git/hooks/post-receive <<-\EOF &&
|
|
# discard the update list
|
|
cat >/dev/null
|
|
# record the push certificate
|
|
if test -n "${GIT_PUSH_CERT-}"
|
|
then
|
|
git cat-file blob $GIT_PUSH_CERT >../push-cert
|
|
fi &&
|
|
|
|
cat >../push-cert-status <<E_O_F
|
|
SIGNER=${GIT_PUSH_CERT_SIGNER-nobody}
|
|
KEY=${GIT_PUSH_CERT_KEY-nokey}
|
|
STATUS=${GIT_PUSH_CERT_STATUS-nostatus}
|
|
NONCE_STATUS=${GIT_PUSH_CERT_NONCE_STATUS-nononcestatus}
|
|
NONCE=${GIT_PUSH_CERT_NONCE-nononce}
|
|
E_O_F
|
|
|
|
EOF
|
|
|
|
test_config user.email hasnokey@nowhere.com &&
|
|
(
|
|
sane_unset GIT_COMMITTER_EMAIL &&
|
|
test_must_fail git push --signed dst noop ff +noff
|
|
) &&
|
|
test_config user.signingkey $GIT_COMMITTER_EMAIL &&
|
|
git push --signed dst noop ff +noff &&
|
|
|
|
(
|
|
cat <<-\EOF &&
|
|
SIGNER=C O Mitter <committer@example.com>
|
|
KEY=13B6F51ECDDE430D
|
|
STATUS=G
|
|
NONCE_STATUS=OK
|
|
EOF
|
|
sed -n -e "s/^nonce /NONCE=/p" -e "/^$/q" dst/push-cert
|
|
) >expect &&
|
|
|
|
noop=$(git rev-parse noop) &&
|
|
ff=$(git rev-parse ff) &&
|
|
noff=$(git rev-parse noff) &&
|
|
grep "$noop $ff refs/heads/ff" dst/push-cert &&
|
|
grep "$noop $noff refs/heads/noff" dst/push-cert &&
|
|
test_cmp expect dst/push-cert-status
|
|
'
|
|
|
|
test_expect_success GPGSM 'fail without key and heed user.signingkey x509' '
|
|
test_config gpg.format x509 &&
|
|
prepare_dst &&
|
|
mkdir -p dst/.git/hooks &&
|
|
git -C dst config receive.certnonceseed sekrit &&
|
|
write_script dst/.git/hooks/post-receive <<-\EOF &&
|
|
# discard the update list
|
|
cat >/dev/null
|
|
# record the push certificate
|
|
if test -n "${GIT_PUSH_CERT-}"
|
|
then
|
|
git cat-file blob $GIT_PUSH_CERT >../push-cert
|
|
fi &&
|
|
|
|
cat >../push-cert-status <<E_O_F
|
|
SIGNER=${GIT_PUSH_CERT_SIGNER-nobody}
|
|
KEY=${GIT_PUSH_CERT_KEY-nokey}
|
|
STATUS=${GIT_PUSH_CERT_STATUS-nostatus}
|
|
NONCE_STATUS=${GIT_PUSH_CERT_NONCE_STATUS-nononcestatus}
|
|
NONCE=${GIT_PUSH_CERT_NONCE-nononce}
|
|
E_O_F
|
|
|
|
EOF
|
|
|
|
test_config user.email hasnokey@nowhere.com &&
|
|
test_config user.signingkey "" &&
|
|
(
|
|
sane_unset GIT_COMMITTER_EMAIL &&
|
|
test_must_fail git push --signed dst noop ff +noff
|
|
) &&
|
|
test_config user.signingkey $GIT_COMMITTER_EMAIL &&
|
|
git push --signed dst noop ff +noff &&
|
|
|
|
(
|
|
cat <<-\EOF &&
|
|
SIGNER=/CN=C O Mitter/O=Example/SN=C O/GN=Mitter
|
|
KEY=
|
|
STATUS=G
|
|
NONCE_STATUS=OK
|
|
EOF
|
|
sed -n -e "s/^nonce /NONCE=/p" -e "/^$/q" dst/push-cert
|
|
) >expect.in &&
|
|
key=$(cat "${GNUPGHOME}/trustlist.txt" | cut -d" " -f1 | tr -d ":") &&
|
|
sed -e "s/^KEY=/KEY=${key}/" expect.in >expect &&
|
|
|
|
noop=$(git rev-parse noop) &&
|
|
ff=$(git rev-parse ff) &&
|
|
noff=$(git rev-parse noff) &&
|
|
grep "$noop $ff refs/heads/ff" dst/push-cert &&
|
|
grep "$noop $noff refs/heads/noff" dst/push-cert &&
|
|
test_cmp expect dst/push-cert-status
|
|
'
|
|
|
|
test_expect_success GPG 'failed atomic push does not execute GPG' '
|
|
prepare_dst &&
|
|
git -C dst config receive.certnonceseed sekrit &&
|
|
write_script gpg <<-EOF &&
|
|
# should check atomic push locally before running GPG.
|
|
exit 1
|
|
EOF
|
|
test_must_fail env PATH="$TRASH_DIRECTORY:$PATH" git push \
|
|
--signed --atomic --porcelain \
|
|
dst noop ff noff >out 2>err &&
|
|
|
|
test_i18ngrep ! "gpg failed to sign" err &&
|
|
cat >expect <<-EOF &&
|
|
To dst
|
|
= refs/heads/noop:refs/heads/noop [up to date]
|
|
! refs/heads/ff:refs/heads/ff [rejected] (atomic push failed)
|
|
! refs/heads/noff:refs/heads/noff [rejected] (non-fast-forward)
|
|
Done
|
|
EOF
|
|
test_cmp expect out
|
|
'
|
|
|
|
test_done
|