From patchwork Fri May 5 17:51:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 49819 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A725927BBEA; Fri, 5 May 2023 18:52:28 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C799727BBE2 for ; Fri, 5 May 2023 18:52:25 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1puzbA-0003i4-64; Fri, 05 May 2023 13:52:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1puzb8-0003hm-Sn for guix-patches@gnu.org; Fri, 05 May 2023 13:52:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1puzb8-0003Ya-Kc for guix-patches@gnu.org; Fri, 05 May 2023 13:52:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1puzb8-00083b-GV for guix-patches@gnu.org; Fri, 05 May 2023 13:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63314] [PATCH 1/2] system: pam: Let PAM extenders add shepherd requirements. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 05 May 2023 17:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63314 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63314@debbugs.gnu.org Cc: Josselin Poiret Received: via spool by 63314-submit@debbugs.gnu.org id=B63314.168330911430949 (code B ref 63314); Fri, 05 May 2023 17:52:02 +0000 Received: (at 63314) by debbugs.gnu.org; 5 May 2023 17:51:54 +0000 Received: from localhost ([127.0.0.1]:57408 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1puzaz-000835-Jb for submit@debbugs.gnu.org; Fri, 05 May 2023 13:51:54 -0400 Received: from jpoiret.xyz ([206.189.101.64]:44912) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1puzaw-00082p-M5 for 63314@debbugs.gnu.org; Fri, 05 May 2023 13:51:51 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id A5FF2184D43; Fri, 5 May 2023 17:51:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1683309109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=v1ZKY1hyrlmtGiTk8Dpb6XYdBtKoP8o2lmOZwwzBMIE=; b=vlbQXA3WM5nveZPaMDYvPUZIgSkyB/E5egCcFKtbXzTx9PjVipppmJhpjwdYkWwUlikdsZ gfVacx0PKgAMjgJuRYuGIbx8/61ph4eq7hqc8dreH0WpAt0d181TFCPlrHCqdGtxVKc2OV zjFVOtevDA6SkHcYrV7ZOhQVoutV9hgWAHwvgX5ot2kJIwL6IPMa+StfoMosMjPpyARG4r xV0YXtRDHlCVrQYm6nOxixuxUppDGNiIqdyAxpeTv9uUcAAI+lQxuJM8Q81mrTAMEaqNC2 3hWRuZbsabPFJQjrbh6LkiFSMxhHUkd/kbu5K5VFb+HHp/D+mPBVLOanoSXimw== Date: Fri, 5 May 2023 19:51:48 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Josselin Poiret * gnu/system/pam.scm (): New record type. (pam-shepherd-service): Add Shepherd synchronization point. * gnu/services/mail.scm (dovecot-shepherd-service) * gnu/services/lightdm.scm (lightdm-shepherd-service) * gnu/services/mail.scm (opensmtpd-shepherd-service) * gnu/services/sddm.scm (sddm-shepherd-service) * gnu/services/ssh.scm (lsh-shepherd-service, openssh-shepherd-service) * gnu/services/xorg.scm (slim-shepherd-service, gdm-shepherd-service) * gnu/services/base.scm (greetd-shepherd-services): Add PAM requirement. * gnu/system/pam.scm (/etc-entry, extend-configuration, pam-root-service-type, pam-root-service) * gnu/services/authentication.scm (pam-ldap-pam-service) * gnu/services/base.scm (pam-limits-service-type) (greetd-pam-service) * gnu/services/desktop.scm (pam-gnome-keyring) * gnu/services/kerberos.scm (pam-krb5-pam-service) * gnu/services/pam-mount.scm (pam-mount-pam-service): Adapt to pam-extenders. --- gnu/services/authentication.scm | 28 +++++++++-------- gnu/services/base.scm | 54 +++++++++++++++++--------------- gnu/services/desktop.scm | 44 ++++++++++++++------------ gnu/services/kerberos.scm | 44 +++++++++++++------------- gnu/services/lightdm.scm | 2 +- gnu/services/mail.scm | 4 +-- gnu/services/pam-mount.scm | 23 ++++++++------ gnu/services/sddm.scm | 2 +- gnu/services/ssh.scm | 10 +++--- gnu/services/xorg.scm | 4 +-- gnu/system/pam.scm | 55 ++++++++++++++++++++++++++------- 11 files changed, 160 insertions(+), 110 deletions(-) diff --git a/gnu/services/authentication.scm b/gnu/services/authentication.scm index f7becdfafb..5ec7634789 100644 --- a/gnu/services/authentication.scm +++ b/gnu/services/authentication.scm @@ -506,19 +506,21 @@ (define (pam-ldap-pam-service config) (define pam-ldap-module #~(string-append #$(nslcd-configuration-nss-pam-ldapd config) "/lib/security/pam_ldap.so")) - (lambda (pam) - (if (member (pam-service-name pam) - (nslcd-configuration-pam-services config)) - (let ((sufficient - (pam-entry - (control "sufficient") - (module pam-ldap-module)))) - (pam-service - (inherit pam) - (auth (cons sufficient (pam-service-auth pam))) - (session (cons sufficient (pam-service-session pam))) - (account (cons sufficient (pam-service-account pam))))) - pam))) + (pam-extender + (transformer + (lambda (pam) + (if (member (pam-service-name pam) + (nslcd-configuration-pam-services config)) + (let ((sufficient + (pam-entry + (control "sufficient") + (module pam-ldap-module)))) + (pam-service + (inherit pam) + (auth (cons sufficient (pam-service-auth pam))) + (session (cons sufficient (pam-service-session pam))) + (account (cons sufficient (pam-service-account pam))))) + pam))))) (define (pam-ldap-pam-services config) (list (pam-ldap-pam-service config))) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 4adb551796..eaf5030935 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -1608,20 +1608,22 @@ (define-deprecated (syslog-service #:optional (config (syslog-configuration))) (define pam-limits-service-type (let ((pam-extension - (lambda (pam) - (let ((pam-limits (pam-entry - (control "required") - (module "pam_limits.so") - (arguments - '("conf=/etc/security/limits.conf"))))) - (if (member (pam-service-name pam) - '("login" "greetd" "su" "slim" "gdm-password" "sddm" - "sudo" "sshd")) - (pam-service - (inherit pam) - (session (cons pam-limits - (pam-service-session pam)))) - pam)))) + (pam-extender + (transformer + (lambda (pam) + (let ((pam-limits (pam-entry + (control "required") + (module "pam_limits.so") + (arguments + '("conf=/etc/security/limits.conf"))))) + (if (member (pam-service-name pam) + '("login" "greetd" "su" "slim" "gdm-password" + "sddm" "sudo" "sshd")) + (pam-service + (inherit pam) + (session (cons pam-limits + (pam-service-session pam)))) + pam)))))) ;; XXX: Using file-like objects is deprecated, use lists instead. ;; This is to be reduced into the list? case when the deprecated @@ -3269,16 +3271,18 @@ (define (greetd-pam-service config) (greetd-allow-empty-passwords? config) #:motd (greetd-motd config)) - (lambda (pam) - (if (member (pam-service-name pam) - '("login" "greetd" "su" "slim" "gdm-password")) - (pam-service - (inherit pam) - (auth (append (pam-service-auth pam) - (list optional-pam-mount))) - (session (append (pam-service-session pam) - (list optional-pam-mount)))) - pam)))) + (pam-extender + (transformer + (lambda (pam) + (if (member (pam-service-name pam) + '("login" "greetd" "su" "slim" "gdm-password")) + (pam-service + (inherit pam) + (auth (append (pam-service-auth pam) + (list optional-pam-mount))) + (session (append (pam-service-session pam) + (list optional-pam-mount)))) + pam)))))) (define (greetd-shepherd-services config) (map @@ -3290,7 +3294,7 @@ (define (greetd-shepherd-services config) (greetd-vt (greetd-terminal-vt tc))) (shepherd-service (documentation "Minimal and flexible login manager daemon") - (requirement '(user-processes host-name udev virtual-terminal)) + (requirement '(pam user-processes host-name udev virtual-terminal)) (provision (list (symbol-append 'term-tty (string->symbol (greetd-terminal-vt tc))))) diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index adea5b38dd..3adcfe8e5d 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -1187,10 +1187,12 @@ (define (pam-extension-procedure config) (module (file-append (elogind-package config) "/lib/security/pam_elogind.so")))) - (list (lambda (pam) - (pam-service - (inherit pam) - (session (cons pam-elogind (pam-service-session pam))))))) + (list (pam-extender + (transformer + (lambda (pam) + (pam-service + (inherit pam) + (session (cons pam-elogind (pam-service-session pam))))))))) (define (elogind-shepherd-service config) "Return a Shepherd service to start elogind according to @var{config}." @@ -1703,22 +1705,24 @@ (define (pam-gnome-keyring config) (arguments arguments))) (list - (lambda (service) - (case (assoc-ref (gnome-keyring-pam-services config) - (pam-service-name service)) - ((login) - (pam-service - (inherit service) - (auth (append (pam-service-auth service) - (list (%pam-keyring-entry)))) - (session (append (pam-service-session service) - (list (%pam-keyring-entry "auto_start")))))) - ((passwd) - (pam-service - (inherit service) - (password (append (pam-service-password service) - (list (%pam-keyring-entry)))))) - (else service))))) + (pam-extender + (transformer + (lambda (service) + (case (assoc-ref (gnome-keyring-pam-services config) + (pam-service-name service)) + ((login) + (pam-service + (inherit service) + (auth (append (pam-service-auth service) + (list (%pam-keyring-entry)))) + (session (append (pam-service-session service) + (list (%pam-keyring-entry "auto_start")))))) + ((passwd) + (pam-service + (inherit service) + (password (append (pam-service-password service) + (list (%pam-keyring-entry)))))) + (else service))))))) (define gnome-keyring-service-type (service-type diff --git a/gnu/services/kerberos.scm b/gnu/services/kerberos.scm index c3c7872734..0ae7c127d1 100644 --- a/gnu/services/kerberos.scm +++ b/gnu/services/kerberos.scm @@ -428,27 +428,29 @@ (define-record-type* (define (pam-krb5-pam-service config) "Return a PAM service for Kerberos authentication." - (lambda (pam) - (define pam-krb5-module - #~(string-append #$(pam-krb5-configuration-pam-krb5 config) - "/lib/security/pam_krb5.so")) - - (let ((pam-krb5-sufficient - (pam-entry - (control "sufficient") - (module pam-krb5-module) - (arguments - (list - (format #f "minimum_uid=~a" - (pam-krb5-configuration-minimum-uid config))))))) - (pam-service - (inherit pam) - (auth (cons* pam-krb5-sufficient - (pam-service-auth pam))) - (session (cons* pam-krb5-sufficient - (pam-service-session pam))) - (account (cons* pam-krb5-sufficient - (pam-service-account pam))))))) + (pam-extender + (transformer + (lambda (pam) + (define pam-krb5-module + #~(string-append #$(pam-krb5-configuration-pam-krb5 config) + "/lib/security/pam_krb5.so")) + + (let ((pam-krb5-sufficient + (pam-entry + (control "sufficient") + (module pam-krb5-module) + (arguments + (list + (format #f "minimum_uid=~a" + (pam-krb5-configuration-minimum-uid config))))))) + (pam-service + (inherit pam) + (auth (cons* pam-krb5-sufficient + (pam-service-auth pam))) + (session (cons* pam-krb5-sufficient + (pam-service-session pam))) + (account (cons* pam-krb5-sufficient + (pam-service-account pam))))))))) (define (pam-krb5-pam-services config) (list (pam-krb5-pam-service config))) diff --git a/gnu/services/lightdm.scm b/gnu/services/lightdm.scm index 0b9094cda1..b966f402d6 100644 --- a/gnu/services/lightdm.scm +++ b/gnu/services/lightdm.scm @@ -616,7 +616,7 @@ (define (lightdm-shepherd-service config) (list (shepherd-service (documentation "LightDM display manager") - (requirement '(dbus-system user-processes host-name)) + (requirement '(pam dbus-system user-processes host-name)) (provision '(lightdm display-manager xorg-server)) (respawn? #f) (start diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm index bf4948dcfb..12dcc8e71d 100644 --- a/gnu/services/mail.scm +++ b/gnu/services/mail.scm @@ -1578,7 +1578,7 @@ (define (dovecot-shepherd-service config) (list (shepherd-service (documentation "Run the Dovecot POP3/IMAP mail server.") (provision '(dovecot)) - (requirement '(networking)) + (requirement '(pam networking)) (start #~(make-forkexec-constructor (list (string-append #$dovecot "/sbin/dovecot") "-F"))) @@ -1676,7 +1676,7 @@ (define (opensmtpd-shepherd-service config) (package config-file shepherd-requirement) (list (shepherd-service (provision '(smtpd)) - (requirement `(loopback ,@shepherd-requirement)) + (requirement `(pam loopback ,@shepherd-requirement)) (documentation "Run the OpenSMTPD daemon.") (start (let ((smtpd (file-append package "/sbin/smtpd"))) #~(make-forkexec-constructor diff --git a/gnu/services/pam-mount.scm b/gnu/services/pam-mount.scm index e60781d05b..3e6667af9c 100644 --- a/gnu/services/pam-mount.scm +++ b/gnu/services/pam-mount.scm @@ -88,16 +88,19 @@ (define (pam-mount-pam-service config) (pam-entry (control "optional") (module #~(string-append #$pam-mount "/lib/security/pam_mount.so")))) - (list (lambda (pam) - (if (member (pam-service-name pam) - '("login" "greetd" "su" "slim" "gdm-password" "sddm")) - (pam-service - (inherit pam) - (auth (append (pam-service-auth pam) - (list optional-pam-mount))) - (session (append (pam-service-session pam) - (list optional-pam-mount)))) - pam)))) + (list + (pam-extender + (transformer + (lambda (pam) + (if (member (pam-service-name pam) + '("login" "greetd" "su" "slim" "gdm-password" "sddm")) + (pam-service + (inherit pam) + (auth (append (pam-service-auth pam) + (list optional-pam-mount))) + (session (append (pam-service-session pam) + (list optional-pam-mount)))) + pam)))))) (define pam-mount-service-type (service-type diff --git a/gnu/services/sddm.scm b/gnu/services/sddm.scm index 9e02f1cc81..c9a7ba96f4 100644 --- a/gnu/services/sddm.scm +++ b/gnu/services/sddm.scm @@ -169,7 +169,7 @@ (define (sddm-shepherd-service config) (list (shepherd-service (documentation "SDDM display manager.") - (requirement '(user-processes elogind)) + (requirement '(user-processes elogind pam)) (provision '(xorg-server display-manager)) (start #~(make-forkexec-constructor #$sddm-command)) (stop #~(make-kill-destructor))))) diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm index b76544c1a8..de5afdaa1a 100644 --- a/gnu/services/ssh.scm +++ b/gnu/services/ssh.scm @@ -197,9 +197,11 @@ (define (lsh-shepherd-service config) interfaces))))) (define requires - (if (and daemonic? (lsh-configuration-syslog-output? config)) - '(networking syslogd) - '(networking))) + `(networking + pam + ,@(if (and daemonic? (lsh-configuration-syslog-output? config)) + '(syslogd) + '()))) (list (shepherd-service (documentation "GNU lsh SSH server") @@ -566,7 +568,7 @@ (define (openssh-shepherd-service config) (list (shepherd-service (documentation "OpenSSH server.") - (requirement '(syslogd loopback)) + (requirement '(pam syslogd loopback)) (provision '(ssh-daemon ssh sshd)) (start #~(if #$inetd-style? diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 7295a45b59..8b6080fd26 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -667,7 +667,7 @@ (define (slim-shepherd-service config) (list (symbol-append 'xorg-server- (string->symbol vt))))) - (requirement '(user-processes host-name udev)) + (requirement '(pam user-processes host-name udev)) (start #~(lambda () ;; A stale lock file can prevent SLiM from starting, so remove it to @@ -1119,7 +1119,7 @@ (define (gdm-shepherd-service config) (list (shepherd-service (documentation "Xorg display server (GDM)") (provision '(xorg-server)) - (requirement '(dbus-system user-processes host-name udev elogind)) + (requirement '(dbus-system pam user-processes host-name udev elogind)) (start #~(lambda () (fork+exec-command (list #$(file-append (gdm-configuration-gdm config) diff --git a/gnu/system/pam.scm b/gnu/system/pam.scm index b635681642..6d9a7484c3 100644 --- a/gnu/system/pam.scm +++ b/gnu/system/pam.scm @@ -21,6 +21,7 @@ (define-module (gnu system pam) #:use-module (guix derivations) #:use-module (guix gexp) #:use-module (gnu services) + #:use-module (gnu services shepherd) #:use-module (gnu system setuid) #:use-module (ice-9 match) #:use-module (srfi srfi-1) @@ -55,6 +56,10 @@ (define-module (gnu system pam) session-environment-service session-environment-service-type + pam-extender + pam-extender-transformer + pam-extender-shepherd-requirements + pam-root-service-type pam-root-service)) @@ -347,32 +352,58 @@ (define (session-environment-service vars) ;;; PAM root service. ;;; +;; A PAM transformer consists of a procedure acting on each PAM entry, with an +;; additional list of shepherd-requirements that the meta PAM sheherd service +;; will rely on. +(define-record-type* + pam-extender make-pam-extender pam-extender? + (transformer pam-extender-transformer) + (shepherd-requirements pam-extender-shepherd-requirements + (default '()))) + ;; Overall PAM configuration: a list of services, plus a procedure that takes ;; one and returns a . The procedure is used to ;; implement cross-cutting concerns such as the use of the 'elogind.so' ;; session module that keeps track of logged-in users. (define-record-type* - pam-configuration make-pam-configuration? pam-configuration? + pam-configuration make-pam-configuration pam-configuration? (services pam-configuration-services) ;list of - (transform pam-configuration-transform)) ;procedure + (extenders pam-configuration-extenders)) ;list of (define (/etc-entry config) "Return the /etc/pam.d entry corresponding to CONFIG." (match config - (($ services transform) - (let ((services (map transform services))) + (($ services extenders) + (let ((services + (map + ;; XXX We need to add identity because compose expects at least + ;; one argument for some reason. + (apply compose (cons identity (map pam-extender-transformer extenders))) + services))) `(("pam.d" ,(pam-services->directory services))))))) +(define (pam-shepherd-service config) + (define requirements + (match config + (($ services extenders) + (concatenate (map pam-extender-shepherd-requirements extenders))))) + (list (shepherd-service + (documentation "Synchronization point for services that need to be +started for PAM to work.") + (provision '(pam)) + (requirement requirements) + (start #~(const #t)) + (stop #~(const #t))))) + (define (extend-configuration initial extensions) "Extend INITIAL with NEW." - (let-values (((services procs) + (let-values (((services extenders) (partition pam-service? extensions))) (pam-configuration (services (append (pam-configuration-services initial) services)) - (transform (apply compose - (pam-configuration-transform initial) - procs))))) + (extenders (append (pam-configuration-extenders initial) + extenders))))) (define pam-root-service-type (service-type (name 'pam) @@ -382,7 +413,9 @@ (define pam-root-service-type (lambda (_) (list (file-like->setuid-program (file-append linux-pam "/sbin/unix_chkpwd"))))) - (service-extension etc-service-type /etc-entry))) + (service-extension etc-service-type /etc-entry) + (service-extension shepherd-root-service-type + pam-shepherd-service))) ;; Arguments include as well as procedures. (compose concatenate) @@ -394,7 +427,7 @@ (define pam-root-service-type program may authenticate users or what it should do when opening a new session."))) -(define* (pam-root-service base #:key (transform identity)) +(define* (pam-root-service base #:key (extenders '())) "The \"root\" PAM service, which collects instance and turns them into a /etc/pam.d directory, including the listed in BASE. TRANSFORM is a procedure that takes a and returns a @@ -402,6 +435,6 @@ (define* (pam-root-service base #:key (transform identity)) all the PAM services." (service pam-root-service-type (pam-configuration (services base) - (transform transform)))) + (extenders extenders))))