diff options
author | netblue30 <netblue30@protonmail.com> | 2022-09-26 10:56:19 -0400 |
---|---|---|
committer | netblue30 <netblue30@protonmail.com> | 2022-09-26 10:56:19 -0400 |
commit | 4bbc9680836c3f959fac63e6c0abf4d7afb70346 (patch) | |
tree | 9cc50b7486aab5697d5ba475c9e8df1f818654b9 /etc | |
parent | merges (diff) | |
parent | Merge pull request #5360 from glitsj16/ff-dbus (diff) | |
download | firejail-4bbc9680836c3f959fac63e6c0abf4d7afb70346.tar.gz firejail-4bbc9680836c3f959fac63e6c0abf4d7afb70346.tar.zst firejail-4bbc9680836c3f959fac63e6c0abf4d7afb70346.zip |
Merge branch 'master' of ssh://github.com/netblue30/firejail
Diffstat (limited to 'etc')
-rw-r--r-- | etc/profile-a-l/firefox-developer-edition.profile | 4 | ||||
-rw-r--r-- | etc/profile-a-l/firefox.profile | 3 | ||||
-rw-r--r-- | etc/profile-m-z/signal-desktop.profile | 5 | ||||
-rw-r--r-- | etc/profile-m-z/zeal.profile | 5 |
4 files changed, 5 insertions, 12 deletions
diff --git a/etc/profile-a-l/firefox-developer-edition.profile b/etc/profile-a-l/firefox-developer-edition.profile index 3a9b8cf92..8c7ca3887 100644 --- a/etc/profile-a-l/firefox-developer-edition.profile +++ b/etc/profile-a-l/firefox-developer-edition.profile | |||
@@ -7,9 +7,5 @@ include firefox-developer-edition.local | |||
7 | # added by included profile | 7 | # added by included profile |
8 | #include globals.local | 8 | #include globals.local |
9 | 9 | ||
10 | # Edition-specific DBus filters | ||
11 | dbus-user.own org.mozilla.FirefoxDeveloperEdition.* | ||
12 | dbus-user.own org.mozilla.firefoxdeveloperedition.* | ||
13 | |||
14 | # Redirect | 10 | # Redirect |
15 | include firefox.profile | 11 | include firefox.profile |
diff --git a/etc/profile-a-l/firefox.profile b/etc/profile-a-l/firefox.profile index 99a6db2ae..0e1d30958 100644 --- a/etc/profile-a-l/firefox.profile +++ b/etc/profile-a-l/firefox.profile | |||
@@ -49,8 +49,7 @@ include whitelist-usr-share-common.inc | |||
49 | #private-etc firefox | 49 | #private-etc firefox |
50 | 50 | ||
51 | dbus-user filter | 51 | dbus-user filter |
52 | dbus-user.own org.mozilla.Firefox.* | 52 | dbus-user.own org.mozilla.* |
53 | dbus-user.own org.mozilla.firefox.* | ||
54 | dbus-user.own org.mpris.MediaPlayer2.firefox.* | 53 | dbus-user.own org.mpris.MediaPlayer2.firefox.* |
55 | # Add the next line to your firefox.local to enable native notifications. | 54 | # Add the next line to your firefox.local to enable native notifications. |
56 | #dbus-user.talk org.freedesktop.Notifications | 55 | #dbus-user.talk org.freedesktop.Notifications |
diff --git a/etc/profile-m-z/signal-desktop.profile b/etc/profile-m-z/signal-desktop.profile index 1166f378b..2c4bdecd8 100644 --- a/etc/profile-m-z/signal-desktop.profile +++ b/etc/profile-m-z/signal-desktop.profile | |||
@@ -26,9 +26,8 @@ dbus-user filter | |||
26 | # allow D-Bus notifications | 26 | # allow D-Bus notifications |
27 | dbus-user.talk org.freedesktop.Notifications | 27 | dbus-user.talk org.freedesktop.Notifications |
28 | 28 | ||
29 | # allow D-Bus communication with firefox for opening links | 29 | # allow D-Bus communication with Firefox browsers for opening links |
30 | dbus-user.talk org.mozilla.Firefox.* | 30 | dbus-user.talk org.mozilla.* |
31 | dbus-user.talk org.mozilla.firefox.* | ||
32 | 31 | ||
33 | ignore dbus-user none | 32 | ignore dbus-user none |
34 | 33 | ||
diff --git a/etc/profile-m-z/zeal.profile b/etc/profile-m-z/zeal.profile index 62af9c6a8..84f6d52dd 100644 --- a/etc/profile-m-z/zeal.profile +++ b/etc/profile-m-z/zeal.profile | |||
@@ -19,7 +19,7 @@ include disable-programs.inc | |||
19 | include disable-shell.inc | 19 | include disable-shell.inc |
20 | include disable-xdg.inc | 20 | include disable-xdg.inc |
21 | 21 | ||
22 | # Allow zeal to open links in Firefox. | 22 | # Allow zeal to open links in Firefox browsers. |
23 | # This also requires dbus-user filtering (see below). | 23 | # This also requires dbus-user filtering (see below). |
24 | noblacklist ${HOME}/.mozilla | 24 | noblacklist ${HOME}/.mozilla |
25 | whitelist ${HOME}/.mozilla/firefox/profiles.ini | 25 | whitelist ${HOME}/.mozilla/firefox/profiles.ini |
@@ -64,8 +64,7 @@ private-etc alternatives,ca-certificates,crypto-policies,fonts,host.conf,hostnam | |||
64 | private-tmp | 64 | private-tmp |
65 | 65 | ||
66 | dbus-user filter | 66 | dbus-user filter |
67 | dbus-user.talk org.mozilla.Firefox.* | 67 | dbus-user.talk org.mozilla.* |
68 | dbus-user.talk org.mozilla.firefox.* | ||
69 | ?ALLOW_TRAY: dbus-user.talk org.kde.StatusNotifierWatcher | 68 | ?ALLOW_TRAY: dbus-user.talk org.kde.StatusNotifierWatcher |
70 | dbus-system none | 69 | dbus-system none |
71 | 70 | ||