[PATCH 0/5] *** PulseAudio service improvements ***

### Allow including a default.pa.d directory, which if present, can be used

### for additional configuration snippets.

.nofail

.include /gnu/store/7xwgz4bavb1i8sfx1lm55hlrr3ngjkdx-pulseaudio-15.0/etc/pulse/default.pa.d

(script-file (computed-file "default.pa"

#~(begin

(copy-file #$(file-apend pulseaudio "/etc/default.pa")

#$output)

(call-with-port

(open-file #$output "a")

(lambda (port)

(format port "~%\

set-card-profile alsa_card.pci-0000_01_01.0 output:analog-surround-40+input:analog-mono

set-default-source alsa_input.pci-0000_01_01.0.analog-mono

set-default-sink alsa_output.pci-0000_01_01.0.analog-surround-40~%"))))))

(extra-script-files

(list (plain-file "configure-audigy-card"

(string-append "\

set-card-profile alsa_card.pci-0000_01_01.0 output:analog-surround-40+input:analog-mono

set-default-source alsa_input.pci-0000_01_01.0.analog-mono

set-default-sink alsa_output.pci-0000_01_01.0.analog-surround-40\n"))))

modified gnu/packages/pulseaudio.scm

@@ -279,13 +279,12 @@ (define pulseaudio/fixed

`(modify-phases ,phases

(add-after 'unpack 'customize-default-script

(lambda _

- (call-with-port

- (open-file "src/daemon/default.pa.in" "a")

- (lambda (port)

- (format port "~%\

-### Include extra script files configured via the pulseaudio-service-type.

-.nofail

-.include /etc/pulse/default.pa.d~%")))))))))))

+ (substitute* "src/daemon/default.pa.in"

+ (("^\\.include.*default.pa.d.*" anchor)

+ (string-append

+ ;; Honor PulseAudio script extensions found under

+ ;; /etc/pulse/default.pa.d.

+ anchor ".include /etc/pulse/default.pa.d\n")))))))))))

(define-public pavucontrol

(package

1 file changed, 20 insertions(+), 4 deletions(-)

gnu/services/sound.scm | 24 ++++++++++++++++++++----

modified gnu/services/sound.scm

@@ -26,10 +26,12 @@ (define-module (gnu services sound)

#:use-module (gnu services)

#:use-module (gnu system pam)

#:use-module (gnu system shadow)

+ #:use-module (guix diagnostics)

#:use-module (guix gexp)

#:use-module (guix packages)

#:use-module (guix records)

#:use-module (guix store)

+ #:use-module (guix ui)

#:use-module (gnu packages audio)

#:use-module (gnu packages linux)

#:use-module (gnu packages pulseaudio)

@@ -149,10 +151,24 @@ (define pulseaudio-environment

("PULSE_CLIENTCONFIG" . "/etc/pulse/client.conf")))))

(define (extra-script-files->file-union extra-script-files)

- "Return a G-exp obtained by processing EXTRA-SCRIPT-FILES with FILE-UNION.

-Each file is named \"snippet-n.pa\", where N is their 1-offset index."

- (let ((labels (map (lambda (n) (format #f "snippet-~a.pa" n))

- (iota (length extra-script-files) 1))))

+ "Return a G-exp obtained by processing EXTRA-SCRIPT-FILES with FILE-UNION."

+

+ (define (file-like->name file)

+ (let ((name (match file

+ ((? local-file?)

+ (local-file-name file))

+ ((? plain-file?)

+ (plain-file-name file))

+ ((? computed-file?)

+ (computed-file-name file))

+ (_ (leave (G_ "~a is not a local-file, plain-file or \

+computed-file object~%") file)))))

+ (unless (string-suffix? name ".pa")

+ (leave (G_ "`~a' lacks the required '.pa' file name extension~%")

+ name))

+ name))

+

+ (let ((labels (map file-like->name extra-script-files)))

(file-union "default.pa.d" (zip labels extra-script-files))))

(define pulseaudio-etc

(define (file-like-name file)

((match file

((? local-file?) local-file-name)

 ((? plain-file?) plain-file-name)

 ((? computed-file?) computed-file-name)

[...]

(_ (const #f))) ; alternatively raise an error

file))

(define (assert-pulseaudio-script-file-name name)

(unless name (raise ...))

(unless (string-suffix? name ".pa") (leave ...))

name)

(script-file 

(mixed-text-file "default.pa"

".include"

;; (pulseaudio-configuration-script-file service)

(file-append pulseaudio "/etc/default.pa")

"

set-card-profile alsa_card.pci-0000_01_01.0

output:analog-surround-40+input:analog-mono

set-default-source alsa_input.pci-0000_01_01.0.analog-mono

set-default-sink

alsa_output.pci-0000_01_01.0.analog-surround-40\n"))

.include /gnu/store/7xwgz4bavb1i8sfx1lm55hlrr3ngjkdx-pulseaudio-

15.0/etc/default.pa

set-card-profile alsa_card.pci-0000_01_01.0

output:analog-surround-40+input:analog-mono

set-default-source alsa_input.pci-0000_01_01.0.analog-mono

set-default-sink

alsa_output.pci-0000_01_01.0.analog-surround-40

.include /gnu/store/7xwgz4bavb1i8sfx1lm55hlrr3ngjkdx-pulseaudio-

15.0/etc/default.pa

.include /gnu/store/12345678901234567890123456789012-audigy-card.pa

.include /gnu/store/12345678901234567890123456789013-other-stuff.pa

[...]

(script-file

(mixed-text-file "default.pa"

".include"

(file-append pulseaudio "/etc/default.pa")

".include" my-pulseaudio-extra-config))

modified Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp

@@ -24,6 +24,7 @@

#include <fcntl.h>

#include <glib.h>

#include <seccomp.h>

+#include <string.h>

#include <sys/ioctl.h>

#include <sys/mman.h>

#include <unistd.h>

@@ -337,7 +338,16 @@ static void bindIfExists(Vector<CString>& args, const char* path, BindFlags bind

bindType = "--ro-bind-try";

else

bindType = "--bind-try";

- args.appendVector(Vector<CString>({ bindType, path, path }));

+

+ // Canonicalize the source path, otherwise a symbolic link could

+ // point to a location outside of the namespace.

+ char canonicalPath[PATH_MAX];

+ if (!realpath(path, canonicalPath)) {

+ if (strlen(path) + 1 > PATH_MAX)

+ return; // too long of a path

+ strcpy(path, canonicalPath); // no-op

+ }

+ args.appendVector(Vector<CString>({ bindType, canonicalPath, path }));

}

static void bindDBusSession(Vector<CString>& args, XDGDBusProxyLauncher& proxy)

diff --git a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp b/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp

index 0d5dd4f6986d..1512b73a985d 100644

--- a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp

+++ b/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp

@@ -325,6 +325,18 @@ enum class BindFlags {

Device,

};

+static void bindSymlinksRealPath(Vector<CString>& args, const char* path,

+ const char* bindOption = "--ro-bind")

+{

+ char realPath[PATH_MAX];

+

+ if (realpath(path, realPath) && strcmp(path, realPath)) {

+ args.appendVector(Vector<CString>({

+ bindOption, realPath, realPath,

+ }));

+ }

+}

+

static void bindIfExists(Vector<CString>& args, const char* path, BindFlags bindFlags = BindFlags::ReadOnly)

{

if (!path || path[0] == '\0')

@@ -337,6 +349,10 @@ static void bindIfExists(Vector<CString>& args, const char* path, BindFlags bind

bindType = "--ro-bind-try";

else

bindType = "--bind-try";

+

+ // Canonicalize the source path, otherwise a symbolic link could

+ // point to a location outside of the namespace.

+ bindSymlinksRealPath(args, path, bindType);

args.appendVector(Vector<CString>({ bindType, path, path }));

}

@@ -615,17 +631,6 @@ static void bindV4l(Vector<CString>& args)

}));

}

-static void bindSymlinksRealPath(Vector<CString>& args, const char* path)

-{

- char realPath[PATH_MAX];

-

- if (realpath(path, realPath) && strcmp(path, realPath)) {

- args.appendVector(Vector<CString>({

- "--ro-bind", realPath, realPath,

- }));

- }

-}

-

// Translate a libseccomp error code into an error message. libseccomp

// mostly returns negative errno values such as -ENOMEM, but some

// standard errno values are used for non-standard purposes where their

--8<---------------cut here---------------end--------------->8---

Which produced the intended bwrap arguments, but unfortunately that'd

still fail. The issue seems to be related to attempt to bind

/etc/pulse/client.conf over something already existing there; it can be

simply reproduced with:

One thing to try would be to not bind mount client.conf; /etc/ is

already bind mounted as a whole. If the resolved paths are all bind

mounted (which they are since we share the whole of /gnu), we should be

OK.

Alternatively we could try to bind only the resolved paths, and rewrite

the environment variables such as PULSE_CLIENTCONFIG at run time in

webkitgtk such that it points to the resolved destination.

To be continued...

Maxim

modified gnu/services/sound.scm

@@ -154,21 +154,24 @@ (define (extra-script-files->file-union extra-script-files)

"Return a G-exp obtained by processing EXTRA-SCRIPT-FILES with FILE-UNION."

(define (file-like->name file)

- (let ((name (match file

- ((? local-file?)

- (local-file-name file))

- ((? plain-file?)

- (plain-file-name file))

- ((? computed-file?)

- (computed-file-name file))

- (_ (leave (G_ "~a is not a local-file, plain-file or \

-computed-file object~%") file)))))

- (unless (string-suffix? ".pa" name)

- (leave (G_ "`~a' lacks the required `.pa' file name extension~%")

- name))

- name))

-

- (let ((labels (map file-like->name extra-script-files)))

+ (match file

+ ((? local-file?)

+ (local-file-name file))

+ ((? plain-file?)

+ (plain-file-name file))

+ ((? computed-file?)

+ (computed-file-name file))

+ (_ (leave (G_ "~a is not a local-file, plain-file or \

+computed-file object~%") file))))

+

+ (define (assert-pulseaudio-script-file-name name)

+ (unless (string-suffix? ".pa" name)

+ (leave (G_ "`~a' lacks the required `.pa' file name extension~%") name))

+ name)

+

+ (let ((labels (map (compose assert-pulseaudio-script-file-name)

+ file-like->name

+ extra-script-files)))

(file-union "default.pa.d" (zip labels extra-script-files))))

modified doc/guix.texi

@@ -21507,7 +21507,10 @@ List of settings to set in @file{daemon.conf}, formatted just like

@var{client-conf}.

@item @code{script-file} (default: @code{(file-append pulseaudio "/etc/pulse/default.pa")})

-Script file to use as @file{default.pa}.

+Script file to use as @file{default.pa}. In case the

+@code{extra-script-files} field below is used, an @code{.include}

+directive pointing to @file{/etc/pulse/default.pa.d} is appended to the

+provided script.

@item @code{extra-script-files} (default: @code{'())})

A list of file-like objects defining extra PulseAudio scripts to run at

modified gnu/services/sound.scm

@@ -174,6 +174,21 @@ (define (assert-pulseaudio-script-file-name name)

extra-script-files)))

(file-union "default.pa.d" (zip labels extra-script-files))))

+(define (append-include-directive script-file)

+ "Append an include directive to source scripts under /etc/pulse/default.pa.d."

+ (computed-file "default.pa"

+ #~(begin

+ (use-modules (ice-9 textual-ports))

+ (define script-text

+ (call-with-input-file #$script-file get-string-all))

+ (call-with-output-file #$output

+ (lambda (port)

+ (format port (string-append script-text

+ "

+# Added by Guix to include scripts specified in extra-script-files.

+.nofail

+.include /etc/pulse/default.pa.d~%")))))))

+

(define pulseaudio-etc

(match-lambda

(($ <pulseaudio-configuration> client-conf daemon-conf default-script-file

@@ -181,7 +196,10 @@ (define pulseaudio-etc

`(("pulse"

,(file-union

"pulse"

- `(("default.pa" ,default-script-file)

+ `(("default.pa"

+ ,(if (null? extra-script-files)

+ default-script-file

+ (append-include-directive default-script-file)))

("system.pa" ,system-script-file)

,@(if (null? extra-script-files)

'()