aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar glitsj16 <glitsj16@users.noreply.github.com>2020-01-18 23:29:09 +0000
committerLibravatar GitHub <noreply@github.com>2020-01-18 23:29:09 +0000
commit789c30eb984ea638735726e39f2e65fbc25c989e (patch)
tree508e45f6a4328304a3ab19d82de1ecb4c155c667
parentUpdate SECURITY.md (diff)
downloadfirejail-789c30eb984ea638735726e39f2e65fbc25c989e.tar.gz
firejail-789c30eb984ea638735726e39f2e65fbc25c989e.tar.zst
firejail-789c30eb984ea638735726e39f2e65fbc25c989e.zip
fixes for 'blacklist ${RUNUSER}/wayland-*' (#3166)
* unbreak audio-recorder Support both X11 and Wayland by default. Users can add 'blacklist ${RUNUSER}/wayland-*' or 'x11 none' in their audio-recorder.local. * unbreak ddgtk Support both X11 and Wayland by default. Users can add 'blacklist ${RUNUSER}/wayland-*' or 'x11 none' in their ddgtk.local. * unbreak and harden gconf-editor Support both X11 and Wayland by default. Also whitelist /usr/share/gconf-editor for wusc. * unbreak seahorse Support both X11 and Wayland by default. * add blacklist ${RUNUSER}/wayland-* to dnscrypt-proxy
-rw-r--r--etc/audio-recorder.profile3
-rw-r--r--etc/ddgtk.profile3
-rw-r--r--etc/dnscrypt-proxy.profile1
-rw-r--r--etc/gconf-editor.profile4
-rw-r--r--etc/seahorse.profile1
5 files changed, 3 insertions, 9 deletions
diff --git a/etc/audio-recorder.profile b/etc/audio-recorder.profile
index 799405f1d..b2ed3b030 100644
--- a/etc/audio-recorder.profile
+++ b/etc/audio-recorder.profile
@@ -7,8 +7,6 @@ include audio-recorder.local
7# Persistent global definitions 7# Persistent global definitions
8include globals.local 8include globals.local
9 9
10blacklist ${RUNUSER}/wayland-*
11
12noblacklist ${MUSIC} 10noblacklist ${MUSIC}
13 11
14include disable-common.inc 12include disable-common.inc
@@ -42,7 +40,6 @@ protocol unix
42seccomp 40seccomp
43shell none 41shell none
44tracelog 42tracelog
45x11 none
46 43
47disable-mnt 44disable-mnt
48# private-bin audio-recorder 45# private-bin audio-recorder
diff --git a/etc/ddgtk.profile b/etc/ddgtk.profile
index 46386f09e..3dfc657bc 100644
--- a/etc/ddgtk.profile
+++ b/etc/ddgtk.profile
@@ -6,8 +6,6 @@ include ddgtk.local
6# Persistent global definitions 6# Persistent global definitions
7include globals.local 7include globals.local
8 8
9blacklist ${RUNUSER}/wayland-*
10
11# Allow python (blacklisted by disable-interpreters.inc) 9# Allow python (blacklisted by disable-interpreters.inc)
12include allow-python2.inc 10include allow-python2.inc
13include allow-python3.inc 11include allow-python3.inc
@@ -45,7 +43,6 @@ protocol unix
45seccomp 43seccomp
46shell none 44shell none
47tracelog 45tracelog
48x11 none
49 46
50disable-mnt 47disable-mnt
51private-bin bash,dd,ddgtk,grep,lsblk,python*,sed,sh,tr 48private-bin bash,dd,ddgtk,grep,lsblk,python*,sed,sh,tr
diff --git a/etc/dnscrypt-proxy.profile b/etc/dnscrypt-proxy.profile
index 65722b3ef..6637b8d02 100644
--- a/etc/dnscrypt-proxy.profile
+++ b/etc/dnscrypt-proxy.profile
@@ -8,6 +8,7 @@ include dnscrypt-proxy.local
8include globals.local 8include globals.local
9 9
10blacklist /tmp/.X11-unix 10blacklist /tmp/.X11-unix
11blacklist ${RUNUSER}/wayland-*
11 12
12noblacklist /sbin 13noblacklist /sbin
13noblacklist /usr/sbin 14noblacklist /usr/sbin
diff --git a/etc/gconf-editor.profile b/etc/gconf-editor.profile
index 7325bfb4c..cb39174e5 100644
--- a/etc/gconf-editor.profile
+++ b/etc/gconf-editor.profile
@@ -8,9 +8,9 @@ include gconf-editor.local
8#include globals.local 8#include globals.local
9 9
10blacklist /tmp/.X11-unix 10blacklist /tmp/.X11-unix
11blacklist ${RUNUSER}/wayland-*
12 11
13ignore net none 12whitelist /usr/share/gconf-editor
13
14ignore x11 none 14ignore x11 none
15 15
16# Redirect 16# Redirect
diff --git a/etc/seahorse.profile b/etc/seahorse.profile
index 0470dc286..5a742d05f 100644
--- a/etc/seahorse.profile
+++ b/etc/seahorse.profile
@@ -7,7 +7,6 @@ include seahorse.local
7include globals.local 7include globals.local
8 8
9blacklist /tmp/.X11-unix 9blacklist /tmp/.X11-unix
10blacklist ${RUNUSER}/wayland-*
11 10
12noblacklist ${HOME}/.gnupg 11noblacklist ${HOME}/.gnupg
13noblacklist ${HOME}/.ssh 12noblacklist ${HOME}/.ssh