From patchwork Tue Apr 28 11:29:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pinoaffe X-Patchwork-Id: 21706 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 56C4227BBE4; Tue, 28 Apr 2020 12:31:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id C9E5227BBE1 for ; Tue, 28 Apr 2020 12:31:09 +0100 (BST) Received: from localhost ([::1]:53902 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTOSD-00028X-BU for patchwork@mira.cbaines.net; Tue, 28 Apr 2020 07:31:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50520) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTOS7-00028O-EA for guix-patches@gnu.org; Tue, 28 Apr 2020 07:31:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTOS6-0006Zl-Vc for guix-patches@gnu.org; Tue, 28 Apr 2020 07:31:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55856) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jTOS6-0006Zg-Ii for guix-patches@gnu.org; Tue, 28 Apr 2020 07:31:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jTOS6-00055I-FF for guix-patches@gnu.org; Tue, 28 Apr 2020 07:31:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40878] [PATCH (hopefully not garbled this time)] services: mpd: Allow authentication and permissions to be configured. References: <1ee4ef44362d20518fe69da7b6c37df5@airmail.cc> In-Reply-To: <1ee4ef44362d20518fe69da7b6c37df5@airmail.cc> Resent-From: pinoaffe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 28 Apr 2020 11:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40878 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40878@debbugs.gnu.org Received: via spool by 40878-submit@debbugs.gnu.org id=B40878.158807341216584 (code B ref 40878); Tue, 28 Apr 2020 11:31:02 +0000 Received: (at 40878) by debbugs.gnu.org; 28 Apr 2020 11:30:12 +0000 Received: from localhost ([127.0.0.1]:39169 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jTORH-0004Iy-IP for submit@debbugs.gnu.org; Tue, 28 Apr 2020 07:30:12 -0400 Received: from mail.cock.li ([37.120.193.124]:58996) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jTORE-00047T-2p for 40878@debbugs.gnu.org; Tue, 28 Apr 2020 07:30:10 -0400 Date: Tue, 28 Apr 2020 13:29:59 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=airmail.cc; s=mail; t=1588073402; bh=r4uAFeK2sZBPceJA9JOMw7DgOEhntiwmGkUPjCwnG/4=; h=Date:From:To:Subject:From; b=hRG/Np3HWR49roSmPtlZbBbeiEuHXZFkRxa5wCqUE9oV1rqd5Zr++ChjtouWQXED7 /2ZxYjhz3Fs7YknilzEojtLspKsmYP8Zxavddvwa8rM3fuJagMJLkA7An+RagSxHxR vHfkqVM96JM3AdCCAbMQHsJtL50zymjxHiw0xDStfydLQ4ojR4AfV/xccnX7ozmEQv Ug92wJyWXoytlCBxGA7fDDcnd3U6oiw8gUhkmfz1cRFK9T6VRrk2DVxdZD3IgSupaj GVdc24qBDPYQNvy5D2hF75fLrcb58m0UxZx15T1qgdp9kBr2QCdw3mxEMbDTw15SvN PExeONVoUmRsQ== From: pinoaffe Message-ID: <20200426223555.2a5793bb@airmail.cc> X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 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 * gnu/services/audio.scm (mpd-credential): New public variable. * gnu/services/audio.scm (mpd-configuration): Add credentials and permissions. --- doc/guix.texi | 23 ++++++++++++ gnu/services/audio.scm | 79 ++++++++++++++++++++++++++++++------------ 2 files changed, 80 insertions(+), 22 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 6613a4af13..1693d938f1 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -23271,12 +23271,35 @@ an absolute path can be specified here. @item @code{outputs} (default: @code{"(list (mpd-output))"}) The audio outputs that MPD can use. By default this is a single output using pulseaudio. +@item @code{default-permissions} (default: @code{'(read add control admin)}) +The permissions a user that connected to the mpd server without a password should enjoy. +Should be a subset of @code{'(read add control admin)}. + +@item @code{credentials} (default: @code{'()}) +The list of credentials one can use to sign in to mpd and gain extra permissions. By +default this is an empty list. + @end table @end deftp +@deftp {Data Type} mpd-credential +Data type representing an @command{mpd} password/permissions pair. + @deftp {Data Type} mpd-output Data type representing an @command{mpd} audio output. +@table @asis +@item @code{password} (default: @code{""}) +The password used to authenticate. The password may not contain "@". + +@item @code{permissions} (default: @code{'()}) +The permissions one gains after authenticating to the server using @code{password}. +This should be a subset of @code{'(read add control admin)}, as in +@code{default-permissions}. + +@end table +@end deftp + @table @asis @item @code{name} (default: @code{"MPD"}) The name of the audio output. diff --git a/gnu/services/audio.scm b/gnu/services/audio.scm index 345d8225b2..9a6dc8db94 100644 --- a/gnu/services/audio.scm +++ b/gnu/services/audio.scm @@ -26,6 +26,8 @@ #:use-module (ice-9 match) #:export (mpd-output mpd-output? + mpd-credential + mpd-credential? mpd-configuration mpd-configuration? mpd-service-type)) @@ -36,6 +38,16 @@ ;;; ;;; Code: +(define-record-type* + mpd-credential make-mpd-credential + mpd-credential? + (password mpd-credential-password + ;; valid: any string that does not contain #\@ + (default "")) + (permissions mpd-credential-permissions + ;; valid: any subset of read, add, control and admin + (default '()))) + (define-record-type* mpd-output make-mpd-output mpd-output? @@ -58,24 +70,41 @@ (define-record-type* mpd-configuration make-mpd-configuration mpd-configuration? - (user mpd-configuration-user - (default "mpd")) - (music-dir mpd-configuration-music-dir - (default "~/Music")) - (playlist-dir mpd-configuration-playlist-dir - (default "~/.mpd/playlists")) - (db-file mpd-configuration-db-file - (default "~/.mpd/tag_cache")) - (state-file mpd-configuration-state-file - (default "~/.mpd/state")) - (sticker-file mpd-configuration-sticker-file - (default "~/.mpd/sticker.sql")) - (port mpd-configuration-port - (default "6600")) - (address mpd-configuration-address - (default "any")) - (outputs mpd-configuration-outputs - (default (list (mpd-output))))) + (user mpd-configuration-user + (default "mpd")) + (music-dir mpd-configuration-music-dir + (default "~/Music")) + (playlist-dir mpd-configuration-playlist-dir + (default "~/.mpd/playlists")) + (db-file mpd-configuration-db-file + (default "~/.mpd/tag_cache")) + (state-file mpd-configuration-state-file + (default "~/.mpd/state")) + (sticker-file mpd-configuration-sticker-file + (default "~/.mpd/sticker.sql")) + (port mpd-configuration-port + (default "6600")) + (address mpd-configuration-address + (default "any")) + (credentials mpd-configuration-credentials + (default '())) + (default-permissions mpd-configuration-default-permissions + (default '(read add control admin))) + (outputs mpd-configuration-outputs + (default (list (mpd-output))))) + +(define (mpd-permissions->string permissions) + (string-join (map symbol->string + permissions) + ",")) + +(define (mpd-credential->string credential) + "Convert the USER of type to a configuration file snippet." + (format #f + "password \"~a@~a\"\n" + (mpd-credential-password credential) + (mpd-permissions->string + (mpd-credential-permissions credential)))) (define (mpd-output->string output) "Convert the OUTPUT of type to a configuration file snippet." @@ -110,8 +139,14 @@ audio_output { (apply mixed-text-file "mpd.conf" "pid_file \"" (mpd-file-name config "pid") "\"\n" + "default_permissions \"" + (mpd-permissions->string + (mpd-configuration-default-permissions config)) + "\"\n" (append (map mpd-output->string (mpd-configuration-outputs config)) + (map mpd-credential->string + (mpd-configuration-credentials config)) (map (match-lambda ((config-name config-val) (string-append config-name " \"" (config-val config) "\"\n"))) @@ -143,10 +178,10 @@ audio_output { #:environment-variables ;; Required to detect PulseAudio when run under a user account. '(#$(string-append - "XDG_RUNTIME_DIR=/run/user/" - (number->string - (passwd:uid - (getpwnam (mpd-configuration-user config)))))) + "XDG_RUNTIME_DIR=/run/user/" + (number->string + (passwd:uid + (getpwnam (mpd-configuration-user config)))))) #:log-file #$(mpd-file-name config "log"))) (stop #~(make-kill-destructor))))