tribes/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 21:20:33 +02:00
Code Activity

authenticate: Report failure to load keys to the daemon.

Browse Source 
Previously, when failing to load a signing key, ‘guix authenticate’ would
print a backtrace and exit with a non-zero code.  That, in turn, would lead
the guix-daemon child process to crash with:

  nix/libutil/serialise.cc:15: virtual nix::BufferedSink::~BufferedSink(): Assertion `!bufPos' failed.

This patch fixes it by reporting the error to the daemon as was intended.

* guix/scripts/authenticate.scm (guix-authenticate): Arrange to call
‘load-key-pair’ from within ‘with-reply’.
* tests/guix-authenticate.sh: Test it.

Fixes: guix/guix#4928
Reported-by: Rutherther <rutherther@ditigal.xyz>
Change-Id: I8654ad6fdfbe18c55e1e85647d0c49f408d0574a
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Merges: #4961
This commit is contained in:
Ludovic Courtès
2025-12-19 09:34:47 +01:00
parent 5d6dfd8981
commit 0ac2a0fd18
2 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
guix/scripts/authenticate.scm
View File

@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013-2017, 2020, 2025 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@@ -196,20 +196,23 @@ Sign data or verify signatures. This tool is meant to be used internally by
;; Read a request on standard input and reply. ;; Read a request on standard input and reply.
(match (read-command (current-input-port)) (match (read-command (current-input-port))
(("sign" signing-key (= base16-string->bytevector hash)) (("sign" signing-key (= base16-string->bytevector hash))
(let* ((key-pairs keys (let ((cached-keys (match (vhash-assoc signing-key key-pairs)
(match (vhash-assoc signing-key key-pairs) ((_ . keys) keys)
((_ . keys) (#f #f)))
(values key-pairs keys)) (new-keys #f))
(#f (with-reply (begin
(let ((keys (load-key-pair signing-key))) (unless cached-keys
(values (vhash-cons signing-key keys ;; Delay 'load-key-pair' call so that failure
key-pairs) ;; to load keys is reported via 'with-reply'.
keys)))))) (set! new-keys (load-key-pair signing-key)))
(with-reply (canonical-sexp->string (canonical-sexp->string
(match keys (match (or cached-keys new-keys)
((public . secret) ((public . secret)
(sign-with-key public secret hash))))) (sign-with-key public secret hash))))))
(loop key-pairs))) (loop (if new-keys
(vhash-cons signing-key new-keys
key-pairs)
key-pairs))))
(("verify" signature) (("verify" signature)
(with-reply (bytevector->base16-string (with-reply (bytevector->base16-string
(validate-signature (validate-signature

7
tests/guix-authenticate.sh
View File

@@ -1,5 +1,5 @@
# GNU Guix --- Functional package management for GNU # GNU Guix --- Functional package management for GNU
# Copyright © 2013, 2014, 2020 Ludovic Courtès <ludo@gnu.org> # Copyright © 2013, 2014, 2020, 2025 Ludovic Courtès <ludo@gnu.org>
# #
# This file is part of GNU Guix. # This file is part of GNU Guix.
# #
@@ -85,3 +85,8 @@ sed -i "$sig" -e's/^0 //g'
echo "verify $(cat $sig)" | guix authenticate echo "verify $(cat $sig)" | guix authenticate
hash2="$(echo "verify $(cat $sig)" | guix authenticate | cut -f2 -d ' ')" hash2="$(echo "verify $(cat $sig)" | guix authenticate | cut -f2 -d ' ')"
test "$(echo $hash2 | cut -d : -f 2)" = "$hash" test "$(echo $hash2 | cut -d : -f 2)" = "$hash"
# Make sure an error is properly reported for unreadable key pairs, with exit
# code zero (the process would keep running commands on standard input).
echo "sign 9:/dev/null $hash_len:$hash" | guix authenticate
test $(echo "sign 9:/dev/null $hash_len:$hash" | guix authenticate | cut -f1 -d ' ') = 500