diff options
32 files changed, 138 insertions, 147 deletions
@@ -827,7 +827,7 @@ soredake (https://github.com/soredake) | |||
827 | - fix handling of STEAM_RUNTIME_PREFER_HOST_LIBRARIES in steam profile | 827 | - fix handling of STEAM_RUNTIME_PREFER_HOST_LIBRARIES in steam profile |
828 | - fix keepassxc.profile | 828 | - fix keepassxc.profile |
829 | - fix qtox.profile | 829 | - fix qtox.profile |
830 | - add ocaltime to private-etc to make qtox show correct time | 830 | - add localtime to private-etc to make qtox show correct time |
831 | - fixes for the keepassxc 2.2.5 version | 831 | - fixes for the keepassxc 2.2.5 version |
832 | SkewedZeppelin (https://github.com/SkewedZeppelin) | 832 | SkewedZeppelin (https://github.com/SkewedZeppelin) |
833 | - added Bless, Gnome 2048, Gnome Calculator, Gnome Contacts, JD-GUI, Lollypop, MultiMC5 profiles | 833 | - added Bless, Gnome 2048, Gnome Calculator, Gnome Contacts, JD-GUI, Lollypop, MultiMC5 profiles |
diff --git a/contrib/sort.py b/contrib/sort.py index 9e5062c3c..c7325facb 100755 --- a/contrib/sort.py +++ b/contrib/sort.py | |||
@@ -35,43 +35,16 @@ def sort_alphabetical(raw_items): | |||
35 | 35 | ||
36 | def sort_protocol(protocols): | 36 | def sort_protocol(protocols): |
37 | """sort the given protocole into this scheme: unix,inet,inet6,netlink,packet,bluetooth""" | 37 | """sort the given protocole into this scheme: unix,inet,inet6,netlink,packet,bluetooth""" |
38 | |||
38 | # shortcut for common protocol lines | 39 | # shortcut for common protocol lines |
39 | if protocols in ("unix", "unix,inet,inet6"): | 40 | if protocols in ("unix", "unix,inet,inet6"): |
40 | return protocols | 41 | return protocols |
42 | |||
41 | fixed_protocols = "" | 43 | fixed_protocols = "" |
42 | present_protocols = { | 44 | for protocol in ("unix", "inet", "inet6", "netlink", "packet", "bluetooth"): |
43 | "unix": False, | 45 | for prefix in ("", "-", "+", "="): |
44 | "inet": False, | 46 | if f",{prefix}{protocol}," in f",{protocols},": |
45 | "inet6": False, | 47 | fixed_protocols += f"{prefix}{protocol}," |
46 | "netlink": False, | ||
47 | "packet": False, | ||
48 | "bluetooth": False, | ||
49 | } | ||
50 | for protocol in protocols.split(","): | ||
51 | if protocol == "unix": | ||
52 | present_protocols["unix"] = True | ||
53 | elif protocol == "inet": | ||
54 | present_protocols["inet"] = True | ||
55 | elif protocol == "inet6": | ||
56 | present_protocols["inet6"] = True | ||
57 | elif protocol == "netlink": | ||
58 | present_protocols["netlink"] = True | ||
59 | elif protocol == "packet": | ||
60 | present_protocols["packet"] = True | ||
61 | elif protocol == "bluetooth": | ||
62 | present_protocols["bluetooth"] = True | ||
63 | if present_protocols["unix"]: | ||
64 | fixed_protocols += "unix," | ||
65 | if present_protocols["inet"]: | ||
66 | fixed_protocols += "inet," | ||
67 | if present_protocols["inet6"]: | ||
68 | fixed_protocols += "inet6," | ||
69 | if present_protocols["netlink"]: | ||
70 | fixed_protocols += "netlink," | ||
71 | if present_protocols["packet"]: | ||
72 | fixed_protocols += "packet," | ||
73 | if present_protocols["bluetooth"]: | ||
74 | fixed_protocols += "bluetooth," | ||
75 | return fixed_protocols[:-1] | 48 | return fixed_protocols[:-1] |
76 | 49 | ||
77 | 50 | ||
diff --git a/etc/inc/disable-passwdmgr.inc b/etc/inc/disable-passwdmgr.inc index 316378cb8..3ed9a1b14 100644 --- a/etc/inc/disable-passwdmgr.inc +++ b/etc/inc/disable-passwdmgr.inc | |||
@@ -7,6 +7,7 @@ blacklist ${HOME}/.config/KeePass | |||
7 | blacklist ${HOME}/.config/keepass | 7 | blacklist ${HOME}/.config/keepass |
8 | blacklist ${HOME}/.config/keepassx | 8 | blacklist ${HOME}/.config/keepassx |
9 | blacklist ${HOME}/.config/keepassxc | 9 | blacklist ${HOME}/.config/keepassxc |
10 | blacklist ${HOME}/.config/KeePassXCrc | ||
10 | blacklist ${HOME}/.config/Sinew Software Systems | 11 | blacklist ${HOME}/.config/Sinew Software Systems |
11 | blacklist ${HOME}/.fpm | 12 | blacklist ${HOME}/.fpm |
12 | blacklist ${HOME}/.keepass | 13 | blacklist ${HOME}/.keepass |
diff --git a/etc/inc/disable-programs.inc b/etc/inc/disable-programs.inc index cf9ef44bf..1e1734a9e 100644 --- a/etc/inc/disable-programs.inc +++ b/etc/inc/disable-programs.inc | |||
@@ -138,6 +138,7 @@ blacklist ${HOME}/.config/Rambox | |||
138 | blacklist ${HOME}/.config/Riot | 138 | blacklist ${HOME}/.config/Riot |
139 | blacklist ${HOME}/.config/Rocket.Chat | 139 | blacklist ${HOME}/.config/Rocket.Chat |
140 | blacklist ${HOME}/.config/RogueLegacy | 140 | blacklist ${HOME}/.config/RogueLegacy |
141 | blacklist ${HOME}/.config/RogueLegacyStorageContainer | ||
141 | blacklist ${HOME}/.config/Signal | 142 | blacklist ${HOME}/.config/Signal |
142 | blacklist ${HOME}/.config/Sinew Software Systems | 143 | blacklist ${HOME}/.config/Sinew Software Systems |
143 | blacklist ${HOME}/.config/Slack | 144 | blacklist ${HOME}/.config/Slack |
@@ -612,7 +613,8 @@ blacklist ${HOME}/.local/share/QGIS | |||
612 | blacklist ${HOME}/.local/share/QMediathekView | 613 | blacklist ${HOME}/.local/share/QMediathekView |
613 | blacklist ${HOME}/.local/share/QuiteRss | 614 | blacklist ${HOME}/.local/share/QuiteRss |
614 | blacklist ${HOME}/.local/share/Ricochet | 615 | blacklist ${HOME}/.local/share/Ricochet |
615 | blacklist ${HOME}/.local/share/RogueLegacy* | 616 | blacklist ${HOME}/.local/share/RogueLegacy |
617 | blacklist ${HOME}/.local/share/RogueLegacyStorageContainer | ||
616 | blacklist ${HOME}/.local/share/Shortwave | 618 | blacklist ${HOME}/.local/share/Shortwave |
617 | blacklist ${HOME}/.local/share/Steam | 619 | blacklist ${HOME}/.local/share/Steam |
618 | blacklist ${HOME}/.local/share/SteamWorldDig | 620 | blacklist ${HOME}/.local/share/SteamWorldDig |
diff --git a/etc/profile-a-l/audio-recorder.profile b/etc/profile-a-l/audio-recorder.profile index b2ed3b030..2c7fdc812 100644 --- a/etc/profile-a-l/audio-recorder.profile +++ b/etc/profile-a-l/audio-recorder.profile | |||
@@ -20,6 +20,7 @@ include disable-xdg.inc | |||
20 | whitelist ${MUSIC} | 20 | whitelist ${MUSIC} |
21 | whitelist ${DOWNLOADS} | 21 | whitelist ${DOWNLOADS} |
22 | whitelist /usr/share/audio-recorder | 22 | whitelist /usr/share/audio-recorder |
23 | whitelist /usr/share/gstreamer-1.0 | ||
23 | include whitelist-common.inc | 24 | include whitelist-common.inc |
24 | include whitelist-usr-share-common.inc | 25 | include whitelist-usr-share-common.inc |
25 | include whitelist-var-common.inc | 26 | include whitelist-var-common.inc |
@@ -44,7 +45,11 @@ tracelog | |||
44 | disable-mnt | 45 | disable-mnt |
45 | # private-bin audio-recorder | 46 | # private-bin audio-recorder |
46 | private-cache | 47 | private-cache |
47 | private-etc alternatives,fonts | 48 | private-etc alternatives,fonts,ld.so.cache,ld.so.conf,ld.so.conf.d,ld.so.preload |
48 | private-tmp | 49 | private-tmp |
49 | 50 | ||
51 | dbus-user filter | ||
52 | dbus-user.talk ca.desrt.dconf | ||
53 | dbus-system none | ||
54 | |||
50 | # memory-deny-write-execute - breaks on Arch | 55 | # memory-deny-write-execute - breaks on Arch |
diff --git a/etc/profile-a-l/digikam.profile b/etc/profile-a-l/digikam.profile index ae4a63c62..2ca7bd400 100644 --- a/etc/profile-a-l/digikam.profile +++ b/etc/profile-a-l/digikam.profile | |||
@@ -10,6 +10,7 @@ noblacklist ${HOME}/.config/digikam | |||
10 | noblacklist ${HOME}/.config/digikamrc | 10 | noblacklist ${HOME}/.config/digikamrc |
11 | noblacklist ${HOME}/.kde/share/apps/digikam | 11 | noblacklist ${HOME}/.kde/share/apps/digikam |
12 | noblacklist ${HOME}/.kde4/share/apps/digikam | 12 | noblacklist ${HOME}/.kde4/share/apps/digikam |
13 | noblacklist ${HOME}/.local/share/kxmlgui5/digikam | ||
13 | noblacklist ${PICTURES} | 14 | noblacklist ${PICTURES} |
14 | 15 | ||
15 | include disable-common.inc | 16 | include disable-common.inc |
diff --git a/etc/profile-a-l/discord-common.profile b/etc/profile-a-l/discord-common.profile index b583f1a1d..b83e626d9 100644 --- a/etc/profile-a-l/discord-common.profile +++ b/etc/profile-a-l/discord-common.profile | |||
@@ -18,6 +18,7 @@ ignore dbus-user none | |||
18 | ignore dbus-system none | 18 | ignore dbus-system none |
19 | 19 | ||
20 | ignore noexec ${HOME} | 20 | ignore noexec ${HOME} |
21 | ignore novideo | ||
21 | 22 | ||
22 | whitelist ${HOME}/.config/BetterDiscord | 23 | whitelist ${HOME}/.config/BetterDiscord |
23 | whitelist ${HOME}/.local/share/betterdiscordctl | 24 | whitelist ${HOME}/.local/share/betterdiscordctl |
diff --git a/etc/profile-a-l/etr.profile b/etc/profile-a-l/etr.profile index f55d23778..6d31f3042 100644 --- a/etc/profile-a-l/etr.profile +++ b/etc/profile-a-l/etr.profile | |||
@@ -37,6 +37,7 @@ nou2f | |||
37 | novideo | 37 | novideo |
38 | protocol unix,netlink | 38 | protocol unix,netlink |
39 | seccomp | 39 | seccomp |
40 | seccomp.block-secondary | ||
40 | shell none | 41 | shell none |
41 | tracelog | 42 | tracelog |
42 | 43 | ||
diff --git a/etc/profile-a-l/firefox.profile b/etc/profile-a-l/firefox.profile index cefba93d4..b22a78458 100644 --- a/etc/profile-a-l/firefox.profile +++ b/etc/profile-a-l/firefox.profile | |||
@@ -6,6 +6,14 @@ include firefox.local | |||
6 | # Persistent global definitions | 6 | # Persistent global definitions |
7 | include globals.local | 7 | include globals.local |
8 | 8 | ||
9 | # NOTE: sandboxing web browsers is as important as it is complex. Users might be | ||
10 | # interested in creating custom profiles depending on use case (e.g. one for | ||
11 | # general browsing, another for banking, ...). Consult our FAQ/issue tracker for more | ||
12 | # info. Here are a few links to get you going. | ||
13 | # https://github.com/netblue30/firejail/wiki/Frequently-Asked-Questions#firefox-doesnt-open-in-a-new-sandbox-instead-it-opens-a-new-tab-in-an-existing-firefox-instance | ||
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 | ||
16 | |||
9 | noblacklist ${HOME}/.cache/mozilla | 17 | noblacklist ${HOME}/.cache/mozilla |
10 | noblacklist ${HOME}/.mozilla | 18 | noblacklist ${HOME}/.mozilla |
11 | 19 | ||
diff --git a/etc/profile-a-l/gl-117-wrapper.profie b/etc/profile-a-l/gl-117-wrapper.profie deleted file mode 100644 index d783940f3..000000000 --- a/etc/profile-a-l/gl-117-wrapper.profie +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | # Firejail profile for gl-117-wrapper | ||
2 | # This file is overwritten after every install/update | ||
3 | # Persistent local customizations | ||
4 | include gl-117-wrapper.local | ||
5 | # Persistent global definitions | ||
6 | # added by included profile | ||
7 | #include globals.local | ||
8 | |||
9 | include allow-opengl-game.inc | ||
10 | |||
11 | private-bin gl-117-wrapper | ||
12 | |||
13 | # Redirect | ||
14 | include gl-117.profile | ||
diff --git a/etc/profile-a-l/glaxium-wrapper.profie b/etc/profile-a-l/glaxium-wrapper.profie deleted file mode 100644 index 7dc2cf65e..000000000 --- a/etc/profile-a-l/glaxium-wrapper.profie +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | # Firejail profile for glaxium-wrapper | ||
2 | # This file is overwritten after every install/update | ||
3 | # Persistent local customizations | ||
4 | include glaxium-wrapper.local | ||
5 | # Persistent global definitions | ||
6 | # added by included profile | ||
7 | #include globals.local | ||
8 | |||
9 | include allow-opengl-game.inc | ||
10 | |||
11 | private-bin glaxium-wrapper | ||
12 | |||
13 | # Redirect | ||
14 | include glaxium.profile | ||
diff --git a/etc/profile-a-l/kcalc.profile b/etc/profile-a-l/kcalc.profile index fa82e76f3..c1414472b 100644 --- a/etc/profile-a-l/kcalc.profile +++ b/etc/profile-a-l/kcalc.profile | |||
@@ -15,6 +15,7 @@ include disable-interpreters.inc | |||
15 | include disable-passwdmgr.inc | 15 | include disable-passwdmgr.inc |
16 | include disable-programs.inc | 16 | include disable-programs.inc |
17 | include disable-shell.inc | 17 | include disable-shell.inc |
18 | include disable-xdg.inc | ||
18 | 19 | ||
19 | mkdir ${HOME}/.local/share/kxmlgui5/kcalc | 20 | mkdir ${HOME}/.local/share/kxmlgui5/kcalc |
20 | mkfile ${HOME}/.config/kcalcrc | 21 | mkfile ${HOME}/.config/kcalcrc |
@@ -24,7 +25,12 @@ whitelist ${HOME}/.config/kcalcrc | |||
24 | whitelist ${HOME}/.kde/share/config/kcalcrc | 25 | whitelist ${HOME}/.kde/share/config/kcalcrc |
25 | whitelist ${HOME}/.kde4/share/config/kcalcrc | 26 | whitelist ${HOME}/.kde4/share/config/kcalcrc |
26 | whitelist ${HOME}/.local/share/kxmlgui5/kcalc | 27 | whitelist ${HOME}/.local/share/kxmlgui5/kcalc |
28 | whitelist /usr/share/config.kcfg/kcalc.kcfg | ||
29 | whitelist /usr/share/kcalc | ||
30 | whitelist /usr/share/kconf_update/kcalcrc.upd | ||
27 | include whitelist-common.inc | 31 | include whitelist-common.inc |
32 | include whitelist-runuser-common.inc | ||
33 | include whitelist-usr-share-common.inc | ||
28 | include whitelist-var-common.inc | 34 | include whitelist-var-common.inc |
29 | 35 | ||
30 | apparmor | 36 | apparmor |
@@ -41,13 +47,19 @@ nou2f | |||
41 | novideo | 47 | novideo |
42 | protocol unix | 48 | protocol unix |
43 | seccomp | 49 | seccomp |
50 | seccomp.block-secondary | ||
44 | shell none | 51 | shell none |
52 | tracelog | ||
45 | 53 | ||
46 | disable-mnt | 54 | disable-mnt |
47 | private-bin kcalc | 55 | private-bin kcalc |
56 | private-cache | ||
48 | private-dev | 57 | private-dev |
58 | private-etc alternatives,fonts,ld.so.cache,locale,locale.conf | ||
49 | # private-lib - problems on Arch | 59 | # private-lib - problems on Arch |
50 | private-tmp | 60 | private-tmp |
51 | 61 | ||
52 | dbus-user none | 62 | dbus-user none |
53 | dbus-system none | 63 | dbus-system none |
64 | |||
65 | #memory-deny-write-execute | ||
diff --git a/etc/profile-a-l/keepassxc.profile b/etc/profile-a-l/keepassxc.profile index 11c279911..3c7737063 100644 --- a/etc/profile-a-l/keepassxc.profile +++ b/etc/profile-a-l/keepassxc.profile | |||
@@ -10,6 +10,7 @@ noblacklist ${HOME}/*.kdb | |||
10 | noblacklist ${HOME}/*.kdbx | 10 | noblacklist ${HOME}/*.kdbx |
11 | noblacklist ${HOME}/.cache/keepassxc | 11 | noblacklist ${HOME}/.cache/keepassxc |
12 | noblacklist ${HOME}/.config/keepassxc | 12 | noblacklist ${HOME}/.config/keepassxc |
13 | noblacklist ${HOME}/.config/KeePassXCrc | ||
13 | noblacklist ${HOME}/.keepassxc | 14 | noblacklist ${HOME}/.keepassxc |
14 | noblacklist ${DOCUMENTS} | 15 | noblacklist ${DOCUMENTS} |
15 | 16 | ||
@@ -51,6 +52,7 @@ include disable-xdg.inc | |||
51 | #mkdir ${HOME}/.config/keepassxc | 52 | #mkdir ${HOME}/.config/keepassxc |
52 | #whitelist ${HOME}/.cache/keepassxc | 53 | #whitelist ${HOME}/.cache/keepassxc |
53 | #whitelist ${HOME}/.config/keepassxc | 54 | #whitelist ${HOME}/.config/keepassxc |
55 | #whitelist ${HOME}/.config/KeePassXCrc | ||
54 | #include whitelist-common.inc | 56 | #include whitelist-common.inc |
55 | 57 | ||
56 | whitelist /usr/share/keepassxc | 58 | whitelist /usr/share/keepassxc |
diff --git a/etc/profile-m-z/mrrescue.profile b/etc/profile-m-z/mrrescue.profile index f02a4f357..5b2164bae 100644 --- a/etc/profile-m-z/mrrescue.profile +++ b/etc/profile-m-z/mrrescue.profile | |||
@@ -8,18 +8,23 @@ include globals.local | |||
8 | 8 | ||
9 | noblacklist ${HOME}/.local/share/love | 9 | noblacklist ${HOME}/.local/share/love |
10 | 10 | ||
11 | include allow-bin-sh.inc | ||
12 | include allow-lua.inc | ||
13 | |||
11 | include disable-common.inc | 14 | include disable-common.inc |
12 | include disable-devel.inc | 15 | include disable-devel.inc |
13 | include disable-exec.inc | 16 | include disable-exec.inc |
14 | include disable-interpreters.inc | 17 | include disable-interpreters.inc |
15 | include disable-passwdmgr.inc | 18 | include disable-passwdmgr.inc |
16 | include disable-programs.inc | 19 | include disable-programs.inc |
20 | include disable-shell.inc | ||
17 | include disable-xdg.inc | 21 | include disable-xdg.inc |
18 | 22 | ||
19 | mkdir ${HOME}/.local/share/love | 23 | mkdir ${HOME}/.local/share/love |
20 | whitelist ${HOME}/.local/share/love | 24 | whitelist ${HOME}/.local/share/love |
21 | whitelist /usr/share/mrrescue | 25 | whitelist /usr/share/mrrescue |
22 | include whitelist-common.inc | 26 | include whitelist-common.inc |
27 | include whitelist-runuser-common.inc | ||
23 | include whitelist-usr-share-common.inc | 28 | include whitelist-usr-share-common.inc |
24 | include whitelist-var-common.inc | 29 | include whitelist-var-common.inc |
25 | 30 | ||
@@ -35,6 +40,7 @@ nou2f | |||
35 | novideo | 40 | novideo |
36 | protocol unix,netlink | 41 | protocol unix,netlink |
37 | seccomp | 42 | seccomp |
43 | seccomp.block-secondary | ||
38 | shell none | 44 | shell none |
39 | tracelog | 45 | tracelog |
40 | 46 | ||
diff --git a/etc/profile-m-z/neverball-wrapper.profie b/etc/profile-m-z/neverball-wrapper.profie deleted file mode 100644 index 534e41dd1..000000000 --- a/etc/profile-m-z/neverball-wrapper.profie +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | # Firejail profile for neverball-wrapper | ||
2 | # This file is overwritten after every install/update | ||
3 | # Persistent local customizations | ||
4 | include neverball-wrapper.local | ||
5 | # Persistent global definitions | ||
6 | # added by included profile | ||
7 | #include globals.local | ||
8 | |||
9 | include allow-opengl-game.inc | ||
10 | |||
11 | private-bin neverball-wrapper | ||
12 | |||
13 | # Redirect | ||
14 | include neverball.profile | ||
diff --git a/etc/profile-m-z/neverball.profile b/etc/profile-m-z/neverball.profile index 84c634549..2695f2f90 100644 --- a/etc/profile-m-z/neverball.profile +++ b/etc/profile-m-z/neverball.profile | |||
@@ -14,13 +14,19 @@ include disable-exec.inc | |||
14 | include disable-interpreters.inc | 14 | include disable-interpreters.inc |
15 | include disable-passwdmgr.inc | 15 | include disable-passwdmgr.inc |
16 | include disable-programs.inc | 16 | include disable-programs.inc |
17 | include disable-shell.inc | ||
18 | include disable-xdg.inc | ||
17 | 19 | ||
18 | mkdir ${HOME}/.neverball | 20 | mkdir ${HOME}/.neverball |
19 | whitelist ${HOME}/.neverball | 21 | whitelist ${HOME}/.neverball |
22 | whitelist /usr/share/neverball | ||
20 | include whitelist-common.inc | 23 | include whitelist-common.inc |
24 | include whitelist-runuser-common.inc | ||
25 | include whitelist-usr-share-common.inc | ||
26 | include whitelist-var-common.inc | ||
21 | 27 | ||
22 | caps.drop all | 28 | caps.drop all |
23 | netfilter | 29 | net none |
24 | nodvd | 30 | nodvd |
25 | nogroups | 31 | nogroups |
26 | nonewprivs | 32 | nonewprivs |
@@ -28,12 +34,18 @@ noroot | |||
28 | notv | 34 | notv |
29 | nou2f | 35 | nou2f |
30 | novideo | 36 | novideo |
31 | protocol unix,netlink | 37 | protocol unix |
32 | seccomp | 38 | seccomp |
39 | seccomp.block-secondary | ||
33 | shell none | 40 | shell none |
41 | tracelog | ||
34 | 42 | ||
35 | disable-mnt | 43 | disable-mnt |
36 | private-bin neverball | 44 | private-bin neverball |
45 | private-cache | ||
37 | private-dev | 46 | private-dev |
47 | private-etc alternatives,fonts,ld.so.cache,ld.so.conf,ld.so.conf.d,ld.so.preload,locale,machine-id | ||
38 | private-tmp | 48 | private-tmp |
39 | 49 | ||
50 | dbus-user none | ||
51 | dbus-system none | ||
diff --git a/etc/profile-m-z/neverputt-wrapper.profie b/etc/profile-m-z/neverputt-wrapper.profie deleted file mode 100644 index dacd113cc..000000000 --- a/etc/profile-m-z/neverputt-wrapper.profie +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | # Firejail profile for neverputt-wrapper | ||
2 | # This file is overwritten after every install/update | ||
3 | # Persistent local customizations | ||
4 | include neverputt-wrapper.local | ||
5 | # Persistent global definitions | ||
6 | # added by included profile | ||
7 | #include globals.local | ||
8 | |||
9 | include allow-opengl-game.inc | ||
10 | |||
11 | private-bin neverputt-wrapper | ||
12 | |||
13 | # Redirect | ||
14 | include neverputt.profile | ||
diff --git a/etc/profile-m-z/okular.profile b/etc/profile-m-z/okular.profile index e21ac997a..3f75d4f09 100644 --- a/etc/profile-m-z/okular.profile +++ b/etc/profile-m-z/okular.profile | |||
@@ -28,10 +28,16 @@ include disable-programs.inc | |||
28 | include disable-shell.inc | 28 | include disable-shell.inc |
29 | include disable-xdg.inc | 29 | include disable-xdg.inc |
30 | 30 | ||
31 | whitelist /usr/share/config.kcfg | 31 | whitelist /usr/share/config.kcfg/gssettings.kcfg |
32 | whitelist /usr/share/config.kcfg/pdfsettings.kcfg | ||
33 | whitelist /usr/share/config.kcfg/okular.kcfg | ||
34 | whitelist /usr/share/config.kcfg/okular_core.kcfg | ||
35 | whitelist /usr/share/ghostscript | ||
36 | whitelist /usr/share/kconf_update/okular.upd | ||
32 | whitelist /usr/share/kxmlgui5/okular | 37 | whitelist /usr/share/kxmlgui5/okular |
33 | whitelist /usr/share/okular | 38 | whitelist /usr/share/okular |
34 | whitelist /usr/share/poppler | 39 | whitelist /usr/share/poppler |
40 | include whitelist-runuser-common.inc | ||
35 | include whitelist-usr-share-common.inc | 41 | include whitelist-usr-share-common.inc |
36 | include whitelist-var-common.inc | 42 | include whitelist-var-common.inc |
37 | 43 | ||
diff --git a/etc/profile-m-z/pinball-wrapper.profie b/etc/profile-m-z/pinball-wrapper.profie deleted file mode 100644 index 2b5ed6e27..000000000 --- a/etc/profile-m-z/pinball-wrapper.profie +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | # Firejail profile for pinball-wrapper | ||
2 | # This file is overwritten after every install/update | ||
3 | # Persistent local customizations | ||
4 | include pinball-wrapper.local | ||
5 | # Persistent global definitions | ||
6 | # added by included profile | ||
7 | #include globals.local | ||
8 | |||
9 | include allow-opengl-game.inc | ||
10 | |||
11 | private-bin pinball-wrapper | ||
12 | |||
13 | # Redirect | ||
14 | include pinball.profile | ||
diff --git a/etc/profile-m-z/pingus.profile b/etc/profile-m-z/pingus.profile index ebfd236aa..e3b20e59f 100644 --- a/etc/profile-m-z/pingus.profile +++ b/etc/profile-m-z/pingus.profile | |||
@@ -8,12 +8,15 @@ include globals.local | |||
8 | 8 | ||
9 | noblacklist ${HOME}/.pingus | 9 | noblacklist ${HOME}/.pingus |
10 | 10 | ||
11 | include allow-bin-sh.inc | ||
12 | |||
11 | include disable-common.inc | 13 | include disable-common.inc |
12 | include disable-devel.inc | 14 | include disable-devel.inc |
13 | include disable-exec.inc | 15 | include disable-exec.inc |
14 | include disable-interpreters.inc | 16 | include disable-interpreters.inc |
15 | include disable-passwdmgr.inc | 17 | include disable-passwdmgr.inc |
16 | include disable-programs.inc | 18 | include disable-programs.inc |
19 | include disable-shell.inc | ||
17 | include disable-xdg.inc | 20 | include disable-xdg.inc |
18 | 21 | ||
19 | mkdir ${HOME}/.pingus | 22 | mkdir ${HOME}/.pingus |
@@ -36,6 +39,7 @@ nou2f | |||
36 | novideo | 39 | novideo |
37 | protocol unix,netlink | 40 | protocol unix,netlink |
38 | seccomp | 41 | seccomp |
42 | seccomp.block-secondary | ||
39 | shell none | 43 | shell none |
40 | tracelog | 44 | tracelog |
41 | 45 | ||
diff --git a/etc/profile-m-z/regextester.profile b/etc/profile-m-z/regextester.profile index 6fb0d4b5f..bab2badb5 100644 --- a/etc/profile-m-z/regextester.profile +++ b/etc/profile-m-z/regextester.profile | |||
@@ -16,9 +16,8 @@ include disable-shell.inc | |||
16 | include disable-xdg.inc | 16 | include disable-xdg.inc |
17 | 17 | ||
18 | whitelist /usr/share/com.github.artemanufrij.regextester | 18 | whitelist /usr/share/com.github.artemanufrij.regextester |
19 | include whitelist-usr-share-common.inc | ||
20 | |||
21 | include whitelist-common.inc | 19 | include whitelist-common.inc |
20 | include whitelist-usr-share-common.inc | ||
22 | include whitelist-var-common.inc | 21 | include whitelist-var-common.inc |
23 | 22 | ||
24 | apparmor | 23 | apparmor |
@@ -48,11 +47,9 @@ private-etc alternatives,fonts | |||
48 | private-lib libgranite.so.* | 47 | private-lib libgranite.so.* |
49 | private-tmp | 48 | private-tmp |
50 | 49 | ||
51 | # makes settings immutable | 50 | dbus-user filter |
52 | # dbus-user none | 51 | dbus-user.talk ca.desrt.dconf |
53 | # dbus-system none | 52 | dbus-system none |
54 | |||
55 | memory-deny-write-execute | ||
56 | 53 | ||
57 | # never write anything | 54 | # never write anything |
58 | read-only ${HOME} | 55 | read-only ${HOME} |
diff --git a/etc/profile-m-z/spectacle.profile b/etc/profile-m-z/spectacle.profile index cedff0b83..f99246ad6 100644 --- a/etc/profile-m-z/spectacle.profile +++ b/etc/profile-m-z/spectacle.profile | |||
@@ -26,6 +26,8 @@ include disable-xdg.inc | |||
26 | mkfile ${HOME}/.config/spectaclerc | 26 | mkfile ${HOME}/.config/spectaclerc |
27 | whitelist ${HOME}/.config/spectaclerc | 27 | whitelist ${HOME}/.config/spectaclerc |
28 | whitelist ${PICTURES} | 28 | whitelist ${PICTURES} |
29 | whitelist /usr/share/kconf_update/spectacle_newConfig.upd | ||
30 | whitelist /usr/share/kconf_update/spectacle_shortcuts.upd | ||
29 | include whitelist-common.inc | 31 | include whitelist-common.inc |
30 | include whitelist-runuser-common.inc | 32 | include whitelist-runuser-common.inc |
31 | include whitelist-usr-share-common.inc | 33 | include whitelist-usr-share-common.inc |
diff --git a/etc/profile-m-z/steam.profile b/etc/profile-m-z/steam.profile index 0bcbe6da2..922823f98 100644 --- a/etc/profile-m-z/steam.profile +++ b/etc/profile-m-z/steam.profile | |||
@@ -10,6 +10,7 @@ noblacklist ${HOME}/.config/Epic | |||
10 | noblacklist ${HOME}/.config/Loop_Hero | 10 | noblacklist ${HOME}/.config/Loop_Hero |
11 | noblacklist ${HOME}/.config/ModTheSpire | 11 | noblacklist ${HOME}/.config/ModTheSpire |
12 | noblacklist ${HOME}/.config/RogueLegacy | 12 | noblacklist ${HOME}/.config/RogueLegacy |
13 | noblacklist ${HOME}/.config/RogueLegacyStorageContainer | ||
13 | noblacklist ${HOME}/.killingfloor | 14 | noblacklist ${HOME}/.killingfloor |
14 | noblacklist ${HOME}/.klei | 15 | noblacklist ${HOME}/.klei |
15 | noblacklist ${HOME}/.local/share/3909/PapersPlease | 16 | noblacklist ${HOME}/.local/share/3909/PapersPlease |
@@ -22,7 +23,8 @@ noblacklist ${HOME}/.local/share/feral-interactive | |||
22 | noblacklist ${HOME}/.local/share/IntoTheBreach | 23 | noblacklist ${HOME}/.local/share/IntoTheBreach |
23 | noblacklist ${HOME}/.local/share/Paradox Interactive | 24 | noblacklist ${HOME}/.local/share/Paradox Interactive |
24 | noblacklist ${HOME}/.local/share/PillarsOfEternity | 25 | noblacklist ${HOME}/.local/share/PillarsOfEternity |
25 | noblacklist ${HOME}/.local/share/RogueLegacy* | 26 | noblacklist ${HOME}/.local/share/RogueLegacy |
27 | noblacklist ${HOME}/.local/share/RogueLegacyStorageContainer | ||
26 | noblacklist ${HOME}/.local/share/Steam | 28 | noblacklist ${HOME}/.local/share/Steam |
27 | noblacklist ${HOME}/.local/share/SteamWorldDig | 29 | noblacklist ${HOME}/.local/share/SteamWorldDig |
28 | noblacklist ${HOME}/.local/share/SteamWorld Dig 2 | 30 | noblacklist ${HOME}/.local/share/SteamWorld Dig 2 |
@@ -69,7 +71,7 @@ mkdir ${HOME}/.local/share/feral-interactive | |||
69 | mkdir ${HOME}/.local/share/IntoTheBreach | 71 | mkdir ${HOME}/.local/share/IntoTheBreach |
70 | mkdir ${HOME}/.local/share/Paradox Interactive | 72 | mkdir ${HOME}/.local/share/Paradox Interactive |
71 | mkdir ${HOME}/.local/share/PillarsOfEternity | 73 | mkdir ${HOME}/.local/share/PillarsOfEternity |
72 | mkdir ${HOME}/.local/share/RogueLegacy* | 74 | mkdir ${HOME}/.local/share/RogueLegacy |
73 | mkdir ${HOME}/.local/share/Steam | 75 | mkdir ${HOME}/.local/share/Steam |
74 | mkdir ${HOME}/.local/share/SteamWorldDig | 76 | mkdir ${HOME}/.local/share/SteamWorldDig |
75 | mkdir ${HOME}/.local/share/SteamWorld Dig 2 | 77 | mkdir ${HOME}/.local/share/SteamWorld Dig 2 |
@@ -86,6 +88,7 @@ whitelist ${HOME}/.config/Epic | |||
86 | whitelist ${HOME}/.config/Loop_Hero | 88 | whitelist ${HOME}/.config/Loop_Hero |
87 | whitelist ${HOME}/.config/ModTheSpire | 89 | whitelist ${HOME}/.config/ModTheSpire |
88 | whitelist ${HOME}/.config/RogueLegacy | 90 | whitelist ${HOME}/.config/RogueLegacy |
91 | whitelist ${HOME}/.config/RogueLegacyStorageContainer | ||
89 | whitelist ${HOME}/.config/unity3d | 92 | whitelist ${HOME}/.config/unity3d |
90 | whitelist ${HOME}/.killingfloor | 93 | whitelist ${HOME}/.killingfloor |
91 | whitelist ${HOME}/.klei | 94 | whitelist ${HOME}/.klei |
@@ -99,7 +102,8 @@ whitelist ${HOME}/.local/share/feral-interactive | |||
99 | whitelist ${HOME}/.local/share/IntoTheBreach | 102 | whitelist ${HOME}/.local/share/IntoTheBreach |
100 | whitelist ${HOME}/.local/share/Paradox Interactive | 103 | whitelist ${HOME}/.local/share/Paradox Interactive |
101 | whitelist ${HOME}/.local/share/PillarsOfEternity | 104 | whitelist ${HOME}/.local/share/PillarsOfEternity |
102 | whitelist ${HOME}/.local/share/RogueLegacy* | 105 | whitelist ${HOME}/.local/share/RogueLegacy |
106 | whitelist ${HOME}/.local/share/RogueLegacyStorageContainer | ||
103 | whitelist ${HOME}/.local/share/Steam | 107 | whitelist ${HOME}/.local/share/Steam |
104 | whitelist ${HOME}/.local/share/SteamWorldDig | 108 | whitelist ${HOME}/.local/share/SteamWorldDig |
105 | whitelist ${HOME}/.local/share/SteamWorld Dig 2 | 109 | whitelist ${HOME}/.local/share/SteamWorld Dig 2 |
@@ -115,6 +119,14 @@ whitelist ${HOME}/.steampid | |||
115 | include whitelist-common.inc | 119 | include whitelist-common.inc |
116 | include whitelist-var-common.inc | 120 | include whitelist-var-common.inc |
117 | 121 | ||
122 | # Note: The following were intentionally left out as they are alternative | ||
123 | # (i.e.: unnecessary and/or legacy) paths whose existence may potentially | ||
124 | # clobber other paths (see #4225). If you use any, either add the entry to | ||
125 | # steam.local or move the contents to a path listed above (or open an issue if | ||
126 | # it's missing above). | ||
127 | #mkdir ${HOME}/.config/RogueLegacyStorageContainer | ||
128 | #mkdir ${HOME}/.local/share/RogueLegacyStorageContainer | ||
129 | |||
118 | caps.drop all | 130 | caps.drop all |
119 | #ipc-namespace | 131 | #ipc-namespace |
120 | netfilter | 132 | netfilter |
diff --git a/etc/profile-m-z/supertux2.profile b/etc/profile-m-z/supertux2.profile index 9cc023765..d31f25c0d 100644 --- a/etc/profile-m-z/supertux2.profile +++ b/etc/profile-m-z/supertux2.profile | |||
@@ -14,6 +14,7 @@ include disable-exec.inc | |||
14 | include disable-interpreters.inc | 14 | include disable-interpreters.inc |
15 | include disable-passwdmgr.inc | 15 | include disable-passwdmgr.inc |
16 | include disable-programs.inc | 16 | include disable-programs.inc |
17 | include disable-shell.inc | ||
17 | include disable-xdg.inc | 18 | include disable-xdg.inc |
18 | 19 | ||
19 | mkdir ${HOME}/.local/share/supertux2 | 20 | mkdir ${HOME}/.local/share/supertux2 |
@@ -42,6 +43,8 @@ tracelog | |||
42 | 43 | ||
43 | disable-mnt | 44 | disable-mnt |
44 | # private-bin supertux2 | 45 | # private-bin supertux2 |
46 | private-cache | ||
47 | private-etc machine-id | ||
45 | private-dev | 48 | private-dev |
46 | private-tmp | 49 | private-tmp |
47 | 50 | ||
diff --git a/etc/profile-m-z/virtualbox.profile b/etc/profile-m-z/virtualbox.profile index 64d787bfb..c22fb0ff9 100644 --- a/etc/profile-m-z/virtualbox.profile +++ b/etc/profile-m-z/virtualbox.profile | |||
@@ -44,7 +44,7 @@ shell none | |||
44 | tracelog | 44 | tracelog |
45 | 45 | ||
46 | #disable-mnt | 46 | #disable-mnt |
47 | #private-bin basename,bash,env,gawk,grep,ps,readlink,sh,virtualbox,VirtualBox,VBox*,vbox*,whoami | 47 | #private-bin awk,basename,bash,env,gawk,grep,ps,readlink,sh,virtualbox,VirtualBox,VBox*,vbox*,whoami |
48 | private-cache | 48 | private-cache |
49 | private-etc alsa,asound.conf,ca-certificates,conf.d,crypto-policies,dconf,fonts,hostname,hosts,ld.so.cache,localtime,machine-id,pki,pulse,resolv.conf,ssl | 49 | private-etc alsa,asound.conf,ca-certificates,conf.d,crypto-policies,dconf,fonts,hostname,hosts,ld.so.cache,localtime,machine-id,pki,pulse,resolv.conf,ssl |
50 | private-tmp | 50 | private-tmp |
diff --git a/etc/profile-m-z/xfce4-mixer.profile b/etc/profile-m-z/xfce4-mixer.profile index 78cb2862c..d9d1cd393 100644 --- a/etc/profile-m-z/xfce4-mixer.profile +++ b/etc/profile-m-z/xfce4-mixer.profile | |||
@@ -19,7 +19,7 @@ include disable-xdg.inc | |||
19 | 19 | ||
20 | mkfile ${HOME}/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-mixer.xml | 20 | mkfile ${HOME}/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-mixer.xml |
21 | whitelist ${HOME}/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-mixer.xml | 21 | whitelist ${HOME}/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-mixer.xml |
22 | whitelist /usr/share/gstreamer | 22 | whitelist /usr/share/gstreamer-* |
23 | whitelist /usr/share/xfce4 | 23 | whitelist /usr/share/xfce4 |
24 | whitelist /usr/share/xfce4-mixer | 24 | whitelist /usr/share/xfce4-mixer |
25 | include whitelist-common.inc | 25 | include whitelist-common.inc |
diff --git a/src/fbuilder/build_bin.c b/src/fbuilder/build_bin.c index 96bd351f3..431aebee6 100644 --- a/src/fbuilder/build_bin.c +++ b/src/fbuilder/build_bin.c | |||
@@ -121,6 +121,6 @@ void build_bin(const char *fname, FILE *fp) { | |||
121 | ptr = ptr->next; | 121 | ptr = ptr->next; |
122 | } | 122 | } |
123 | fprintf(fp, "\n"); | 123 | fprintf(fp, "\n"); |
124 | fprintf(fp, "# private-lib\n"); | 124 | fprintf(fp, "#private-lib\n"); |
125 | } | 125 | } |
126 | } | 126 | } |
diff --git a/src/fbuilder/build_fs.c b/src/fbuilder/build_fs.c index 495f71ab8..ac0cd455a 100644 --- a/src/fbuilder/build_fs.c +++ b/src/fbuilder/build_fs.c | |||
@@ -220,6 +220,10 @@ static void tmp_callback(char *ptr) { | |||
220 | // skip strace file | 220 | // skip strace file |
221 | if (strncmp(ptr, "/tmp/firejail-strace", 20) == 0) | 221 | if (strncmp(ptr, "/tmp/firejail-strace", 20) == 0) |
222 | return; | 222 | return; |
223 | if (strncmp(ptr, "/tmp/runtime-", 13) == 0) | ||
224 | return; | ||
225 | if (strcmp(ptr, "/tmp") == 0) | ||
226 | return; | ||
223 | 227 | ||
224 | tmp_out = filedb_add(tmp_out, ptr); | 228 | tmp_out = filedb_add(tmp_out, ptr); |
225 | } | 229 | } |
@@ -232,8 +236,7 @@ void build_tmp(const char *fname, FILE *fp) { | |||
232 | if (tmp_out == NULL) | 236 | if (tmp_out == NULL) |
233 | fprintf(fp, "private-tmp\n"); | 237 | fprintf(fp, "private-tmp\n"); |
234 | else { | 238 | else { |
235 | fprintf(fp, "\n"); | 239 | fprintf(fp, "#private-tmp\n"); |
236 | fprintf(fp, "# private-tmp\n"); | ||
237 | fprintf(fp, "# File accessed in /tmp directory:\n"); | 240 | fprintf(fp, "# File accessed in /tmp directory:\n"); |
238 | fprintf(fp, "# "); | 241 | fprintf(fp, "# "); |
239 | FileDB *ptr = tmp_out; | 242 | FileDB *ptr = tmp_out; |
@@ -310,9 +313,8 @@ void build_dev(const char *fname, FILE *fp) { | |||
310 | if (dev_out == NULL) | 313 | if (dev_out == NULL) |
311 | fprintf(fp, "private-dev\n"); | 314 | fprintf(fp, "private-dev\n"); |
312 | else { | 315 | else { |
313 | fprintf(fp, "\n"); | 316 | fprintf(fp, "#private-dev\n"); |
314 | fprintf(fp, "# private-dev\n"); | 317 | fprintf(fp, "# This is the list of devices accessed on top of regular private-dev devices:\n"); |
315 | fprintf(fp, "# This is the list of devices accessed (on top of regular private-dev devices:\n"); | ||
316 | fprintf(fp, "# "); | 318 | fprintf(fp, "# "); |
317 | FileDB *ptr = dev_out; | 319 | FileDB *ptr = dev_out; |
318 | while (ptr) { | 320 | while (ptr) { |
diff --git a/src/fbuilder/build_home.c b/src/fbuilder/build_home.c index 683009b71..d7706282a 100644 --- a/src/fbuilder/build_home.c +++ b/src/fbuilder/build_home.c | |||
@@ -141,7 +141,7 @@ void process_home(const char *fname, char *home, int home_len) { | |||
141 | } | 141 | } |
142 | 142 | ||
143 | // skip files and directories in whitelist-common.inc | 143 | // skip files and directories in whitelist-common.inc |
144 | if (filedb_find(db_skip, toadd)) { | 144 | if (strlen(toadd) == 0 || filedb_find(db_skip, toadd)) { |
145 | if (dir) | 145 | if (dir) |
146 | free(dir); | 146 | free(dir); |
147 | continue; | 147 | continue; |
diff --git a/src/fbuilder/build_profile.c b/src/fbuilder/build_profile.c index 96a83954d..0c1b57384 100644 --- a/src/fbuilder/build_profile.c +++ b/src/fbuilder/build_profile.c | |||
@@ -150,12 +150,12 @@ void build_profile(int argc, char **argv, int index, FILE *fp) { | |||
150 | 150 | ||
151 | fprintf(fp, "### basic blacklisting\n"); | 151 | fprintf(fp, "### basic blacklisting\n"); |
152 | fprintf(fp, "include disable-common.inc\n"); | 152 | fprintf(fp, "include disable-common.inc\n"); |
153 | fprintf(fp, "# include disable-devel.inc\n"); | 153 | fprintf(fp, "#include disable-devel.inc\n"); |
154 | fprintf(fp, "# include disable-exec.inc\n"); | 154 | fprintf(fp, "#include disable-exec.inc\n"); |
155 | fprintf(fp, "# include disable-interpreters.inc\n"); | 155 | fprintf(fp, "#include disable-interpreters.inc\n"); |
156 | fprintf(fp, "include disable-passwdmgr.inc\n"); | 156 | fprintf(fp, "include disable-passwdmgr.inc\n"); |
157 | fprintf(fp, "# include disable-programs.inc\n"); | 157 | fprintf(fp, "#include disable-programs.inc\n"); |
158 | fprintf(fp, "# include disable-xdg.inc\n"); | 158 | fprintf(fp, "#include disable-xdg.inc\n"); |
159 | fprintf(fp, "\n"); | 159 | fprintf(fp, "\n"); |
160 | 160 | ||
161 | fprintf(fp, "### home directory whitelisting\n"); | 161 | fprintf(fp, "### home directory whitelisting\n"); |
@@ -163,18 +163,17 @@ void build_profile(int argc, char **argv, int index, FILE *fp) { | |||
163 | fprintf(fp, "\n"); | 163 | fprintf(fp, "\n"); |
164 | 164 | ||
165 | fprintf(fp, "### filesystem\n"); | 165 | fprintf(fp, "### filesystem\n"); |
166 | fprintf(fp, "# /usr/share:\n"); | 166 | fprintf(fp, "### /usr/share:\n"); |
167 | build_share(trace_output, fp); | 167 | build_share(trace_output, fp); |
168 | fprintf(fp, "# /var:\n"); | 168 | fprintf(fp, "### /var:\n"); |
169 | build_var(trace_output, fp); | 169 | build_var(trace_output, fp); |
170 | fprintf(fp, "\n"); | 170 | fprintf(fp, "### /bin:\n"); |
171 | fprintf(fp, "# $PATH:\n"); | ||
172 | build_bin(trace_output, fp); | 171 | build_bin(trace_output, fp); |
173 | fprintf(fp, "# /dev:\n"); | 172 | fprintf(fp, "### /dev:\n"); |
174 | build_dev(trace_output, fp); | 173 | build_dev(trace_output, fp); |
175 | fprintf(fp, "# /etc:\n"); | 174 | fprintf(fp, "### /etc:\n"); |
176 | build_etc(trace_output, fp); | 175 | build_etc(trace_output, fp); |
177 | fprintf(fp, "# /tmp:\n"); | 176 | fprintf(fp, "### /tmp:\n"); |
178 | build_tmp(trace_output, fp); | 177 | build_tmp(trace_output, fp); |
179 | fprintf(fp, "\n"); | 178 | fprintf(fp, "\n"); |
180 | 179 | ||
diff --git a/src/man/firejail-profile.txt b/src/man/firejail-profile.txt index ee685da73..2bb57cee2 100644 --- a/src/man/firejail-profile.txt +++ b/src/man/firejail-profile.txt | |||
@@ -295,7 +295,9 @@ Use the options no3d, nodvd, nosound, notv, nou2f and novideo for additional res | |||
295 | Build a new /etc in a temporary | 295 | Build a new /etc in a temporary |
296 | filesystem, and copy the files and directories in the list. | 296 | filesystem, and copy the files and directories in the list. |
297 | The files and directories in the list must be expressed as relative to | 297 | The files and directories in the list must be expressed as relative to |
298 | the /etc directory. | 298 | the /etc directory, and must not contain the / character |
299 | (e.g., /etc/foo must be expressed as foo, but /etc/foo/bar -- | ||
300 | expressed as foo/bar -- is disallowed). | ||
299 | All modifications are discarded when the sandbox is closed. | 301 | All modifications are discarded when the sandbox is closed. |
300 | #ifdef HAVE_PRIVATE_HOME | 302 | #ifdef HAVE_PRIVATE_HOME |
301 | .TP | 303 | .TP |
@@ -319,14 +321,18 @@ This feature is still under development, see \fBman 1 firejail\fR for some examp | |||
319 | Build a new /opt in a temporary | 321 | Build a new /opt in a temporary |
320 | filesystem, and copy the files and directories in the list. | 322 | filesystem, and copy the files and directories in the list. |
321 | The files and directories in the list must be expressed as relative to | 323 | The files and directories in the list must be expressed as relative to |
322 | the /opt directory. | 324 | the /opt directory, and must not contain the / character |
325 | (e.g., /opt/foo must be expressed as foo, but /opt/foo/bar -- | ||
326 | expressed as foo/bar -- is disallowed). | ||
323 | All modifications are discarded when the sandbox is closed. | 327 | All modifications are discarded when the sandbox is closed. |
324 | .TP | 328 | .TP |
325 | \fBprivate-srv file,directory | 329 | \fBprivate-srv file,directory |
326 | Build a new /srv in a temporary | 330 | Build a new /srv in a temporary |
327 | filesystem, and copy the files and directories in the list. | 331 | filesystem, and copy the files and directories in the list. |
328 | The files and directories in the list must be expressed as relative to | 332 | The files and directories in the list must be expressed as relative to |
329 | the /srv directory. | 333 | the /srv directory, and must not contain the / character |
334 | (e.g., /srv/foo must be expressed as foo, but /srv/foo/bar -- | ||
335 | expressed as foo/bar -- is disallowed). | ||
330 | All modifications are discarded when the sandbox is closed. | 336 | All modifications are discarded when the sandbox is closed. |
331 | .TP | 337 | .TP |
332 | \fBprivate-tmp | 338 | \fBprivate-tmp |
diff --git a/src/man/firejail.txt b/src/man/firejail.txt index f27379a2d..1ee7ab1f1 100644 --- a/src/man/firejail.txt +++ b/src/man/firejail.txt | |||
@@ -1883,7 +1883,9 @@ $ | |||
1883 | Build a new /etc in a temporary | 1883 | Build a new /etc in a temporary |
1884 | filesystem, and copy the files and directories in the list. | 1884 | filesystem, and copy the files and directories in the list. |
1885 | The files and directories in the list must be expressed as relative to | 1885 | The files and directories in the list must be expressed as relative to |
1886 | the /etc directory. | 1886 | the /etc directory, and must not contain the / character |
1887 | (e.g., /etc/foo must be expressed as foo, but /etc/foo/bar -- | ||
1888 | expressed as foo/bar -- is disallowed). | ||
1887 | If no listed file is found, /etc directory will be empty. | 1889 | If no listed file is found, /etc directory will be empty. |
1888 | All modifications are discarded when the sandbox is closed. | 1890 | All modifications are discarded when the sandbox is closed. |
1889 | .br | 1891 | .br |
@@ -1893,7 +1895,7 @@ Example: | |||
1893 | .br | 1895 | .br |
1894 | $ firejail --private-etc=group,hostname,localtime, \\ | 1896 | $ firejail --private-etc=group,hostname,localtime, \\ |
1895 | .br | 1897 | .br |
1896 | nsswitch.conf,passwd,resolv.conf,default/motd-news | 1898 | nsswitch.conf,passwd,resolv.conf |
1897 | #ifdef HAVE_PRIVATE_HOME | 1899 | #ifdef HAVE_PRIVATE_HOME |
1898 | .TP | 1900 | .TP |
1899 | \fB\-\-private-home=file,directory | 1901 | \fB\-\-private-home=file,directory |
@@ -1968,7 +1970,9 @@ $ | |||
1968 | Build a new /opt in a temporary | 1970 | Build a new /opt in a temporary |
1969 | filesystem, and copy the files and directories in the list. | 1971 | filesystem, and copy the files and directories in the list. |
1970 | The files and directories in the list must be expressed as relative to | 1972 | The files and directories in the list must be expressed as relative to |
1971 | the /opt directory. | 1973 | the /opt directory, and must not contain the / character |
1974 | (e.g., /opt/foo must be expressed as foo, but /opt/foo/bar -- | ||
1975 | expressed as foo/bar -- is disallowed). | ||
1972 | If no listed file is found, /opt directory will be empty. | 1976 | If no listed file is found, /opt directory will be empty. |
1973 | All modifications are discarded when the sandbox is closed. | 1977 | All modifications are discarded when the sandbox is closed. |
1974 | .br | 1978 | .br |
@@ -1983,7 +1987,9 @@ $ firejail --private-opt=firefox /opt/firefox/firefox | |||
1983 | Build a new /srv in a temporary | 1987 | Build a new /srv in a temporary |
1984 | filesystem, and copy the files and directories in the list. | 1988 | filesystem, and copy the files and directories in the list. |
1985 | The files and directories in the list must be expressed as relative to | 1989 | The files and directories in the list must be expressed as relative to |
1986 | the /srv directory. | 1990 | the /srv directory, and must not contain the / character |
1991 | (e.g., /opt/srv must be expressed as foo, but /srv/foo/bar -- | ||
1992 | expressed as srv/bar -- is disallowed). | ||
1987 | If no listed file is found, /srv directory will be empty. | 1993 | If no listed file is found, /srv directory will be empty. |
1988 | All modifications are discarded when the sandbox is closed. | 1994 | All modifications are discarded when the sandbox is closed. |
1989 | .br | 1995 | .br |