futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

channels: Consider the current channel commit as authentic.

Browse Source 
Fixes <https://bugs.gnu.org/45895>.

When the ~/.cache/guix/authentication is empty, this change allows
authentication to start at the current commit, as shown by 'guix
describe', instead of starting from the introductory commit, which would
take more and more time (there's currently 18K commits per year).

* guix/git-authenticate.scm (authenticate-repository): Add #:authentic-commits.
[authenticated-commits]: Append it.
* guix/channels.scm (authenticate-channel)[authentic-commits]: New
variable.  Pass it to 'authenticate-repository'.
This commit is contained in:
Ludovic Courtès 2021-02-02 09:37:33 +01:00
parent 8ecc265c5c
commit 29009fdb2d
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
guix/channels.scm
View File

@ -47,6 +47,7 @@
#:use-module (srfi srfi-26)
#:use-module (srfi srfi-34)
#:use-module (srfi srfi-35)
#:autoload (guix describe) (current-channels) ;XXX: circular dep
#:autoload (guix self) (whole-package make-config.scm)
#:autoload (guix inferior) (gexp->derivation-in-inferior) ;FIXME: circular dep
#:autoload (guix quirks) (%quirks %patches applicable-patch? apply-patch)
@ -344,6 +345,18 @@ commits)...~%")
(progress-reporter/bar (length commits)))
(define authentic-commits
;; Consider the currently-used commit of CHANNEL as authentic so
;; authentication can skip it and all its closure.
(match (find (lambda (candidate)
(eq? (channel-name candidate) (channel-name channel)))
(current-channels))
(#f '())
(channel
(if (channel-commit channel)
(list (channel-commit channel))
'()))))
;; XXX: Too bad we need to re-open CHECKOUT.
(with-repository checkout repository
(authenticate-repository repository
@ -354,6 +367,7 @@ commits)...~%")
#:keyring-reference
(string-append keyring-reference-prefix
keyring-reference)
#:authentic-commits authentic-commits
#:make-reporter make-reporter
#:cache-key cache-key)))

9
guix/git-authenticate.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -376,12 +376,14 @@ instead of '~a'")
(cache-key (repository-cache-key repository))
(end (reference-target
(repository-head repository)))
(authentic-commits '())
(historical-authorizations '())
(make-reporter
(const progress-reporter/silent)))
"Authenticate REPOSITORY up to commit END, an OID. Authentication starts
with commit START, an OID, which must be signed by SIGNER; an exception is
raised if that is not the case. Return an alist mapping OpenPGP public keys
raised if that is not the case. Commits listed in AUTHENTIC-COMMITS and their
closure are considered authentic. Return an alist mapping OpenPGP public keys
to the number of commits signed by that key that have been traversed.
The OpenPGP keyring is loaded from KEYRING-REFERENCE in REPOSITORY, where
@ -404,7 +406,8 @@ denoting the authorized keys for commits whose parent lack the
(filter-map (lambda (id)
(false-if-git-not-found
(commit-lookup repository (string->oid id))))
(previously-authenticated-commits cache-key)))
(append (previously-authenticated-commits cache-key)
authentic-commits)))
(define commits
;; Commits to authenticate, excluding the closure of