2013-03-31 18:02:24 +02:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
|
|
test_description='merge signature verification tests'
|
2020-11-19 00:44:40 +01:00
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
tests: mark tests relying on the current default for `init.defaultBranch`
In addition to the manual adjustment to let the `linux-gcc` CI job run
the test suite with `master` and then with `main`, this patch makes sure
that GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME is set in all test scripts
that currently rely on the initial branch name being `master by default.
To determine which test scripts to mark up, the first step was to
force-set the default branch name to `master` in
- all test scripts that contain the keyword `master`,
- t4211, which expects `t/t4211/history.export` with a hard-coded ref to
initialize the default branch,
- t5560 because it sources `t/t556x_common` which uses `master`,
- t8002 and t8012 because both source `t/annotate-tests.sh` which also
uses `master`)
This trick was performed by this command:
$ sed -i '/^ *\. \.\/\(test-lib\|lib-\(bash\|cvs\|git-svn\)\|gitweb-lib\)\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' $(git grep -l master t/t[0-9]*.sh) \
t/t4211*.sh t/t5560*.sh t/t8002*.sh t/t8012*.sh
After that, careful, manual inspection revealed that some of the test
scripts containing the needle `master` do not actually rely on a
specific default branch name: either they mention `master` only in a
comment, or they initialize that branch specificially, or they do not
actually refer to the current default branch. Therefore, the
aforementioned modification was undone in those test scripts thusly:
$ git checkout HEAD -- \
t/t0027-auto-crlf.sh t/t0060-path-utils.sh \
t/t1011-read-tree-sparse-checkout.sh \
t/t1305-config-include.sh t/t1309-early-config.sh \
t/t1402-check-ref-format.sh t/t1450-fsck.sh \
t/t2024-checkout-dwim.sh \
t/t2106-update-index-assume-unchanged.sh \
t/t3040-subprojects-basic.sh t/t3301-notes.sh \
t/t3308-notes-merge.sh t/t3423-rebase-reword.sh \
t/t3436-rebase-more-options.sh \
t/t4015-diff-whitespace.sh t/t4257-am-interactive.sh \
t/t5323-pack-redundant.sh t/t5401-update-hooks.sh \
t/t5511-refspec.sh t/t5526-fetch-submodules.sh \
t/t5529-push-errors.sh t/t5530-upload-pack-error.sh \
t/t5548-push-porcelain.sh \
t/t5552-skipping-fetch-negotiator.sh \
t/t5572-pull-submodule.sh t/t5608-clone-2gb.sh \
t/t5614-clone-submodules-shallow.sh \
t/t7508-status.sh t/t7606-merge-custom.sh \
t/t9302-fast-import-unpack-limit.sh
We excluded one set of test scripts in these commands, though: the range
of `git p4` tests. The reason? `git p4` stores the (foreign) remote
branch in the branch called `p4/master`, which is obviously not the
default branch. Manual analysis revealed that only five of these tests
actually require a specific default branch name to pass; They were
modified thusly:
$ sed -i '/^ *\. \.\/lib-git-p4\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' t/t980[0167]*.sh t/t9811*.sh
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-11-19 00:44:19 +01:00
|
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
|
|
2013-03-31 18:02:24 +02:00
|
|
|
. ./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 &&
|
tests: make forging GPG signed commits and tags more robust
A couple of test scripts create forged GPG signed commits or tags to
check that such forgery can't fool various git commands' signature
verification. All but one of those test scripts are prone to
occasional failures because the forgery creates a bogus GPG signature,
and git commands error out with an unexpected error message, e.g.
"Commit deadbeef does not have a GPG signature" instead of "... has a
bad GPG signature".
't5573-pull-verify-signatures.sh', 't7510-signed-commit.sh' and
't7612-merge-verify-signatures.sh' create forged signed commits like
this:
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
On rare occasions the given pattern occurs not only in the commit
message but in the GPG signature as well, and after it's replaced in
the signature the resulting signature becomes invalid, GPG will report
CRC error and that it couldn't find any signature, which will then
ultimately cause the test failure.
Since in all three cases the pattern to be replaced during the forgery
is the first word of the commit message's subject line, and since the
GPG signature in the commit object is indented by a space, let's just
anchor those patterns to the beginning of the line to prevent this
issue.
The test script 't7030-verify-tag.sh' creates a forged signed tag
object in a similar way by replacing the pattern "seventh", but the
GPG signature in tag objects is not indented by a space, so the above
solution is not applicable in this case. However, in the tag object
in question the pattern "seventh" occurs not only in the tag message
but in the 'tag' header as well. To create a forged tag object it's
sufficient to replace only one of the two occurences, so modify the
sed script to limit the pattern to the 'tag' header (i.e. a line
beginning with "tag ", which, because of the space character, can
never occur in the base64-encoded GPG signature).
Note that the forgery in 't7004-tag.sh' is not affected by this issue:
while 't7004' does create a forged signed tag kind of the same way,
it replaces "signed-tag" in the tag object, which, because of the '-'
character, can never occur in the base64-encoded GPG signarute.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-06-04 15:39:26 +02:00
|
|
|
sed -e "s/^bad/forged bad/" raw >forged &&
|
2013-03-31 18:02:24 +02:00
|
|
|
git hash-object -w -t commit forged >forged.commit &&
|
|
|
|
|
git checkout initial &&
|
|
|
|
|
|
2013-03-31 18:02:46 +02:00
|
|
|
git checkout -b side-untrusted &&
|
|
|
|
|
echo 3 >baz && git add baz &&
|
2015-03-20 11:07:15 +01:00
|
|
|
test_tick && git commit -SB7227189 -m "untrusted on side" &&
|
2013-03-31 18:02:46 +02:00
|
|
|
|
2020-11-19 00:44:40 +01:00
|
|
|
git checkout main
|
2013-03-31 18:02:24 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success GPG 'merge unsigned commit with verification' '
|
2017-12-15 20:42:36 +01:00
|
|
|
test_when_finished "git reset --hard && git checkout initial" &&
|
2013-03-31 18:02:24 +02: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 07:53:57 +01:00
|
|
|
test_expect_success GPG 'merge unsigned commit with merge.verifySignatures=true' '
|
2017-12-15 20:42:36 +01:00
|
|
|
test_when_finished "git reset --hard && git checkout initial" &&
|
2017-12-10 07:53:57 +01: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 18:02:24 +02:00
|
|
|
test_expect_success GPG 'merge commit with bad signature with verification' '
|
2017-12-15 20:42:36 +01:00
|
|
|
test_when_finished "git reset --hard && git checkout initial" &&
|
2013-03-31 18:02:24 +02: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 07:53:57 +01:00
|
|
|
test_expect_success GPG 'merge commit with bad signature with merge.verifySignatures=true' '
|
2017-12-15 20:42:36 +01:00
|
|
|
test_when_finished "git reset --hard && git checkout initial" &&
|
2017-12-10 07:53:57 +01: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 18:02:46 +02:00
|
|
|
test_expect_success GPG 'merge commit with untrusted signature with verification' '
|
2017-12-15 20:42:36 +01:00
|
|
|
test_when_finished "git reset --hard && git checkout initial" &&
|
2013-03-31 18:02:46 +02:00
|
|
|
test_must_fail git merge --ff-only --verify-signatures side-untrusted 2>mergeerror &&
|
|
|
|
|
test_i18ngrep "has an untrusted GPG signature" mergeerror
|
|
|
|
|
'
|
|
|
|
|
|
gpg-interface: add minTrustLevel as a configuration option
Previously, signature verification for merge and pull operations checked
if the key had a trust-level of either TRUST_NEVER or TRUST_UNDEFINED in
verify_merge_signature(). If that was the case, the process die()d.
The other code paths that did signature verification relied entirely on
the return code from check_commit_signature(). And signatures made with
a good key, irregardless of its trust level, was considered valid by
check_commit_signature().
This difference in behavior might induce users to erroneously assume
that the trust level of a key in their keyring is always considered by
Git, even for operations where it is not (e.g. during a verify-commit or
verify-tag).
The way it worked was by gpg-interface.c storing the result from the
key/signature status *and* the lowest-two trust levels in the `result`
member of the signature_check structure (the last of these status lines
that were encountered got written to `result`). These are documented in
GPG under the subsection `General status codes` and `Key related`,
respectively [1].
The GPG documentation says the following on the TRUST_ status codes [1]:
"""
These are several similar status codes:
- TRUST_UNDEFINED <error_token>
- TRUST_NEVER <error_token>
- TRUST_MARGINAL [0 [<validation_model>]]
- TRUST_FULLY [0 [<validation_model>]]
- TRUST_ULTIMATE [0 [<validation_model>]]
For good signatures one of these status lines are emitted to
indicate the validity of the key used to create the signature.
The error token values are currently only emitted by gpgsm.
"""
My interpretation is that the trust level is conceptionally different
from the validity of the key and/or signature. That seems to also have
been the assumption of the old code in check_signature() where a result
of 'G' (as in GOODSIG) and 'U' (as in TRUST_NEVER or TRUST_UNDEFINED)
were both considered a success.
The two cases where a result of 'U' had special meaning were in
verify_merge_signature() (where this caused git to die()) and in
format_commit_one() (where it affected the output of the %G? format
specifier).
I think it makes sense to refactor the processing of TRUST_ status lines
such that users can configure a minimum trust level that is enforced
globally, rather than have individual parts of git (e.g. merge) do it
themselves (except for a grace period with backward compatibility).
I also think it makes sense to not store the trust level in the same
struct member as the key/signature status. While the presence of a
TRUST_ status code does imply that the signature is good (see the first
paragraph in the included snippet above), as far as I can tell, the
order of the status lines from GPG isn't well-defined; thus it would
seem plausible that the trust level could be overwritten with the
key/signature status if they were stored in the same member of the
signature_check structure.
This patch introduces a new configuration option: gpg.minTrustLevel. It
consolidates trust-level verification to gpg-interface.c and adds a new
`trust_level` member to the signature_check structure.
Backward-compatibility is maintained by introducing a special case in
verify_merge_signature() such that if no user-configurable
gpg.minTrustLevel is set, then the old behavior of rejecting
TRUST_UNDEFINED and TRUST_NEVER is enforced. If, on the other hand,
gpg.minTrustLevel is set, then that value overrides the old behavior.
Similarly, the %G? format specifier will continue show 'U' for
signatures made with a key that has a trust level of TRUST_UNDEFINED or
TRUST_NEVER, even though the 'U' character no longer exist in the
`result` member of the signature_check structure. A new format
specifier, %GT, is also introduced for users that want to show all
possible trust levels for a signature.
Another approach would have been to simply drop the trust-level
requirement in verify_merge_signature(). This would also have made the
behavior consistent with other parts of git that perform signature
verification. However, requiring a minimum trust level for signing keys
does seem to have a real-world use-case. For example, the build system
used by the Qubes OS project currently parses the raw output from
verify-tag in order to assert a minimum trust level for keys used to
sign git tags [2].
[1] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=blob;f=doc/doc/DETAILS;h=bd00006e933ac56719b1edd2478ecd79273eae72;hb=refs/heads/master
[2] https://github.com/QubesOS/qubes-builder/blob/9674c1991deef45b1a1b1c71fddfab14ba50dccf/scripts/verify-git-tag#L43
Signed-off-by: Hans Jerry Illikainen <hji@dyntopia.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-12-27 14:55:57 +01:00
|
|
|
test_expect_success GPG 'merge commit with untrusted signature with verification and high minTrustLevel' '
|
|
|
|
|
test_when_finished "git reset --hard && git checkout initial" &&
|
|
|
|
|
test_config gpg.minTrustLevel marginal &&
|
|
|
|
|
test_must_fail git merge --ff-only --verify-signatures side-untrusted 2>mergeerror &&
|
|
|
|
|
test_i18ngrep "has an untrusted GPG signature" mergeerror
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success GPG 'merge commit with untrusted signature with verification and low minTrustLevel' '
|
|
|
|
|
test_when_finished "git reset --hard && git checkout initial" &&
|
|
|
|
|
test_config gpg.minTrustLevel undefined &&
|
|
|
|
|
git merge --ff-only --verify-signatures side-untrusted >mergeoutput &&
|
|
|
|
|
test_i18ngrep "has a good GPG signature" mergeoutput
|
|
|
|
|
'
|
|
|
|
|
|
2017-12-10 07:53:57 +01:00
|
|
|
test_expect_success GPG 'merge commit with untrusted signature with merge.verifySignatures=true' '
|
2017-12-15 20:42:36 +01:00
|
|
|
test_when_finished "git reset --hard && git checkout initial" &&
|
2017-12-10 07:53:57 +01: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
|
|
|
|
|
'
|
|
|
|
|
|
gpg-interface: add minTrustLevel as a configuration option
Previously, signature verification for merge and pull operations checked
if the key had a trust-level of either TRUST_NEVER or TRUST_UNDEFINED in
verify_merge_signature(). If that was the case, the process die()d.
The other code paths that did signature verification relied entirely on
the return code from check_commit_signature(). And signatures made with
a good key, irregardless of its trust level, was considered valid by
check_commit_signature().
This difference in behavior might induce users to erroneously assume
that the trust level of a key in their keyring is always considered by
Git, even for operations where it is not (e.g. during a verify-commit or
verify-tag).
The way it worked was by gpg-interface.c storing the result from the
key/signature status *and* the lowest-two trust levels in the `result`
member of the signature_check structure (the last of these status lines
that were encountered got written to `result`). These are documented in
GPG under the subsection `General status codes` and `Key related`,
respectively [1].
The GPG documentation says the following on the TRUST_ status codes [1]:
"""
These are several similar status codes:
- TRUST_UNDEFINED <error_token>
- TRUST_NEVER <error_token>
- TRUST_MARGINAL [0 [<validation_model>]]
- TRUST_FULLY [0 [<validation_model>]]
- TRUST_ULTIMATE [0 [<validation_model>]]
For good signatures one of these status lines are emitted to
indicate the validity of the key used to create the signature.
The error token values are currently only emitted by gpgsm.
"""
My interpretation is that the trust level is conceptionally different
from the validity of the key and/or signature. That seems to also have
been the assumption of the old code in check_signature() where a result
of 'G' (as in GOODSIG) and 'U' (as in TRUST_NEVER or TRUST_UNDEFINED)
were both considered a success.
The two cases where a result of 'U' had special meaning were in
verify_merge_signature() (where this caused git to die()) and in
format_commit_one() (where it affected the output of the %G? format
specifier).
I think it makes sense to refactor the processing of TRUST_ status lines
such that users can configure a minimum trust level that is enforced
globally, rather than have individual parts of git (e.g. merge) do it
themselves (except for a grace period with backward compatibility).
I also think it makes sense to not store the trust level in the same
struct member as the key/signature status. While the presence of a
TRUST_ status code does imply that the signature is good (see the first
paragraph in the included snippet above), as far as I can tell, the
order of the status lines from GPG isn't well-defined; thus it would
seem plausible that the trust level could be overwritten with the
key/signature status if they were stored in the same member of the
signature_check structure.
This patch introduces a new configuration option: gpg.minTrustLevel. It
consolidates trust-level verification to gpg-interface.c and adds a new
`trust_level` member to the signature_check structure.
Backward-compatibility is maintained by introducing a special case in
verify_merge_signature() such that if no user-configurable
gpg.minTrustLevel is set, then the old behavior of rejecting
TRUST_UNDEFINED and TRUST_NEVER is enforced. If, on the other hand,
gpg.minTrustLevel is set, then that value overrides the old behavior.
Similarly, the %G? format specifier will continue show 'U' for
signatures made with a key that has a trust level of TRUST_UNDEFINED or
TRUST_NEVER, even though the 'U' character no longer exist in the
`result` member of the signature_check structure. A new format
specifier, %GT, is also introduced for users that want to show all
possible trust levels for a signature.
Another approach would have been to simply drop the trust-level
requirement in verify_merge_signature(). This would also have made the
behavior consistent with other parts of git that perform signature
verification. However, requiring a minimum trust level for signing keys
does seem to have a real-world use-case. For example, the build system
used by the Qubes OS project currently parses the raw output from
verify-tag in order to assert a minimum trust level for keys used to
sign git tags [2].
[1] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=blob;f=doc/doc/DETAILS;h=bd00006e933ac56719b1edd2478ecd79273eae72;hb=refs/heads/master
[2] https://github.com/QubesOS/qubes-builder/blob/9674c1991deef45b1a1b1c71fddfab14ba50dccf/scripts/verify-git-tag#L43
Signed-off-by: Hans Jerry Illikainen <hji@dyntopia.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-12-27 14:55:57 +01:00
|
|
|
test_expect_success GPG 'merge commit with untrusted signature with merge.verifySignatures=true and minTrustLevel' '
|
|
|
|
|
test_when_finished "git reset --hard && git checkout initial" &&
|
|
|
|
|
test_config merge.verifySignatures true &&
|
|
|
|
|
test_config gpg.minTrustLevel marginal &&
|
|
|
|
|
test_must_fail git merge --ff-only side-untrusted 2>mergeerror &&
|
|
|
|
|
test_i18ngrep "has an untrusted GPG signature" mergeerror
|
|
|
|
|
'
|
|
|
|
|
|
2013-03-31 18:02:24 +02:00
|
|
|
test_expect_success GPG 'merge signed commit with verification' '
|
2017-12-15 20:42:36 +01:00
|
|
|
test_when_finished "git reset --hard && git checkout initial" &&
|
2013-03-31 18:02:24 +02:00
|
|
|
git merge --verbose --ff-only --verify-signatures side-signed >mergeoutput &&
|
|
|
|
|
test_i18ngrep "has a good GPG signature" mergeoutput
|
|
|
|
|
'
|
|
|
|
|
|
2017-12-10 07:53:57 +01:00
|
|
|
test_expect_success GPG 'merge signed commit with merge.verifySignatures=true' '
|
2017-12-15 20:42:36 +01:00
|
|
|
test_when_finished "git reset --hard && git checkout initial" &&
|
2017-12-10 07:53:57 +01: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 18:02:24 +02:00
|
|
|
test_expect_success GPG 'merge commit with bad signature without verification' '
|
2017-12-15 20:42:36 +01:00
|
|
|
test_when_finished "git reset --hard && git checkout initial" &&
|
2017-12-10 07:53:57 +01:00
|
|
|
git merge $(cat forged.commit)
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success GPG 'merge commit with bad signature with merge.verifySignatures=false' '
|
2017-12-15 20:42:36 +01:00
|
|
|
test_when_finished "git reset --hard && git checkout initial" &&
|
2017-12-10 07:53:57 +01:00
|
|
|
test_config merge.verifySignatures false &&
|
2013-03-31 18:02:24 +02:00
|
|
|
git merge $(cat forged.commit)
|
|
|
|
|
'
|
|
|
|
|
|
2017-12-10 07:53:57 +01:00
|
|
|
test_expect_success GPG 'merge commit with bad signature with merge.verifySignatures=true and --no-verify-signatures' '
|
2017-12-15 20:42:36 +01:00
|
|
|
test_when_finished "git reset --hard && git checkout initial" &&
|
2017-12-10 07:53:57 +01:00
|
|
|
test_config merge.verifySignatures true &&
|
|
|
|
|
git merge --no-verify-signatures $(cat forged.commit)
|
|
|
|
|
'
|
|
|
|
|
|
2018-11-06 08:51:15 +01:00
|
|
|
test_expect_success GPG 'merge unsigned commit into unborn branch' '
|
|
|
|
|
test_when_finished "git checkout initial" &&
|
|
|
|
|
git checkout --orphan unborn &&
|
|
|
|
|
test_must_fail git merge --verify-signatures side-unsigned 2>mergeerror &&
|
|
|
|
|
test_i18ngrep "does not have a GPG signature" mergeerror
|
|
|
|
|
'
|
|
|
|
|
|
2013-03-31 18:02:24 +02:00
|
|
|
test_done
|