From: "Ludovic Courtès" <ludo@gnu.org>
To: 66156@debbugs.gnu.org
Cc: "Ludovic Courtès" <ludo@gnu.org>
Subject: [bug#66156] [PATCH 07/12] services: childhurd: Authorize the childhurd’s key on the host.
Date: Fri, 22 Sep 2023 14:54:08 +0200 [thread overview]
Message-ID: <0f2ebabd36558e2f660e4f1037a3c0a7f77f53d5.1695386493.git.ludo@gnu.org> (raw)
In-Reply-To: <cover.1695386493.git.ludo@gnu.org>
This partly automates setting up a childhurd for offloading purposes.
* gnu/services/virtualization.scm (authorize-guest-substitutes-on-host):
New procedure.
(hurd-vm-activation): Use it.
---
gnu/services/virtualization.scm | 51 ++++++++++++++++++++++++++++++++-
1 file changed, 50 insertions(+), 1 deletion(-)
diff --git a/gnu/services/virtualization.scm b/gnu/services/virtualization.scm
index fd153dd051..ca000f5d28 100644
--- a/gnu/services/virtualization.scm
+++ b/gnu/services/virtualization.scm
@@ -28,6 +28,7 @@ (define-module (gnu services virtualization)
#:use-module (gnu image)
#:use-module (gnu packages admin)
#:use-module (gnu packages gdb)
+ #:autoload (gnu packages gnupg) (guile-gcrypt)
#:use-module (gnu packages package-management)
#:use-module (gnu packages ssh)
#:use-module (gnu packages virtualization)
@@ -50,6 +51,7 @@ (define-module (gnu services virtualization)
#:use-module (guix records)
#:use-module (guix store)
#:use-module (guix utils)
+ #:autoload (guix self) (make-config.scm)
#:use-module (srfi srfi-9)
#:use-module (srfi srfi-26)
@@ -1271,6 +1273,50 @@ (define (initialize-hurd-vm-substitutes)
(program-file "initialize-hurd-vm-substitutes" run))
+(define (authorize-guest-substitutes-on-host)
+ "Return a program that authorizes the guest's archive signing key (passed as
+an argument) on the host."
+ (define not-config?
+ (match-lambda
+ ('(guix config) #f)
+ (('guix _ ...) #t)
+ (('gnu _ ...) #t)
+ (_ #f)))
+
+ (define run
+ (with-extensions (list guile-gcrypt)
+ (with-imported-modules `(((guix config) => ,(make-config.scm))
+ ,@(source-module-closure
+ '((guix pki)
+ (guix build utils))
+ #:select? not-config?))
+ #~(begin
+ (use-modules (ice-9 match)
+ (ice-9 textual-ports)
+ (gcrypt pk-crypto)
+ (guix pki)
+ (guix build utils))
+
+ (match (command-line)
+ ((_ guest-config-directory)
+ (let ((guest-key (string-append guest-config-directory
+ "/signing-key.pub")))
+ (if (file-exists? guest-key)
+ ;; Add guest key to the host's ACL.
+ (let* ((key (string->canonical-sexp
+ (call-with-input-file guest-key
+ get-string-all)))
+ (acl (public-keys->acl
+ (cons key (acl->public-keys (current-acl))))))
+ (with-atomic-file-replacement %acl-file
+ (lambda (_ port)
+ (write-acl acl port))))
+ (format (current-error-port)
+ "warning: guest key missing from '~a'~%"
+ guest-key)))))))))
+
+ (program-file "authorize-guest-substitutes-on-host" run))
+
(define (hurd-vm-activation config)
"Return a gexp to activate the Hurd VM according to CONFIG."
(with-imported-modules '((guix build utils))
@@ -1294,7 +1340,10 @@ (define (hurd-vm-activation config)
(unless (file-exists? guix-directory)
(invoke #$(initialize-hurd-vm-substitutes)
- guix-directory)))))
+ guix-directory))
+
+ ;; Authorize the archive signing key from GUIX-DIRECTORY in the host.
+ (invoke #$(authorize-guest-substitutes-on-host) guix-directory))))
(define hurd-vm-service-type
(service-type
--
2.41.0
next prev parent reply other threads:[~2023-09-22 12:56 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-22 12:52 [bug#66156] [PATCH 00/12] Introducing Smart Hurdloading Ludovic Courtès
2023-09-22 12:54 ` [bug#66156] [PATCH 01/12] system: vm: Remove unused variable Ludovic Courtès
2023-09-22 12:54 ` [bug#66156] [PATCH 02/12] secret-service: Increase default handshake timeout Ludovic Courtès
2023-09-22 12:54 ` [bug#66156] [PATCH 03/12] services: hurd-vm: Use the default SSH port number Ludovic Courtès
2023-09-22 12:54 ` [bug#66156] [PATCH 04/12] gnu: glibc-utf8-locales: Reintroduce input labels Ludovic Courtès
2023-09-22 12:54 ` [bug#66156] [PATCH 05/12] services: guix: Use the right locale package on GNU/Hurd Ludovic Courtès
2023-09-22 12:54 ` [bug#66156] [PATCH 06/12] services: guix: Support declarative offloading setup Ludovic Courtès
2023-09-22 12:54 ` Ludovic Courtès [this message]
2023-09-22 12:54 ` [bug#66156] [PATCH 08/12] services: hurd-vm: ‘image’ field has to be an <image> record Ludovic Courtès
2023-09-22 12:54 ` [bug#66156] [PATCH 09/12] tests: hurd-vm: Remove custom disk image configuration Ludovic Courtès
2023-09-22 12:54 ` [bug#66156] [PATCH 10/12] services: hurd-vm: Disable password-based authentication for root Ludovic Courtès
2023-09-22 12:54 ` [bug#66156] [PATCH 11/12] doc: Give an example showing how to add an account in the childhurd Ludovic Courtès
2023-09-22 12:54 ` [bug#66156] [PATCH 12/12] services: hurd-vm: Implement zero-configuration offloading Ludovic Courtès
2023-09-22 14:07 ` [bug#66156] [PATCH 00/12] Introducing Smart Hurdloading Janneke Nieuwenhuizen
2023-09-22 15:24 ` Ludovic Courtès
2023-09-23 13:44 ` Janneke Nieuwenhuizen
2023-09-27 17:35 ` Ludovic Courtès
2023-09-27 17:52 ` Janneke Nieuwenhuizen
2023-10-01 21:06 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0f2ebabd36558e2f660e4f1037a3c0a7f77f53d5.1695386493.git.ludo@gnu.org \
--to=ludo@gnu.org \
--cc=66156@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).