From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id IAE3NHaFMWQBSAAASxT56A (envelope-from ) for ; Sat, 08 Apr 2023 17:17:10 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id gMc9NHaFMWSeNgAA9RJhRA (envelope-from ) for ; Sat, 08 Apr 2023 17:17:10 +0200 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 57D7D1140D for ; Sat, 8 Apr 2023 17:17:10 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1plAJL-0004aQ-Fr; Sat, 08 Apr 2023 11:17:03 -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 1plAJK-0004a6-Jr for guix-patches@gnu.org; Sat, 08 Apr 2023 11:17:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1plAJK-0006P1-CC for guix-patches@gnu.org; Sat, 08 Apr 2023 11:17:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1plAJK-0006iW-0T for guix-patches@gnu.org; Sat, 08 Apr 2023 11:17:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62726] [PATCH] services: Activate `setuid-program-service-type' in shepherd. References: <874jpq4dfi.fsf@psyduck.jhoto.kublai.com> In-Reply-To: <874jpq4dfi.fsf@psyduck.jhoto.kublai.com> Resent-From: Brian Cully Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 08 Apr 2023 15:17:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62726 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 62726@debbugs.gnu.org Cc: Brian Cully Received: via spool by 62726-submit@debbugs.gnu.org id=B62726.168096700025788 (code B ref 62726); Sat, 08 Apr 2023 15:17:01 +0000 Received: (at 62726) by debbugs.gnu.org; 8 Apr 2023 15:16:40 +0000 Received: from localhost ([127.0.0.1]:59317 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plAIx-0006hs-6G for submit@debbugs.gnu.org; Sat, 08 Apr 2023 11:16:39 -0400 Received: from coleridge.kublai.com ([166.84.7.167]:61860 helo=mail.spork.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plAIv-0006hi-KX for 62726@debbugs.gnu.org; Sat, 08 Apr 2023 11:16:38 -0400 Received: from psyduck.jhoto.kublai.com (ool-18b8e9e7.dyn.optonline.net [24.184.233.231]) by mail.spork.org (Postfix) with ESMTPSA id 70729A86F; Sat, 8 Apr 2023 11:16:37 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=spork.org; s=dkim; t=1680966997; bh=EQMMz5hm8clzjPwU1kyvrDlgAD2TtLv5f1zpwcqNZu0=; h=From:To:Cc:Subject:Date; b=eIvW8TzpzZzwltsFq2aEjkY33OluBiFPNfdSCiBu101cIkv5s527PKPTzCTTELu6K 2QWeEUzXVYvhAu79B4CvjHXIkMP5y3R4LyO7/fMGH6T96CnTLz3Jbyt1u0zy0PFE9I 3pskbzfLRFSA2ZdPQ1K5zfDZZI7xeOmay88OTgDA= Date: Sat, 8 Apr 2023 11:16:35 -0400 Message-Id: X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 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: Brian Cully X-ACL-Warn: , Brian Cully via Guix-patches From: Brian Cully 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-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1680967030; a=rsa-sha256; cv=none; b=LJm9rXs8rv0ckWV8CPAJtcmZt7sBsVu3ifpeWRA1ngQECoFirhhWmiybs39zzKx1LPfbtK PgbVBN/rSXDWSsWbUL3iyhchwCqK7nZyNvtHdbzhLwx0fJYbYQIKrRxJ/5FN3/jtzTjGM4 9RIlJUMVjdih7tsnNx8MRrd9VxIPGMf78UfrwcK777q0Dc+c+c9hAyQa27dYtc5CXIhx6I L4Q7Ab5mLLOOM3XVQpcCbDOFdb03jwls03lcaPYIv1EVmpCPnlTdjWy3ub3xmq2J9vW8Nt t8XCK1PaoO6PbVPTPt13JMLhC7r+I3rVIwVlbTooXo/TiTJJSdsRTYjS3eJUTw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=spork.org header.s=dkim header.b=eIvW8Tzp; 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=1680967030; 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-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=dxnbItu696sg9yhqBkzBzB64KWZr74X00b20/JosWHE=; b=YWn4FMWyAesUCmeFYV11N0q7foSLyhdt+44Tmvp2sUaM9WSMBW76cJbkOdBlTRgOYyzjkl J9qrK8cgkgBoeko3rRblxHjm1nzhXX1g5h7jqRc51SM6IsvvqD6TZ4Oob6QydJi3GKDnYT VF5WJwisLTPMbOhMI3vQ/Zw+KfhS+zNWN0dAjk6RIVA9D82ur5LR+7NqwRNXNAASVtFt4q eIb0IaqDXDQZKVnqyF0oaLxIz0jquW/itD8rNli+MbLMi9uha+h6H2qUuvT7sa5hLwmEp+ b2tHQ774lcib/y/Vzu3HafuKET1JH/7WF1gu5jFM+6AVaeBiqHvRu3Gzg90cCA== Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=spork.org header.s=dkim header.b=eIvW8Tzp; 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" X-Migadu-Scanner: scn0.migadu.com X-Migadu-Spam-Score: -4.02 X-Spam-Score: -4.02 X-Migadu-Queue-Id: 57D7D1140D X-TUID: /9R2sk8toopO Activate using a one-shot Shepherd service on boot, rather than attaching to `activation-service-type' to populate `/run/setuid-programs'. In order to prevent a dependency cycle between (gnu services) and (gnu services shepherd), introduce a new module (gnu services setuid) and deprecate the import of `setuid-program-service-type' from (gnu services). * gnu/local.mk (GNU_SYSTEM_MODULES): add setuid.scm. * gnu/services.scm (setuid-program-service-type): deprecate. * gnu/services/setuid.scm: new module. * gnu/services/dbus.scm (gnu): import (gnu services setuid). * gnu/services/desktop.scm (gnu): import (gnu services setuid). * gnu/services/docker.scm (gnu): import (gnu services setuid). * gnu/services/mail.scm (gnu): import (gnu services setuid). * gnu/services/xorg.scm (gnu): import (gnu services setuid). * gnu/system.scm (gnu): import (gnu services setuid). --- gnu/local.mk | 1 + gnu/services.scm | 40 +++--------------------------- gnu/services/dbus.scm | 1 + gnu/services/desktop.scm | 1 + gnu/services/docker.scm | 1 + gnu/services/mail.scm | 1 + gnu/services/setuid.scm | 53 ++++++++++++++++++++++++++++++++++++++++ gnu/services/xorg.scm | 1 + gnu/system.scm | 1 + 9 files changed, 63 insertions(+), 37 deletions(-) create mode 100644 gnu/services/setuid.scm diff --git a/gnu/local.mk b/gnu/local.mk index b7e19b6bc2..55dae3426a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -704,6 +704,7 @@ GNU_SYSTEM_MODULES = \ %D%/services/rsync.scm \ %D%/services/samba.scm \ %D%/services/sddm.scm \ + %D%/services/setuid.scm \ %D%/services/spice.scm \ %D%/services/ssh.scm \ %D%/services/syncthing.scm \ diff --git a/gnu/services.scm b/gnu/services.scm index d6c7ad0553..f42d4bc15f 100644 --- a/gnu/services.scm +++ b/gnu/services.scm @@ -43,7 +43,6 @@ (define-module (gnu services) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages hurd) - #:use-module (gnu system setuid) #:use-module (srfi srfi-1) #:use-module (srfi srfi-9) #:use-module (srfi srfi-9 gnu) @@ -110,7 +109,7 @@ (define-module (gnu services) extra-special-file etc-service-type etc-directory - setuid-program-service-type + setuid-program-service-type ; deprecated profile-service-type firmware-service-type gc-root-service-type @@ -811,41 +810,8 @@ (define-deprecated (etc-service files) FILES must be a list of name/file-like object pairs." (service etc-service-type files)) -(define (setuid-program->activation-gexp programs) - "Return an activation gexp for setuid-program from PROGRAMS." - (let ((programs (map (lambda (program) - ;; FIXME This is really ugly, I didn't managed to use - ;; "inherit" - (let ((program-name (setuid-program-program program)) - (setuid? (setuid-program-setuid? program)) - (setgid? (setuid-program-setgid? program)) - (user (setuid-program-user program)) - (group (setuid-program-group program)) ) - #~(setuid-program - (setuid? #$setuid?) - (setgid? #$setgid?) - (user #$user) - (group #$group) - (program #$program-name)))) - programs))) - (with-imported-modules (source-module-closure - '((gnu system setuid))) - #~(begin - (use-modules (gnu system setuid)) - - (activate-setuid-programs (list #$@programs)))))) - -(define setuid-program-service-type - (service-type (name 'setuid-program) - (extensions - (list (service-extension activation-service-type - setuid-program->activation-gexp))) - (compose concatenate) - (extend (lambda (config extensions) - (append config extensions))) - (description - "Populate @file{/run/setuid-programs} with the specified -executables, making them setuid and/or setgid."))) +(define-deprecated/public-alias setuid-program-service-type + (@ (gnu services setuid) setuid-program-service-type)) (define (packages->profile-entry packages) "Return a system entry for the profile containing PACKAGES." diff --git a/gnu/services/dbus.scm b/gnu/services/dbus.scm index e9c9346f56..dd9f0122b1 100644 --- a/gnu/services/dbus.scm +++ b/gnu/services/dbus.scm @@ -21,6 +21,7 @@ (define-module (gnu services dbus) #:use-module (gnu services) + #:use-module (gnu services setuid) #:use-module (gnu services shepherd) #:use-module (gnu system setuid) #:use-module (gnu system shadow) diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index adea5b38dd..1ff7abd61e 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -33,6 +33,7 @@ (define-module (gnu services desktop) #:use-module (gnu services) + #:use-module (gnu services setuid) #:use-module (gnu services shepherd) #:use-module (gnu services base) #:use-module (gnu services dbus) diff --git a/gnu/services/docker.scm b/gnu/services/docker.scm index 741bab5a8c..32ed9739bf 100644 --- a/gnu/services/docker.scm +++ b/gnu/services/docker.scm @@ -26,6 +26,7 @@ (define-module (gnu services docker) #:use-module (gnu services configuration) #:use-module (gnu services base) #:use-module (gnu services dbus) + #:use-module (gnu services setuid) #:use-module (gnu services shepherd) #:use-module (gnu system setuid) #:use-module (gnu system shadow) diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm index bf4948dcfb..d6e35a07f8 100644 --- a/gnu/services/mail.scm +++ b/gnu/services/mail.scm @@ -27,6 +27,7 @@ (define-module (gnu services mail) #:use-module (gnu services) #:use-module (gnu services base) #:use-module (gnu services configuration) + #:use-module (gnu services setuid) #:use-module (gnu services shepherd) #:use-module (gnu system pam) #:use-module (gnu system shadow) diff --git a/gnu/services/setuid.scm b/gnu/services/setuid.scm new file mode 100644 index 0000000000..4e46510733 --- /dev/null +++ b/gnu/services/setuid.scm @@ -0,0 +1,53 @@ +(define-module (gnu services setuid) + #:use-module (gnu services) + #:use-module (gnu services shepherd) + #:use-module (gnu system setuid) + #:use-module (guix gexp) + #:use-module (guix modules) + #:use-module (srfi srfi-1) + #:export (setuid-program-service-type)) + +(define (setuid-programs->shepherd-service programs) + (let ((programs (map (lambda (program) + ;; FIXME This is really ugly, I didn't managed to use + ;; "inherit" + (let ((program-name (setuid-program-program program)) + (setuid? (setuid-program-setuid? program)) + (setgid? (setuid-program-setgid? program)) + (user (setuid-program-user program)) + (group (setuid-program-group program)) ) + #~(setuid-program + (setuid? #$setuid?) + (setgid? #$setgid?) + (user #$user) + (group #$group) + (program #$program-name)))) + programs))) + (with-imported-modules (source-module-closure + '((gnu system setuid) + (gnu build activation))) + (list (shepherd-service + (documentation "Populate @file{/run/setuid-programs}.") + (provision '(setuid-programs)) + ;; TODO: actually need to require account service. maybe user-homes + ;; as a proxy? + (requirement '(file-systems)) + (one-shot? #t) + (modules '((gnu system setuid) + (gnu build activation))) + (start #~(lambda () + (activate-setuid-programs (list #$@programs)) + #t))))))) + +(define setuid-program-service-type + (service-type (name 'setuid-program) + (extensions + (list + (service-extension shepherd-root-service-type + setuid-programs->shepherd-service))) + (compose concatenate) + (extend append) + (default-value '()) + (description + "Populate @file{/run/setuid-programs} with the specified +executables, making them setuid and/or setgid."))) diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 7295a45b59..9ed1977f66 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -34,6 +34,7 @@ (define-module (gnu services xorg) #:use-module (gnu artwork) #:use-module (gnu services) #:use-module (gnu services configuration) + #:use-module (gnu services setuid) #:use-module (gnu services shepherd) #:use-module (gnu system pam) #:use-module (gnu system setuid) diff --git a/gnu/system.scm b/gnu/system.scm index c17c6e4e98..8faa3b4672 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -67,6 +67,7 @@ (define-module (gnu system) #:use-module (gnu packages text-editors) #:use-module (gnu packages wget) #:use-module (gnu services) + #:use-module (gnu services setuid) #:use-module (gnu services shepherd) #:use-module (gnu services base) #:use-module (gnu bootloader) -- 2.39.2