From unknown Wed Jun 25 09:09:41 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#38182] [PATCH 0/3] Add PAM Mount. Resent-From: Guillaume Le Vaillant Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2019 18:03:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 38182 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38182@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.157358174923795 (code B ref -1); Tue, 12 Nov 2019 18:03:01 +0000 Received: (at submit) by debbugs.gnu.org; 12 Nov 2019 18:02:29 +0000 Received: from localhost ([127.0.0.1]:58341 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iUaUm-0006Bj-SK for submit@debbugs.gnu.org; Tue, 12 Nov 2019 13:02:29 -0500 Received: from lists.gnu.org ([209.51.188.17]:36821) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iUaUj-0006BZ-RF for submit@debbugs.gnu.org; Tue, 12 Nov 2019 13:02:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37941) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iUaUe-0000N7-HT for guix-patches@gnu.org; Tue, 12 Nov 2019 13:02:25 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iUaUd-0007Vw-AR for guix-patches@gnu.org; Tue, 12 Nov 2019 13:02:20 -0500 Received: from mout02.posteo.de ([185.67.36.66]:58333) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iUaUc-0007S5-R8 for guix-patches@gnu.org; Tue, 12 Nov 2019 13:02:19 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 1D6CD2400FB for ; Tue, 12 Nov 2019 19:02:15 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1573581735; bh=6S5KuOVrKIN/GMDIiG1Sx9pmQKfIYG8YHA8UBsp14XE=; h=From:To:Subject:Date:From; b=W1OGICzhgbFLM2N20HGKbjjw/fYtbcMC6sPe1IfYzUVuIjm32NGscdTXKKruVIhbL Kw6M9DJIUjmTwb/mL15y6cEGjitolnTdGgRaLD75pdXPNbpTcy8zSxLAscGMNgH8W/ OJxqg4EImk32ByWHQ9WHEIhL02vuskgC9vaA/JXp2R9uOZxIQu/PkljRXHg87QCav7 T8wwBIWYi9HMO/7pPfEl0N84oppO2uStaR82vcZRfXo/2gqojzIpnwRpfMW93pQzc6 xEa0ibs89G1BhaYiTKMTJxIKkn1EcSPf/sskf+ciakKlqMiwUDt06W/iAG/HLIfJDv o771IxnEWG6sQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 47CFv92QnHz9rxW for ; Tue, 12 Nov 2019 19:02:13 +0100 (CET) User-agent: mu4e 1.2.0; emacs 26.3 From: Guillaume Le Vaillant Date: Tue, 12 Nov 2019 19:02:10 +0100 Message-ID: <87ftitas7x.fsf@yamatai> MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 185.67.36.66 X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) This patch series adds a 'pam-mount-service-type' allowing to mount volumes when logging in. Patches: 1- gnu: Add libhx. 2- gnu: Add pam-mount. 3- services: Add pam-mount. From unknown Wed Jun 25 09:09:41 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#38182] [PATCH 1/3] gnu: Add libhx. Resent-From: Guillaume Le Vaillant Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2019 18:06:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38182 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38182@debbugs.gnu.org Cc: Guillaume Le Vaillant Received: via spool by 38182-submit@debbugs.gnu.org id=B38182.157358195224145 (code B ref 38182); Tue, 12 Nov 2019 18:06:01 +0000 Received: (at 38182) by debbugs.gnu.org; 12 Nov 2019 18:05:52 +0000 Received: from localhost ([127.0.0.1]:58347 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iUaY3-0006HN-CC for submit@debbugs.gnu.org; Tue, 12 Nov 2019 13:05:51 -0500 Received: from mout02.posteo.de ([185.67.36.66]:54775) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iUaY0-0006H7-Th for 38182@debbugs.gnu.org; Tue, 12 Nov 2019 13:05:49 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id D5DCF2400FC for <38182@debbugs.gnu.org>; Tue, 12 Nov 2019 19:05:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1573581942; bh=y9CYRMdieAlfDY2+gtMljfV6uvRNRopDnX8FvC1w52U=; h=From:To:Cc:Subject:Date:From; b=MrrTS1/vBqx0nZ3ZFjs4RTthSjn8V1EXvEvQrkAp/au725fK/f3sfel6SBAoyUVVB 35mS6OEmfLLKDCgNhpKpelZvvyEApBlVW5qy6tu/+/iaZaqTwdyWKGBgcjAkMQXYs5 CF/EjpenRZc9gvAbXxwO8VdpdFhOH7oHLZi5iGXgwWwfeRiCi8kO905FLbJLb1WFFZ J8rf4VAbrlbYzifP4cMCCUEcWYZJsUZYHYycWgZTpYiehyMTGQ7fZPo5RWIWvZBQgH KM/RvowPW4oU6G1oeBiLl+sTRGhE7f+vtlW+dByH6oTKrxD9CkwjyxhzK/dCQMwKC7 fOU0IHg86MggA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 47CFz96ddGz9rxD; Tue, 12 Nov 2019 19:05:41 +0100 (CET) From: Guillaume Le Vaillant Date: Tue, 12 Nov 2019 19:05:17 +0100 Message-Id: <20191112180519.9625-1-glv@posteo.net> X-Mailer: git-send-email 2.24.0 In-Reply-To: <87ftitas7x.fsf@yamatai> References: <87ftitas7x.fsf@yamatai> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/c.scm (libhx): New variable. --- gnu/packages/c.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 41946f4169..77c87a2bb3 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Pierre Neidhardt ;;; Copyright © 2019 Efraim Flashner +;;; Copyright © 2019 Guillaume Le Vaillant ;;; ;;; This file is part of GNU Guix. ;;; @@ -316,3 +317,25 @@ Its three main components are: "The purpose of libfixposix is to offer replacements for parts of POSIX whose behaviour is inconsistent across *NIX flavours.") (license license:boost1.0))) + +(define-public libhx + (package + (name "libhx") + (version "3.24") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/libhx/libHX/" + "libHX-" version ".tar.xz")) + (sha256 + (base32 + "0i8v2464p830c15myknvvs6bhxaf663lrqgga95l94ygfynkw6x5")))) + (build-system gnu-build-system) + (home-page "http://libhx.sourceforge.net") + (synopsis "C library with common data structures and functions") + (description + "This is a C library (with some C++ bindings available) that provides data +structures and functions commonly needed, such as maps, deques, linked lists, +string formatting and autoresizing, option and config file parsing, type +checking casts and more.") + (license license:lgpl2.1+))) -- 2.24.0 From unknown Wed Jun 25 09:09:41 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#38182] [PATCH 2/3] gnu: Add pam-mount. Resent-From: Guillaume Le Vaillant Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2019 18:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38182 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38182@debbugs.gnu.org Cc: Guillaume Le Vaillant Received: via spool by 38182-submit@debbugs.gnu.org id=B38182.157358197324209 (code B ref 38182); Tue, 12 Nov 2019 18:07:01 +0000 Received: (at 38182) by debbugs.gnu.org; 12 Nov 2019 18:06:13 +0000 Received: from localhost ([127.0.0.1]:58351 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iUaYN-0006IL-0T for submit@debbugs.gnu.org; Tue, 12 Nov 2019 13:06:13 -0500 Received: from mout02.posteo.de ([185.67.36.66]:50559) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iUaYD-0006HY-6M for 38182@debbugs.gnu.org; Tue, 12 Nov 2019 13:06:06 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 767A12400FE for <38182@debbugs.gnu.org>; Tue, 12 Nov 2019 19:05:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1573581955; bh=BxBU0vA6DMp4AsfjJduGI0SCzcL0tKBdWnt2p1+BqbE=; h=From:To:Cc:Subject:Date:From; b=XVXr7TIp1d9jxkCrS+x2XwIaQlfw3nGl/+aXyTXTbbNHmuwfLRSJQnPA72plDGIrj a4ESb1e2IIvwcJz0ZzQ3Gr4T17ig+TeLWF08Ot5NqBolI30VWCcoqALxYNUBACwwoY CuPH/x0yg10GL7NL+w/ehJBMv3u0xo5z0n872hezG/D9+bgUL/cbRGsjGd2D/ZS3mY tlGJvYKINN/tgCaCBoi4bnXh02UhDfWwdUNMIGclcTcBHeqAKXk9IFh7EjgEY7v2LP 8Ytyy/EGUJvYKxc3J0y1MQMAgnOq9L2k36Lq3yarera8pTU5pnl9+SZcByzStM4HOw 1ja15MjxGCY4A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 47CFzQ5zm4z9rxX; Tue, 12 Nov 2019 19:05:54 +0100 (CET) From: Guillaume Le Vaillant Date: Tue, 12 Nov 2019 19:05:18 +0100 Message-Id: <20191112180519.9625-2-glv@posteo.net> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191112180519.9625-1-glv@posteo.net> References: <87ftitas7x.fsf@yamatai> <20191112180519.9625-1-glv@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/admin.scm (pam-mount): New variable. * gnu/packages/patches/pam-mount-luks2-support.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/admin.scm | 68 +++++++++++++++++++ .../patches/pam-mount-luks2-support.patch | 51 ++++++++++++++ 3 files changed, 120 insertions(+) create mode 100644 gnu/packages/patches/pam-mount-luks2-support.patch diff --git a/gnu/local.mk b/gnu/local.mk index e1c1cef854..5fa7b5a883 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1205,6 +1205,7 @@ dist_patch_DATA = \ %D%/packages/patches/p7zip-CVE-2016-9296.patch \ %D%/packages/patches/p7zip-CVE-2017-17969.patch \ %D%/packages/patches/p7zip-remove-unused-code.patch \ + %D%/packages/patches/pam-mount-luks2-support.patch \ %D%/packages/patches/patchutils-test-perms.patch \ %D%/packages/patches/patch-hurd-path-max.patch \ %D%/packages/patches/pcre2-fix-jit_match-crash.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index c4723c5a9d..5211fc7c36 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -27,6 +27,7 @@ ;;; Copyright © 2019 Björn Höfling ;;; Copyright © 2019 Jakob L. Kreuze ;;; Copyright © 2019 Hartmut Goebel +;;; Copyright © 2019 Guillaume Le Vaillant ;;; ;;; This file is part of GNU Guix. ;;; @@ -60,8 +61,10 @@ #:use-module (gnu packages algebra) #:use-module (gnu packages base) #:use-module (gnu packages bash) + #:use-module (gnu packages c) #:use-module (gnu packages check) #:use-module (gnu packages crypto) + #:use-module (gnu packages cryptsetup) #:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages dns) #:use-module (gnu packages file) @@ -3452,3 +3455,68 @@ IGMP and Raw, across a wide variety of interface types, and understands BPF filter logic in the same fashion as more common packet sniffing tools, such as tcpdump and snoop.") (license license:bsd-3))) + +(define-public pam-mount + (package + (name "pam-mount") + (version "2.16") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/pam-mount/pam_mount/" + version "/pam_mount-" version ".tar.xz")) + (sha256 + (base32 + "1rvi4irb7ylsbhvx1cr6islm2xxw1a4b19q6z4a9864ndkm0f0mf")) + (patches + ;; Patch adding support for encrypted volumes in LUKS2 format. + ;; It comes from the Gentoo package definition for sys-auth/pam_mount. + (search-patches "pam-mount-luks2-support.patch")))) + (build-system gnu-build-system) + (native-inputs + `(("perl" ,perl) + ("pkg-config" ,pkg-config))) + (inputs + `(("cryptsetup" ,cryptsetup) + ("libhx" ,libhx) + ("libxml2" ,libxml2) + ("linux-pam" ,linux-pam) + ("lvm2" ,lvm2) + ("openssl" ,openssl) + ("pcre" ,pcre) + ("util-linux" ,util-linux))) + (arguments + `(#:configure-flags + (list (string-append "--with-slibdir=" %output "/lib") + (string-append "--with-ssbindir=" %output "/sbin")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-program-paths + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((util-linux (assoc-ref inputs "util-linux")) + (out (assoc-ref outputs "out"))) + (substitute* "src/mtcrypt.c" + (("\"mount\";") + (string-append "\"" util-linux "/bin/mount\";")) + (("\"umount\";") + (string-append "\"" util-linux "/bin/umount\";")) + (("\"fsck\",") + (string-append "\"" util-linux "/sbin/fsck\","))) + (substitute* "src/rdconf1.c" + (("\"mount\", \"") + (string-append "\"" util-linux "/bin/mount\", \"")) + (("\"umount\", \"") + (string-append "\"" util-linux "/bin/umount\", \"")) + (("\"fsck\", \"") + (string-append "\"" util-linux "/sbin/fsck\", \"")) + (("\"pmvarrun\", \"") + (string-append "\"" out "/sbin/pmvarrun\", \"")))) + #t))))) + (home-page "http://pam-mount.sourceforge.net") + (synopsis "PAM module to mount volumes for a user session") + (description + "Pam-mount is a PAM module that can mount volumes when a user logs in. +It supports mounting local filesystems of any kind the normal mount utility +supports. It can also mount encrypted LUKS volumes using the password +supplied by the user when logging in.") + (license (list license:gpl2+ license:lgpl2.1+)))) diff --git a/gnu/packages/patches/pam-mount-luks2-support.patch b/gnu/packages/patches/pam-mount-luks2-support.patch new file mode 100644 index 0000000000..b59daf5ce1 --- /dev/null +++ b/gnu/packages/patches/pam-mount-luks2-support.patch @@ -0,0 +1,51 @@ +From d4434c05e7c0cf05d87089404cfa2deedc60811a Mon Sep 17 00:00:00 2001 +From: Ingo Franzki +Date: Mon, 29 Oct 2018 16:47:40 +0100 +Subject: [PATCH] crypto: Add support for LUKS2 + +Cryptsetup version 2.0 added support for LUKS2. +This patch adds support for mounting LUKS2 volumes with +pam_mount. + +Signed-off-by: Ingo Franzki +--- + src/crypto-dmc.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/crypto-dmc.c b/src/crypto-dmc.c +index d0ab6ca..abd0358 100644 +--- a/src/crypto-dmc.c ++++ b/src/crypto-dmc.c +@@ -21,6 +21,12 @@ + #include "libcryptmount.h" + #include "pam_mount.h" + ++#ifndef CRYPT_LUKS ++ #define CRYPT_LUKS NULL /* Passing NULL to crypt_load will ++ default to LUKS(1) on older ++ libcryptsetup versions. */ ++#endif ++ + /** + * dmc_is_luks - check if @path points to a LUKS volume (cf. normal dm-crypt) + * @path: path to the crypto container +@@ -48,7 +54,7 @@ EXPORT_SYMBOL int ehd_is_luks(const char *path, bool blkdev) + + ret = crypt_init(&cd, device); + if (ret == 0) { +- ret = crypt_load(cd, CRYPT_LUKS1, NULL); ++ ret = crypt_load(cd, CRYPT_LUKS, NULL); + if (ret == -EINVAL) + ret = false; + else if (ret == 0) +@@ -106,7 +112,7 @@ static bool dmc_run(const struct ehd_mount_request *req, + #endif + } + +- ret = crypt_load(cd, CRYPT_LUKS1, NULL); ++ ret = crypt_load(cd, CRYPT_LUKS, NULL); + if (ret == 0) { + ret = crypt_activate_by_passphrase(cd, mt->crypto_name, + CRYPT_ANY_SLOT, req->key_data, req->key_size, flags); +-- +2.21.0 -- 2.24.0 From unknown Wed Jun 25 09:09:41 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#38182] [PATCH 3/3] services: Add pam-mount. Resent-From: Guillaume Le Vaillant Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2019 18:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38182 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38182@debbugs.gnu.org Cc: Guillaume Le Vaillant Received: via spool by 38182-submit@debbugs.gnu.org id=B38182.157358198524233 (code B ref 38182); Tue, 12 Nov 2019 18:07:02 +0000 Received: (at 38182) by debbugs.gnu.org; 12 Nov 2019 18:06:25 +0000 Received: from localhost ([127.0.0.1]:58355 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iUaYa-0006In-Iz for submit@debbugs.gnu.org; Tue, 12 Nov 2019 13:06:24 -0500 Received: from mout02.posteo.de ([185.67.36.66]:35385) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iUaYW-0006IX-8V for 38182@debbugs.gnu.org; Tue, 12 Nov 2019 13:06:22 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id AA1EE2400FC for <38182@debbugs.gnu.org>; Tue, 12 Nov 2019 19:06:14 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1573581974; bh=Rm77EAHWjg4SWCEhsz6R37zxgul6uSo02eqsyj0VgoA=; h=From:To:Cc:Subject:Date:From; b=chFmbmk85Agp8CzsOk7DcvBpWRAz7uB8+L5bf5Aqz1kJvcceT/wQHXC1U7ob1NvJk WyKKhMg0LH7eSYcu46a3JzG1p3evq6Os9xz5i3uHQF2uKRuzM2mRikLZcJMKRbQKlA bs4HuyZohKTxZP9Vn+ya8a9TUXZrFrCY0YaLyRaBuDf/DB2WaVvHigPhLrdFzLDsI7 beaRmDc4pLIS2Nxfb9AhRkNNnbtMjtOB2rqRONN0ofRFMAF+Dxu4ECHmx3qWj8JYrG +4siWNhSv14/VCdom5vN+CdlVdLEJT3SOeR2hGdbymlC5EJWUa9xrqiQ6rob9+iIEO QQvckVuxQfM/A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 47CFzm3SF5z9rxD; Tue, 12 Nov 2019 19:06:12 +0100 (CET) From: Guillaume Le Vaillant Date: Tue, 12 Nov 2019 19:05:19 +0100 Message-Id: <20191112180519.9625-3-glv@posteo.net> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191112180519.9625-1-glv@posteo.net> References: <87ftitas7x.fsf@yamatai> <20191112180519.9625-1-glv@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/services/pam-mount.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. * doc/guix.texi (PAM Mount Service): New subsection. --- doc/guix.texi | 31 ++++++++++++++++ gnu/local.mk | 1 + gnu/services/pam-mount.scm | 76 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 108 insertions(+) create mode 100644 gnu/services/pam-mount.scm diff --git a/doc/guix.texi b/doc/guix.texi index 242beb18c8..3a339b42a0 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -68,6 +68,7 @@ Copyright @copyright{} 2019 Ivan Petkov@* Copyright @copyright{} 2019 Jakob L. Kreuze@* Copyright @copyright{} 2019 Kyle Andrews@* Copyright @copyright{} 2019 Alex Griffin@* +Copyright @copyright{} 2019 Guillaume Le Vaillant@* Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -304,6 +305,7 @@ Services * Virtualization Services:: Virtualization services. * Version Control Services:: Providing remote access to Git repositories. * Game Services:: Game servers. +* PAM Mount Service:: Service to mount volumes when logging in. * Miscellaneous Services:: Other services. Defining Services @@ -11867,6 +11869,7 @@ declaration. * Virtualization Services:: Virtualization services. * Version Control Services:: Providing remote access to Git repositories. * Game Services:: Game servers. +* PAM Mount Service:: Service to mount volumes when logging in. * Guix Services:: Services relating specifically to Guix. * Miscellaneous Services:: Other services. @end menu @@ -24592,6 +24595,34 @@ The port to bind the server to. @end deftp +@node PAM Mount Service +@subsection PAM Mount Service +@cindex pam-mount + +The @code{(gnu services pam-mount)} module provides a service allowing +users to mount volumes when they log in. It should be able to mount any +volume format supported by the system. Note that to automatically mount +encrypted volumes using the password the user entered to log in, the +@code{pam-mount} package must be added in the @code{packages} field of +the @code{operating-system} definition. + +@defvar {Scheme Variable} pam-mount-service-type +Service type for PAM Mount support. +@end defvar + +@deftp {Data Type} pam-mount-configuration +Data type representing the configuration of PAM Mount. + +It takes the following parameters: + +@table @asis +@item @code{file} +The configuration file that will be placed in +@file{/etc/security/pam_mount.conf.xml}. +@end table +@end deftp + + @node Guix Services @subsection Guix Services diff --git a/gnu/local.mk b/gnu/local.mk index 5fa7b5a883..43ef679935 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -551,6 +551,7 @@ GNU_SYSTEM_MODULES = \ %D%/services/networking.scm \ %D%/services/nix.scm \ %D%/services/nfs.scm \ + %D%/services/pam-mount.scm \ %D%/services/security-token.scm \ %D%/services/shepherd.scm \ %D%/services/sound.scm \ diff --git a/gnu/services/pam-mount.scm b/gnu/services/pam-mount.scm new file mode 100644 index 0000000000..65db9b0068 --- /dev/null +++ b/gnu/services/pam-mount.scm @@ -0,0 +1,76 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019 Guillaume Le Vaillant +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu services pam-mount) + #:use-module (gnu packages admin) + #:use-module (gnu services) + #:use-module (gnu services configuration) + #:use-module (gnu system pam) + #:use-module (guix gexp) + #:use-module (guix records) + #:export (pam-mount-configuration + pam-mount-configuration? + pam-mount-service-type)) + +(define %pam-mount-default-configuration + (plain-file "pam_mount.conf.xml" + " + + + + + + + +\n")) + +(define-record-type* + pam-mount-configuration + make-pam-mount-configuration + pam-mount-configuration? + (file pam-mount-configuration-file + (default %pam-mount-default-configuration))) + +(define (pam-mount-etc-service config) + `(("security/pam_mount.conf.xml" ,(pam-mount-configuration-file config)))) + +(define (pam-mount-pam-service config) + (define optional-pam-mount + (pam-entry + (control "optional") + (module #~(string-append #$pam-mount "/lib/security/pam_mount.so")))) + (list (lambda (pam) + (if (member (pam-service-name pam) + '("login" "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 pam-mount-service-type + (service-type + (name 'pam-mount) + (extensions (list (service-extension etc-service-type + pam-mount-etc-service) + (service-extension pam-root-service-type + pam-mount-pam-service))) + (default-value (pam-mount-configuration)))) -- 2.24.0 From unknown Wed Jun 25 09:09:41 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#38182] [PATCH 3/3] services: Add pam-mount. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Nov 2019 22:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38182 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Guillaume Le Vaillant Cc: 38182@debbugs.gnu.org Received: via spool by 38182-submit@debbugs.gnu.org id=B38182.157472234915825 (code B ref 38182); Mon, 25 Nov 2019 22:53:01 +0000 Received: (at 38182) by debbugs.gnu.org; 25 Nov 2019 22:52:29 +0000 Received: from localhost ([127.0.0.1]:49891 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iZNDY-00047A-83 for submit@debbugs.gnu.org; Mon, 25 Nov 2019 17:52:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34136) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iZNDU-00046r-1J for 38182@debbugs.gnu.org; Mon, 25 Nov 2019 17:52:27 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:46681) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iZNDO-0002V0-Nn; Mon, 25 Nov 2019 17:52:18 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=46158 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1iZNDO-0004Po-6M; Mon, 25 Nov 2019 17:52:18 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <87ftitas7x.fsf@yamatai> <20191112180519.9625-1-glv@posteo.net> <20191112180519.9625-3-glv@posteo.net> Date: Mon, 25 Nov 2019 23:52:16 +0100 In-Reply-To: <20191112180519.9625-3-glv@posteo.net> (Guillaume Le Vaillant's message of "Tue, 12 Nov 2019 19:05:19 +0100") Message-ID: <87mucjtvq7.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Guillaume, I=E2=80=99ve applied the first two patches, thanks! Guillaume Le Vaillant skribis: > * gnu/services/pam-mount.scm: New file. > * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. > * doc/guix.texi (PAM Mount Service): New subsection. [=E2=80=A6] > +The @code{(gnu services pam-mount)} module provides a service allowing > +users to mount volumes when they log in. It should be able to mount any > +volume format supported by the system. How does one specify what needs to be mounted upon log-in of a specific user? I=E2=80=99m new to PAM-Mount and I=E2=80=99m left wondering. :-) > Note that to automatically mount > +encrypted volumes using the password the user entered to log in, the > +@code{pam-mount} package must be added in the @code{packages} field of > +the @code{operating-system} definition. Should we instead arrange so that the =E2=80=98pam-mount=E2=80=99 command (= or whatever it=E2=80=99s called) is automatically found, instead of asking users to add= it to =E2=80=98packages=E2=80=99? Perhaps the manual should give an example for the global config file, too? > +(define %pam-mount-default-configuration > + (plain-file "pam_mount.conf.xml" > + " > + > + > + > + +allow=3D\"nosuid,nodev,loop,encryption,fsck,nonempty,allow_root,allow_ot= her\" /> > + > + > + > +\n")) I suggest writing SXML instead and using =E2=80=98sxml->xml=E2=80=99, if yo= u don=E2=80=99t mind. :-) > +(define pam-mount-service-type > + (service-type > + (name 'pam-mount) > + (extensions (list (service-extension etc-service-type > + pam-mount-etc-service) > + (service-extension pam-root-service-type > + pam-mount-pam-service))) > + (default-value (pam-mount-configuration)))) Please also add a =E2=80=98description=E2=80=99 field. Could you send an updated patch? Thanks! Ludo=E2=80=99. From unknown Wed Jun 25 09:09:41 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#38182] [PATCH 3/3] services: Add pam-mount. Resent-From: Guillaume Le Vaillant Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 26 Nov 2019 22:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38182 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 38182@debbugs.gnu.org Received: via spool by 38182-submit@debbugs.gnu.org id=B38182.157480564424032 (code B ref 38182); Tue, 26 Nov 2019 22:01:02 +0000 Received: (at 38182) by debbugs.gnu.org; 26 Nov 2019 22:00:44 +0000 Received: from localhost ([127.0.0.1]:53116 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iZit1-0006FX-5E for submit@debbugs.gnu.org; Tue, 26 Nov 2019 17:00:44 -0500 Received: from mout02.posteo.de ([185.67.36.66]:43075) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iZisw-0006FF-H0 for 38182@debbugs.gnu.org; Tue, 26 Nov 2019 17:00:42 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id EC8942400FC for <38182@debbugs.gnu.org>; Tue, 26 Nov 2019 23:00:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1574805632; bh=40l6m+kVOIKrUSQzKM5oxWUe25OMdJMXsnXUn2DWG6g=; h=From:To:Cc:Subject:Date:From; b=qKUHyzGX4OayQvySQN08csSpArtewtiQjJm5JhOl4o4rOvuJvsox2+d9vJ/HciHpx DPTWoLfUqOpebgn4kle6jx51v5oNclEqduSTzMWDvh/FBw0Gncf9G/XvMpjGtOvFev rtsexatG79pnLvBNnQqiHvnx4KBlFq0HJYAh2JvwWByxCZmbCPJcR6UVBjW7tQ6HPH vDxDWDD4nP9hWi9TZEvnhfzaLQRnqUoV7vRO1j+RbT1YFhllMQ8vpz4bQtwPHobqOx nKpsOMxxqGyb1uZ6IaPOnb18EYF50c3GvKuHd67AuQjyMLDWVkLA8V/+aV32YzDp0Y IFzZXk3qEUMXw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 47MyWK0HCtz9rxN; Tue, 26 Nov 2019 23:00:12 +0100 (CET) References: <87ftitas7x.fsf@yamatai> <20191112180519.9625-1-glv@posteo.net> <20191112180519.9625-3-glv@posteo.net> <87mucjtvq7.fsf@gnu.org> User-agent: mu4e 1.2.0; emacs 26.3 From: Guillaume Le Vaillant In-reply-to: <87mucjtvq7.fsf@gnu.org> Date: Tue, 26 Nov 2019 23:00:04 +0100 Message-ID: <87imn6uwm3.fsf@yamatai> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s skribis: > Hi Guillaume, > > I=E2=80=99ve applied the first two patches, thanks! > > Guillaume Le Vaillant skribis: > >> * gnu/services/pam-mount.scm: New file. >> * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. >> * doc/guix.texi (PAM Mount Service): New subsection. > > [=E2=80=A6] > >> +The @code{(gnu services pam-mount)} module provides a service allowing >> +users to mount volumes when they log in. It should be able to mount any >> +volume format supported by the system. > > How does one specify what needs to be mounted upon log-in of a specific > user? I=E2=80=99m new to PAM-Mount and I=E2=80=99m left wondering. :-) I added an example in the manual. >> Note that to automatically mount >> +encrypted volumes using the password the user entered to log in, the >> +@code{pam-mount} package must be added in the @code{packages} field of >> +the @code{operating-system} definition. > > Should we instead arrange so that the =E2=80=98pam-mount=E2=80=99 command= (or whatever > it=E2=80=99s called) is automatically found, instead of asking users to a= dd it > to =E2=80=98packages=E2=80=99? I found a way to have 'pam-mount' call directly '/gnu/store/...-pam-mount-.../sbin/mount.crypt' when necessary. So adding 'pam-mount' to 'packages' is not needed anymore. >> +(define %pam-mount-default-configuration >> + (plain-file "pam_mount.conf.xml" >> + " >> + >> + >> + >> +> +allow=3D\"nosuid,nodev,loop,encryption,fsck,nonempty,allow_root,allow_o= ther\" /> >> + >> + >> + >> +\n")) > > I suggest writing SXML instead and using =E2=80=98sxml->xml=E2=80=99, if = you don=E2=80=99t > mind. :-) Done. >> +(define pam-mount-service-type >> + (service-type >> + (name 'pam-mount) >> + (extensions (list (service-extension etc-service-type >> + pam-mount-etc-service) >> + (service-extension pam-root-service-type >> + pam-mount-pam-service))) >> + (default-value (pam-mount-configuration)))) > > Please also add a =E2=80=98description=E2=80=99 field. Done. > Could you send an updated patch? > > Thanks! > > Ludo=E2=80=99. Updated patch attached. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0001-services-Add-pam-mount.patch Content-Transfer-Encoding: quoted-printable >From 4572adf4f28480fd891293ff2204228dbb8b41d1 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 26 Nov 2019 21:56:44 +0100 Subject: [PATCH v2 3/3] services: Add pam-mount. * gnu/services/pam-mount.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. * doc/guix.texi (PAM Mount Service): New subsection. --- doc/guix.texi | 85 ++++++++++++++++++++++++++++ gnu/local.mk | 1 + gnu/services/pam-mount.scm | 111 +++++++++++++++++++++++++++++++++++++ 3 files changed, 197 insertions(+) create mode 100644 gnu/services/pam-mount.scm diff --git a/doc/guix.texi b/doc/guix.texi index a64b0fb84c..b293adb0b1 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -68,6 +68,7 @@ Copyright @copyright{} 2019 Ivan Petkov@* Copyright @copyright{} 2019 Jakob L. Kreuze@* Copyright @copyright{} 2019 Kyle Andrews@* Copyright @copyright{} 2019 Alex Griffin@* +Copyright @copyright{} 2019 Guillaume Le Vaillant@* =20 Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -305,6 +306,7 @@ Services * Virtualization Services:: Virtualization services. * Version Control Services:: Providing remote access to Git repositorie= s. * Game Services:: Game servers. +* PAM Mount Service:: Service to mount volumes when logging in. * Miscellaneous Services:: Other services. =20 Defining Services @@ -11931,6 +11933,7 @@ declaration. * Virtualization Services:: Virtualization services. * Version Control Services:: Providing remote access to Git repositorie= s. * Game Services:: Game servers. +* PAM Mount Service:: Service to mount volumes when logging in. * Guix Services:: Services relating specifically to Guix. * Miscellaneous Services:: Other services. @end menu @@ -24656,6 +24659,88 @@ The port to bind the server to. @end deftp =20 =20 +@node PAM Mount Service +@subsection PAM Mount Service +@cindex pam-mount + +The @code{(gnu services pam-mount)} module provides a service allowing +users to mount volumes when they log in. It should be able to mount any +volume format supported by the system. + +@defvar {Scheme Variable} pam-mount-service-type +Service type for PAM Mount support. +@end defvar + +@deftp {Data Type} pam-mount-configuration +Data type representing the configuration of PAM Mount. + +It takes the following parameters: + +@table @asis +@item @code{rules} +The configuration rules that will be used to generate +@file{/etc/security/pam_mount.conf.xml}. + +The configuration rules are SXML elements, and the the default ones +don't mount anything for anyone at login: + +@lisp +`((debug (@@ (enable "0"))) + (mntoptions (@@ (allow ,(string-join + '("nosuid" "nodev" "loop" + "encryption" "fsck" "nonempty" + "allow_root" "allow_other") + ",")))) + (mntoptions (@@ (require "nosuid,nodev"))) + (logout (@@ (wait "0") + (hup "0") + (term "no") + (kill "no"))) + (mkmountpoint (@@ (enable "1") + (remove "true")))) +@end lisp + +Some @code{volume} elements must be added to automatically mount volumes +at login. Here's an example allowing the user @code{alice} to mount her +encrypted @code{HOME} directory and allowing the user @code{bob} to mount +the partition where he stores his data: + +@lisp +(define pam-mount-rules +`((debug (@@ (enable "0"))) + (volume (@@ (user "alice") + (fstype "crypt") + (path "/dev/sda2") + (mountpoint "/home/alice"))) + (volume (@@ (user "bob") + (fstype "auto") + (path "/dev/sdb3") + (mountpoint "/home/bob/data") + (options "defaults,autodefrag,compress"))) + (mntoptions (@@ (allow ,(string-join + '("nosuid" "nodev" "loop" + "encryption" "fsck" "nonempty" + "allow_root" "allow_other") + ",")))) + (mntoptions (@@ (require "nosuid,nodev"))) + (logout (@@ (wait "0") + (hup "0") + (term "no") + (kill "no"))) + (mkmountpoint (@@ (enable "1") + (remove "true"))))) + +(service pam-mount-service-type + (pam-mount-configuration + (rules pam-mount-rules))) +@end lisp + +The complete list of possible options can be found in the man page for +@uref{http://pam-mount.sourceforge.net/pam_mount.conf.5.html, pam_mount.co= nf}. +@end table +@end deftp + + @node Guix Services @subsection Guix Services =20 diff --git a/gnu/local.mk b/gnu/local.mk index 0129e42944..0e0c3e30e7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -551,6 +551,7 @@ GNU_SYSTEM_MODULES =3D \ %D%/services/networking.scm \ %D%/services/nix.scm \ %D%/services/nfs.scm \ + %D%/services/pam-mount.scm \ %D%/services/security-token.scm \ %D%/services/shepherd.scm \ %D%/services/sound.scm \ diff --git a/gnu/services/pam-mount.scm b/gnu/services/pam-mount.scm new file mode 100644 index 0000000000..98611462c2 --- /dev/null +++ b/gnu/services/pam-mount.scm @@ -0,0 +1,111 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright =C2=A9 2019 Guillaume Le Vaillant +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu services pam-mount) + #:use-module (gnu packages admin) + #:use-module (gnu services) + #:use-module (gnu services configuration) + #:use-module (gnu system pam) + #:use-module (guix gexp) + #:use-module (guix records) + #:export (pam-mount-configuration + pam-mount-configuration? + pam-mount-service-type)) + +(define %pam-mount-default-configuration + `((debug (@ (enable "0"))) + (mntoptions (@ (allow ,(string-join + '("nosuid" "nodev" "loop" + "encryption" "fsck" "nonempty" + "allow_root" "allow_other") + ",")))) + (mntoptions (@ (require "nosuid,nodev"))) + (logout (@ (wait "0") + (hup "0") + (term "no") + (kill "no"))) + (mkmountpoint (@ (enable "1") + (remove "true"))))) + +(define (make-pam-mount-configuration-file config) + (computed-file + "pam_mount.conf.xml" + #~(begin + (use-modules (sxml simple)) + (call-with-output-file #$output + (lambda (port) + (sxml->xml + '(*TOP* + (*PI* xml "version=3D'1.0' encoding=3D'utf-8'") + (pam_mount + #$@(pam-mount-configuration-rules config) + (pmvarrun + #$(file-append pam-mount + "/sbin/pmvarrun -u '%(USER)' -o '%(OPERATIO= N)'")) + (cryptmount + #$(file-append pam-mount + (string-append + "/sbin/mount.crypt" + " '%(if %(CIPHER),-ocipher=3D%(CIPHER))'" + " '%(if %(FSKEYCIPHER)," + "-ofsk_cipher=3D%(FSKEYCIPHER))'" + " '%(if %(FSKEYHASH),-ofsk_hash=3D%(FSKEYH= ASH))'" + " '%(if %(FSKEYPATH),-okeyfile=3D%(FSKEYPA= TH))'" + " '%(if %(OPTIONS),-o%(OPTIONS))'" + " '%(VOLUME)' '%(MNTPT)'"))) + (cryptumount + #$(file-append pam-mount "/sbin/umount.crypt '%(MNTPT)'"))= )) + port)))))) + +(define-record-type* + pam-mount-configuration + make-pam-mount-configuration + pam-mount-configuration? + (rules pam-mount-configuration-rules + (default %pam-mount-default-configuration))) + +(define (pam-mount-etc-service config) + `(("security/pam_mount.conf.xml" + ,(make-pam-mount-configuration-file config)))) + +(define (pam-mount-pam-service config) + (define optional-pam-mount + (pam-entry + (control "optional") + (module #~(string-append #$pam-mount "/lib/security/pam_mount.so")))) + (list (lambda (pam) + (if (member (pam-service-name pam) + '("login" "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 pam-mount-service-type + (service-type + (name 'pam-mount) + (extensions (list (service-extension etc-service-type + pam-mount-etc-service) + (service-extension pam-root-service-type + pam-mount-pam-service))) + (default-value (pam-mount-configuration)) + (description "Activate PAM-Mount support. It allows mounting volumes f= or +specific users when they log in."))) --=20 2.24.0 --=-=-=-- From unknown Wed Jun 25 09:09:41 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Guillaume Le Vaillant Subject: bug#38182: closed (Re: [bug#38182] [PATCH 3/3] services: Add pam-mount.) Message-ID: References: <87o8www58f.fsf@gnu.org> <87ftitas7x.fsf@yamatai> X-Gnu-PR-Message: they-closed 38182 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 38182@debbugs.gnu.org Date: Thu, 28 Nov 2019 12:34:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1574944442-30869-1" This is a multi-part message in MIME format... ------------=_1574944442-30869-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #38182: [PATCH 0/3] Add PAM Mount. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 38182@debbugs.gnu.org. --=20 38182: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D38182 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1574944442-30869-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 38182-done) by debbugs.gnu.org; 28 Nov 2019 12:33:22 +0000 Received: from localhost ([127.0.0.1]:56840 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iaIz3-000812-L4 for submit@debbugs.gnu.org; Thu, 28 Nov 2019 07:33:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45927) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iaIyy-00080l-Ie for 38182-done@debbugs.gnu.org; Thu, 28 Nov 2019 07:33:18 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:40998) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iaIyt-0007h7-BV; Thu, 28 Nov 2019 07:33:11 -0500 Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=37338 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1iaIyp-0003oQ-Bo; Thu, 28 Nov 2019 07:33:09 -0500 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Guillaume Le Vaillant Subject: Re: [bug#38182] [PATCH 3/3] services: Add pam-mount. References: <87ftitas7x.fsf@yamatai> <20191112180519.9625-1-glv@posteo.net> <20191112180519.9625-3-glv@posteo.net> <87mucjtvq7.fsf@gnu.org> <87imn6uwm3.fsf@yamatai> Date: Thu, 28 Nov 2019 13:33:04 +0100 In-Reply-To: <87imn6uwm3.fsf@yamatai> (Guillaume Le Vaillant's message of "Tue, 26 Nov 2019 23:00:04 +0100") Message-ID: <87o8www58f.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Spam-Score: -0.8 (/) X-Debbugs-Envelope-To: 38182-done Cc: 38182-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) Hi, Guillaume Le Vaillant skribis: >>>From 4572adf4f28480fd891293ff2204228dbb8b41d1 Mon Sep 17 00:00:00 2001 > From: Guillaume Le Vaillant > Date: Tue, 26 Nov 2019 21:56:44 +0100 > Subject: [PATCH v2 3/3] services: Add pam-mount. > > * gnu/services/pam-mount.scm: New file. > * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. > * doc/guix.texi (PAM Mount Service): New subsection. Applied, thanks! I forgot to mention it before but you should consider writing a test for this service in (gnu tests =E2=80=A6). That will ease maintenance over tim= e and will make it easy to see whether a change breaks the service. Thank you, Ludo=E2=80=99. ------------=_1574944442-30869-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 12 Nov 2019 18:02:29 +0000 Received: from localhost ([127.0.0.1]:58341 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iUaUm-0006Bj-SK for submit@debbugs.gnu.org; Tue, 12 Nov 2019 13:02:29 -0500 Received: from lists.gnu.org ([209.51.188.17]:36821) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iUaUj-0006BZ-RF for submit@debbugs.gnu.org; Tue, 12 Nov 2019 13:02:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37941) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iUaUe-0000N7-HT for guix-patches@gnu.org; Tue, 12 Nov 2019 13:02:25 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iUaUd-0007Vw-AR for guix-patches@gnu.org; Tue, 12 Nov 2019 13:02:20 -0500 Received: from mout02.posteo.de ([185.67.36.66]:58333) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iUaUc-0007S5-R8 for guix-patches@gnu.org; Tue, 12 Nov 2019 13:02:19 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 1D6CD2400FB for ; Tue, 12 Nov 2019 19:02:15 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1573581735; bh=6S5KuOVrKIN/GMDIiG1Sx9pmQKfIYG8YHA8UBsp14XE=; h=From:To:Subject:Date:From; b=W1OGICzhgbFLM2N20HGKbjjw/fYtbcMC6sPe1IfYzUVuIjm32NGscdTXKKruVIhbL Kw6M9DJIUjmTwb/mL15y6cEGjitolnTdGgRaLD75pdXPNbpTcy8zSxLAscGMNgH8W/ OJxqg4EImk32ByWHQ9WHEIhL02vuskgC9vaA/JXp2R9uOZxIQu/PkljRXHg87QCav7 T8wwBIWYi9HMO/7pPfEl0N84oppO2uStaR82vcZRfXo/2gqojzIpnwRpfMW93pQzc6 xEa0ibs89G1BhaYiTKMTJxIKkn1EcSPf/sskf+ciakKlqMiwUDt06W/iAG/HLIfJDv o771IxnEWG6sQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 47CFv92QnHz9rxW for ; Tue, 12 Nov 2019 19:02:13 +0100 (CET) User-agent: mu4e 1.2.0; emacs 26.3 From: Guillaume Le Vaillant To: guix-patches@gnu.org Subject: [PATCH 0/3] Add PAM Mount. Date: Tue, 12 Nov 2019 19:02:10 +0100 Message-ID: <87ftitas7x.fsf@yamatai> MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 185.67.36.66 X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) This patch series adds a 'pam-mount-service-type' allowing to mount volumes when logging in. Patches: 1- gnu: Add libhx. 2- gnu: Add pam-mount. 3- services: Add pam-mount. ------------=_1574944442-30869-1--