From b631640f3b41f7c1c992dca9d712c7e318593323 Mon Sep 17 00:00:00 2001 From: Richard Sent Date: Fri, 28 Jun 2024 14:16:31 -0400 Subject: [PATCH] home: Set 700 permissions on .gnupg with home-gpg-agent-service MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/home/services/gnupg.scm (gpg-agent-activation): New variable. (home-gpg-agent-service-type) [extensions]: Extend home-activation-service-type. Change-Id: If3365c6cade2b03ee53a466ce1d63a5cdf654d6c Signed-off-by: Ludovic Courtès --- gnu/home/services/gnupg.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/home/services/gnupg.scm b/gnu/home/services/gnupg.scm index 04989666ed..1bd1deae5c 100644 --- a/gnu/home/services/gnupg.scm +++ b/gnu/home/services/gnupg.scm @@ -19,6 +19,7 @@ (define-module (gnu home services gnupg) #:use-module (guix gexp) + #:use-module (guix modules) #:use-module ((guix records) #:select (match-record)) #:use-module (gnu services) #:use-module (gnu services configuration) @@ -142,6 +143,17 @@ agent, with support for handling OpenSSH material.")))) . "$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh")) '())) +(define gpg-agent-activation + (with-imported-modules (source-module-closure + '((gnu build activation))) + #~(begin + (use-modules (gnu build activation)) + + ;; Make sure ~/.gnupg is #o700. + (let* ((home (getenv "HOME")) + (dot-ssh (string-append home "/.gnupg"))) + (mkdir-p/perms dot-ssh (getpw (getuid)) #o700))))) + (define home-gpg-agent-service-type (service-type (name 'home-gpg-agent) @@ -150,6 +162,8 @@ agent, with support for handling OpenSSH material.")))) home-gpg-agent-files) (service-extension home-shepherd-service-type home-gpg-agent-shepherd-services) + (service-extension home-activation-service-type + (const gpg-agent-activation)) (service-extension home-environment-variables-service-type home-gpg-agent-environment-variables))) (default-value (home-gpg-agent-configuration))