From patchwork Tue Nov 12 18:05:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Guillaume Le Vaillant X-Patchwork-Id: 16097 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 21FE71773D; Tue, 12 Nov 2019 18:07:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 974F617739 for ; Tue, 12 Nov 2019 18:07:14 +0000 (GMT) Received: from localhost ([::1]:38752 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iUaZO-0001vH-69 for patchwork@mira.cbaines.net; Tue, 12 Nov 2019 13:07:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38420) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iUaZE-0001q1-Ek for guix-patches@gnu.org; Tue, 12 Nov 2019 13:07:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iUaZC-00026f-D8 for guix-patches@gnu.org; Tue, 12 Nov 2019 13:07:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49535) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iUaZC-00026W-9S for guix-patches@gnu.org; Tue, 12 Nov 2019 13:07:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iUaZC-0006Jm-3W for guix-patches@gnu.org; Tue, 12 Nov 2019 13:07:02 -0500 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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))))