From patchwork Mon Aug 8 18:50:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: muradm X-Patchwork-Id: 41413 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 B765027BBEA; Mon, 8 Aug 2022 19:56:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EFCB627BBE9 for ; Mon, 8 Aug 2022 19:56:16 +0100 (BST) Received: from localhost ([::1]:51780 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oL7vE-00082t-2g for patchwork@mira.cbaines.net; Mon, 08 Aug 2022 14:56:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58566) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oL7v0-00081S-NK for guix-patches@gnu.org; Mon, 08 Aug 2022 14:56:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52250) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oL7v0-0004AQ-EZ for guix-patches@gnu.org; Mon, 08 Aug 2022 14:56:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oL7v0-0004m1-Ar for guix-patches@gnu.org; Mon, 08 Aug 2022 14:56:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56690] [PATCH] gnu: seatd-service-type: Should use seat group. Resent-From: muradm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Aug 2022 18:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56690 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Liliana Marie Prikler Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , 56690@debbugs.gnu.org Received: via spool by 56690-submit@debbugs.gnu.org id=B56690.165998490818271 (code B ref 56690); Mon, 08 Aug 2022 18:56:02 +0000 Received: (at 56690) by debbugs.gnu.org; 8 Aug 2022 18:55:08 +0000 Received: from localhost ([127.0.0.1]:41999 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oL7u7-0004kc-Gr for submit@debbugs.gnu.org; Mon, 08 Aug 2022 14:55:08 -0400 Received: from nomad-cl1.staging.muradm.net ([139.162.159.157]:59868 helo=nomad-cl1.muradm.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oL7u4-0004jt-L4 for 56690@debbugs.gnu.org; Mon, 08 Aug 2022 14:55:06 -0400 Received: from localhost ([127.0.0.1]:41944) by nomad-cl1.muradm.net with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1oL7tO-00026B-1N; Mon, 08 Aug 2022 18:54:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=muradm.net; s=mail; h=Content-Type:MIME-Version:Message-ID:In-reply-to:Date:Subject:Cc:To :From:References:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=JJ5GmDtzXto0sDMRc3eHBd62hUbicG28hkovC8jKZoI=; b=hyKZYqb8GBDntts8nr/M613j5L OyOXrSFe0Ijy1x2ORBnqUVAaK07/OgU/JSiTWF1vS05euIU95u+zrQUsGiCTXp6ZgQ33dOKbpUbFP ig+2buUADLT41wDNsMBN1aHorZBgWFA3KXejtI/1jmx+vqQhkWEH/0Tur18Sk3+2I6hAORV6mG5UO 6Hwc5iGwCficagP7OsjIx8w9HFD2RQV3ufflAz1Nb9qtShuo1EtCX4y12sIUFjL+8xQDWg2eCx13T nb1tXKqsIbuGuUTta+8m2hxIDrE8Gh5EGwzKT47ZW6UIpUJYgp0fLaR36tq0Ct62+guIJfaPZMVP/ HvD1pV5VNGwkukpj/mBtni7cO9ydpyh8uk7OO9eX9uGL89smmux5QX7pE6VY78GzVa7u2b2gtz4jH 4cWTgpwiBEHzc+BXehdWYsGpDvZxlirhvaIworT343buiD3CUeZLS7EZGNQjk9Zmc90qbkDILvAaq W/Lw9hl4M2y90luUP+p7/yFm; Received: from muradm by localhost with local (Exim 4.96) (envelope-from ) id 1oL7tp-0006BK-2o; Mon, 08 Aug 2022 21:54:49 +0300 References: <20220722042745.26745-1-mail@muradm.net> <87czdddrra.fsf@gnu.org> <87les00x51.fsf@muradm.net> <87h72n24ra.fsf@muradm.net> <55a3a3bf118f364b70cbd74d214998955d81eaa9.camel@ist.tugraz.at> User-agent: mu4e 1.8.7; emacs 29.0.50 From: muradm Date: Mon, 08 Aug 2022 21:50:43 +0300 In-reply-to: <55a3a3bf118f364b70cbd74d214998955d81eaa9.camel@ist.tugraz.at> Message-ID: <87mtcezhty.fsf@muradm.net> MIME-Version: 1.0 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Liliana Marie Prikler writes: > Am Sonntag, dem 07.08.2022 um 23:05 +0300 schrieb muradm: > >> * gnu/services/desktop.scm (seatd-service-type): Uses "seat" >> group. >> [extensions]: Added account-service-type with seatd-accounts. >> (seatd-accounts): Conditionally produces list with "seat" >> group. >> (): >> [user] Drop user field, since it is not going to be used. > Removed field. done >> [group] Change default value to "seat". >> [existing-group?] Add field which controls if group should be >> created or not. > Would be Added field, but see below. obsolete >> * doc/guix.texi: Mention that users may need to become members >> of >> "seat" group and update default value for group field. Add >> explanation on seatd.sock file. Remove dropped user field. > >> +When seat mamanagement is provided by @code{seatd}, users that >> acquire > management. done >> +resources provided by @code{seatd} should have permissions to >> access >> +its UNIX domain socket. By default, @code{seatd-service-type} >> provides >> +``seat'' group. And user should become its member. > Which user? Closely related, who acquires resources provided by > @code{seatd}? Just the greeter? A regular user logging in? > What access level is needed/provided? Read access? Write > access? While I understand what you are saying, for me user is fine, and I can't come up with better description, as my eyes too blurred on this subject. Anyway for now I specified it as "libseat user". >> + (group seatd-group (default "seat")) >> + (existing-group? seatd-existing-group? (default #f)) > AFAIK this is not necessary. accounts-service-type can handle > multiple > eq? groups, so as long as you're careful with what you put into > group, > you shouldn't get an error. ok field removed > Cheers From e733977a5cbd2bb34cf129908b16a4a0af830f02 Mon Sep 17 00:00:00 2001 From: muradm Date: Fri, 22 Jul 2022 07:09:54 +0300 Subject: [PATCH v3] gnu: seatd-service-type: Should use seat group. To: 56690@debbugs.gnu.org * gnu/services/desktop.scm (seatd-service-type): Uses "seat" group. [extensions]: Added account-service-type with seatd-accounts. (seatd-accounts): Conditionally produces list with "seat" group. (): [user] Removed user field, since it is not going to be used. [group] Change default value to "seat". * doc/guix.texi: Mention that users may need to become members of "seat" group and update default value for group field. Add explanation on seatd.sock file. Remove dropped user field. --- doc/guix.texi | 29 +++++++++++++++++++++++++---- gnu/services/desktop.scm | 14 +++++++++----- gnu/tests/desktop.scm | 9 +++++++++ 3 files changed, 43 insertions(+), 9 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 9a6a5c307d..92701fca10 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -23171,6 +23171,30 @@ input), without requiring the applications needing access to be root. %base-services) @end lisp + +@code{seatd} operates over a UNIX domain socket, with @code{libseat} +providing the client-side of the protocol. Then applications dealing +with seat management (e.g. @code{sway}) connects to @code{seatd} via +mentioned socket. + +When seat management is provided by @code{seatd}, @code{libseat} users +that acquire resources provided by @code{seatd} should have permissions +to access its UNIX domain socket. By default, @code{seatd-service-type} +provides ``seat'' group. And @code{libseat} user should become its +member. + +@lisp +(user-account + (name "alice") + (group "users") + (supplementary-groups '("wheel" ;allow use of sudo, etc. + "seat" ;interact with seatd + "audio" ;sound card + "video" ;video devices such as webcams + "cdrom")) ;the good ol' CD-ROM + (comment "Bob's sister")) +@end lisp + @end defvr @deftp {Data Type} seatd-configuration @@ -23180,10 +23204,7 @@ Configuration record for the seatd daemon service. @item @code{seatd} (default: @code{seatd}) The seatd package to use. -@item @code{user} (default: @samp{"root"}) -User to own the seatd socket. - -@item @code{group} (default: @samp{"users"}) +@item @code{group} (default: @samp{"seat"}) Group to own the seatd socket. @item @code{socket} (default: @samp{"/run/seatd.sock"}) diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 29a3722f1b..fbd5a46a06 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; Copyright © 2020 Reza Alizadeh Majd ;;; Copyright © 2021 Brice Waegeneire -;;; Copyright © 2021 muradm +;;; Copyright © 2021, 2022 muradm ;;; ;;; This file is part of GNU Guix. ;;; @@ -1645,8 +1645,7 @@ (define-record-type* seatd-configuration make-seatd-configuration seatd-configuration? (seatd seatd-package (default seatd)) - (user seatd-user (default "root")) - (group seatd-group (default "users")) + (group seatd-group (default "seat")) (socket seatd-socket (default "/run/seatd.sock")) (logfile seatd-logfile (default "/var/log/seatd.log")) (loglevel seatd-loglevel (default "info"))) @@ -1660,7 +1659,6 @@ (define (seatd-shepherd-service config) (provision '(seatd elogind)) (start #~(make-forkexec-constructor (list #$(file-append (seatd-package config) "/bin/seatd") - "-u" #$(seatd-user config) "-g" #$(seatd-group config)) #:environment-variables (list (string-append "SEATD_LOGLEVEL=" @@ -1670,9 +1668,14 @@ (define (seatd-shepherd-service config) #:log-file #$(seatd-logfile config))) (stop #~(make-kill-destructor))))) +(define seatd-accounts + (match-lambda + (($ _ group) + (list (user-group (name group) (system? #t)))))) + (define seatd-environment (match-lambda - (($ _ _ _ socket) + (($ _ _ socket) `(("SEATD_SOCK" . ,socket))))) (define seatd-service-type @@ -1683,6 +1686,7 @@ (define seatd-service-type applications needing access to be root.") (extensions (list + (service-extension account-service-type seatd-accounts) (service-extension session-environment-service-type seatd-environment) ;; TODO: once cgroups is separate dependency we should not mount it here ;; for now it is mounted here, because elogind mounts it diff --git a/gnu/tests/desktop.scm b/gnu/tests/desktop.scm index 25971f9225..6fe6ec21be 100644 --- a/gnu/tests/desktop.scm +++ b/gnu/tests/desktop.scm @@ -255,6 +255,15 @@ (define (sock-var-sock var) (socks (map wait-for-unix-socket-m socks))) (and (= 2 (length socks)) (every identity socks))))) + (test-equal "seatd.sock ownership" + '("root" "seat") + `(,(marionette-eval + '(passwd:name (getpwuid (stat:uid (stat "/run/seatd.sock")))) + marionette) + ,(marionette-eval + '(group:name (getgrgid (stat:gid (stat "/run/seatd.sock")))) + marionette))) + (test-assert "greetd is ready" (begin (marionette-type "ps -C greetd -o pid,args --no-headers > ps-greetd\n" -- 2.37.1