diff options
author | glitsj16 <glitsj16@users.noreply.github.com> | 2020-01-17 23:31:46 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-17 23:31:46 +0000 |
commit | f9c9c469a23dbb6d484f82f6ba719d662b784753 (patch) | |
tree | 9485d36a39798b0542ed70b9a5df688bab2c3d69 /etc | |
parent | join: wait with effective uid of the user (diff) | |
download | firejail-f9c9c469a23dbb6d484f82f6ba719d662b784753.tar.gz firejail-f9c9c469a23dbb6d484f82f6ba719d662b784753.tar.zst firejail-f9c9c469a23dbb6d484f82f6ba719d662b784753.zip |
hardenings for various profiles (#3160)
* harden devilspie
* harden devilspie2
* harden curl
* harden wget
* harden curl
* harden dig
* harden claws-mail
* harden dnscrypt-proxy
* harden dnscrypt-proxy
* harden dnscrypt-proxy
* harden exfalso
* refactor easystroke as whitelist profile
* refactor enchant as whitelist profile
* safeguard ${DOCUMENTS}
Thanks @rusty-snake for the suggestion.
* drop x11-none
Thanks @rusty-snake for catching this.
* drop x11 none
Thanks @rusty-snake for saving the bacon...
* drop x11 none
Thanks @rusty-snake for catching this.
* drop x11 none
Thanks @rusty-snake for preventing breakage!
* drop ipc-namespace
Better safe than sorry...
Diffstat (limited to 'etc')
-rw-r--r-- | etc/claws-mail.profile | 3 | ||||
-rw-r--r-- | etc/curl.profile | 4 | ||||
-rw-r--r-- | etc/devilspie.profile | 3 | ||||
-rw-r--r-- | etc/devilspie2.profile | 3 | ||||
-rw-r--r-- | etc/dig.profile | 5 | ||||
-rw-r--r-- | etc/dnscrypt-proxy.profile | 7 | ||||
-rw-r--r-- | etc/easystroke.profile | 5 | ||||
-rw-r--r-- | etc/enchant.profile | 6 | ||||
-rw-r--r-- | etc/exfalso.profile | 1 |
9 files changed, 36 insertions, 1 deletions
diff --git a/etc/claws-mail.profile b/etc/claws-mail.profile index f07e2039b..44124f4a3 100644 --- a/etc/claws-mail.profile +++ b/etc/claws-mail.profile | |||
@@ -13,11 +13,14 @@ noblacklist ${HOME}/.signature | |||
13 | # and 'blacklist' it in your disable-common.local too so it is kept hidden from other applications | 13 | # and 'blacklist' it in your disable-common.local too so it is kept hidden from other applications |
14 | noblacklist ${HOME}/Mail | 14 | noblacklist ${HOME}/Mail |
15 | 15 | ||
16 | noblacklist ${DOCUMENTS} | ||
16 | include disable-common.inc | 17 | include disable-common.inc |
17 | include disable-devel.inc | 18 | include disable-devel.inc |
19 | include disable-exec.inc | ||
18 | include disable-interpreters.inc | 20 | include disable-interpreters.inc |
19 | include disable-passwdmgr.inc | 21 | include disable-passwdmgr.inc |
20 | include disable-programs.inc | 22 | include disable-programs.inc |
23 | include disable-xdg.inc | ||
21 | 24 | ||
22 | whitelist /usr/share/doc/claws-mail | 25 | whitelist /usr/share/doc/claws-mail |
23 | whitelist /usr/share/gnupg | 26 | whitelist /usr/share/gnupg |
diff --git a/etc/curl.profile b/etc/curl.profile index 679f5a152..3f93e5f7e 100644 --- a/etc/curl.profile +++ b/etc/curl.profile | |||
@@ -9,10 +9,14 @@ include globals.local | |||
9 | 9 | ||
10 | noblacklist ${HOME}/.curlrc | 10 | noblacklist ${HOME}/.curlrc |
11 | 11 | ||
12 | blacklist /tmp/.X11-unix | ||
13 | |||
12 | include disable-common.inc | 14 | include disable-common.inc |
13 | include disable-exec.inc | 15 | include disable-exec.inc |
14 | include disable-passwdmgr.inc | 16 | include disable-passwdmgr.inc |
15 | include disable-programs.inc | 17 | include disable-programs.inc |
18 | # depending on workflow you can uncomment the below or put 'include disable-xdg.inc' in your curl.local | ||
19 | #include disable-xdg.inc | ||
16 | 20 | ||
17 | include whitelist-usr-share-common.inc | 21 | include whitelist-usr-share-common.inc |
18 | 22 | ||
diff --git a/etc/devilspie.profile b/etc/devilspie.profile index ad891ffaf..bbbdfd702 100644 --- a/etc/devilspie.profile +++ b/etc/devilspie.profile | |||
@@ -8,6 +8,8 @@ include globals.local | |||
8 | 8 | ||
9 | noblacklist ${HOME}/.devilspie | 9 | noblacklist ${HOME}/.devilspie |
10 | 10 | ||
11 | blacklist /tmp/.X11-unix | ||
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 |
@@ -41,6 +43,7 @@ protocol unix | |||
41 | seccomp | 43 | seccomp |
42 | shell none | 44 | shell none |
43 | tracelog | 45 | tracelog |
46 | x11 none | ||
44 | 47 | ||
45 | disable-mnt | 48 | disable-mnt |
46 | private-bin devilspie | 49 | private-bin devilspie |
diff --git a/etc/devilspie2.profile b/etc/devilspie2.profile index f2bacda9a..253e3856c 100644 --- a/etc/devilspie2.profile +++ b/etc/devilspie2.profile | |||
@@ -8,6 +8,8 @@ include globals.local | |||
8 | 8 | ||
9 | noblacklist ${HOME}/.config/devilspie2 | 9 | noblacklist ${HOME}/.config/devilspie2 |
10 | 10 | ||
11 | blacklist /tmp/.X11-unix | ||
12 | |||
11 | # Allow lua (blacklisted by disable-interpreters.inc) | 13 | # Allow lua (blacklisted by disable-interpreters.inc) |
12 | include allow-lua.inc | 14 | include allow-lua.inc |
13 | 15 | ||
@@ -44,6 +46,7 @@ protocol unix | |||
44 | seccomp | 46 | seccomp |
45 | shell none | 47 | shell none |
46 | tracelog | 48 | tracelog |
49 | x11 none | ||
47 | 50 | ||
48 | disable-mnt | 51 | disable-mnt |
49 | private-bin devilspie2 | 52 | private-bin devilspie2 |
diff --git a/etc/dig.profile b/etc/dig.profile index af71ff17f..054e4891d 100644 --- a/etc/dig.profile +++ b/etc/dig.profile | |||
@@ -9,6 +9,8 @@ include globals.local | |||
9 | 9 | ||
10 | noblacklist ${HOME}/.digrc | 10 | noblacklist ${HOME}/.digrc |
11 | 11 | ||
12 | blacklist /tmp/.X11-unix | ||
13 | |||
12 | include disable-common.inc | 14 | include disable-common.inc |
13 | # include disable-devel.inc | 15 | # include disable-devel.inc |
14 | include disable-exec.inc | 16 | include disable-exec.inc |
@@ -24,7 +26,7 @@ include whitelist-usr-share-common.inc | |||
24 | include whitelist-var-common.inc | 26 | include whitelist-var-common.inc |
25 | 27 | ||
26 | caps.drop all | 28 | caps.drop all |
27 | # ipc-namespace | 29 | ipc-namespace |
28 | machine-id | 30 | machine-id |
29 | netfilter | 31 | netfilter |
30 | no3d | 32 | no3d |
@@ -40,6 +42,7 @@ novideo | |||
40 | protocol unix,inet,inet6 | 42 | protocol unix,inet,inet6 |
41 | seccomp | 43 | seccomp |
42 | shell none | 44 | shell none |
45 | tracelog | ||
43 | 46 | ||
44 | disable-mnt | 47 | disable-mnt |
45 | private | 48 | private |
diff --git a/etc/dnscrypt-proxy.profile b/etc/dnscrypt-proxy.profile index d0430d5ca..65722b3ef 100644 --- a/etc/dnscrypt-proxy.profile +++ b/etc/dnscrypt-proxy.profile | |||
@@ -7,6 +7,8 @@ include dnscrypt-proxy.local | |||
7 | # Persistent global definitions | 7 | # Persistent global definitions |
8 | include globals.local | 8 | include globals.local |
9 | 9 | ||
10 | blacklist /tmp/.X11-unix | ||
11 | |||
10 | noblacklist /sbin | 12 | noblacklist /sbin |
11 | noblacklist /usr/sbin | 13 | noblacklist /usr/sbin |
12 | 14 | ||
@@ -20,10 +22,13 @@ include disable-xdg.inc | |||
20 | 22 | ||
21 | whitelist /usr/share/dnscrypt-proxy | 23 | whitelist /usr/share/dnscrypt-proxy |
22 | include whitelist-usr-share-common.inc | 24 | include whitelist-usr-share-common.inc |
25 | include whitelist-var-common.inc | ||
23 | 26 | ||
27 | apparmor | ||
24 | caps.keep ipc_lock,net_bind_service,setgid,setuid,sys_chroot | 28 | caps.keep ipc_lock,net_bind_service,setgid,setuid,sys_chroot |
25 | ipc-namespace | 29 | ipc-namespace |
26 | machine-id | 30 | machine-id |
31 | netfilter | ||
27 | no3d | 32 | no3d |
28 | nodbus | 33 | nodbus |
29 | nodvd | 34 | nodvd |
@@ -34,6 +39,8 @@ nou2f | |||
34 | novideo | 39 | novideo |
35 | protocol inet,inet6 | 40 | protocol inet,inet6 |
36 | seccomp.drop _sysctl,acct,add_key,adjtimex,clock_adjtime,delete_module,fanotify_init,finit_module,get_mempolicy,init_module,io_cancel,io_destroy,io_getevents,io_setup,io_submit,ioperm,iopl,kcmp,kexec_file_load,kexec_load,keyctl,lookup_dcookie,mbind,migrate_pages,modify_ldt,mount,move_pages,open_by_handle_at,perf_event_open,perf_event_open,pivot_root,process_vm_readv,process_vm_writev,ptrace,remap_file_pages,request_key,set_mempolicy,swapoff,swapon,sysfs,syslog,umount2,uselib,vmsplice | 41 | seccomp.drop _sysctl,acct,add_key,adjtimex,clock_adjtime,delete_module,fanotify_init,finit_module,get_mempolicy,init_module,io_cancel,io_destroy,io_getevents,io_setup,io_submit,ioperm,iopl,kcmp,kexec_file_load,kexec_load,keyctl,lookup_dcookie,mbind,migrate_pages,modify_ldt,mount,move_pages,open_by_handle_at,perf_event_open,perf_event_open,pivot_root,process_vm_readv,process_vm_writev,ptrace,remap_file_pages,request_key,set_mempolicy,swapoff,swapon,sysfs,syslog,umount2,uselib,vmsplice |
42 | shell none | ||
43 | tracelog | ||
37 | 44 | ||
38 | disable-mnt | 45 | disable-mnt |
39 | private | 46 | private |
diff --git a/etc/easystroke.profile b/etc/easystroke.profile index 623a4cadc..1297f5f40 100644 --- a/etc/easystroke.profile +++ b/etc/easystroke.profile | |||
@@ -16,7 +16,11 @@ include disable-passwdmgr.inc | |||
16 | include disable-programs.inc | 16 | include disable-programs.inc |
17 | include disable-xdg.inc | 17 | include disable-xdg.inc |
18 | 18 | ||
19 | mkdir ${HOME}/.easystroke | ||
20 | whitelist ${HOME}/.easystroke | ||
21 | include whitelist-common.inc | ||
19 | include whitelist-usr-share-common.inc | 22 | include whitelist-usr-share-common.inc |
23 | include whitelist-var-common.inc | ||
20 | 24 | ||
21 | apparmor | 25 | apparmor |
22 | caps.drop all | 26 | caps.drop all |
@@ -35,6 +39,7 @@ novideo | |||
35 | protocol unix | 39 | protocol unix |
36 | seccomp | 40 | seccomp |
37 | shell none | 41 | shell none |
42 | tracelog | ||
38 | 43 | ||
39 | disable-mnt | 44 | disable-mnt |
40 | # breaks custom shell command functionality | 45 | # breaks custom shell command functionality |
diff --git a/etc/enchant.profile b/etc/enchant.profile index d276cec84..e2811a955 100644 --- a/etc/enchant.profile +++ b/etc/enchant.profile | |||
@@ -8,6 +8,8 @@ include globals.local | |||
8 | 8 | ||
9 | noblacklist ${HOME}/.config/enchant | 9 | noblacklist ${HOME}/.config/enchant |
10 | 10 | ||
11 | blacklist /tmp/.X11-unix | ||
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 |
@@ -16,7 +18,11 @@ include disable-passwdmgr.inc | |||
16 | include disable-programs.inc | 18 | include disable-programs.inc |
17 | include disable-xdg.inc | 19 | include disable-xdg.inc |
18 | 20 | ||
21 | mkdir ${HOME}/.config/enchant | ||
22 | whitelist ${HOME}/.config/enchant | ||
23 | include whitelist-common.inc | ||
19 | include whitelist-usr-share-common.inc | 24 | include whitelist-usr-share-common.inc |
25 | include whitelist-var-common.inc | ||
20 | 26 | ||
21 | apparmor | 27 | apparmor |
22 | caps.drop all | 28 | caps.drop all |
diff --git a/etc/exfalso.profile b/etc/exfalso.profile index 7d91f2854..04bafdde4 100644 --- a/etc/exfalso.profile +++ b/etc/exfalso.profile | |||
@@ -31,6 +31,7 @@ include whitelist-usr-share-common.inc | |||
31 | include whitelist-var-common.inc | 31 | include whitelist-var-common.inc |
32 | 32 | ||
33 | caps.drop all | 33 | caps.drop all |
34 | ipc-namespace | ||
34 | machine-id | 35 | machine-id |
35 | netfilter | 36 | netfilter |
36 | no3d | 37 | no3d |