ssh signing: tests for logs, tags & push certs
Signed-off-by: Fabian Stelzer <fs@gigacodes.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Fabian Stelzer
Junio C Hamano
parent
3326a783f1
commit
f265f2d630
@ -1616,6 +1616,16 @@ test_expect_success GPGSM 'setup signed branch x509' '
|
||||
git commit -S -m signed_commit
|
||||
'
|
||||
|
||||
test_expect_success GPGSSH 'setup sshkey signed branch' '
|
||||
test_config gpg.format ssh &&
|
||||
test_config user.signingkey "${GPGSSH_KEY_PRIMARY}" &&
|
||||
test_when_finished "git reset --hard && git checkout main" &&
|
||||
git checkout -b signed-ssh main &&
|
||||
echo foo >foo &&
|
||||
git add foo &&
|
||||
git commit -S -m signed_commit
|
||||
'
|
||||
|
||||
test_expect_success GPGSM 'log x509 fingerprint' '
|
||||
echo "F8BF62E0693D0694816377099909C779FA23FD65 | " >expect &&
|
||||
git log -n1 --format="%GF | %GP" signed-x509 >actual &&
|
||||
@ -1628,6 +1638,13 @@ test_expect_success GPGSM 'log OpenPGP fingerprint' '
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success GPGSSH 'log ssh key fingerprint' '
|
||||
test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
|
||||
ssh-keygen -lf "${GPGSSH_KEY_PRIMARY}" | awk "{print \$2\" | \"}" >expect &&
|
||||
git log -n1 --format="%GF | %GP" signed-ssh >actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success GPG 'log --graph --show-signature' '
|
||||
git log --graph --show-signature -n1 signed >actual &&
|
||||
grep "^| gpg: Signature made" actual &&
|
||||
@ -1640,6 +1657,12 @@ test_expect_success GPGSM 'log --graph --show-signature x509' '
|
||||
grep "^| gpgsm: Good signature" actual
|
||||
'
|
||||
|
||||
test_expect_success GPGSSH 'log --graph --show-signature ssh' '
|
||||
test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
|
||||
git log --graph --show-signature -n1 signed-ssh >actual &&
|
||||
grep "${GOOD_SIGNATURE_TRUSTED}" actual
|
||||
'
|
||||
|
||||
test_expect_success GPG 'log --graph --show-signature for merged tag' '
|
||||
test_when_finished "git reset --hard && git checkout main" &&
|
||||
git checkout -b plain main &&
|
||||
|
||||
@ -137,6 +137,53 @@ test_expect_success GPG 'signed push sends push certificate' '
|
||||
test_cmp expect dst/push-cert-status
|
||||
'
|
||||
|
||||
test_expect_success GPGSSH 'ssh signed push sends push certificate' '
|
||||
prepare_dst &&
|
||||
mkdir -p dst/.git/hooks &&
|
||||
git -C dst config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
|
||||
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 gpg.format ssh &&
|
||||
test_config user.signingkey "${GPGSSH_KEY_PRIMARY}" &&
|
||||
FINGERPRINT=$(ssh-keygen -lf "${GPGSSH_KEY_PRIMARY}" | awk "{print \$2;}") &&
|
||||
git push --signed dst noop ff +noff &&
|
||||
|
||||
(
|
||||
cat <<-\EOF &&
|
||||
SIGNER=principal with number 1
|
||||
KEY=FINGERPRINT
|
||||
STATUS=G
|
||||
NONCE_STATUS=OK
|
||||
EOF
|
||||
sed -n -e "s/^nonce /NONCE=/p" -e "/^$/q" dst/push-cert
|
||||
) | sed -e "s|FINGERPRINT|$FINGERPRINT|" >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 &&
|
||||
@ -276,6 +323,60 @@ test_expect_success GPGSM 'fail without key and heed user.signingkey x509' '
|
||||
test_cmp expect dst/push-cert-status
|
||||
'
|
||||
|
||||
test_expect_success GPGSSH 'fail without key and heed user.signingkey ssh' '
|
||||
test_config gpg.format ssh &&
|
||||
prepare_dst &&
|
||||
mkdir -p dst/.git/hooks &&
|
||||
git -C dst config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
|
||||
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 gpg.format ssh &&
|
||||
test_config user.signingkey "" &&
|
||||
(
|
||||
sane_unset GIT_COMMITTER_EMAIL &&
|
||||
test_must_fail git push --signed dst noop ff +noff
|
||||
) &&
|
||||
test_config user.signingkey "${GPGSSH_KEY_PRIMARY}" &&
|
||||
FINGERPRINT=$(ssh-keygen -lf "${GPGSSH_KEY_PRIMARY}" | awk "{print \$2;}") &&
|
||||
git push --signed dst noop ff +noff &&
|
||||
|
||||
(
|
||||
cat <<-\EOF &&
|
||||
SIGNER=principal with number 1
|
||||
KEY=FINGERPRINT
|
||||
STATUS=G
|
||||
NONCE_STATUS=OK
|
||||
EOF
|
||||
sed -n -e "s/^nonce /NONCE=/p" -e "/^$/q" dst/push-cert
|
||||
) | sed -e "s|FINGERPRINT|$FINGERPRINT|" >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 &&
|
||||
|
||||
161
t/t7031-verify-tag-signed-ssh.sh
Executable file
161
t/t7031-verify-tag-signed-ssh.sh
Executable file
@ -0,0 +1,161 @@
|
||||
#!/bin/sh
|
||||
|
||||
test_description='signed tag tests'
|
||||
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
||||
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
||||
|
||||
. ./test-lib.sh
|
||||
. "$TEST_DIRECTORY/lib-gpg.sh"
|
||||
|
||||
test_expect_success GPGSSH 'create signed tags ssh' '
|
||||
test_when_finished "test_unconfig commit.gpgsign" &&
|
||||
test_config gpg.format ssh &&
|
||||
test_config user.signingkey "${GPGSSH_KEY_PRIMARY}" &&
|
||||
|
||||
echo 1 >file && git add file &&
|
||||
test_tick && git commit -m initial &&
|
||||
git tag -s -m initial initial &&
|
||||
git branch side &&
|
||||
|
||||
echo 2 >file && test_tick && git commit -a -m second &&
|
||||
git tag -s -m second second &&
|
||||
|
||||
git checkout side &&
|
||||
echo 3 >elif && git add elif &&
|
||||
test_tick && git commit -m "third on side" &&
|
||||
|
||||
git checkout main &&
|
||||
test_tick && git merge -S side &&
|
||||
git tag -s -m merge merge &&
|
||||
|
||||
echo 4 >file && test_tick && git commit -a -S -m "fourth unsigned" &&
|
||||
git tag -a -m fourth-unsigned fourth-unsigned &&
|
||||
|
||||
test_tick && git commit --amend -S -m "fourth signed" &&
|
||||
git tag -s -m fourth fourth-signed &&
|
||||
|
||||
echo 5 >file && test_tick && git commit -a -m "fifth" &&
|
||||
git tag fifth-unsigned &&
|
||||
|
||||
git config commit.gpgsign true &&
|
||||
echo 6 >file && test_tick && git commit -a -m "sixth" &&
|
||||
git tag -a -m sixth sixth-unsigned &&
|
||||
|
||||
test_tick && git rebase -f HEAD^^ && git tag -s -m 6th sixth-signed HEAD^ &&
|
||||
git tag -m seventh -s seventh-signed &&
|
||||
|
||||
echo 8 >file && test_tick && git commit -a -m eighth &&
|
||||
git tag -u"${GPGSSH_KEY_UNTRUSTED}" -m eighth eighth-signed-alt
|
||||
'
|
||||
|
||||
test_expect_success GPGSSH 'verify and show ssh signatures' '
|
||||
test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
|
||||
(
|
||||
for tag in initial second merge fourth-signed sixth-signed seventh-signed
|
||||
do
|
||||
git verify-tag $tag 2>actual &&
|
||||
grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
|
||||
! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
|
||||
echo $tag OK || exit 1
|
||||
done
|
||||
) &&
|
||||
(
|
||||
for tag in fourth-unsigned fifth-unsigned sixth-unsigned
|
||||
do
|
||||
test_must_fail git verify-tag $tag 2>actual &&
|
||||
! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
|
||||
! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
|
||||
echo $tag OK || exit 1
|
||||
done
|
||||
) &&
|
||||
(
|
||||
for tag in eighth-signed-alt
|
||||
do
|
||||
test_must_fail git verify-tag $tag 2>actual &&
|
||||
grep "${GPGSSH_GOOD_SIGNATURE_UNTRUSTED}" actual &&
|
||||
! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
|
||||
grep "${GPGSSH_KEY_NOT_TRUSTED}" actual &&
|
||||
echo $tag OK || exit 1
|
||||
done
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success GPGSSH 'detect fudged ssh signature' '
|
||||
test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
|
||||
git cat-file tag seventh-signed >raw &&
|
||||
sed -e "/^tag / s/seventh/7th forged/" raw >forged1 &&
|
||||
git hash-object -w -t tag forged1 >forged1.tag &&
|
||||
test_must_fail git verify-tag $(cat forged1.tag) 2>actual1 &&
|
||||
grep "${GPGSSH_BAD_SIGNATURE}" actual1 &&
|
||||
! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual1 &&
|
||||
! grep "${GPGSSH_GOOD_SIGNATURE_UNTRUSTED}" actual1
|
||||
'
|
||||
|
||||
test_expect_success GPGSSH 'verify ssh signatures with --raw' '
|
||||
test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
|
||||
(
|
||||
for tag in initial second merge fourth-signed sixth-signed seventh-signed
|
||||
do
|
||||
git verify-tag --raw $tag 2>actual &&
|
||||
grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
|
||||
! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
|
||||
echo $tag OK || exit 1
|
||||
done
|
||||
) &&
|
||||
(
|
||||
for tag in fourth-unsigned fifth-unsigned sixth-unsigned
|
||||
do
|
||||
test_must_fail git verify-tag --raw $tag 2>actual &&
|
||||
! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
|
||||
! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
|
||||
echo $tag OK || exit 1
|
||||
done
|
||||
) &&
|
||||
(
|
||||
for tag in eighth-signed-alt
|
||||
do
|
||||
test_must_fail git verify-tag --raw $tag 2>actual &&
|
||||
grep "${GPGSSH_GOOD_SIGNATURE_UNTRUSTED}" actual &&
|
||||
! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
|
||||
echo $tag OK || exit 1
|
||||
done
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success GPGSSH 'verify signatures with --raw ssh' '
|
||||
test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
|
||||
git verify-tag --raw sixth-signed 2>actual &&
|
||||
grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
|
||||
! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
|
||||
echo sixth-signed OK
|
||||
'
|
||||
|
||||
test_expect_success GPGSSH 'verify multiple tags ssh' '
|
||||
test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
|
||||
tags="seventh-signed sixth-signed" &&
|
||||
for i in $tags
|
||||
do
|
||||
git verify-tag -v --raw $i || return 1
|
||||
done >expect.stdout 2>expect.stderr.1 &&
|
||||
grep "^${GPGSSH_GOOD_SIGNATURE_TRUSTED}" <expect.stderr.1 >expect.stderr &&
|
||||
git verify-tag -v --raw $tags >actual.stdout 2>actual.stderr.1 &&
|
||||
grep "^${GPGSSH_GOOD_SIGNATURE_TRUSTED}" <actual.stderr.1 >actual.stderr &&
|
||||
test_cmp expect.stdout actual.stdout &&
|
||||
test_cmp expect.stderr actual.stderr
|
||||
'
|
||||
|
||||
test_expect_success GPGSSH 'verifying tag with --format - ssh' '
|
||||
test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
|
||||
cat >expect <<-\EOF &&
|
||||
tagname : fourth-signed
|
||||
EOF
|
||||
git verify-tag --format="tagname : %(tag)" "fourth-signed" >actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success GPGSSH 'verifying a forged tag with --format should fail silently - ssh' '
|
||||
test_must_fail git verify-tag --format="tagname : %(tag)" $(cat forged1.tag) >actual-forged &&
|
||||
test_must_be_empty actual-forged
|
||||
'
|
||||
|
||||
test_done
|
||||
Loading…
Reference in New Issue
Block a user