mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-18 13:36:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

channels: Add #:verify-certificate? and honor it.

Browse source 
* guix/channels.scm (latest-channel-instance): Add #:verify-certificate?
and pass it on.
(latest-channel-instances): Likewise.

Change-Id: I43564738dfeefa5b735e6f9e349f9f5596d25164
This commit is contained in:
Ludovic Courtès 2024-12-10 23:57:35 +01:00
parent fc438ef675
commit e168d31819
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
guix/channels.scm
View file

@ -407,12 +407,15 @@ (define authentic-commits
(define* (latest-channel-instance store channel
#:key (patches %patches)
starting-commit
(authenticate? #f)
(authenticate? #t)
(validate-pull
ensure-forward-channel-update))
ensure-forward-channel-update)
(verify-certificate? #t))
"Return the latest channel instance for CHANNEL. When STARTING-COMMIT is
true, call VALIDATE-PULL with CHANNEL, STARTING-COMMIT, the target commit, and
their relation. When AUTHENTICATE? is false, CHANNEL is not authenticated."
their relation. When AUTHENTICATE? is false, CHANNEL is not authenticated.
When VERIFY-CERTIFICATE? is false, invalid X.509 host certificates are
accepted."
(define (dot-git? file stat)
(and (string=? (basename file) ".git")
(eq? 'directory (stat:type stat))))
@ -421,7 +424,8 @@ (define (dot-git? file stat)
(checkout commit relation
(update-cached-checkout (channel-url channel)
#:ref (channel-reference channel)
#:starting-commit starting-commit)))
#:starting-commit starting-commit
#:verify-certificate? verify-certificate?)))
(when relation
(validate-pull channel starting-commit commit relation))
@ -505,13 +509,17 @@ (define* (latest-channel-instances store channels
(current-channels '())
(authenticate? #t)
(validate-pull
ensure-forward-channel-update))
ensure-forward-channel-update)
(verify-certificate? #t))
"Return a list of channel instances corresponding to the latest checkouts of
CHANNELS and the channels on which they depend.
When AUTHENTICATE? is true, authenticate the subset of CHANNELS that has a
\"channel introduction\".
When VERIFY-CERTIFICATE? is false, invalid X.509 host certificates are
accepted.
CURRENT-CHANNELS is the list of currently used channels. It is compared
against the newly-fetched instances of CHANNELS, and VALIDATE-PULL is called
for each channel update and can choose to emit warnings or raise an error,
@ -562,7 +570,9 @@ (define (more-specific? a b)
#:validate-pull
validate-pull
#:starting-commit
current)))
current
#:verify-certificate?
verify-certificate?)))
(when authenticate?
;; CHANNEL is authenticated so we can trust the
;; primary URL advertised in its metadata and warn