From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id wI7tJ8wlpGYJtAAA62LTzQ:P1 (envelope-from ) for ; Fri, 26 Jul 2024 22:40:12 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id wI7tJ8wlpGYJtAAA62LTzQ (envelope-from ) for ; Sat, 27 Jul 2024 00:40:12 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lease-up.com header.s=2017 header.b=PoqWFjRT; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1722033612; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=ZGm2ndPEMklcnTyfx/JBN4DqE6ugCzhCEOSvh+zMSfs=; b=O7ivi5RE2E6/acEcT8gTEV+XvD4zqIQ10rxAlljA7eRqP80AaVClwt5Q+sWT77LKTGIb3H 1LdAbmX88c0s0S3AzfVaHxW6i6Psa+C92ddtLN79rqRMqhXmqouOtg+T5IhIN0U92VxjiD mCFmxs2LR/ABOmj1+3dfn9nibztCLUBHLX+lCyvU07HF3+woC3iH4/u3f4N2ETjGadwdf9 1/TnNeoHapggPSXcisqabawjfvN7HTtoVY7zEZyRto3A1F6kuHHymbusDdgUfSJH/FXfvV Rvjn9N94LfbJ9ZeSl/3ETKm40FyxAvbgL8x9ebUBdU5oCz4xFZlb1F2nDUPHaA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1722033612; a=rsa-sha256; cv=none; b=FLb51jEqINBLoQUyvo0eqhpXZTNO3z04N+RFeZ9IHvg0h0YbtWlte0gwr3ld3o6ghaCg6d FdUesqGQBqIWaarRfKzodpcZJJcAWzeYWvh0h5uoPUgVemxmBxL76xXGLbiM3vElGv8BrW HTFxTVX756WjYh1PEoW4Qf7rL1wGi0b5HwQxAXFCkBDuq4sKWeQqQ0e3RMsuN1Crb2tPJI xrn/aA0H+2EreqsQCiQOY8/Xv8ZrfUjuQw5x5dQcbCqyljj0Kk3pluhocH1aiYuccQno1c wTlc/adtg+q8g4/zEHRTnYRs7/QEVtqtawg7+H48Cy/rIHkDh+HszY1H3Zn6cA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lease-up.com header.s=2017 header.b=PoqWFjRT; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id EFA526092C for ; Sat, 27 Jul 2024 00:40:11 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sXTbS-0002yZ-5M; Fri, 26 Jul 2024 18:39:58 -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 1sXTbN-0002g4-TA for guix-patches@gnu.org; Fri, 26 Jul 2024 18:39:54 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sXTbN-0002Sg-Ky for guix-patches@gnu.org; Fri, 26 Jul 2024 18:39:53 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sXTbW-0002wb-G9 for guix-patches@gnu.org; Fri, 26 Jul 2024 18:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72316] [PATCH 2/3] Switch to Guile-PAM. Resent-From: Felix Lechner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 26 Jul 2024 22:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72316 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72316@debbugs.gnu.org Cc: Felix Lechner Received: via spool by 72316-submit@debbugs.gnu.org id=B72316.172203358911276 (code B ref 72316); Fri, 26 Jul 2024 22:40:02 +0000 Received: (at 72316) by debbugs.gnu.org; 26 Jul 2024 22:39:49 +0000 Received: from localhost ([127.0.0.1]:40239 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sXTbH-0002vm-4U for submit@debbugs.gnu.org; Fri, 26 Jul 2024 18:39:48 -0400 Received: from sail-ipv4.us-core.com ([208.82.101.137]:53130) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sXTbC-0002vE-J0 for 72316@debbugs.gnu.org; Fri, 26 Jul 2024 18:39:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=2017; bh=CWel/sTFVUJqb+F iGMQKU75ZDornNS/3liGjcF+zBrY=; h=references:in-reply-to:date:subject: cc:to:from; d=lease-up.com; b=PoqWFjRT3AzL849/0ouUOfVq46kmvd+M2R4109Rc tfWQ0dXpJhpjgS95GUjpUrnQ/xVSqGn0WpndrTEoSK1Dn8mhbG6q84/FIXf/8aNM+HLYvC MSgkg0uDwiha7fyf84kr2YE5FT0d1tVUlh/Tl6BhdtIn7bxbnV3/feCFPg1LE= Received: by sail-ipv4.us-core.com (OpenSMTPD) with ESMTPSA id a42c417d (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Fri, 26 Jul 2024 22:39:32 +0000 (UTC) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id b02fa678; Fri, 26 Jul 2024 22:39:32 +0000 (UTC) Date: Fri, 26 Jul 2024 15:39:12 -0700 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Felix Lechner X-ACL-Warn: , Felix Lechner via Guix-patches From: Felix Lechner via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: EFA526092C X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -6.92 X-Spam-Score: -6.92 X-TUID: Q9tZ5fcLXYk7 Change-Id: Ib691b41cdb152f508a4a8d1b12b2a20da8706fed --- gnu/services/authentication.scm | 9 +- gnu/services/base.scm | 16 +- gnu/services/desktop.scm | 14 +- gnu/services/kerberos.scm | 12 +- gnu/services/lightdm.scm | 69 ++++++-- gnu/services/pam-mount.scm | 5 +- gnu/services/sddm.scm | 91 +++++++--- gnu/services/xorg.scm | 17 +- gnu/system/pam.scm | 296 ++++++++++++++++++++++++++------ 9 files changed, 420 insertions(+), 109 deletions(-) diff --git a/gnu/services/authentication.scm b/gnu/services/authentication.scm index fbfef2d3d0..88ccba6ada 100644 --- a/gnu/services/authentication.scm +++ b/gnu/services/authentication.scm @@ -503,9 +503,6 @@ (define (nslcd-shepherd-service config) (define (pam-ldap-pam-service config) "Return a PAM service for LDAP authentication." - (define pam-ldap-module - (file-append (nslcd-configuration-nss-pam-ldapd config) - "/lib/security/pam_ldap.so")) (pam-extension (transformer (lambda (pam) @@ -514,7 +511,11 @@ (define (pam-ldap-pam-service config) (let ((sufficient (pam-entry (control "sufficient") - (module pam-ldap-module)))) + (module "pam_ldap.so") + (foreign-library-path + (list + (file-append (nslcd-configuration-nss-pam-ldapd config) + "/lib/security")))))) (pam-service (inherit pam) (auth (cons sufficient (pam-service-auth pam))) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 4b5b103cc3..0d99c649c2 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -58,8 +58,8 @@ (define-module (gnu services base) #:use-module (gnu packages admin) #:use-module ((gnu packages linux) #:select (alsa-utils btrfs-progs crda eudev - e2fsprogs f2fs-tools fuse gpm kbd lvm2 rng-tools - util-linux xfsprogs)) + e2fsprogs f2fs-tools fuse gpm kbd linux-pam + lvm2 rng-tools util-linux xfsprogs)) #:use-module (gnu packages bash) #:use-module ((gnu packages base) #:select (coreutils glibc glibc/hurd @@ -1652,7 +1652,10 @@ (define pam-limits-service-type (control "required") (module "pam_limits.so") (arguments - (list #~(string-append "conf=" #$limits-file)))))) + (list #~(string-append "conf=" #$limits-file))) + (foreign-library-path + (list + (file-append linux-pam "/lib/security")))))) (if (member (pam-service-name pam) '("login" "greetd" "su" "slim" "gdm-password" "sddm" "lightdm" "sudo" "sshd")) @@ -3540,8 +3543,11 @@ (define (greetd-pam-service config) (define optional-pam-mount (pam-entry (control "optional") - (module (file-append greetd-pam-mount "/lib/security/pam_mount.so")) - (arguments '("disable_interactive")))) + (module "pam_mount.so") + (arguments '("disable_interactive")) + (foreign-library-path + (list + (file-append greetd-pam-mount "/lib/security"))))) (list (unix-pam-service "greetd" diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 63e2011ce3..762b933519 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -1233,8 +1233,10 @@ (define (pam-extension-procedure config) (define pam-elogind (pam-entry (control "required") - (module (file-append (elogind-package config) - "/lib/security/pam_elogind.so")))) + (module "pam_elogind.so") + (foreign-library-path + (list + (file-append (elogind-package config) "/lib/security"))))) (list (pam-extension (transformer @@ -1886,9 +1888,11 @@ (define (pam-gnome-keyring config) (define (%pam-keyring-entry . arguments) (pam-entry (control "optional") - (module (file-append (gnome-keyring-package config) - "/lib/security/pam_gnome_keyring.so")) - (arguments arguments))) + (module "pam_gnome_keyring.so") + (arguments arguments) + (foreign-library-path + (list + (file-append (gnome-keyring-package config) "/lib/security"))))) (list (pam-extension diff --git a/gnu/services/kerberos.scm b/gnu/services/kerberos.scm index a6f540a9b6..d2d8988a83 100644 --- a/gnu/services/kerberos.scm +++ b/gnu/services/kerberos.scm @@ -431,18 +431,18 @@ (define (pam-krb5-pam-service config) (pam-extension (transformer (lambda (pam) - (define pam-krb5-module - (file-append (pam-krb5-configuration-pam-krb5 config) - "/lib/security/pam_krb5.so")) - (let ((pam-krb5-sufficient (pam-entry (control "sufficient") - (module pam-krb5-module) + (module "pam_krb5.so") (arguments (list (format #f "minimum_uid=~a" - (pam-krb5-configuration-minimum-uid config))))))) + (pam-krb5-configuration-minimum-uid config)))) + (foreign-library-path + (list + (file-append (pam-krb5-configuration-pam-krb5 config) + "/lib/security")))))) (pam-service (inherit pam) (auth (cons* pam-krb5-sufficient diff --git a/gnu/services/lightdm.scm b/gnu/services/lightdm.scm index 18beaa44de..dcdae51c68 100644 --- a/gnu/services/lightdm.scm +++ b/gnu/services/lightdm.scm @@ -24,6 +24,7 @@ (define-module (gnu services lightdm) #:use-module (gnu packages display-managers) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gnome) + #:use-module ((gnu packages linux) #:select (linux-pam)) #:use-module (gnu packages vnc) #:use-module (gnu packages xorg) #:use-module (gnu services configuration) @@ -546,15 +547,35 @@ (define (lightdm-greeter-pam-service) (name "lightdm-greeter") (auth (list ;; Load environment from /etc/environment and ~/.pam_environment. - (pam-entry (control "required") (module "pam_env.so")) + (pam-entry (control "required") + (module "pam_env.so") + (foreign-library-path + (list + (file-append linux-pam "/lib/security")))) ;; Always let the greeter start without authentication. - (pam-entry (control "required") (module "pam_permit.so")))) + (pam-entry (control "required") + (module "pam_permit.so") + (foreign-library-path + (list + (file-append linux-pam "/lib/security")))))) ;; No action required for account management - (account (list (pam-entry (control "required") (module "pam_permit.so")))) + (account (list (pam-entry (control "required") + (module "pam_permit.so") + (foreign-library-path + (list + (file-append linux-pam "/lib/security")))))) ;; Prohibit changing password. - (password (list (pam-entry (control "required") (module "pam_deny.so")))) + (password (list (pam-entry (control "required") + (module "pam_deny.so") + (foreign-library-path + (list + (file-append linux-pam "/lib/security")))))) ;; Setup session. - (session (list (pam-entry (control "required") (module "pam_unix.so")))))) + (session (list (pam-entry (control "required") + (module "pam_unix.so") + (foreign-library-path + (list + (file-append linux-pam "/lib/security")))))))) (define (lightdm-autologin-pam-service) "Return a PAM service for @command{lightdm-autologin}}." @@ -563,17 +584,41 @@ (define (lightdm-autologin-pam-service) (auth (list ;; Block login if user is globally disabled. - (pam-entry (control "required") (module "pam_nologin.so")) - (pam-entry (control "required") (module "pam_succeed_if.so") - (arguments (list "uid >= 1000"))) + (pam-entry (control "required") + (module "pam_nologin.so") + (foreign-library-path + (list + (file-append linux-pam "/lib/security")))) + (pam-entry (control "required") + (module "pam_succeed_if.so") + (arguments (list "uid >= 1000")) + (foreign-library-path + (list + (file-append linux-pam "/lib/security")))) ;; Allow access without authentication. - (pam-entry (control "required") (module "pam_permit.so")))) + (pam-entry (control "required") + (module "pam_permit.so") + (foreign-library-path + (list + (file-append linux-pam "/lib/security")))))) ;; Stop autologin if account requires action. - (account (list (pam-entry (control "required") (module "pam_unix.so")))) + (account (list (pam-entry (control "required") + (module "pam_unix.so") + (foreign-library-path + (list + (file-append linux-pam "/lib/security")))))) ;; Prohibit changing password. - (password (list (pam-entry (control "required") (module "pam_deny.so")))) + (password (list (pam-entry (control "required") + (module "pam_deny.so") + (foreign-library-path + (list + (file-append linux-pam "/lib/security")))))) ;; Setup session. - (session (list (pam-entry (control "required") (module "pam_unix.so")))))) + (session (list (pam-entry (control "required") + (module "pam_unix.so") + (foreign-library-path + (list + (file-append linux-pam "/lib/security")))))))) (define (lightdm-pam-services config) (list (lightdm-pam-service config) diff --git a/gnu/services/pam-mount.scm b/gnu/services/pam-mount.scm index b3a02e82e9..1eb5b44e31 100644 --- a/gnu/services/pam-mount.scm +++ b/gnu/services/pam-mount.scm @@ -94,7 +94,10 @@ (define (pam-mount-pam-service config) (define optional-pam-mount (pam-entry (control "optional") - (module (file-append pam-mount "/lib/security/pam_mount.so")))) + (module "pam_mount.so") + (foreign-library-path + (list + (file-append pam-mount "/lib/security"))))) (list (pam-extension (transformer diff --git a/gnu/services/sddm.scm b/gnu/services/sddm.scm index 92d64cc599..cb2c5a9276 100644 --- a/gnu/services/sddm.scm +++ b/gnu/services/sddm.scm @@ -24,6 +24,7 @@ (define-module (gnu services sddm) #:use-module (gnu packages admin) #:use-module (gnu packages display-managers) #:use-module (gnu packages freedesktop) + #:use-module ((gnu packages linux) #:select (linux-pam)) #:use-module (gnu packages xorg) #:use-module (gnu services) #:use-module (gnu services shepherd) @@ -206,40 +207,61 @@ (define (sddm-pam-service config) (list (pam-entry (control "requisite") - (module "pam_nologin.so")) + (module "pam_nologin.so") + (foreign-library-path + (list + (file-append linux-pam "/lib/security")))) (pam-entry (control "required") - (module "pam_env.so")) + (module "pam_env.so") + (foreign-library-path + (list + (file-append linux-pam "/lib/security")))) (pam-entry (control "required") (module "pam_succeed_if.so") (arguments (list (string-append "uid >= " (number->string (sddm-configuration-minimum-uid config))) - "quiet"))) + "quiet")) + (foreign-library-path + (list + (file-append linux-pam "/lib/security")))) ;; should be factored out into system-auth (pam-entry (control "required") - (module "pam_unix.so")))) + (module "pam_unix.so") + (foreign-library-path + (list + (file-append linux-pam "/lib/security")))))) (account (list ;; should be factored out into system-account (pam-entry (control "required") - (module "pam_unix.so")))) + (module "pam_unix.so") + (foreign-library-path + (list + (file-append linux-pam "/lib/security")))))) (password (list ;; should be factored out into system-password (pam-entry (control "required") (module "pam_unix.so") - (arguments (list "sha512" "shadow" "try_first_pass"))))) + (arguments (list "sha512" "shadow" "try_first_pass")) + (foreign-library-path + (list + (file-append linux-pam "/lib/security")))))) (session (list ;; lfs has a required pam_limits.so ;; should be factored out into system-session (pam-entry (control "required") - (module "pam_unix.so")))))) + (module "pam_unix.so") + (foreign-library-path + (list + (file-append linux-pam "/lib/security")))))))) (define (sddm-greeter-pam-service) "Return a PAM service for @command{sddm-greeter}." @@ -250,29 +272,44 @@ (define (sddm-greeter-pam-service) ;; Load environment from /etc/environment and ~/.pam_environment (pam-entry (control "required") - (module "pam_env.so")) + (module "pam_env.so") + (foreign-library-path + (list + (file-append linux-pam "/lib/security")))) ;; Always let the greeter start without authentication (pam-entry (control "required") - (module "pam_permit.so")))) + (module "pam_permit.so") + (foreign-library-path + (list + (file-append linux-pam "/lib/security")))))) (account (list ;; No action required for account management (pam-entry (control "required") - (module "pam_permit.so")))) + (module "pam_permit.so") + (foreign-library-path + (list + (file-append linux-pam "/lib/security")))))) (password (list ;; Can't change password (pam-entry (control "required") - (module "pam_deny.so")))) + (module "pam_deny.so") + (foreign-library-path + (list + (file-append linux-pam "/lib/security")))))) (session (list ;; Setup session (pam-entry (control "required") - (module "pam_unix.so")))))) + (module "pam_unix.so") + (foreign-library-path + (list + (file-append linux-pam "/lib/security")))))))) (define (sddm-autologin-pam-service config) "Return a PAM service for @command{sddm-autologin}" @@ -282,31 +319,37 @@ (define (sddm-autologin-pam-service config) (list (pam-entry (control "requisite") - (module "pam_nologin.so")) + (module "pam_nologin.so") + (foreign-library-path + (list + (file-append linux-pam "/lib/security")))) (pam-entry (control "required") (module "pam_succeed_if.so") (arguments (list (string-append "uid >= " (number->string (sddm-configuration-minimum-uid config))) - "quiet"))) + "quiet")) + (foreign-library-path + (list + (file-append linux-pam "/lib/security")))) (pam-entry (control "required") - (module "pam_permit.so")))) + (module "pam_permit.so") + (foreign-library-path + (list + (file-append linux-pam "/lib/security")))))) (account - (list - (pam-entry - (control "include") - (module "sddm")))) + (pam-service-account (sddm-pam-service config))) (password (list (pam-entry (control "required") - (module "pam_deny.so")))) + (module "pam_deny.so") + (foreign-library-path + (list + (file-append linux-pam "/lib/security")))))) (session - (list - (pam-entry - (control "include") - (module "sddm")))))) + (pam-service-session (sddm-pam-service config))))) (define (sddm-pam-services config) (list (sddm-pam-service config) diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index e7d8922d76..b1df08662f 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -1236,16 +1236,25 @@ (define (gdm-pam-service config) #:login-uid? #t)) (auth (list (pam-entry (control "optional") - (module (file-append (gdm-configuration-gdm config) - "/lib/security/pam_gdm.so"))) + (module "pam_gdm.so") + (foreign-library-path + (list + (file-append (gdm-configuration-gdm config) + "/lib/security/")))) (pam-entry (control "sufficient") - (module "pam_permit.so"))))) + (module "pam_permit.so") + (foreign-library-path + (list + (file-append linux-pam "/lib/security"))))))) (pam-service (inherit (unix-pam-service "gdm-launch-environment")) (auth (list (pam-entry (control "required") - (module "pam_permit.so"))))) + (module "pam_permit.so") + (foreign-library-path + (list + (file-append linux-pam "/lib/security"))))))) (unix-pam-service "gdm-password" #:login-uid? #t #:allow-empty-passwords? diff --git a/gnu/system/pam.scm b/gnu/system/pam.scm index a035a92e25..232256d59a 100644 --- a/gnu/system/pam.scm +++ b/gnu/system/pam.scm @@ -32,7 +32,9 @@ (define-module (gnu system pam) #:use-module (srfi srfi-11) #:use-module (srfi srfi-26) #:use-module ((guix utils) #:select (%current-system)) + #:use-module (gnu packages guile) #:use-module (gnu packages linux) + #:use-module (gnu packages mes) #:export (pam-service pam-service-name pam-service-account @@ -44,6 +46,8 @@ (define-module (gnu system pam) pam-entry-control pam-entry-module pam-entry-arguments + pam-entry-guile-inputs + pam-entry-foreign-library-path pam-limits-entry pam-limits-entry-domain @@ -92,10 +96,16 @@ (define-record-type* pam-service (define-record-type* pam-entry make-pam-entry pam-entry? - (control pam-entry-control) ; string + (control pam-entry-control) ; string, symbol or g-expression (module pam-entry-module) ; file name (arguments pam-entry-arguments ; list of string-valued g-expressions - (default '()))) + (default '())) + (guile-inputs pam-entry-guile-inputs ; list of package variables + (default '())) + (foreign-library-path pam-entry-foreign-library-path ; list of file-like folders + ;; courtesy for historical usage + (default (list + (file-append linux-pam "/lib/security"))))) ;; PAM limits entries are used by the pam_limits PAM module to set or override ;; limits on system resources for user sessions. The format is specified @@ -150,35 +160,79 @@ (define (pam-limits-entry->string entry) (number->string value)))) " ")))) -(define (pam-service->configuration service) +(define (pam-service->configuration service shared-object environment-file pamda-file) "Return the derivation building the configuration file for SERVICE, to be dumped in /etc/pam.d/NAME, where NAME is the name of SERVICE." - (define (entry->gexp type entry) - (match entry - (($ control module (arguments ...)) - #~(format #t "~a ~a ~a ~a~%" - #$type #$control #$module - (string-join (list #$@arguments)))))) - - (match service - (($ name account auth password session) - (define builder - #~(begin - (with-output-to-file #$output - (lambda () - #$@(append (map (cut entry->gexp "account" <>) account) - (map (cut entry->gexp "auth" <>) auth) - (map (cut entry->gexp "password" <>) password) - (map (cut entry->gexp "session" <>) session)) - #t)))) - - (computed-file name builder)))) - -(define (pam-services->directory services) + (mixed-text-file (pam-service-name service) + "account required " shared-object " " environment-file " " pamda-file "\n" + "auth required " shared-object " " environment-file " " pamda-file "\n" + "password required " shared-object " " environment-file " " pamda-file "\n" + "session required " shared-object " " environment-file " " pamda-file "\n")) + +(define (intersperse a xs) + (if (null? xs) + '() + [cons (car xs) + (if (null? (cdr xs)) + (cdr xs) + (cons a (intersperse a (cdr xs))))])) + +(define* (make-environment-file guile-inputs + foreign-library-path + #:key + (auto-compile? #f) + (guix-locale-path '("/run/current-system/locale")) + (install-locale? #f) + (jit-log-level 0) + (jit-pause-when-stopping? #f) + (jit-stop-after -1) + (jit-threshold 1000) + (locale "C.utf8") + (warn-deprecated "yes")) + (let* ((load-path (map (lambda (package) + (file-append package "/share/guile/site/3.0")) + guile-inputs)) + (load-compiled-path (map (lambda (package) + (file-append package "/lib/guile/3.0/site-ccache")) + guile-inputs)) + (lines `(("LANG=" ,locale) + ;; note on LOCPATH from the Glibc manual: + ;; The value of ‘LOCPATH’ is ignored by privileged programs for security + ;; reasons, and only the default directory is used. + ("GUIX_LOCPATH=" ,@(intersperse ":" guix-locale-path)) + ("GUILE_AUTO_COMPILE=" ,(if auto-compile? "1" "0")) + ("GUILE_INSTALL_LOCALE=" ,(if install-locale? "1" "0")) + ("GUILE_LOAD_PATH=" ,@(intersperse ":" load-path)) + ("GUILE_LOAD_COMPILED_PATH=" ,@(intersperse ":" load-compiled-path)) + ("GUILE_EXTENSIONS_PATH=" ,@(intersperse ":" foreign-library-path)) + ("GUILE_WARN_DEPRECATED=" ,warn-deprecated) + ("GUILE_JIT_LOG=" ,(number->string jit-log-level)) + ("GUILE_JIT_PAUSE_WHEN_STOPPING=" ,(if jit-pause-when-stopping? "1" "0")) + ("GUILE_JIT_STOP_AFTER=" ,(number->string jit-stop-after)) + ("GUILE_JIT_THRESHOLD=" ,(number->string jit-threshold)))) + (terminated (map (lambda (line) + (append line '("\0"))) + lines)) + (flattened (fold (lambda (right left) + (append left right)) + '() + terminated))) + (apply mixed-text-file "guile-pam-environment" flattened))) + +(define (pam-services->directory shared-object + guile-inputs + foreign-library-path + folder + services) "Return the derivation to build the configuration directory to be used as /etc/pam.d for SERVICES." - (let ((names (map pam-service-name services)) - (files (map pam-service->configuration services))) + (let* ((names (map pam-service-name services)) + (environment-file (make-environment-file guile-inputs + foreign-library-path)) + (pamda-file (make-pam-stack folder services)) + (files (map (cut pam-service->configuration <> + shared-object environment-file pamda-file) + services))) (define builder #~(begin (use-modules (ice-9 match) @@ -195,14 +249,17 @@ (define (pam-services->directory services) ;; instead. See . (delete-duplicates '#$(zip names files))))) - (computed-file "pam.d" builder))) + (computed-file folder builder))) (define %pam-other-services ;; The "other" PAM configuration, which denies everything (see ;; .) (let ((deny (pam-entry (control "required") - (module "pam_deny.so")))) + (module "pam_deny.so") + (foreign-library-path + (list + (file-append linux-pam "/lib/security")))))) (pam-service (name "other") (account (list deny)) @@ -213,12 +270,18 @@ (define %pam-other-services (define unix-pam-service (let ((unix (pam-entry (control "required") - (module "pam_unix.so"))) + (module "pam_unix.so") + (foreign-library-path + (list + (file-append linux-pam "/lib/security"))))) (env (pam-entry ; to honor /etc/environment. (control "required") - (module "pam_env.so")))) + (module "pam_env.so") + (foreign-library-path + (list + (file-append linux-pam "/lib/security")))))) (lambda* (name #:key allow-empty-passwords? allow-root? motd - login-uid? gnupg?) + login-uid? gnupg?) "Return a standard Unix-style PAM service for NAME. When ALLOW-EMPTY-PASSWORDS? is true, allow empty passwords. When ALLOW-ROOT? is true, allow root to run the command without authentication. When MOTD is @@ -234,40 +297,61 @@ (define unix-pam-service (auth (append (if allow-root? (list (pam-entry (control "sufficient") - (module "pam_rootok.so"))) + (module "pam_rootok.so") + (foreign-library-path + (list + (file-append linux-pam "/lib/security"))))) '()) (list (if allow-empty-passwords? (pam-entry (control "required") (module "pam_unix.so") - (arguments '("nullok"))) + (arguments '("nullok")) + (foreign-library-path + (list + (file-append linux-pam "/lib/security")))) unix)) (if gnupg? (list (pam-entry (control "required") - (module (file-append pam-gnupg "/lib/security/pam_gnupg.so")))) + (module "pam_gnupg.so") + (foreign-library-path + (list + (file-append pam-gnupg "/lib/security"))))) '()))) (password (list (pam-entry (control "required") (module "pam_unix.so") ;; Store SHA-512 encrypted passwords in /etc/shadow. - (arguments '("sha512" "shadow"))))) + (arguments '("sha512" "shadow")) + (foreign-library-path + (list + (file-append linux-pam "/lib/security")))))) (session `(,@(if motd (list (pam-entry (control "optional") (module "pam_motd.so") (arguments - (list #~(string-append "motd=" #$motd))))) + (list #~(string-append "motd=" #$motd))) + (foreign-library-path + (list + (file-append linux-pam "/lib/security"))))) '()) ,@(if login-uid? (list (pam-entry ;to fill in /proc/self/loginuid (control "required") - (module "pam_loginuid.so"))) + (module "pam_loginuid.so") + (foreign-library-path + (list + (file-append linux-pam "/lib/security"))))) '()) ,@(if gnupg? (list (pam-entry (control "required") - (module (file-append pam-gnupg "/lib/security/pam_gnupg.so")))) + (module "pam_gnupg.so") + (foreign-library-path + (list + (file-append pam-gnupg "/lib/security"))))) '()) ,env ,unix)))))) @@ -276,13 +360,19 @@ (define (rootok-pam-service command) authenticate to run COMMAND." (let ((unix (pam-entry (control "required") - (module "pam_unix.so")))) + (module "pam_unix.so") + (foreign-library-path + (list + (file-append linux-pam "/lib/security")))))) (pam-service (name command) (account (list unix)) (auth (list (pam-entry (control "sufficient") - (module "pam_rootok.so")))) + (module "pam_rootok.so") + (foreign-library-path + (list + (file-append linux-pam "/lib/security")))))) (password (list unix)) (session (list unix))))) @@ -374,21 +464,114 @@ (define-record-type* (services pam-configuration-services) ;list of procedures -> (transformers pam-configuration-transformers) + ;; file-like shared module + (shared-object pam-configuration-shared-object) + ;; list of package variables + (guile-inputs pam-configuration-guile-inputs) + ;; list of file-like folders + (foreign-library-path pam-configuration-foreign-library-path) ;list of symbols (shepherd-requirements pam-configuration-shepherd-requirements)) +(define (make-pam-stack folder services) + (define* (entry->gate entry + #:key + only-actions + only-services) + (match entry + (($ control module (options ...)) + ;; adapted from (pam legacy configuration) + (cond + ((string=? "include" control) + (error "PAM include not implemented; send list of instead" + control module options entry)) + ((string=? "substack" control) + ;; this probably differs a little bit from Linux-PAM + #~(gate required (stack-pamda + (configuration-file->gates #$folder #$module + #:only-actions '#$only-actions + #:only-services '#$only-services)) + #:only-actions '#$only-actions + #:only-services '#$only-services)) + (else + #~(gate (legacy-plan->modern-plan #$control) + (legacy-or-modern-pamda #$module) + #:options (list #$@options) + #:only-actions '#$only-actions + #:only-services '#$only-services)))))) + + (define (service->gates service) + (match service + (($ name account auth password session) + (append (map (cut entry->gate <> + #:only-actions '(pam_sm_acct_mgmt) + #:only-services (list name)) + account) + (map (cut entry->gate <> + #:only-actions '(pam_sm_authenticate + pam_sm_setcred) + #:only-services (list name)) + auth) + (map (cut entry->gate <> + #:only-actions '(pam_sm_chauthtok) + #:only-services (list name)) + password) + (map (cut entry->gate <> + #:only-actions '(pam_sm_open_session + pam_sm_close_session) + #:only-services (list name)) + session))))) + + (let* ((gates (append-map service->gates services))) + (scheme-file + "guile-pam-stack.scm" + #~(begin + (use-modules (pam stack) + (pam legacy configuration) + (pam legacy module) + (pam legacy stack)) + (stack-pamda (list #$@gates)))))) + (define (/etc-entry config) "Return the /etc/pam.d entry corresponding to CONFIG." + (define (service->pam-entries service) + (match service + (($ name account auth password session) + (append account auth password session)))) (match config - (($ services transformers shepherd-requirements) - (let ((services (map (apply compose identity transformers) - services))) - `(("pam.d" ,(pam-services->directory services))))))) + (($ services + transformers + shared-object + guile-inputs + foreign-library-path + shepherd-requirements) + (let* ((services (map (apply compose identity transformers) + services)) + (all-entries (append-map service->pam-entries + services)) + (combined-inputs (delete-duplicates + (append guile-inputs + (append-map pam-entry-guile-inputs + all-entries)))) + (combined-library-path (delete-duplicates + (append foreign-library-path + (append-map pam-entry-foreign-library-path + all-entries))))) + `(("pam.d" ,(pam-services->directory shared-object + combined-inputs + combined-library-path + "pam.d" + services))))))) (define (pam-shepherd-service config) "Return the PAM synchronization shepherd service corresponding to CONFIG." (match config - (($ services transformers shepherd-requirements) + (($ services + transformers + shared-object + guile-inputs + foreign-library-path + shepherd-requirements) (list (shepherd-service (documentation "Synchronization point for services that need to be started for PAM to work.") @@ -417,6 +600,9 @@ (define (extend-configuration initial extensions) services)) (transformers (append (pam-configuration-transformers initial) (map pam-extension-transformer pam-extensions))) + (shared-object (pam-configuration-shared-object initial)) + (guile-inputs (pam-configuration-guile-inputs initial)) + (foreign-library-path (pam-configuration-foreign-library-path initial)) (shepherd-requirements (append (pam-configuration-shepherd-requirements initial) (append-map pam-extension-shepherd-requirements pam-extensions)))))) @@ -442,8 +628,19 @@ (define pam-root-service-type such as @command{login} or @command{sshd}, and specifies for instance how the program may authenticate users or what it should do when opening a new session."))) - -(define* (pam-root-service base #:key (transformers '()) (shepherd-requirements '())) +(define* (pam-root-service base + #:key + (transformers '()) + (shared-object + (file-append guile-pam "/lib/security/pam_guile.so")) + (guile-inputs + (list guile-3.0 + guile-bytestructures ;for (bytestructures guile) + guile-pam ;for (pam) and (ffi pam) + nyacc)) ;for (system ffi-helper-rt) + (foreign-library-path + (list (file-append linux-pam "/lib"))) ;for libpam.so + (shepherd-requirements '())) "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 @@ -452,6 +649,9 @@ (define* (pam-root-service base #:key (transformers '()) (shepherd-requirements (service pam-root-service-type (pam-configuration (services base) (transformers transformers) + (shared-object shared-object) + (guile-inputs guile-inputs) + (foreign-library-path foreign-library-path) (shepherd-requirements shepherd-requirements)))) -- 2.45.2