From: Vivien Kraus via Bug reports for GNU Guix <bug-guix@gnu.org>
To: 51487@debbugs.gnu.org
Subject: bug#51487: Acknowledgement (The openssh service does not allow multiple authorized key files per user)
Date: Fri, 29 Oct 2021 18:51:54 +0200 [thread overview]
Message-ID: <5e2cb25499ce79f6afc6b8fc775b6ff8e5817670.camel@planete-kraus.eu> (raw)
In-Reply-To: <handler.51487.B.16355241781380.ack@debbugs.gnu.org>
[-- Attachment #1: Type: text/plain, Size: 96 bytes --]
The patch does not seem to get formatted correctly, sorry. Hopefully,
this should work.
Vivien
[-- Attachment #2: 0001-gnu-openssh-service-Collect-all-keys-for-all-users.patch --]
[-- Type: text/x-patch, Size: 2028 bytes --]
From 8dcf1a92cb6ebbc537029f88d5c7197cbf4959aa 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: (authorized-key-directory)[build]: ensure that no key is forgotten.
---
gnu/services/ssh.scm | 28 +++++++++++++++++-----------
1 file changed, 17 insertions(+), 11 deletions(-)
diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm
index a018052eeb..118dfdbef8 100644
--- a/gnu/services/ssh.scm
+++ b/gnu/services/ssh.scm
@@ -415,17 +415,23 @@ (define build
(guix build utils))
(mkdir #$output)
- (for-each (match-lambda
- ((user keys ...)
- (let ((file (string-append #$output "/" user)))
- (call-with-output-file file
- (lambda (port)
- (for-each (lambda (key)
- (call-with-input-file key
- (cut dump-port <> port)))
- keys))))))
- '#$keys))))
-
+ (let ((by-user (make-hash-table)))
+ (for-each
+ (match-lambda
+ ((user keys ...)
+ (hash-set! by-user user (append (hash-ref by-user user '()) keys))))
+ '#$keys)
+ (hash-for-each
+ (match-lambda*
+ ((user keys)
+ (let ((file (string-append #$output "/" user)))
+ (call-with-output-file file
+ (lambda (port)
+ (for-each (lambda (key)
+ (call-with-input-file key
+ (cut dump-port <> port)))
+ keys))))))
+ by-user)))))
(computed-file "openssh-authorized-keys" build))
(define (openssh-config-file config)
--
2.33.1
next prev parent reply other threads:[~2021-10-29 17:35 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 [this message]
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
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5e2cb25499ce79f6afc6b8fc775b6ff8e5817670.camel@planete-kraus.eu \
--to=bug-guix@gnu.org \
--cc=51487@debbugs.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 public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).