diff options
author | netblue30 <netblue30@yahoo.com> | 2019-04-18 07:56:11 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-18 07:56:11 -0500 |
commit | 50cec08c1da5706285f76a167f39cf63f897e561 (patch) | |
tree | 474e0c21254fa76cac7087ec9c7942b66b6f228c /etc | |
parent | Update gajim.profile and mpv.profile (diff) | |
parent | Add a conditional to control DRM/noexec exception for browsers (diff) | |
download | firejail-50cec08c1da5706285f76a167f39cf63f897e561.tar.gz firejail-50cec08c1da5706285f76a167f39cf63f897e561.tar.zst firejail-50cec08c1da5706285f76a167f39cf63f897e561.zip |
Merge pull request #2649 from SkewedZeppelin/drm-noexec
Add a conditional to control DRM/noexec exception for browsers
Diffstat (limited to 'etc')
-rw-r--r-- | etc/chromium-common.profile | 2 | ||||
-rw-r--r-- | etc/firefox-common.profile | 2 | ||||
-rw-r--r-- | etc/firejail.config | 9 | ||||
-rw-r--r-- | etc/midori.profile | 2 | ||||
-rw-r--r-- | etc/min.profile | 2 |
5 files changed, 10 insertions, 7 deletions
diff --git a/etc/chromium-common.profile b/etc/chromium-common.profile index 3c7423316..63983d93b 100644 --- a/etc/chromium-common.profile +++ b/etc/chromium-common.profile | |||
@@ -7,7 +7,7 @@ include chromium-common.local | |||
7 | #include globals.local | 7 | #include globals.local |
8 | 8 | ||
9 | # noexec ${HOME} breaks DRM binaries. | 9 | # noexec ${HOME} breaks DRM binaries. |
10 | ignore noexec ${HOME} | 10 | ?BROWSER_ALLOW_DRM: ignore noexec ${HOME} |
11 | 11 | ||
12 | noblacklist ${HOME}/.pki | 12 | noblacklist ${HOME}/.pki |
13 | noblacklist ${HOME}/.local/share/pki | 13 | noblacklist ${HOME}/.local/share/pki |
diff --git a/etc/firefox-common.profile b/etc/firefox-common.profile index a2a34f33f..080d9e81a 100644 --- a/etc/firefox-common.profile +++ b/etc/firefox-common.profile | |||
@@ -7,7 +7,7 @@ include firefox-common.local | |||
7 | #include globals.local | 7 | #include globals.local |
8 | 8 | ||
9 | # noexec ${HOME} breaks DRM binaries. | 9 | # noexec ${HOME} breaks DRM binaries. |
10 | ignore noexec ${HOME} | 10 | ?BROWSER_ALLOW_DRM: ignore noexec ${HOME} |
11 | 11 | ||
12 | # Uncomment the following line to allow access to common programs/addons/plugins. | 12 | # Uncomment the following line to allow access to common programs/addons/plugins. |
13 | #include firefox-common-addons.inc | 13 | #include firefox-common-addons.inc |
diff --git a/etc/firejail.config b/etc/firejail.config index b37edf7a5..497d9633e 100644 --- a/etc/firejail.config +++ b/etc/firejail.config | |||
@@ -5,9 +5,6 @@ | |||
5 | # Enable AppArmor functionality, default enabled. | 5 | # Enable AppArmor functionality, default enabled. |
6 | # apparmor yes | 6 | # apparmor yes |
7 | 7 | ||
8 | # Disable U2F in browsers, default enabled. | ||
9 | # browser-disable-u2f yes | ||
10 | |||
11 | # Number of ARP probes sent when assigning an IP address for --net option, | 8 | # Number of ARP probes sent when assigning an IP address for --net option, |
12 | # default 2. This is a partial implementation of RFC 5227. A 0.5 seconds | 9 | # default 2. This is a partial implementation of RFC 5227. A 0.5 seconds |
13 | # timeout is implemented for each probe. Increase this number to 4 if your | 10 | # timeout is implemented for each probe. Increase this number to 4 if your |
@@ -18,6 +15,12 @@ | |||
18 | # Enable or disable bind support, default enabled. | 15 | # Enable or disable bind support, default enabled. |
19 | # bind yes | 16 | # bind yes |
20 | 17 | ||
18 | # Allow (DRM) execution in browsers, default disabled. | ||
19 | # browser-allow-drm no | ||
20 | |||
21 | # Disable U2F in browsers, default enabled. | ||
22 | # browser-disable-u2f yes | ||
23 | |||
21 | # Enable or disable cgroup support, default enabled. | 24 | # Enable or disable cgroup support, default enabled. |
22 | # cgroup yes | 25 | # cgroup yes |
23 | 26 | ||
diff --git a/etc/midori.profile b/etc/midori.profile index d59a6a16b..e4d39cd70 100644 --- a/etc/midori.profile +++ b/etc/midori.profile | |||
@@ -14,7 +14,7 @@ noblacklist ${HOME}/.pki | |||
14 | noblacklist ${HOME}/.local/share/pki | 14 | noblacklist ${HOME}/.local/share/pki |
15 | 15 | ||
16 | # noexec ${HOME} breaks DRM binaries. | 16 | # noexec ${HOME} breaks DRM binaries. |
17 | ignore noexec ${HOME} | 17 | ?BROWSER_ALLOW_DRM: ignore noexec ${HOME} |
18 | 18 | ||
19 | include disable-common.inc | 19 | include disable-common.inc |
20 | include disable-devel.inc | 20 | include disable-devel.inc |
diff --git a/etc/min.profile b/etc/min.profile index eec81677d..c89df0a95 100644 --- a/etc/min.profile +++ b/etc/min.profile | |||
@@ -12,7 +12,7 @@ noblacklist ${HOME}/.pki | |||
12 | noblacklist ${HOME}/.local/share/pki | 12 | noblacklist ${HOME}/.local/share/pki |
13 | 13 | ||
14 | # noexec ${HOME} breaks DRM binaries. | 14 | # noexec ${HOME} breaks DRM binaries. |
15 | ignore noexec ${HOME} | 15 | ?BROWSER_ALLOW_DRM: ignore noexec ${HOME} |
16 | 16 | ||
17 | include disable-common.inc | 17 | include disable-common.inc |
18 | include disable-devel.inc | 18 | include disable-devel.inc |