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

Previous Next

Full log

View this message in rfc822 format

From: Richard Sent <richard <at> freakingpenguin.com>
To: 71826 <at> debbugs.gnu.org
Cc: Richard Sent <richard <at> freakingpenguin.com>, ( <paren <at> disroot.org>, Andrew Tropin <andrew <at> trop.in>, Ludovic Courtès <ludo <at> gnu.org>, Tanguy Le Carrour <tanguy <at> bioneland.org>
Subject: [bug#71826] [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

Previous Next

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