diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/firecfg/firecfg.config | 9 | ||||
-rw-r--r-- | src/firejail/checkcfg.c | 1 | ||||
-rw-r--r-- | src/firejail/firejail.h | 1 | ||||
-rw-r--r-- | src/firejail/profile.c | 5 | ||||
-rw-r--r-- | src/man/firejail-profile.txt | 2 |
5 files changed, 17 insertions, 1 deletions
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config index 097d03235..9f5f7a7a8 100644 --- a/src/firecfg/firecfg.config +++ b/src/firecfg/firecfg.config | |||
@@ -186,6 +186,7 @@ firefox-esr | |||
186 | firefox-nightly | 186 | firefox-nightly |
187 | firefox-wayland | 187 | firefox-wayland |
188 | flameshot | 188 | flameshot |
189 | flacsplt | ||
189 | flashpeak-slimjet | 190 | flashpeak-slimjet |
190 | flowblade | 191 | flowblade |
191 | font-manager | 192 | font-manager |
@@ -199,6 +200,9 @@ freeciv-gtk3 | |||
199 | freeciv-mp-gtk3 | 200 | freeciv-mp-gtk3 |
200 | freecol | 201 | freecol |
201 | freemind | 202 | freemind |
203 | freeoffice-planmaker | ||
204 | freeoffice-presentations | ||
205 | freeoffice-textmaker | ||
202 | freshclam | 206 | freshclam |
203 | frozen-bubble | 207 | frozen-bubble |
204 | gajim | 208 | gajim |
@@ -255,6 +259,7 @@ gpa | |||
255 | gpicview | 259 | gpicview |
256 | gpredict | 260 | gpredict |
257 | gradio | 261 | gradio |
262 | gramps | ||
258 | gthumb | 263 | gthumb |
259 | guayadeque | 264 | guayadeque |
260 | gucharmap | 265 | gucharmap |
@@ -358,6 +363,8 @@ midori | |||
358 | min | 363 | min |
359 | minetest | 364 | minetest |
360 | mousepad | 365 | mousepad |
366 | mp3splt | ||
367 | mp3wrap | ||
361 | mpDris2 | 368 | mpDris2 |
362 | mplayer | 369 | mplayer |
363 | mpsyt | 370 | mpsyt |
@@ -384,6 +391,7 @@ netactview | |||
384 | nethack | 391 | nethack |
385 | netsurf | 392 | netsurf |
386 | neverball | 393 | neverball |
394 | newsboat | ||
387 | nheko | 395 | nheko |
388 | nitroshare | 396 | nitroshare |
389 | nitroshare-cli | 397 | nitroshare-cli |
@@ -396,6 +404,7 @@ nyx | |||
396 | obs | 404 | obs |
397 | ocenaudio | 405 | ocenaudio |
398 | odt2txt | 406 | odt2txt |
407 | oggsplt | ||
399 | okular | 408 | okular |
400 | onionshare-gui | 409 | onionshare-gui |
401 | open-invaders | 410 | open-invaders |
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 | ||
154 | static int check_allow_drm(void) { | ||
155 | return checkcfg(CFG_BROWSER_ALLOW_DRM) != 0; | ||
156 | } | ||
157 | |||
154 | Cond conditionals[] = { | 158 | Cond 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 | ||
95 | This example will load the whitelist profile line only if the \-\-appimage option has been specified on the command line. | 95 | This example will load the whitelist profile line only if the \-\-appimage option has been specified on the command line. |
96 | 96 | ||
97 | Currently the only conditionals supported are HAS_APPIMAGE, HAS_NODBUS and BROWSER_DISABLE_U2F. | 97 | Currently the only conditionals supported are HAS_APPIMAGE, HAS_NODBUS, BROWSER_DISABLE_U2F, and BROWSER_ALLOW_DRM. |
98 | 98 | ||
99 | The profile line may be any profile line that you would normally use in a profile \fBexcept\fR for "quiet" and "include" lines. | 99 | The profile line may be any profile line that you would normally use in a profile \fBexcept\fR for "quiet" and "include" lines. |
100 | 100 | ||