From patchwork Sun Apr 26 20:16:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pinoaffe X-Patchwork-Id: 21671 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 9546C27BBE4; Sun, 26 Apr 2020 21:17: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 075B027BBE1 for ; Sun, 26 Apr 2020 21:17:10 +0100 (BST) Received: from localhost ([::1]:44996 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jSni9-0003la-IP for patchwork@mira.cbaines.net; Sun, 26 Apr 2020 16:17:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54234) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jSni3-0003lQ-8P for guix-patches@gnu.org; Sun, 26 Apr 2020 16:17:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jSni2-0008VR-K6 for guix-patches@gnu.org; Sun, 26 Apr 2020 16:17:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51702) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jSni2-0008VM-80 for guix-patches@gnu.org; Sun, 26 Apr 2020 16:17:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jSni2-0005CE-4d for guix-patches@gnu.org; Sun, 26 Apr 2020 16:17:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40878] [PATCH] services: mpd: Allow authentication and permissions to be configured. Resent-From: pinoaffe@airmail.cc Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 26 Apr 2020 20:17:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 40878 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40878@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.158793217819907 (code B ref -1); Sun, 26 Apr 2020 20:17:01 +0000 Received: (at submit) by debbugs.gnu.org; 26 Apr 2020 20:16:18 +0000 Received: from localhost ([127.0.0.1]:35015 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jSnhK-0005B1-CM for submit@debbugs.gnu.org; Sun, 26 Apr 2020 16:16:18 -0400 Received: from lists.gnu.org ([209.51.188.17]:40177) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jSnhI-0005Au-Rp for submit@debbugs.gnu.org; Sun, 26 Apr 2020 16:16:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54174) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jSnhI-0003NQ-98 for guix-patches@gnu.org; Sun, 26 Apr 2020 16:16:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jSnhE-0007KT-EV for guix-patches@gnu.org; Sun, 26 Apr 2020 16:16:15 -0400 Received: from mail.cock.li ([37.120.193.124]:60356) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jSnhC-0007IS-AZ for guix-patches@gnu.org; Sun, 26 Apr 2020 16:16:12 -0400 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=airmail.cc; s=mail; t=1587932165; bh=/r7fHuMelKOPk7mNh4a4NhSNBoApnUdkdlMKdP/EPP8=; h=Date:From:To:Subject:From; b=qR6bdScKgIRhYLzqMrCdGKFmmjbkGx5hHeHpnP1nRTeP/WzsEiBvgmeCnmbOJiFoC TbvydCGgeCRiOVPkh2XMsXc2jcPYHdd2XAwugQDlysMqsUT6bTIumz2V3xcWNeL4OI gJp3Mh4EbMEhExWas6enLAJtP9AWLRU2sHDeqLbQBNBYU1ExqirPx6xkXEg68Xovpb 0dxNKeJIowN26v4aGAfbFFC3bRHm7UwtsjRuUbHsDEZsp1s9Y8kTf9sPZcU3iIlheK tFArPp09ZGJOt8lRs4YjjsSopaC5K0NTYHNNvR1XvLzeLY/l/JKGnzeM/qhvglKBay bDvJVHZAbmrGQ== Date: Sun, 26 Apr 2020 20:16:05 +0000 From: pinoaffe@airmail.cc Message-ID: <1ee4ef44362d20518fe69da7b6c37df5@airmail.cc> X-Sender: pinoaffe@airmail.cc User-Agent: Roundcube Webmail/1.3.10 Received-SPF: permerror client-ip=37.120.193.124; envelope-from=pinoaffe@airmail.cc; helo=mail.cock.li X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/26 16:16:05 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] 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(-) "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)))) 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)