From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id QLL7Gz7rh2GZRQEAgWs5BA (envelope-from ) for ; Sun, 07 Nov 2021 16:05:34 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id 8HyoFz7rh2FFfwAA1q6Kng (envelope-from ) for ; Sun, 07 Nov 2021 15:05:34 +0000 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 359A7CFF4 for ; Sun, 7 Nov 2021 16:05:34 +0100 (CET) Received: from localhost ([::1]:36348 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mjjjh-0003qp-D5 for larch@yhetil.org; Sun, 07 Nov 2021 10:05:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37814) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mjjjE-0003VK-Gi for bug-guix@gnu.org; Sun, 07 Nov 2021 10:05:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:42771) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mjjjC-0003Rj-H9 for bug-guix@gnu.org; Sun, 07 Nov 2021 10:05:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mjjjC-0000Du-Am for bug-guix@gnu.org; Sun, 07 Nov 2021 10:05:02 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#51487: The openssh service does not allow multiple authorized key files per user Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sun, 07 Nov 2021 15:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51487 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: Vivien Kraus Received: via spool by 51487-submit@debbugs.gnu.org id=B51487.1636297494839 (code B ref 51487); Sun, 07 Nov 2021 15:05:02 +0000 Received: (at 51487) by debbugs.gnu.org; 7 Nov 2021 15:04:54 +0000 Received: from localhost ([127.0.0.1]:54317 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mjjj3-0000DT-Ps for submit@debbugs.gnu.org; Sun, 07 Nov 2021 10:04:54 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40442) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mjjj1-0000D4-U4 for 51487@debbugs.gnu.org; Sun, 07 Nov 2021 10:04:52 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:46846) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mjjiw-0003QZ-8l; Sun, 07 Nov 2021 10:04:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=awU/B9g9Bq46G0gKF9AXzLwr+Q0wuiJfPfB4jiIco6U=; b=Kyq5Pm9mpd+y4Z5QTHx7 Rx7mT9w+O1umd8yHwlhE+WLq/ORHPNB2hxdpxVGy2JD5yVW93tdNCslupLaXV3W7KUwZnPyKfJ6o8 r4c3He7cbcG9rF4P/vauXu1x3/PfX7X66T7cu5KLQCL/ZqUM5KQDfqHlFW357eQksXE+HBPZaa6aI 6asUmgqOzD9r5P8qt/0gZugodZ6qQuKit9OrubX9duQTsgB8DxwWVJ4ImVmWqfsoRthljHvtNi+WM Y8/i/qKVUpFbQ0eCfT+3LdSNTA3p7ynpCs9MpQMiKTGaN1XwbpzWJCBod+C9LSxV2W7zOe9mOyMTL dweSL/elyicOeg==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:55536 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mjjiv-0003mz-VK; Sun, 07 Nov 2021 10:04:46 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <87fssjvmbp.fsf@planete-kraus.eu> <5e2cb25499ce79f6afc6b8fc775b6ff8e5817670.camel@planete-kraus.eu> Date: Sun, 07 Nov 2021 16:04:44 +0100 In-Reply-To: (Vivien Kraus's message of "Fri, 29 Oct 2021 23:26:02 +0200") Message-ID: <87fss8knw3.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 51487@debbugs.gnu.org Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1636297534; h=from:from:sender:sender: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:dkim-signature; bh=awU/B9g9Bq46G0gKF9AXzLwr+Q0wuiJfPfB4jiIco6U=; b=R9tGPwikBogKxx65vUzdlAaxyCI6dw8u6ChyOdqeBmB3NGfiOJ2Z2p9frAwcz7Ib1rVVo0 PiachP5BvzfRnd3cCEAcKe7yaZfabU7Oh+hhcrigV0Jk7K/dQQR6raYC6OKrxfTq2XQYl4 f5E55vqrmWqHJchIuXyEE7ygQaGCSBZGJ1EBZ1HI+Am1df0l754Ng8SGgZLZycBiq3cxvx VUKQpwLyWRAGa0oqcBIcCXzD6tYsRkUJYNkMNrahxqa3cfeNz2xjvLbraBrmr+bJ9mFocq Qw6NiZHs88zuQOGn2GOPUrn0sz7u+snQCR4TUqXIM1uIswZCyW7IBJLzQJFyxA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1636297534; a=rsa-sha256; cv=none; b=RNGItU3k1/dasfZ1o8UrLgUxT7qzTd4W2Qlt0mVS1LdGSOj6qrU98h98XyHpK4Ws0SUIVA K2IFXyJTalKnQNZbxOydEDdhkXp9jsy93cPVFvrRYyzY3ulF4UibicGgkwdDGEkFRIYbjQ j6STcl1rzM88MctL3o/tgMzry89WX8VDVu6jbI5d9x9N2JeFhbGeAL5ud5QSHNH0Lw0RKY jCjyojQpRMRA2GHKTk0QNzxjtAEWIOHtrRtZxkYYRVy78O/YjK0LXW9Zqhdw6kcijUCWMw S884/O/3xdkRv+BUjJwfe5ChVdmj2r9xjH8jWYKrEj2AxEp9MnYUnml1rCN8Og== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=Kyq5Pm9m; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Spam-Score: -2.92 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=Kyq5Pm9m; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Queue-Id: 359A7CFF4 X-Spam-Score: -2.92 X-Migadu-Scanner: scn0.migadu.com X-TUID: OhTEINMLvwg2 Hi, Vivien Kraus skribis: > From b2f47730a3d9aa97716741134917c340354d9c3a Mon Sep 17 00:00:00 2001 > From: Vivien Kraus > Date: Fri, 29 Oct 2021 18:25:24 +0200 > Subject: [PATCH] gnu: openssh-service: Collect all keys for all users. > > * gnu/services/ssh.scm (extend-openssh-authorized-keys): ensure that no k= ey is forgotten. Good catch! > diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm > index a018052eeb..1309e062ce 100644 > --- a/gnu/services/ssh.scm > +++ b/gnu/services/ssh.scm > @@ -532,10 +532,16 @@ (define (openssh-pam-services config) >=20=20 > (define (extend-openssh-authorized-keys config keys) > "Extend CONFIG with the extra authorized keys listed in KEYS." > - (openssh-configuration > - (inherit config) > - (authorized-keys > - (append (openssh-authorized-keys config) keys)))) > + (let ((all-keys (make-hash-table))) > + (for-each > + (match-lambda > + ((user keys ...) > + (hash-set! all-keys user (append (hash-ref all-keys user '()) ke= ys)))) > + (append (openssh-authorized-keys config) keys)) > + (openssh-configuration > + (inherit config) > + (authorized-keys > + (hash-map->list cons all-keys))))) Could you write it in functional style using a vhash (info "(guile) VHashes")? You=E2=80=99ll probably need two list traversals: one to build = the user/key mapping, and one to compute the list of users. Thanks in advance, Ludo=E2=80=99.