GNU bug report logs - #71826
[PATCH] home: Set 700 permissions on .gnupg with home-gpg-agent-service

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 71826 in the body.
You can then email your comments to 71826 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Richard Sent <richard <at> freakingpenguin.com>
To: guix-patches <at> gnu.org
Cc: Richard Sent <richard <at> freakingpenguin.com>
Subject: [PATCH] home: Set 700 permissions on .gnupg with
 home-gpg-agent-service
Date: Fri, 28 Jun 2024 14:16:31 -0400

* gnu/home/services/gnupg.scm (gpg-agent-activation): New variable.
(home-gpg-agent-service-type) [extensions]: Extend
home-activation-service-type.

Change-Id: If3365c6cade2b03ee53a466ce1d63a5cdf654d6c
---

Followed a similar structure as openssh-activation in (gnu home
services ssh).

 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 @@ (define (home-gpg-agent-environment-variables config)
          . "$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 @@ (define home-gpg-agent-service-type
                              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))

base-commit: ae55410e0752000268b31c71dddea58e6106522a
-- 
2.45.1

Message #10 received at 71826-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Richard Sent <richard <at> freakingpenguin.com>
Cc: paren <at> disroot.org, Tanguy Le Carrour <tanguy <at> bioneland.org>,
 71826-done <at> debbugs.gnu.org, Andrew Tropin <andrew <at> trop.in>
Subject: Re: [bug#71826] [PATCH] home: Set 700 permissions on .gnupg with
 home-gpg-agent-service
Date: Fri, 26 Jul 2024 18:47:34 +0200

Richard Sent <richard <at> freakingpenguin.com> skribis:

> * gnu/home/services/gnupg.scm (gpg-agent-activation): New variable.
> (home-gpg-agent-service-type) [extensions]: Extend
> home-activation-service-type.
>
> Change-Id: If3365c6cade2b03ee53a466ce1d63a5cdf654d6c

Applied, thanks!

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.