mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-16 03:45:24 -05:00
ca87601dd9
Fixes a bug whereby authentication of a commit *not* descending from the
introductory commit could succeed, provided the commit verifies the
authorization invariant.
In the example below, A is a common ancestor of the introductory commit
I and of commit X. Authentication of X would succeed, even though it is
not a descendant of I, as long as X is authorized according to the
'.guix-authorizations' in A:
X I
\ /
A
This is because, 'authenticate-repository' would not check whether X
descends from I, and the call (commit-difference X I) would return X.
In practice that only affects forks because it means that ancestors of
the introductory commit already contain a '.guix-authorizations' file.
* guix/git-authenticate.scm (authenticate-repository): Add call to
'commit-descendant?'.
* tests/channels.scm ("authenticate-channel, not a descendant of introductory commit"):
New test.
* tests/git-authenticate.scm ("authenticate-repository, target not a descendant of intro"):
New test.
* tests/guix-git-authenticate.sh: Expect earlier test to fail since
9549f0283a is not a descendant of
$intro_commit. Add new test targeting an ancestor of the introductory
commit, and another test targeting the v1.2.0 commit.
* doc/guix.texi (Specifying Channel Authorizations): Add a sentence.
68 lines
2.7 KiB
Bash
68 lines
2.7 KiB
Bash
# GNU Guix --- Functional package management for GNU
|
|
# Copyright © 2020, 2022 Ludovic Courtès <ludo@gnu.org>
|
|
#
|
|
# This file is part of GNU Guix.
|
|
#
|
|
# GNU Guix is free software; you can redistribute it and/or modify it
|
|
# under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or (at
|
|
# your option) any later version.
|
|
#
|
|
# GNU Guix is distributed in the hope that it will be useful, but
|
|
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
#
|
|
# Test the 'guix git authenticate' command-line utility.
|
|
#
|
|
|
|
# Skip if we're not in a Git checkout.
|
|
[ -d "$abs_top_srcdir/.git" ] || exit 77
|
|
|
|
# Skip if there's no 'keyring' branch.
|
|
guile -c '(use-modules (git))
|
|
(member "refs/heads/keyring" (branch-list (repository-open ".")))' || \
|
|
exit 77
|
|
|
|
# Keep in sync with '%default-channels' in (guix channels)!
|
|
intro_commit="9edb3f66fd807b096b48283debdcddccfea34bad"
|
|
intro_signer="BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA"
|
|
|
|
cache_key="test-$$"
|
|
|
|
# This must fail because the end commit is not a descendant of $intro_commit.
|
|
! guix git authenticate "$intro_commit" "$intro_signer" \
|
|
--cache-key="$cache_key" --stats \
|
|
--end=9549f0283a78fe36f2d4ff2a04ef8ad6b0c02604
|
|
|
|
# The v1.2.0 commit is a descendant of $intro_commit and it satisfies the
|
|
# authorization invariant.
|
|
v1_2_0_commit="a099685659b4bfa6b3218f84953cbb7ff9e88063"
|
|
guix git authenticate "$intro_commit" "$intro_signer" \
|
|
--cache-key="$cache_key" --stats \
|
|
--end="$v1_2_0_commit"
|
|
|
|
rm "$XDG_CACHE_HOME/guix/authentication/$cache_key"
|
|
|
|
# Commit and signer of the 'v1.0.0' tag.
|
|
v1_0_0_commit="6298c3ffd9654d3231a6f25390b056483e8f407c"
|
|
v1_0_0_signer="3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5" # civodul
|
|
v1_0_1_commit="d68de958b60426798ed62797ff7c96c327a672ac"
|
|
|
|
# This should succeed because v1.0.0 is an ancestor of $intro_commit.
|
|
guix git authenticate "$intro_commit" "$intro_signer" \
|
|
--cache-key="$cache_key" --stats \
|
|
--end="$v1_0_0_commit"
|
|
|
|
# This should fail because these commits lack '.guix-authorizations'.
|
|
! guix git authenticate "$v1_0_0_commit" "$v1_0_0_signer" \
|
|
--cache-key="$cache_key" --end="$v1_0_1_commit"
|
|
|
|
# This should work thanks to '--historical-authorizations'.
|
|
guix git authenticate "$v1_0_0_commit" "$v1_0_0_signer" \
|
|
--cache-key="$cache_key" --end="$v1_0_1_commit" --stats \
|
|
--historical-authorizations="$abs_top_srcdir/etc/historical-authorizations"
|