From: Vivien Kraus via Bug reports for GNU Guix <bug-guix@gnu.org>
To: "Ludovic Courtès" <ludo@gnu.org>
Cc: 51487@debbugs.gnu.org
Subject: bug#51487: The openssh service does not allow multiple authorized key files per user
Date: Sun, 07 Nov 2021 18:29:30 +0100 [thread overview]
Message-ID: <87lf1zc1lg.fsf@planete-kraus.eu> (raw)
In-Reply-To: <87fss8knw3.fsf_-_@gnu.org>
[-- Attachment #1: Type: text/plain, Size: 644 bytes --]
Hello,
Ludovic Courtès <ludo@gnu.org> writes:
> Could you write it in functional style using a vhash (info "(guile)
> VHashes")? You’ll probably need two list traversals: one to build the
> user/key mapping, and one to compute the list of users.
I thought that as the vhash data structure inherited the drawbacks of
vlist, it would not be worth using in place of a hash table, but you’re
saying that it’s still a better (more functional) data structure, noted.
Here is the new patch (and I also forgot that appending short lists to
long lists was not great, so I do all the appending at the end of the
function now).
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-openssh-service-Collect-all-keys-for-all-users.patch --]
[-- Type: text/x-patch, Size: 2104 bytes --]
From a2c4d7cefbc71fd3d35b0b7cc2f61118bd3a29b2 Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
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 key is forgotten.
---
gnu/services/ssh.scm | 29 +++++++++++++++++++++++++----
1 file changed, 25 insertions(+), 4 deletions(-)
diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm
index a018052eeb..6ddaf55eeb 100644
--- a/gnu/services/ssh.scm
+++ b/gnu/services/ssh.scm
@@ -39,6 +39,7 @@ (define-module (gnu services ssh)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26)
#:use-module (ice-9 match)
+ #:use-module (ice-9 vlist)
#:export (lsh-configuration
lsh-configuration?
lsh-service
@@ -532,10 +533,30 @@ (define (openssh-pam-services config)
(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)))))))
(define openssh-service-type
(service-type (name 'openssh)
--
2.33.1
[-- Attachment #3: Type: text/plain, Size: 8 bytes --]
Vivien
next prev parent reply other threads:[~2021-11-07 17:34 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-29 16:15 bug#51487: The openssh service does not allow multiple authorized key files per user Vivien Kraus via Bug reports for GNU Guix
[not found] ` <handler.51487.B.16355241781380.ack@debbugs.gnu.org>
2021-10-29 16:39 ` bug#51487: Acknowledgement (The openssh service does not allow multiple authorized key files per user) Vivien Kraus via Bug reports for GNU Guix
2021-10-29 16:45 ` Vivien Kraus via Bug reports for GNU Guix
2021-10-29 16:51 ` Vivien Kraus via Bug reports for GNU Guix
2021-10-29 21:22 ` Vivien Kraus via Bug reports for GNU Guix
2021-10-29 21:26 ` Vivien Kraus via Bug reports for GNU Guix
2021-11-07 15:04 ` bug#51487: The openssh service does not allow multiple authorized key files per user Ludovic Courtès
2021-11-07 17:29 ` Vivien Kraus via Bug reports for GNU Guix [this message]
2021-11-15 14:42 ` Ludovic Courtès
2021-11-15 15:31 ` Vivien Kraus via Bug reports for GNU Guix
2021-11-16 9:03 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87lf1zc1lg.fsf@planete-kraus.eu \
--to=bug-guix@gnu.org \
--cc=51487@debbugs.gnu.org \
--cc=ludo@gnu.org \
--cc=vivien@planete-kraus.eu \
/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 external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.