From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 24 12:03:22 2023 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 To: Bruno Victal Subject: Re: [PATCH v2 8/8] services: mympd: Use user-account (resp. user-group) for user (resp. group) fields. 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-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 62298 Cc: 62298@debbugs.gnu.org, ludo@gnu.org, liliana.prikler@gmail.com 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.0 (-) 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