From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id KKkBCklykmEQgQAAgWs5BA (envelope-from ) for ; Mon, 15 Nov 2021 15:44:25 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id WPO4BUlykmF7FgAA1q6Kng (envelope-from ) for ; Mon, 15 Nov 2021 14:44:25 +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 D893BB665 for ; Mon, 15 Nov 2021 15:44:24 +0100 (CET) Received: from localhost ([::1]:58214 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mmdDb-0008S4-Ty for larch@yhetil.org; Mon, 15 Nov 2021 09:44:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51972) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mmdCI-00076b-Fj for bug-guix@gnu.org; Mon, 15 Nov 2021 09:43:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:41605) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mmdCI-00066u-6s for bug-guix@gnu.org; Mon, 15 Nov 2021 09:43:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mmdCI-0001of-53 for bug-guix@gnu.org; Mon, 15 Nov 2021 09:43: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: Mon, 15 Nov 2021 14:43: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.16369873586937 (code B ref 51487); Mon, 15 Nov 2021 14:43:02 +0000 Received: (at 51487) by debbugs.gnu.org; 15 Nov 2021 14:42:38 +0000 Received: from localhost ([127.0.0.1]:53151 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mmdBu-0001no-E6 for submit@debbugs.gnu.org; Mon, 15 Nov 2021 09:42:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51050) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mmdBs-0001nb-Dm for 51487@debbugs.gnu.org; Mon, 15 Nov 2021 09:42:36 -0500 Received: from [2001:470:142:3::e] (port=37072 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mmdBn-00063K-69; Mon, 15 Nov 2021 09:42:31 -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=jhUt59pzVnAR+a45bT3408Xg1YeSqIJ56RP28frUNTM=; b=p2Garm5qPLYBSZPoJvcD WFsZczIaYE+2GeGrLCQ1gm3j55LwybtuRkNuZc8n2nLww2UkpgNU1c12NJmPLII+40xYIkKETCPhf PcHc3thWcGsOYN0wRT3msCUgJhAwvXrq6zhumOTXNBUyOe2SVJ6089YtFerrze5+RdwJu7IpZqg6n yl+6xw2551FN2KyQJTn5RrEzuzpKcT7kaC9H4mft2fmOzCV/c9+p86/f+4MtLRqLgx2aZRVl4ZvLw AJDp3YErHroDf5I/Jk0bYwEZ8+C4ZydinQ8Gv9Sc/HwTb5tIT3sH1KCQ611++fS63s8xSoQx8lEC2 vbImiDryI+S5FA==; Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=41732 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mmdBm-0002KI-53; Mon, 15 Nov 2021 09:42:31 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <87fssjvmbp.fsf@planete-kraus.eu> <5e2cb25499ce79f6afc6b8fc775b6ff8e5817670.camel@planete-kraus.eu> <87fss8knw3.fsf_-_@gnu.org> <87lf1zc1lg.fsf@planete-kraus.eu> Date: Mon, 15 Nov 2021 15:42:28 +0100 In-Reply-To: <87lf1zc1lg.fsf@planete-kraus.eu> (Vivien Kraus's message of "Sun, 07 Nov 2021 18:29:30 +0100") Message-ID: <874k8d5vl7.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=1636987464; 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=jhUt59pzVnAR+a45bT3408Xg1YeSqIJ56RP28frUNTM=; b=m19qV3TGn10fjTZLpfDkeeaEcxLu4/asCRiR89t0H4z7Gv+hYxCnx+VWIc/a5Fd0bZVOUP 03/uuhoqb8lzlZ1W/naxVmd4DWEqY8Q27l1nLKwKcx8oaR+63zEPc45b8DYcDV84xb6cY+ o/4FSyaO8S45K68/7LvWG6YHZQatAPPipB/ZBqLkX02DjCb535wGvc9+TkGAO8B3dfnsUf +rSZo/aLSyS2WaCse1xCR4lIoWSgqE71Aj4WG376jW/db2/8DQCjZox7+U/18mIsRDaDX3 xVHdD30gSidEGgE8ikPwIow5HqmEYYTNy0DTwm5S+4wA2kbou4XJHTnLbEGGDQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1636987464; a=rsa-sha256; cv=none; b=Z3ldk0lxttVp0+lrKlCNTIO8KcYQHsrHPFsolbT9nds0y3WXpVA4t8kSfPzO5Is6bw13T/ BbozdtJraCuQ6FHJKZChMsWIGZdE5rLFBksGykWdQ9qJhKxlsGthXAAMn9ZoWW9gRUURsU Uq3qQ/pBsNfNk6EOiLzwuygiNEDwl/S7Kcj+nwiqAsokS50/vTzR6MWnvomVkeKZmgP7YX S64xPY+ufxRg448I8Ph3Sz/eSF9NZ9TQgKez75wKcm3gyWzFBf+n9+YWg56NKol6dJsoFI IZaIN3uUzw7UQGhV0BPokICfWl/QKKkTe98nQUluNMqEfLbZiXzwen7D7ivDoQ== 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=p2Garm5q; 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-Spam-Score: -3.54 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=p2Garm5q; 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: D893BB665 X-Spam-Score: -3.54 X-Migadu-Scanner: scn1.migadu.com X-TUID: maUJSZFut2XM Hi, Vivien Kraus skribis: > (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 generate-keys > + ((user-keys > + (append (openssh-authorized-keys config) keys)) > + ;; The by-user vhash indexes a list of list of keys for each user= , the > + ;; list of list is not concatenated eagerly to avoid quadratic > + ;; complexity. > + (by-user (alist->vhash '()))) > + (match user-keys > + (() > + (openssh-configuration > + (inherit config) > + (authorized-keys > + (vhash-fold > + (lambda (user keys other-users) > + `((,user ,@(apply append (reverse keys))) ,@other-users)) > + '() by-user)))) > + (((user keys ...) other-user-keys ...) > + (let ((existing > + (match (vhash-assoc user by-user) > + ((_ . keys) keys) > + (#f '())))) > + (generate-keys > + other-user-keys > + (vhash-cons user `(,keys ,@existing) by-user))))))) I find it a bit hard to read. What I had in mind is along these lines: (match (openssh-authorized-keys config) (((users _ ...) ...) ;; Build a user/key-list mapping. (let ((user-keys (fold (lambda (spec table) (match spec ((user keys ...) (vhash-cons user keys table)))) vlist-null (openssh-authorized-keys config)))) ;; Coalesce the key lists associated with each user. (map (lambda (user) (concatenate (vhash-fold* cons '() user user-keys))) users)))) WDYT? Thanks, Ludo=E2=80=99.