diff options
author | 2023-03-23 02:49:53 -0300 | |
---|---|---|
committer | 2023-03-28 11:49:51 -0300 | |
commit | 35885d72566977c1a9686f9324b07ae2cdd1f702 (patch) | |
tree | 0664467ad3077de149fa545c160d4762fc43c1ad | |
parent | mpv: move read-only entries to disable-common.inc (diff) | |
download | firejail-35885d72566977c1a9686f9324b07ae2cdd1f702.tar.gz firejail-35885d72566977c1a9686f9324b07ae2cdd1f702.tar.zst firejail-35885d72566977c1a9686f9324b07ae2cdd1f702.zip |
firefox: move read-only entries to disable-common.inc
Instead of duplicating them on every profile that tries to allow opening
links in Firefox.
And make that path read-write on firefox.profile.
-rw-r--r-- | etc/inc/disable-common.inc | 1 | ||||
-rw-r--r-- | etc/profile-a-l/electron-mail.profile | 1 | ||||
-rw-r--r-- | etc/profile-a-l/email-common.profile | 1 | ||||
-rw-r--r-- | etc/profile-a-l/firefox.profile | 3 | ||||
-rw-r--r-- | etc/profile-a-l/geary.profile | 1 | ||||
-rw-r--r-- | etc/profile-a-l/kube.profile | 1 | ||||
-rw-r--r-- | etc/profile-a-l/linuxqq.profile | 2 | ||||
-rw-r--r-- | etc/profile-m-z/signal-desktop.profile | 1 | ||||
-rw-r--r-- | etc/profile-m-z/thunderbird.profile | 1 | ||||
-rw-r--r-- | etc/profile-m-z/trojita.profile | 1 | ||||
-rw-r--r-- | etc/profile-m-z/tutanota-desktop.profile | 1 | ||||
-rw-r--r-- | etc/profile-m-z/youtube-viewers-common.profile | 1 | ||||
-rw-r--r-- | etc/profile-m-z/zeal.profile | 1 |
13 files changed, 4 insertions, 12 deletions
diff --git a/etc/inc/disable-common.inc b/etc/inc/disable-common.inc index 1b55a5dff..baa68c0c2 100644 --- a/etc/inc/disable-common.inc +++ b/etc/inc/disable-common.inc | |||
@@ -346,6 +346,7 @@ read-only ${HOME}/.local/share/cool-retro-term | |||
346 | read-only ${HOME}/.local/share/nvim | 346 | read-only ${HOME}/.local/share/nvim |
347 | read-only ${HOME}/.local/state/nvim | 347 | read-only ${HOME}/.local/state/nvim |
348 | read-only ${HOME}/.mailcap | 348 | read-only ${HOME}/.mailcap |
349 | read-only ${HOME}/.mozilla/firefox/profiles.ini | ||
349 | read-only ${HOME}/.msmtprc | 350 | read-only ${HOME}/.msmtprc |
350 | read-only ${HOME}/.mutt/muttrc | 351 | read-only ${HOME}/.mutt/muttrc |
351 | read-only ${HOME}/.muttrc | 352 | read-only ${HOME}/.muttrc |
diff --git a/etc/profile-a-l/electron-mail.profile b/etc/profile-a-l/electron-mail.profile index 9f4fabd68..766fe523b 100644 --- a/etc/profile-a-l/electron-mail.profile +++ b/etc/profile-a-l/electron-mail.profile | |||
@@ -24,7 +24,6 @@ whitelist ${HOME}/.config/electron-mail | |||
24 | # there isn't a Firefox instance running with the default profile; see #5352) | 24 | # there isn't a Firefox instance running with the default profile; see #5352) |
25 | noblacklist ${HOME}/.mozilla | 25 | noblacklist ${HOME}/.mozilla |
26 | whitelist ${HOME}/.mozilla/firefox/profiles.ini | 26 | whitelist ${HOME}/.mozilla/firefox/profiles.ini |
27 | read-only ${HOME}/.mozilla/firefox/profiles.ini | ||
28 | 27 | ||
29 | machine-id | 28 | machine-id |
30 | nosound | 29 | nosound |
diff --git a/etc/profile-a-l/email-common.profile b/etc/profile-a-l/email-common.profile index 0a44a62a3..7d5c859e9 100644 --- a/etc/profile-a-l/email-common.profile +++ b/etc/profile-a-l/email-common.profile | |||
@@ -85,6 +85,5 @@ dbus-user.talk org.gnome.seahorse.* | |||
85 | dbus-user.talk org.mozilla.* | 85 | dbus-user.talk org.mozilla.* |
86 | dbus-system none | 86 | dbus-system none |
87 | 87 | ||
88 | read-only ${HOME}/.mozilla/firefox/profiles.ini | ||
89 | read-only ${HOME}/.signature | 88 | read-only ${HOME}/.signature |
90 | restrict-namespaces | 89 | restrict-namespaces |
diff --git a/etc/profile-a-l/firefox.profile b/etc/profile-a-l/firefox.profile index 0e1d30958..42d59157c 100644 --- a/etc/profile-a-l/firefox.profile +++ b/etc/profile-a-l/firefox.profile | |||
@@ -14,6 +14,9 @@ include globals.local | |||
14 | # https://github.com/netblue30/firejail/wiki/Frequently-Asked-Questions#how-do-i-run-two-instances-of-firefox | 14 | # https://github.com/netblue30/firejail/wiki/Frequently-Asked-Questions#how-do-i-run-two-instances-of-firefox |
15 | # https://github.com/netblue30/firejail/issues/4206#issuecomment-824806968 | 15 | # https://github.com/netblue30/firejail/issues/4206#issuecomment-824806968 |
16 | 16 | ||
17 | # (Ignore entry from disable-common.inc) | ||
18 | ignore read-only ${HOME}/.mozilla/firefox/profiles.ini | ||
19 | |||
17 | noblacklist ${HOME}/.cache/mozilla | 20 | noblacklist ${HOME}/.cache/mozilla |
18 | noblacklist ${HOME}/.mozilla | 21 | noblacklist ${HOME}/.mozilla |
19 | noblacklist ${RUNUSER}/*firefox* | 22 | noblacklist ${RUNUSER}/*firefox* |
diff --git a/etc/profile-a-l/geary.profile b/etc/profile-a-l/geary.profile index a19a20ba7..ba0837780 100644 --- a/etc/profile-a-l/geary.profile +++ b/etc/profile-a-l/geary.profile | |||
@@ -91,5 +91,4 @@ dbus-user.talk org.gnome.evolution.dataserver.Sources5 | |||
91 | dbus-user.talk org.mozilla.* | 91 | dbus-user.talk org.mozilla.* |
92 | dbus-system none | 92 | dbus-system none |
93 | 93 | ||
94 | read-only ${HOME}/.mozilla/firefox/profiles.ini | ||
95 | restrict-namespaces | 94 | restrict-namespaces |
diff --git a/etc/profile-a-l/kube.profile b/etc/profile-a-l/kube.profile index 5183a9327..5cf30ed40 100644 --- a/etc/profile-a-l/kube.profile +++ b/etc/profile-a-l/kube.profile | |||
@@ -77,5 +77,4 @@ dbus-user.talk org.freedesktop.secrets | |||
77 | dbus-user.talk org.freedesktop.Notifications | 77 | dbus-user.talk org.freedesktop.Notifications |
78 | dbus-system none | 78 | dbus-system none |
79 | 79 | ||
80 | read-only ${HOME}/.mozilla/firefox/profiles.ini | ||
81 | restrict-namespaces | 80 | restrict-namespaces |
diff --git a/etc/profile-a-l/linuxqq.profile b/etc/profile-a-l/linuxqq.profile index 9157d910b..6ca8b8103 100644 --- a/etc/profile-a-l/linuxqq.profile +++ b/etc/profile-a-l/linuxqq.profile | |||
@@ -37,7 +37,5 @@ dbus-user.talk org.gnome.Mutter.IdleMonitor | |||
37 | dbus-user.talk org.mozilla.* | 37 | dbus-user.talk org.mozilla.* |
38 | ignore dbus-user none | 38 | ignore dbus-user none |
39 | 39 | ||
40 | read-only ${HOME}/.mozilla/firefox/profiles.ini | ||
41 | |||
42 | # Redirect | 40 | # Redirect |
43 | include electron-common.profile | 41 | include electron-common.profile |
diff --git a/etc/profile-m-z/signal-desktop.profile b/etc/profile-m-z/signal-desktop.profile index a26b41524..3e1899ef3 100644 --- a/etc/profile-m-z/signal-desktop.profile +++ b/etc/profile-m-z/signal-desktop.profile | |||
@@ -14,7 +14,6 @@ noblacklist ${HOME}/.config/Signal | |||
14 | # These lines are needed to allow Firefox to open links | 14 | # These lines are needed to allow Firefox to open links |
15 | noblacklist ${HOME}/.mozilla | 15 | noblacklist ${HOME}/.mozilla |
16 | whitelist ${HOME}/.mozilla/firefox/profiles.ini | 16 | whitelist ${HOME}/.mozilla/firefox/profiles.ini |
17 | read-only ${HOME}/.mozilla/firefox/profiles.ini | ||
18 | 17 | ||
19 | mkdir ${HOME}/.config/Signal | 18 | mkdir ${HOME}/.config/Signal |
20 | whitelist ${HOME}/.config/Signal | 19 | whitelist ${HOME}/.config/Signal |
diff --git a/etc/profile-m-z/thunderbird.profile b/etc/profile-m-z/thunderbird.profile index 1ac80bc9a..5df207e25 100644 --- a/etc/profile-m-z/thunderbird.profile +++ b/etc/profile-m-z/thunderbird.profile | |||
@@ -24,7 +24,6 @@ writable-run-user | |||
24 | # These lines are needed to allow Firefox to load your profile when clicking a link in an email | 24 | # These lines are needed to allow Firefox to load your profile when clicking a link in an email |
25 | noblacklist ${HOME}/.mozilla | 25 | noblacklist ${HOME}/.mozilla |
26 | whitelist ${HOME}/.mozilla/firefox/profiles.ini | 26 | whitelist ${HOME}/.mozilla/firefox/profiles.ini |
27 | read-only ${HOME}/.mozilla/firefox/profiles.ini | ||
28 | 27 | ||
29 | noblacklist ${HOME}/.cache/thunderbird | 28 | noblacklist ${HOME}/.cache/thunderbird |
30 | noblacklist ${HOME}/.gnupg | 29 | noblacklist ${HOME}/.gnupg |
diff --git a/etc/profile-m-z/trojita.profile b/etc/profile-m-z/trojita.profile index 378c8a1b7..ba68ccb53 100644 --- a/etc/profile-m-z/trojita.profile +++ b/etc/profile-m-z/trojita.profile | |||
@@ -60,5 +60,4 @@ dbus-user filter | |||
60 | dbus-user.talk org.freedesktop.secrets | 60 | dbus-user.talk org.freedesktop.secrets |
61 | dbus-system none | 61 | dbus-system none |
62 | 62 | ||
63 | read-only ${HOME}/.mozilla/firefox/profiles.ini | ||
64 | restrict-namespaces | 63 | restrict-namespaces |
diff --git a/etc/profile-m-z/tutanota-desktop.profile b/etc/profile-m-z/tutanota-desktop.profile index 4793e9dbb..55e4a4392 100644 --- a/etc/profile-m-z/tutanota-desktop.profile +++ b/etc/profile-m-z/tutanota-desktop.profile | |||
@@ -28,7 +28,6 @@ whitelist ${HOME}/.config/tutanota-desktop | |||
28 | # there isn't a Firefox instance running with the default profile; see #5352) | 28 | # there isn't a Firefox instance running with the default profile; see #5352) |
29 | noblacklist ${HOME}/.mozilla | 29 | noblacklist ${HOME}/.mozilla |
30 | whitelist ${HOME}/.mozilla/firefox/profiles.ini | 30 | whitelist ${HOME}/.mozilla/firefox/profiles.ini |
31 | read-only ${HOME}/.mozilla/firefox/profiles.ini | ||
32 | 31 | ||
33 | machine-id | 32 | machine-id |
34 | nosound | 33 | nosound |
diff --git a/etc/profile-m-z/youtube-viewers-common.profile b/etc/profile-m-z/youtube-viewers-common.profile index 9ef90eb92..d2b73ec4c 100644 --- a/etc/profile-m-z/youtube-viewers-common.profile +++ b/etc/profile-m-z/youtube-viewers-common.profile | |||
@@ -24,7 +24,6 @@ include allow-python3.inc | |||
24 | # there isn't a Firefox instance running with the default profile; see #5352) | 24 | # there isn't a Firefox instance running with the default profile; see #5352) |
25 | noblacklist ${HOME}/.mozilla | 25 | noblacklist ${HOME}/.mozilla |
26 | whitelist ${HOME}/.mozilla/firefox/profiles.ini | 26 | whitelist ${HOME}/.mozilla/firefox/profiles.ini |
27 | read-only ${HOME}/.mozilla/firefox/profiles.ini | ||
28 | 27 | ||
29 | include disable-common.inc | 28 | include disable-common.inc |
30 | include disable-devel.inc | 29 | include disable-devel.inc |
diff --git a/etc/profile-m-z/zeal.profile b/etc/profile-m-z/zeal.profile index caf9eab63..09a1d37a3 100644 --- a/etc/profile-m-z/zeal.profile +++ b/etc/profile-m-z/zeal.profile | |||
@@ -23,7 +23,6 @@ include disable-xdg.inc | |||
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 |
26 | read-only ${HOME}/.mozilla/firefox/profiles.ini | ||
27 | 26 | ||
28 | mkdir ${HOME}/.cache/Zeal | 27 | mkdir ${HOME}/.cache/Zeal |
29 | mkdir ${HOME}/.config/Zeal | 28 | mkdir ${HOME}/.config/Zeal |