From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id qJfZBM1RIGR6SgAASxT56A (envelope-from ) for ; Sun, 26 Mar 2023 16:08:13 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 2H+yBM1RIGT1RwEAauVa8A (envelope-from ) for ; Sun, 26 Mar 2023 16:08:13 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 82D873AFCD for ; Sun, 26 Mar 2023 16:08:12 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1679839692; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=UYEwQOV85NShB2wGF5Hp92BxsVXFSPeJOpCMlEoYaZQ=; b=WzpICOwHM1y/JrYde3hi5tRtUSS7d98HXv7qYBjSqcjg0i0X21q6t1XGAhbRYOrJo9ygzu WiNjRa6nnQwWiAybeGwCbM92k3j27c1rOpJLQ2SDlvjezfN9Lw586sEmqabZTqzht9yBgN 1M6yL91pfJTpa7FhNcIB8WokZ0KtHGJWx2WbHdFzsBD9ppNxld5ZY1GkApQg2XDJLgukt9 aR97gKrmT5kVa1SiTd7P9NXFPBJt1Spp2fR/8dTh9hz1sYIBa7PNBUBytdKhLjgrPTe6Wt JdMxBMvFTW5MrIJEkormbnue27HT2hrgXSm6YQlUuydFWaIuBu1F6aRSw1HpFw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1679839692; a=rsa-sha256; cv=none; b=n9ugbi7E7Zd0Z0dgcsgJDolvL0l4L/YdohFgXo7tWL1MiNNAFfkADYlh7BiGYQjhb47KQB 6KHRPDvlaizP5Ckm7l7eHrWjlCYCXl360CPqf6DH4eEC6b7im8rwK5y4r+LTKwMZHVedFF uxiUJx4nv5C/La8iBhHzLk9crRB+JDneO4aUFCdKPqcG0GTizGymnuhcLg8VKLB/NOWPiq Lc4ztPODtp2z6UXnpDyJwqEjE38p0lraUqu3nyQCHi5pGNJ530udxIBliRkczDJn+tTyde JVIptD6V13+lIfRF514933CeT4dMyHg6SmJmyBJIOy3YBRFdeKd82MUWA7ppQQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pgR2S-0005wu-V6; Sun, 26 Mar 2023 10:08:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pgR2Q-0005wG-TJ for guix-patches@gnu.org; Sun, 26 Mar 2023 10:08:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pgR2Q-0001SS-0R for guix-patches@gnu.org; Sun, 26 Mar 2023 10:08:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pgR2P-0004Y3-JC for guix-patches@gnu.org; Sun, 26 Mar 2023 10:08:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62461] [PATCH 1/3] gnu: home-openssh-configuration: Add field add-keys-to-agent. References: <87bkkfaa2x.fsf@ngraves.fr> In-Reply-To: <87bkkfaa2x.fsf@ngraves.fr> Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 26 Mar 2023 14:08:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62461 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 62461@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 62461-submit@debbugs.gnu.org id=B62461.167983963217392 (code B ref 62461); Sun, 26 Mar 2023 14:08:01 +0000 Received: (at 62461) by debbugs.gnu.org; 26 Mar 2023 14:07:12 +0000 Received: from localhost ([127.0.0.1]:45613 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pgR1c-0004WS-6i for submit@debbugs.gnu.org; Sun, 26 Mar 2023 10:07:12 -0400 Received: from 4.mo576.mail-out.ovh.net ([46.105.42.102]:35073) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pgR1a-0004WH-1s for 62461@debbugs.gnu.org; Sun, 26 Mar 2023 10:07:11 -0400 Received: from director1.ghost.mail-out.ovh.net (unknown [10.108.4.4]) by mo576.mail-out.ovh.net (Postfix) with ESMTP id D777723E1D for <62461@debbugs.gnu.org>; Sun, 26 Mar 2023 14:07:08 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-ml9bn (unknown [10.110.103.209]) by director1.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 6B48C1FD62; Sun, 26 Mar 2023 14:07:08 +0000 (UTC) Received: from ngraves.fr ([37.59.142.95]) by ghost-submission-6684bf9d7b-ml9bn with ESMTPSA id mqStFoxRIGQmtREAKXspMQ (envelope-from ); Sun, 26 Mar 2023 14:07:08 +0000 X-OVh-ClientIp: 90.45.24.108 Date: Sun, 26 Mar 2023 16:07:04 +0200 Message-Id: <20230326140706.32412-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 5876071615968895714 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvhedrvdehtddgjeefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffogggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeetveehffevvdfgtddthedvhfeguefggeffteetueeliedvhffhjeegudehleegheenucfkphepuddvjedrtddrtddruddpfeejrdehledrudegvddrleehnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeivdegieduseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehjeeipdhmohguvgepshhmthhpohhuth 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Migadu-Queue-Id: 82D873AFCD X-Spam-Score: -3.53 X-Migadu-Spam-Score: -3.53 X-Migadu-Scanner: scn0.migadu.com From: Nicolas Graves via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-TUID: 2gqhar/H9ZpH --- gnu/home/services/ssh.scm | 44 +++++++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 9 deletions(-) diff --git a/gnu/home/services/ssh.scm b/gnu/home/services/ssh.scm index 01917a29cd..4ab2adb292 100644 --- a/gnu/home/services/ssh.scm +++ b/gnu/home/services/ssh.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2022 Ludovic Courtès ;;; Copyright © 2023 Janneke Nieuwenhuizen +;;; Copyright © 2023 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -39,6 +40,7 @@ (define-module (gnu home services ssh) home-openssh-configuration-authorized-keys home-openssh-configuration-known-hosts home-openssh-configuration-hosts + home-openssh-configuration-add-keys-to-agent home-ssh-agent-configuration openssh-host @@ -185,17 +187,41 @@ (define (openssh-host-name-field? field) (define-record-type* home-openssh-configuration make-home-openssh-configuration home-openssh-configuration? - (authorized-keys home-openssh-configuration-authorized-keys ;list of file-like - (default '())) - (known-hosts home-openssh-configuration-known-hosts ;unspec | list of file-like - (default *unspecified*)) - (hosts home-openssh-configuration-hosts ;list of - (default '()))) + (authorized-keys home-openssh-configuration-authorized-keys ;list of file-like + (default '())) + (known-hosts home-openssh-configuration-known-hosts ;unspec | list of file-like + (default *unspecified*)) + (hosts home-openssh-configuration-hosts ;list of + (default '())) + (add-keys-to-agent home-openssh-configuration-add-keys-to-agent ;string with limited values + (default "no"))) + +(define (serialize-add-keys-to-agent value) + (define (is-valid-time-string? str) + (and (> (string-length str) 0) + (eq? + (cdr (vector-ref + (string-match "\ +[0-9]+|([0-9]+[Ww])?([0-9]+[Dd])?([0-9]+[Hh])?([0-9]+[Mm])?([0-9]+[Ss])?" str) + 1)) + (string-length str)))) + + (string-append "AddKeysToAgent " + (cond ((member value '("yes" "no" "confirm" "ask")) value) + ((is-valid-time-string? value) value) + ((and (string-prefix? "confirm" value) + (is-valid-time-string? + (cdr (string-split value #\ )))) value) + ;; The 'else' branch is unreachable. + (else (raise (condition (&error))))))) (define (openssh-configuration->string config) - (string-join (map serialize-openssh-host - (home-openssh-configuration-hosts config)) - "\n")) + (string-join + (cons* (serialize-add-keys-to-agent + (home-openssh-configuration-add-keys-to-agent config)) + (map serialize-openssh-host + (home-openssh-configuration-hosts config))) + "\n")) (define* (file-join name files #:optional (delimiter " ")) "Return a file in the store called @var{name} that is the concatenation -- 2.39.2