From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id gNkqDWdaTWRmCwAASxT56A (envelope-from ) for ; Sat, 29 Apr 2023 19:56:55 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id eOIGDWdaTWSxJAAAauVa8A (envelope-from ) for ; Sat, 29 Apr 2023 19:56:55 +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 E8BB7EE69 for ; Sat, 29 Apr 2023 19:56:54 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1psoHt-00017o-7x; Sat, 29 Apr 2023 13:23:09 -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 1psoHq-00015G-Uw for bug-guix@gnu.org; Sat, 29 Apr 2023 13:23:06 -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 1psoHq-0003NS-Lh for bug-guix@gnu.org; Sat, 29 Apr 2023 13:23:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1psoHq-00008G-GW for bug-guix@gnu.org; Sat, 29 Apr 2023 13:23:06 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#63082: [PATCH v2 09/16] services: mpd: Let Shepherd effect the user/group change. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sat, 29 Apr 2023 17:23:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63082 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 63082@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 63082-submit@debbugs.gnu.org id=B63082.1682788958332 (code B ref 63082); Sat, 29 Apr 2023 17:23:06 +0000 Received: (at 63082) by debbugs.gnu.org; 29 Apr 2023 17:22:38 +0000 Received: from localhost ([127.0.0.1]:36575 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psoHO-000059-1h for submit@debbugs.gnu.org; Sat, 29 Apr 2023 13:22:38 -0400 Received: from mail-qt1-f179.google.com ([209.85.160.179]:51695) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psoH4-0008UU-17 for 63082@debbugs.gnu.org; Sat, 29 Apr 2023 13:22:19 -0400 Received: by mail-qt1-f179.google.com with SMTP id d75a77b69052e-3ef32014101so11908741cf.3 for <63082@debbugs.gnu.org>; Sat, 29 Apr 2023 10:22:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682788932; x=1685380932; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=o4UIS3U/bY8kp0hnhqOqYc6kj4830zgb5qRPv7NhxHU=; b=bQsLlhB6XX38wrDbza6rGsdKUvSUgFfc8R5xnwkkuhYsR/usSn/x+vk+XVl/AobSZG VnxRKIT4PdLM9bUWOZlX+laTvjVGOga/RS0vkTGm/jFWzAZ/SA5A8haa9uhbArvI6iWd udPyvQKluvsnsOeO+2zDQV9R7oDtEHAoJSKlG93fDL0UIiumbYxZqXckNJvC1J1OPnO0 1FJhAgWdlgMot2fKu9m72klE/XkcaQZCoPGD6kBxp+rBBfY5+Sb5wtnHEPlXJJCoHDaP vy4qg4BtoHCP9QdtUjNwnc9Xsb+PYaFnClnQEFSh6kteeW2iQ2K+BIlEqmR+8V1/BSR2 MAEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682788932; x=1685380932; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=o4UIS3U/bY8kp0hnhqOqYc6kj4830zgb5qRPv7NhxHU=; b=Rdz590UrMJM0Zp3rNO99LDhy81mdJt/X2WIK8vkTkqQFBGZYoNB8q3A9skQrQom0/Q /gHRF0Lkbhx4CKWkfdJzbT4/bkjzBDqigv5dqA9j+82qf2BBXv0diEToNBYlMiIqBFRd fEx8t5P4aOdF2dLaccJ+Ki6Xk1Zn6NHqdnxe3bK4DRw8GpLFj26qEI1RMbogGjmROsE3 +ho/xmDX1UnBC+8oSWwBGZLpyNVb0weepILyKisGzlXWKX+jhbdxCr7pWKCIYcpijVUc +t50ENA6fTvEEtg+pX4OV2VtZFmYzy51Db1wFZva8PBD5bON20MoZ3WwjDBdIWiX7DVY RsFw== X-Gm-Message-State: AC+VfDxyTutLD/azQ8GzxeXfJs9eoG58aIw5XTTCEgSkq6blFtb/yjkr fycoUvnPIfeA9CGai8brP0ywZQRVJdQ= X-Google-Smtp-Source: ACHHUZ4ssYmiFA9SdT2ZITVgF5uptIvcvZS+sRSqQ01+o+c5lvnE6p8tsvzl2OU+DIL5RzYOBwc38w== X-Received: by 2002:a05:622a:46:b0:3e4:903:4edf with SMTP id y6-20020a05622a004600b003e409034edfmr14867450qtw.28.1682788932245; Sat, 29 Apr 2023 10:22:12 -0700 (PDT) Received: from localhost.localdomain (dsl-155-245.b2b2c.ca. [66.158.155.245]) by smtp.gmail.com with ESMTPSA id dm45-20020a05620a1d6d00b0074cf009f443sm7582489qkb.85.2023.04.29.10.22.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Apr 2023 10:22:11 -0700 (PDT) From: Maxim Cournoyer Date: Sat, 29 Apr 2023 13:21:46 -0400 Message-Id: <9425ba1d3c110df4e840b334ce70c9e71af9d03c.1682788743.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-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=1682791015; a=rsa-sha256; cv=none; b=AtmQ3e0ZNwukjuG2hLSkpK271X+r69aVIjY2q7fITQSAlOwsLauH0z8w4RMZMJf8Y9sXkY pSH8yGBWYLZcov0nNchOanxTj1CEHWWo4nG4+BnhaLfbQy3y8UB01WDEHZQRstHjQmm1Yh NaV+N+AcyZzpl6+NJ/djRwBP0MJJbxCgrDTeyg9/Dr9xnMMgVPIUbMakLc9wRfxmSAYtJ/ GcDZuvITWncXHcQEagpA70j+bRGu5Go2TgwhsfVeD0UriqvnWxvtStpogUl8A6S3nYLfdD afHCY9i5B0+eK238lboI6awaZNjkrBxR4ZaJhyoQvq60Ax5LpSoci4ujsuDjEQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20221208 header.b=bQsLlhB6; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1682791015; 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=Prp32Uz4FG8LAGvQnQx/ClovAYF2qjVvgftM0mygbUo=; b=pN3NTQJVyW4+lueFKYhm2p/cW8EcogxwmLTOpKbUbTZuprd6dAwR62Nx6c1vMB/uG0bGcu +U4wsiXVIkz1IqUi3WrETlNdOdJavrzNjuoSvlS4T3i17AWuHzMeMhsexltDd2ylx7h3PY 7gkQJBGogJo5LQF3Q2dSmvIQRYWUs4uUOiryx8wYEXItOPFNANCE/coUI9oQn8uwLiy0jl QN9J9ELSxuGahAbWgOWUN9kFR7LFLq+YZENwPViaNUl453M/vdZUQi6javwSy+vnSZddBO k6B8DBbiMkrkxcTZY5akMg3Fdnk5S8Nb1QfpavRggo6nczPImBzv0f5bfzZ0Gw== X-Migadu-Spam-Score: -0.11 X-Spam-Score: -0.11 X-Migadu-Queue-Id: E8BB7EE69 X-Migadu-Scanner: scn0.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20221208 header.b=bQsLlhB6; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-TUID: zJ3iveS0fFpt Relates to . Quoting a MPD developer, regarding MPD's feature to switch user itself: "that's legacy for the dark ages when proper service managers did not exist" :-). * gnu/services/audio.scm (mpd-serialize-user-account) (mpd-serialize-user-group): Delete procedures. * gnu/services/audio.scm (mpd-configuration) [user]: Do not serialize. [group]: Likewise. (mpd-shepherd-service): Provide the #:user, #:group and #:supplementary-groups arguments. (mympd-shepherd-service): Likewise, and remove the '--user' argument. * doc/guix.texi (Audio Services): Update doc. (mympd-configuration) [port]: Change default value to 8080. [ssl-port]: Change default value to 443. * gnu/tests/audio.scm (run-mympd-test): Adjust accordingly. --- doc/guix.texi | 12 +++++----- gnu/services/audio.scm | 52 +++++++++++++++++++++++++----------------- gnu/tests/audio.scm | 4 ++-- 3 files changed, 39 insertions(+), 29 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index e558e5bb18..e4dc4fdd17 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -33569,7 +33569,7 @@ Audio Services The MPD package. @item @code{user} (type: user-account) -The user to run mpd as. +The user to run @command{mpd} as. @item @code{group} (default: @code{#f}) (type: boolean) Obsolete. Do not use. @@ -33613,7 +33613,7 @@ Audio Services The location of the sticker database. @item @code{default-port} (default: @code{6600}) (type: maybe-port) -The default port to run mpd on. +The default port to run @command{mpd} on. @item @code{endpoints} (type: maybe-list-of-strings) The addresses that mpd will bind to. A port different from @@ -33798,13 +33798,13 @@ Audio Services @uref{https://jcorporation.github.io/myMPD/, myMPD} is a web server frontend for MPD that provides a mobile friendly web client for MPD. -The following example shows a myMPD instance listening on port 80, +The following example shows a myMPD instance listening on port 8080, with album cover caching disabled. @lisp (service mympd-service-type (mympd-configuration - (port 80) + (port 8080) (covercache-ttl 0))) @end lisp @@ -33848,7 +33848,7 @@ Audio Services @item @code{host} (default: @code{"[::]"}) (type: string) Host name to listen on. -@item @code{port} (default: @code{80}) (type: maybe-port) +@item @code{port} (default: @code{8080}) (type: maybe-port) HTTP port to listen on. @item @code{log-level} (default: @code{5}) (type: integer) @@ -33874,7 +33874,7 @@ Audio Services @item @code{ssl?} (default: @code{#f}) (type: boolean) SSL/TLS support. -@item @code{ssl-port} (default: @code{443}) (type: maybe-port) +@item @code{ssl-port} (default: @code{4443}) (type: maybe-port) Port to listen for HTTPS. @item @code{ssl-cert} (type: maybe-string) diff --git a/gnu/services/audio.scm b/gnu/services/audio.scm index 7fb4b8ccf7..f470ca20e0 100644 --- a/gnu/services/audio.scm +++ b/gnu/services/audio.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2019 Ricardo Wurmus ;;; Copyright © 2020 Ludovic Courtès ;;; Copyright © 2022⁠–⁠2023 Bruno Victal +;;; Copyright © 2023 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -165,9 +166,6 @@ (define mpd-serialize-boolean mpd-serialize-field) (define (mpd-serialize-list-of-strings field-name value) #~(string-append #$@(map (cut mpd-serialize-string field-name <>) value))) -(define (mpd-serialize-user-account field-name value) - (mpd-serialize-string field-name (user-account-name value))) - (define-maybe string (prefix mpd-)) (define-maybe list-of-strings (prefix mpd-)) (define-maybe boolean (prefix mpd-)) @@ -390,10 +388,14 @@ (define-configuration mpd-configuration "The MPD package." empty-serializer) + ;; Note: The user and its group are not serialized, otherwise MPD would + ;; attempt to switch the user/group itself. The task of switching the + ;; user/group is left to Shepherd instead. (user (user-account %mpd-user) - "The user to run mpd as." - (sanitizer mpd-user-sanitizer)) + "The user to run @command{mpd} as." + (sanitizer mpd-user-sanitizer) + empty-serializer) (group (boolean #f) @@ -458,7 +460,7 @@ (define-configuration mpd-configuration (default-port (maybe-port 6600) - "The default port to run mpd on.") + "The default port to run @command{mpd} on.") (endpoints maybe-list-of-strings @@ -611,7 +613,11 @@ (define (mpd-shepherd-service config) (make-forkexec-constructor (list #$(file-append package "/bin/mpd") "--no-daemon" #$config-file) - #:environment-variables '#$environment-variables)))) + #:environment-variables '#$environment-variables + #:user #$username + #:group #$(user-account-group user) + #:supplementary-groups + '#$(user-account-supplementary-groups user))))) (stop #~(make-kill-destructor)) (actions (list (shepherd-configuration-action config-file) @@ -654,7 +660,7 @@ (define mpd-service-type (service-extension account-service-type mpd-accounts) (service-extension rottlog-service-type - (compose list mpd-log-rotation)))) + mpd-log-rotation))) (default-value (mpd-configuration)))) @@ -770,7 +776,7 @@ (define-configuration/no-serialization mympd-configuration "Host name to listen on.") (port - (maybe-port 80) + (maybe-port 8080) "HTTP port to listen on.") (log-level @@ -805,7 +811,7 @@ (define-configuration/no-serialization mympd-configuration "SSL/TLS support.") (ssl-port - (maybe-port 443) + (maybe-port 4443) "Port to listen for HTTPS.") (ssl-cert @@ -901,17 +907,21 @@ (define (mympd-shepherd-service config) '#$(map dirname (filter-map maybe-value (list log-to work-directory - cache-directory))))) - - (make-forkexec-constructor - `(#$(file-append package "/bin/mympd") - "--user" #$username - #$@(if (eq? log-to 'syslog) '("--syslog") '()) - "--workdir" #$work-directory - "--cachedir" #$cache-directory) - #:environment-variables - (list #$(format #f "MYMPD_LOGLEVEL=~a" log-level)) - #:log-file #$(maybe-value log-to))))))))) + cache-directory)))) + + (make-forkexec-constructor + `(#$(file-append package "/bin/mympd") + "--user" #$username + #$@(if (eq? log-to 'syslog) '("--syslog") '()) + "--workdir" #$work-directory + "--cachedir" #$cache-directory) + #:environment-variables + (list #$(format #f "MYMPD_LOGLEVEL=~a" log-level)) + #:log-file #$(maybe-value log-to) + #:user #$username + #:group #$(user-account-group user) + #:supplementary-groups + '#$(user-account-supplementary-groups user)))))))))) (define (mympd-accounts config) (match-record config diff --git a/gnu/tests/audio.scm b/gnu/tests/audio.scm index acb91293e8..efa07b5ba9 100644 --- a/gnu/tests/audio.scm +++ b/gnu/tests/audio.scm @@ -89,7 +89,7 @@ (define (run-mympd-test) (define vm (virtual-machine (operating-system os) - (port-forwardings '((8080 . 80))))) + (port-forwardings '((8080 . 8080))))) (define test (with-imported-modules '((gnu build marionette)) @@ -113,7 +113,7 @@ (define (run-mympd-test) marionette)) (test-assert "HTTP port ready" - (wait-for-tcp-port 80 marionette)) + (wait-for-tcp-port 8080 marionette)) (test-equal "http-head" 200 -- 2.39.2