Skip to content

Commit

Permalink
Rework pipewire/wayland
Browse files Browse the repository at this point in the history
- closes #4483 -- mpv requires whitelisting /usr/share/pipewire
- wruc: whitelist pipewire-?, pipewire is becoming more popular and was
  developed with isolation (container/sandbox) in mind.
- wruc: whitelist wayland-? instead of only -0 and -1
- wusc: whitelist /usr/share/pipewire
- remove these wruc/wusc lines from other profiles
- firefox-common-addons: Make ignore wruc work again (#4512)
- firefox: org.freedesktop.portal.Desktop should be enough
  • Loading branch information
rusty-snake committed Sep 7, 2021
1 parent e17223e commit 5d3e0e8
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 15 deletions.
4 changes: 2 additions & 2 deletions etc/inc/whitelist-runuser-common.inc
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ whitelist ${RUNUSER}/gdm/Xauthority
whitelist ${RUNUSER}/ICEauthority
whitelist ${RUNUSER}/.mutter-Xwaylandauth.*
whitelist ${RUNUSER}/pulse/native
whitelist ${RUNUSER}/wayland-0
whitelist ${RUNUSER}/wayland-1
whitelist ${RUNUSER}/pipewire-?
whitelist ${RUNUSER}/wayland-?
whitelist ${RUNUSER}/xauth_*
whitelist ${RUNUSER}/[[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]]-[[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]]-[[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]]-[[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]]-[[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]]
1 change: 1 addition & 0 deletions etc/inc/whitelist-usr-share-common.inc
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ whitelist /usr/share/myspell
whitelist /usr/share/p11-kit
whitelist /usr/share/perl
whitelist /usr/share/perl5
whitelist /usr/share/pipewire
whitelist /usr/share/pixmaps
whitelist /usr/share/pki
whitelist /usr/share/plasma
Expand Down
4 changes: 0 additions & 4 deletions etc/profile-a-l/chromium-common.profile
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,6 @@ include whitelist-var-common.inc
# Add the next line to your chromium-common.local if your kernel allows unprivileged userns clone.
#include chromium-common-hardened.inc.profile

# Add the next two lines to your chromium-common.local to allow screen sharing under wayland.
#whitelist ${RUNUSER}/pipewire-0
#whitelist /usr/share/pipewire/client.conf

apparmor
caps.keep sys_admin,sys_chroot
netfilter
Expand Down
1 change: 1 addition & 0 deletions etc/profile-a-l/firefox-common-addons.profile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# Persistent customizations should go in a .local file.
include firefox-common-addons.local

ignore whitelist ${RUNUSER}/*firefox*
ignore include whitelist-runuser-common.inc
ignore private-cache

Expand Down
6 changes: 2 additions & 4 deletions etc/profile-a-l/firefox.profile
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,8 @@ dbus-user.own org.mpris.MediaPlayer2.firefox.*
#dbus-user.own org.mpris.MediaPlayer2.plasma-browser-integration
#dbus-user.talk org.kde.JobViewServer
#dbus-user.talk org.kde.kuiserver
# Add the next three lines to your firefox.local to allow screen sharing under wayland.
#whitelist ${RUNUSER}/pipewire-0
#whitelist /usr/share/pipewire/client.conf
#dbus-user.talk org.freedesktop.portal.*
# Add the next line to your firefox.local to allow screen sharing under wayland.
#dbus-user.talk org.freedesktop.portal.Desktop
# Add the next line to your firefox.local if screen sharing sharing still does not work
# with the above lines (might depend on the portal implementation).
#ignore noroot
Expand Down
6 changes: 2 additions & 4 deletions etc/profile-a-l/librewolf.profile
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,8 @@ dbus-user filter
#dbus-user.own org.mpris.MediaPlayer2.plasma-browser-integration
#dbus-user.talk org.kde.JobViewServer
#dbus-user.talk org.kde.kuiserver
# Add the next three lines to your librewolf.local to allow screensharing under Wayland.
#whitelist ${RUNUSER}/pipewire-0
#whitelist /usr/share/pipewire/client.conf
#dbus-user.talk org.freedesktop.portal.*
# Add the next line to your librewolf.local to allow screensharing under Wayland.
#dbus-user.talk org.freedesktop.portal.Desktop
# Also add the next line to your librewolf.local if screensharing does not work with
# the above lines (depends on the portal implementation).
#ignore noroot
Expand Down
1 change: 0 additions & 1 deletion etc/profile-m-z/xournalpp.profile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ noblacklist ${HOME}/.xournalpp

include allow-lua.inc

whitelist /usr/share/pipewire
whitelist /usr/share/texlive
whitelist /usr/share/xournalpp
whitelist /var/lib/texmf
Expand Down

0 comments on commit 5d3e0e8

Please sign in to comment.