From patchwork Wed Sep 2 05:28:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 23862 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 23BBF27BBE8; Wed, 2 Sep 2020 06:29:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 925B427BBE7 for ; Wed, 2 Sep 2020 06:29:08 +0100 (BST) Received: from localhost ([::1]:33768 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDLKV-0004NA-PN for patchwork@mira.cbaines.net; Wed, 02 Sep 2020 01:29:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58872) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDLKQ-0004My-PR for guix-patches@gnu.org; Wed, 02 Sep 2020 01:29:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46406) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kDLKQ-00072y-Fy for guix-patches@gnu.org; Wed, 02 Sep 2020 01:29:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kDLKQ-0007j5-Bp for guix-patches@gnu.org; Wed, 02 Sep 2020 01:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43106] [PATCH v3 2/2] services: childhurd: Support installing secrets from the host. Resent-From: Jan Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Sep 2020 05:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43106 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?utf-8?q?Court=C3=A8s?= Cc: 43106@debbugs.gnu.org Received: via spool by 43106-submit@debbugs.gnu.org id=B43106.159902450629646 (code B ref 43106); Wed, 02 Sep 2020 05:29:02 +0000 Received: (at 43106) by debbugs.gnu.org; 2 Sep 2020 05:28:26 +0000 Received: from localhost ([127.0.0.1]:57952 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kDLJq-0007i6-05 for submit@debbugs.gnu.org; Wed, 02 Sep 2020 01:28:26 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48532) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kDLJl-0007hq-PO for 43106@debbugs.gnu.org; Wed, 02 Sep 2020 01:28:24 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:39372) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDLJf-0006yn-Nd; Wed, 02 Sep 2020 01:28:15 -0400 Received: from [2001:980:1b4f:1:42d2:832d:bb59:862] (port=44488 helo=dundal.janneke.lilypond.org) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kDLJe-0001Mx-O3; Wed, 02 Sep 2020 01:28:15 -0400 From: Jan Nieuwenhuizen Organization: AvatarAcademy.nl References: <20200831063913.664-1-janneke@gnu.org> <20200831063913.664-3-janneke@gnu.org> <87tuwhao4r.fsf@gnu.org> <87sgc1d38p.fsf@gnu.org> <877dtd8bgi.fsf@gnu.org> X-Url: http://AvatarAcademy.nl Date: Wed, 02 Sep 2020 07:28:04 +0200 In-Reply-To: <877dtd8bgi.fsf@gnu.org> ("Ludovic =?utf-8?q?Court=C3=A8s?= "'s message of "Tue, 01 Sep 2020 22:54:21 +0200") Message-ID: <87o8mo693v.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Ludovic Courtès writes: Hello! > Jan Nieuwenhuizen skribis: > >> Ludovic Courtès writes: > > [...] > >> We could add a check for secret-service, possibly here >> >> (define (hurd-vm-disk-image config) >> "Return a disk-image for the Hurd according to CONFIG." >> (let ((os (hurd-vm-configuration-os config)) >> (disk-size (hurd-vm-configuration-disk-size config))) >> (system-image >> (image >> (inherit hurd-disk-image) >> (size disk-size) >> (operating-system os))))) >> >> and/or insert if it it's missing...seems a bit over the top to me? > > Yes, exactly. We could pass ‘os’ through > ‘secret-service-operating-system’, where: > > (define (secret-service-operating-system os) > (operating-system > (inherit os) > (services (cons (service secret-service-type) > (operating-system-user-services os))))) > > (A similar pattern is found in ‘virtualized-operating-system’ and > ‘containerized-operating-system’.) Right, that's nice. I've added this (attached commit) to master. > Thanks for these patches! Happy; thanks for helping! Janneke From f07f479fc7417574c7bcb7ab3b70becda72eae25 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Wed, 2 Sep 2020 07:13:15 +0200 Subject: [PATCH] services: hurd-vm: Have Childhurd always include the secret-service. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 * gnu/services/virtualization.scm (secret-service-operating-system): New procedure. (hurd-vm-disk-image): Use it to ensure a Childhurd always includes the secret-service. (%hurd-vm-operating-system): Remove secret-service. Co-authored-by: Ludovic Courtès --- gnu/services/virtualization.scm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/gnu/services/virtualization.scm b/gnu/services/virtualization.scm index 75fe203e15..20e104f48c 100644 --- a/gnu/services/virtualization.scm +++ b/gnu/services/virtualization.scm @@ -835,6 +835,14 @@ over TCP. Reboot upon failure." boot time. This service is meant to be used by virtual machines (VMs) that can only be accessed by their host."))) +(define (secret-service-operating-system os) + "Return an operating system based on OS that includes the secret-service, +that will be listening to receive secret keys on port 1004, TCP." + (operating-system + (inherit os) + (services (cons (service secret-service-type 1004) + (operating-system-user-services os))))) + ;;; ;;; The Hurd in VM service: a Childhurd. @@ -850,8 +858,6 @@ can only be accessed by their host."))) (target "/dev/vda") (timeout 0))) (services (cons* - ;; Receive secret keys on port 1004, TCP. - (service secret-service-type 1004) (service openssh-service-type (openssh-configuration (openssh openssh-sans-x) @@ -887,8 +893,9 @@ can only be accessed by their host."))) (default "/etc/childhurd"))) (define (hurd-vm-disk-image config) - "Return a disk-image for the Hurd according to CONFIG." - (let ((os (hurd-vm-configuration-os config)) + "Return a disk-image for the Hurd according to CONFIG. The secret-service +is added to the OS specified in CONFIG." + (let ((os (secret-service-operating-system (hurd-vm-configuration-os config))) (disk-size (hurd-vm-configuration-disk-size config))) (system-image (image -- Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com