aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar Tad <tad@spotco.us>2019-04-13 10:27:47 -0400
committerLibravatar Tad <tad@spotco.us>2019-04-13 14:37:02 -0400
commitab78a250dbf889898427f46f52260425ccc8eda5 (patch)
treeac2c49207d51f3779ebbd83098fbd8cab7adb27f /src
parentFixes https://github.com/netblue30/firejail/issues/2547 (#2648) (diff)
downloadfirejail-ab78a250dbf889898427f46f52260425ccc8eda5.tar.gz
firejail-ab78a250dbf889898427f46f52260425ccc8eda5.tar.zst
firejail-ab78a250dbf889898427f46f52260425ccc8eda5.zip
Add a conditional to control DRM/noexec exception for browsers
Diffstat (limited to 'src')
-rw-r--r--src/firejail/checkcfg.c1
-rw-r--r--src/firejail/firejail.h1
-rw-r--r--src/firejail/profile.c5
-rw-r--r--src/man/firejail-profile.txt2
4 files changed, 8 insertions, 1 deletions
diff --git a/src/firejail/checkcfg.c b/src/firejail/checkcfg.c
index 54f6ea023..7ca72bf30 100644
--- a/src/firejail/checkcfg.c
+++ b/src/firejail/checkcfg.c
@@ -111,6 +111,7 @@ int checkcfg(int val) {
111 PARSE_YESNO(CFG_DISABLE_MNT, "disable-mnt") 111 PARSE_YESNO(CFG_DISABLE_MNT, "disable-mnt")
112 PARSE_YESNO(CFG_XPRA_ATTACH, "xpra-attach") 112 PARSE_YESNO(CFG_XPRA_ATTACH, "xpra-attach")
113 PARSE_YESNO(CFG_BROWSER_DISABLE_U2F, "browser-disable-u2f") 113 PARSE_YESNO(CFG_BROWSER_DISABLE_U2F, "browser-disable-u2f")
114 PARSE_YESNO(CFG_BROWSER_ALLOW_DRM, "browser-allow-drm")
114#undef PARSE_YESNO 115#undef PARSE_YESNO
115 116
116 // netfilter 117 // netfilter
diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h
index b2c18d79f..2e04084e3 100644
--- a/src/firejail/firejail.h
+++ b/src/firejail/firejail.h
@@ -702,6 +702,7 @@ enum {
702 CFG_ARP_PROBES, 702 CFG_ARP_PROBES,
703 CFG_XPRA_ATTACH, 703 CFG_XPRA_ATTACH,
704 CFG_BROWSER_DISABLE_U2F, 704 CFG_BROWSER_DISABLE_U2F,
705 CFG_BROWSER_ALLOW_DRM,
705 CFG_PRIVATE_LIB, 706 CFG_PRIVATE_LIB,
706 CFG_APPARMOR, 707 CFG_APPARMOR,
707 CFG_DBUS, 708 CFG_DBUS,
diff --git a/src/firejail/profile.c b/src/firejail/profile.c
index 667b03652..c8619f7e2 100644
--- a/src/firejail/profile.c
+++ b/src/firejail/profile.c
@@ -151,10 +151,15 @@ static int check_disable_u2f(void) {
151 return checkcfg(CFG_BROWSER_DISABLE_U2F) != 0; 151 return checkcfg(CFG_BROWSER_DISABLE_U2F) != 0;
152} 152}
153 153
154static int check_allow_drm(void) {
155 return checkcfg(CFG_BROWSER_ALLOW_DRM) != 0;
156}
157
154Cond conditionals[] = { 158Cond conditionals[] = {
155 {"HAS_APPIMAGE", check_appimage}, 159 {"HAS_APPIMAGE", check_appimage},
156 {"HAS_NODBUS", check_nodbus}, 160 {"HAS_NODBUS", check_nodbus},
157 {"BROWSER_DISABLE_U2F", check_disable_u2f}, 161 {"BROWSER_DISABLE_U2F", check_disable_u2f},
162 {"BROWSER_ALLOW_DRM", check_allow_drm},
158 { NULL, NULL } 163 { NULL, NULL }
159}; 164};
160 165
diff --git a/src/man/firejail-profile.txt b/src/man/firejail-profile.txt
index dde815d05..20b547355 100644
--- a/src/man/firejail-profile.txt
+++ b/src/man/firejail-profile.txt
@@ -94,7 +94,7 @@ Example: "?HAS_APPIMAGE: whitelist ${HOME}/special/appimage/dir"
94 94
95This example will load the whitelist profile line only if the \-\-appimage option has been specified on the command line. 95This example will load the whitelist profile line only if the \-\-appimage option has been specified on the command line.
96 96
97Currently the only conditionals supported are HAS_APPIMAGE, HAS_NODBUS and BROWSER_DISABLE_U2F. 97Currently the only conditionals supported are HAS_APPIMAGE, HAS_NODBUS, BROWSER_DISABLE_U2F, and BROWSER_ALLOW_DRM.
98 98
99The profile line may be any profile line that you would normally use in a profile \fBexcept\fR for "quiet" and "include" lines. 99The profile line may be any profile line that you would normally use in a profile \fBexcept\fR for "quiet" and "include" lines.
100 100