From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id yJk3LwseHmTSdwEASxT56A (envelope-from ) for ; Fri, 24 Mar 2023 23:02:51 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id 6AYeLwseHmTfCwAA9RJhRA (envelope-from ) for ; Fri, 24 Mar 2023 23:02:51 +0100 Received: from lists.gnu.org (unknown [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 863CB17B86 for ; Fri, 24 Mar 2023 23:02:51 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pfpTb-0004NA-JC; Fri, 24 Mar 2023 18:01:35 -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 1pfpTK-0004BH-7s for guix-patches@gnu.org; Fri, 24 Mar 2023 18:01:21 -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 1pfpTJ-0000eY-VZ for guix-patches@gnu.org; Fri, 24 Mar 2023 18:01:17 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pfjta-0005rc-0D for guix-patches@gnu.org; Fri, 24 Mar 2023 12:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62298] [PATCH v2 8/8] services: mympd: Use user-account (resp. user-group) for user (resp. group) fields. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Mar 2023 16:04:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62298 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Bruno Victal Cc: 62298@debbugs.gnu.org, ludo@gnu.org, liliana.prikler@gmail.com Received: via spool by 62298-submit@debbugs.gnu.org id=B62298.167967380222488 (code B ref 62298); Fri, 24 Mar 2023 16:04:01 +0000 Received: (at 62298) by debbugs.gnu.org; 24 Mar 2023 16:03:22 +0000 Received: from localhost ([127.0.0.1]:41205 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pfjss-0005qa-33 for submit@debbugs.gnu.org; Fri, 24 Mar 2023 12:03:21 -0400 Received: from mail-qt1-f173.google.com ([209.85.160.173]:36739) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pfjsq-0005qN-5m for 62298@debbugs.gnu.org; Fri, 24 Mar 2023 12:03:16 -0400 Received: by mail-qt1-f173.google.com with SMTP id hf2so1890121qtb.3 for <62298@debbugs.gnu.org>; Fri, 24 Mar 2023 09:03:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679673790; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=Q3alAuJfWnKloZRjRD7/Bi2OLxmgfPyRaFvT0nN9RBc=; b=gtPYyi+Rcsdd5vu2iW1V+siSCw6rLwqFCN8IPRusMO55WFzN5bkHHJbf0av21Lz3YB 5hkNjc0bos2fcBAn4/ARv03ATJNMnKeShO7C2gQNNJtJtLaxgSXlvpQnVzE1UjgJF5IY dUgEDI54EyvpDxCwzL3mkHiv68CiECV+djskRa5IEX5WH/9A6rfCQfUP/qMQVJYiq/CG ouVTgFLnqgw6ERyRZuOyzm1iZv6ZBgy0lyKkROhboVysRcuTjpR30PzNTXZuOb/pdFaR z4qQDjRYdSeviEnIuOtt0ymOBjwuvanLu3O1b9JrS2RZzXZYzI+JlNd/9Ri9jXsLnv9r RJbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679673790; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=Q3alAuJfWnKloZRjRD7/Bi2OLxmgfPyRaFvT0nN9RBc=; b=mQvxM5JeoQvrBoNO33d/wd6MY2prtjNc6jPF2OMxVo3DvEBXPlBwYycQyD+lIbrkMT 8oqfBnjvj+EmRkIxNEIh5l0Gtm0qAHFnzWCmSeHprJt9TgmDzdBxpnUySVhOdu7vuAs8 0+mEzoDcWKgbKoRPkK5b+DeAwRMIy3VulKT5l6Yz9a8SYIV2LfVE9R9VCYcygH6qkQp4 67Bu37t3kw3yz9ywwQlPYnzpoueg5hvkRbLwyyQEwBrymR5G46zodymJjYdY5gYJZ4aI GcySV2KnRK5bJHLtHx+PklKB3TK1lkGTCySiSFHqHjghJGvhJVarEhHFd2rcxaaJcSsB LiSg== X-Gm-Message-State: AO0yUKVh0mLqbXrD66g7uhzClG7rplmLHuaFuWr2GFXYZeUWsNJVSUFT mf21CJtGhaFTGYTn6mWgUZQ= X-Google-Smtp-Source: AK7set9KeSjCLmyzLdly1hUIVW6kCJPhDSVYxTd36bYGlWQNnc5JMgp7B+xI4iGCHrkAtA72YJvLRw== X-Received: by 2002:a05:622a:454:b0:3b8:6a92:c8d6 with SMTP id o20-20020a05622a045400b003b86a92c8d6mr5089824qtx.60.1679673790508; Fri, 24 Mar 2023 09:03:10 -0700 (PDT) Received: from hurd (dsl-155-54.b2b2c.ca. [66.158.155.54]) by smtp.gmail.com with ESMTPSA id 196-20020a370acd000000b0074690b42617sm7814921qkk.15.2023.03.24.09.03.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Mar 2023 09:03:10 -0700 (PDT) From: Maxim Cournoyer References: <364a2fe961ddce2c4668c0c8b78f46bffe2c2096.1679583701.git.mirai@makinata.eu> Date: Fri, 24 Mar 2023 12:03:09 -0400 In-Reply-To: <364a2fe961ddce2c4668c0c8b78f46bffe2c2096.1679583701.git.mirai@makinata.eu> (Bruno Victal's message of "Thu, 23 Mar 2023 15:02:18 +0000") Message-ID: <877cv6yw5e.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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+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=1679695371; a=rsa-sha256; cv=none; b=VuFu4adSPJUl9yaKXUODryimU65Dgy8q2y8RF9ml71meVKTiZl3j+a5a84tXOSSBMYJv0k DR2VKwtS1GE4/hCzxw9ifO0g89b0nPc4Hmcx005/t31PDApshEc4Df24YQiBQ/X8u/sgin tlCAkuZTlUWWoeN1SOiCwa/SYuKpMc+xHilifk8EG7mZB8z9m5UMAIoZpxlPMGg95wXSie Cu6L1mGWf0LbYk+P3QIuGWs1YS++MO6IkpwlHEuNmgl9UO5OCcoghQDopf1idkoMNBUmRs LEciVDbkv0CCR5c2gSt5ThHym9DbTfTDsFawfy3/eLcdrQtmDUpJ7Vlp3iRQfQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=gtPYyi+R; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); 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=1679695371; h=from:from:sender:sender: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=Q3alAuJfWnKloZRjRD7/Bi2OLxmgfPyRaFvT0nN9RBc=; b=QleWWvhu82k23CFXmaJPHw+rUfiCFEBeMNHpJZsV8TxolsAujIJd9sQbfs20iFAmMu/uUX KyjTSlnT4Dnq4nM29mqrqTDLUUhJOS0GnCQGUOWXmXEADpKtFp84oRzWY0t9Pt2UXE+Lmf ChXV9iDZpOAqG42EmIL+EA2tjypM7Cx40+B4JQldYYbMHrBzHLi7y7U3Fvlr38xWgbBCOK oeEWRkB9ljU1QRQ6pUQ3jybvURchrnS1p7RxkZdK1Fbe8P9Zz60AmGf2f3uNk4d3FK9oiY idZmNMbC08pbPRIO4Yrejns6CxvYA/GNAQBw5pPhzpRQH1HWcYkqrMOHh+zilQ== Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=gtPYyi+R; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); 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: scn1.migadu.com X-Migadu-Spam-Score: 3.36 X-Spam-Score: 3.36 X-Migadu-Queue-Id: 863CB17B86 X-TUID: sEDF034XKEN8 Hello, Bruno Victal writes: > services: mympd: Use user-account (resp. user-group) for user (resp. grou= p) fields. > > * gnu/services/audio.scm (%mympd-user, %mympd-group): New variable. > (mympd-user-sanitizer, mympd-group-sanitizer): New procedure. > (mympd-configuration)[user, group]: Set value type to user-account (resp.= user-group). > (mympd-serialize-configuration): Adapt for user-account values in user fi= eld. > (mympd-accounts): Adapt for user-account (resp. user-group) in user (resp= . group) field. Please configure your editor for the 80 characters mark. > --- > doc/guix.texi | 4 +-- > gnu/services/audio.scm | 74 ++++++++++++++++++++++++++++++++++-------- > 2 files changed, 63 insertions(+), 15 deletions(-) > > diff --git a/doc/guix.texi b/doc/guix.texi > index 520a65b0b1..ee1e66b3ff 100644 > --- a/doc/guix.texi > +++ b/doc/guix.texi > @@ -33732,10 +33732,10 @@ Audio Services > This is a list of symbols naming Shepherd services that this service > will depend on. >=20=20 > -@item @code{user} (default: @code{"mympd"}) (type: string) > +@item @code{user} (type: maybe-user-account) > Owner of the @command{mympd} process. >=20=20 > -@item @code{group} (default: @code{"nogroup"}) (type: string) > +@item @code{group} (type: maybe-user-group) > Owner group of the @command{mympd} process. >=20=20 > @item @code{work-directory} (default: @code{"/var/lib/mympd"}) (type: st= ring) > diff --git a/gnu/services/audio.scm b/gnu/services/audio.scm > index c168d1481c..f7f430039e 100644 > --- a/gnu/services/audio.scm > +++ b/gnu/services/audio.scm > @@ -659,6 +659,54 @@ (define-configuration/no-serialization mympd-ip-acl > (define-maybe/no-serialization integer) > (define-maybe/no-serialization mympd-ip-acl) >=20=20 > +;; XXX: These will shadow the previous definition used by mpd > +;; and cause warnings to be shown. Maybe split the file > +;; into audio/mpd.scm and audio/mympd.scm ? > +#;(define-maybe/no-serialization user-account) > +#;(define-maybe/no-serialization user-group) I'd rather keeping them together if possible; could the prefix trick be used with them? No need for a hanging indent for continued text, here and for the other occurrences. The expressions commented; should they be? On another note, '#;' appears undocumented, I'd avoid it until it is (and it's not necessary here). > +(define %mympd-user > + (user-account > + (name "mympd") > + (group "mympd") > + (system? #t) > + (comment "myMPD user") > + (home-directory "/var/empty") > + (shell (file-append shadow "/sbin/nologin")))) > + > +(define %mympd-group > + (user-group > + (name "mympd") > + (system? #t))) > + > +;;; TODO: procedures for unsupported value types, to be removed. ^ Procedures =20=20=20=20=20=20=20=20=20=20=20=20=20 > +(define (mympd-user-sanitizer value) > + (cond ((user-account? value) value) > + ((string? value) > + (warning (G_ "string value for 'user' is not supported, use \ > +user-account instead~%")) > + (user-account > + (inherit %mympd-user) > + (name value) > + ;; XXX: this is to be lazily substituted in (=E2=80=A6-account= s) > + ;; with the value from 'group'. Extraneous hanging indent :-). > + (group %lazy-group))) > + (else > + (configuration-field-error #f 'user value)))) > + > +(define (mympd-group-sanitizer value) > + (cond ((user-group? value) value) > + ((string? value) > + (warning (G_ "string value for 'group' is not supported, use \ > +user-group instead~%")) > + (user-group > + (inherit %mympd-group) > + (name value))) > + (else > + (configuration-field-error #f 'group value)))) > +;;; Was this ';;;' added by mistake? > ;; XXX: The serialization procedures are insufficient since we require > ;; access to multiple fields at once. > ;; Fields marked with empty-serializer are never serialized and are > @@ -676,13 +724,15 @@ (define-configuration/no-serialization mympd-config= uration > empty-serializer) >=20=20 > (user > - (string "mympd") > + (maybe-user-account %mympd-user) > "Owner of the @command{mympd} process." > + (sanitizer mympd-user-sanitizer) > empty-serializer) >=20=20 > (group > - (string "nogroup") > + (maybe-user-group %mympd-group) > "Owner group of the @command{mympd} process." > + (sanitizer mympd-group-sanitizer) > empty-serializer) >=20=20 > (work-directory > @@ -817,7 +867,8 @@ (define (mympd-shepherd-service config) > (match-record config (package shepherd-requireme= nt > user work-directory > cache-directory log-level = log-to) > - (let ((log-level* (format #f "MYMPD_LOGLEVEL=3D~a" log-level))) > + (let ((log-level* (format #f "MYMPD_LOGLEVEL=3D~a" log-level)) > + (username (user-account-name user))) > (shepherd-service > (documentation "Run the myMPD daemon.") > (requirement `(loopback user-processes > @@ -825,7 +876,7 @@ (define (mympd-shepherd-service config) > ,@shepherd-requirement)) > (provision '(mympd)) > (start #~(begin > - (let* ((pw (getpwnam #$user)) > + (let* ((pw (getpwnam #$username)) > (uid (passwd:uid pw)) > (gid (passwd:gid pw))) > (for-each (lambda (dir) > @@ -835,7 +886,7 @@ (define (mympd-shepherd-service config) >=20=20 > (make-forkexec-constructor > `(#$(file-append package "/bin/mympd") > - "--user" #$user > + "--user" #$username > #$@(if (eqv? log-to 'syslog) '("--syslog") '()) > "--workdir" #$work-directory > "--cachedir" #$cache-directory) > @@ -845,14 +896,11 @@ (define (mympd-shepherd-service config) >=20=20 > (define (mympd-accounts config) > (match-record config (user group) > - (list (user-group (name group) > - (system? #t)) > - (user-account (name user) > - (group group) > - (system? #t) > - (comment "myMPD user") > - (home-directory "/var/empty") > - (shell (file-append shadow "/sbin/no= login")))))) > + ;; TODO: deprecation code, to be removed Please use a full sentence. > + (let ((user (if (eq? (user-account-group user) %lazy-group) > + (inject-group-into-user user group) > + user))) > + (list user group)))) >=20=20 > (define (mympd-log-rotation config) > (match-record config (log-to) LGTM, with the comments from Liliana taken into account. --=20 Thanks, Maxim