aboutsummaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorLibravatar SYN-cook <vinumconsult@posteo.de>2016-12-27 20:33:14 +0100
committerLibravatar GitHub <noreply@github.com>2016-12-27 20:33:14 +0100
commit702e15dfcb0f1028c25933328a376cbfab98b0ac (patch)
tree16109908b0fc81b0465c3c6ac13769c7b7e0ed59 /etc
parentdon't whitelist keepassx in browser profiles (diff)
parentfixes (diff)
downloadfirejail-702e15dfcb0f1028c25933328a376cbfab98b0ac.tar.gz
firejail-702e15dfcb0f1028c25933328a376cbfab98b0ac.tar.zst
firejail-702e15dfcb0f1028c25933328a376cbfab98b0ac.zip
Merge pull request #1 from netblue30/master
merge upstream
Diffstat (limited to 'etc')
-rw-r--r--etc/7z.profile5
-rw-r--r--etc/atool.profile3
-rw-r--r--etc/cpio.profile3
-rw-r--r--etc/elinks.profile3
-rw-r--r--etc/exiftool.profile3
-rw-r--r--etc/git.profile4
-rw-r--r--etc/gnome-mplayer.profile2
-rw-r--r--etc/gpg-agent.profile3
-rw-r--r--etc/gpg.profile3
-rw-r--r--etc/highlight.profile4
-rw-r--r--etc/less.profile3
-rw-r--r--etc/lynx.profile3
-rw-r--r--etc/mediainfo.profile3
-rw-r--r--etc/mutt.profile3
-rw-r--r--etc/odt2txt.profile3
-rw-r--r--etc/pdftotext.profile3
-rw-r--r--etc/ssh-agent.profile3
-rw-r--r--etc/strings.profile3
-rw-r--r--etc/tracker.profile3
-rw-r--r--etc/w3m.profile3
-rw-r--r--etc/wget.profile2
-rw-r--r--etc/xpra.profile2
22 files changed, 63 insertions, 4 deletions
diff --git a/etc/7z.profile b/etc/7z.profile
index 0cb72ff8d..319126540 100644
--- a/etc/7z.profile
+++ b/etc/7z.profile
@@ -1,9 +1,14 @@
1# 7zip crompression tool profile 1# 7zip crompression tool profile
2quiet 2quiet
3ignore noroot 3ignore noroot
4
4include /etc/firejail/default.profile 5include /etc/firejail/default.profile
6
7blacklist /tmp/.X11-unix
8
5tracelog 9tracelog
6net none 10net none
7shell none 11shell none
8private-dev 12private-dev
9nosound 13nosound
14no3d
diff --git a/etc/atool.profile b/etc/atool.profile
index 3fbfb9fc7..578a88fc7 100644
--- a/etc/atool.profile
+++ b/etc/atool.profile
@@ -13,9 +13,12 @@ protocol unix
13seccomp 13seccomp
14netfilter 14netfilter
15net none 15net none
16no3d
16shell none 17shell none
17tracelog 18tracelog
18 19
20blacklist /tmp/.X11-unix
21
19# private-bin atool 22# private-bin atool
20private-tmp 23private-tmp
21private-dev 24private-dev
diff --git a/etc/cpio.profile b/etc/cpio.profile
index 519bd244c..cf89acdac 100644
--- a/etc/cpio.profile
+++ b/etc/cpio.profile
@@ -16,6 +16,7 @@ shell none
16tracelog 16tracelog
17net none 17net none
18nosound 18nosound
19no3d
19 20
20 21blacklist /tmp/.X11-unix
21 22
diff --git a/etc/elinks.profile b/etc/elinks.profile
index df817ea56..ade15f203 100644
--- a/etc/elinks.profile
+++ b/etc/elinks.profile
@@ -11,12 +11,15 @@ nogroups
11nonewprivs 11nonewprivs
12noroot 12noroot
13nosound 13nosound
14no3d
14protocol unix,inet,inet6 15protocol unix,inet,inet6
15seccomp 16seccomp
16netfilter 17netfilter
17shell none 18shell none
18tracelog 19tracelog
19 20
21blacklist /tmp/.X11-unix
22
20# private-bin elinks 23# private-bin elinks
21private-tmp 24private-tmp
22private-dev 25private-dev
diff --git a/etc/exiftool.profile b/etc/exiftool.profile
index 384695473..1cae8c093 100644
--- a/etc/exiftool.profile
+++ b/etc/exiftool.profile
@@ -17,9 +17,12 @@ protocol unix
17seccomp 17seccomp
18netfilter 18netfilter
19net none 19net none
20no3d
20shell none 21shell none
21tracelog 22tracelog
22 23
24blacklist /tmp/.X11-unix
25
23# private-bin exiftool,perl 26# private-bin exiftool,perl
24private-tmp 27private-tmp
25private-dev 28private-dev
diff --git a/etc/git.profile b/etc/git.profile
index d60e58c03..80e534e20 100644
--- a/etc/git.profile
+++ b/etc/git.profile
@@ -12,15 +12,17 @@ include /etc/firejail/disable-common.inc
12include /etc/firejail/disable-programs.inc 12include /etc/firejail/disable-programs.inc
13include /etc/firejail/disable-passwdmgr.inc 13include /etc/firejail/disable-passwdmgr.inc
14 14
15
16caps.drop all 15caps.drop all
17netfilter 16netfilter
18nogroups 17nogroups
19nonewprivs 18nonewprivs
20noroot 19noroot
21nosound 20nosound
21no3d
22protocol unix,inet,inet6 22protocol unix,inet,inet6
23seccomp 23seccomp
24shell none 24shell none
25 25
26blacklist /tmp/.X11-unix
27
26private-dev 28private-dev
diff --git a/etc/gnome-mplayer.profile b/etc/gnome-mplayer.profile
index 1b0fc9807..488c7e0b8 100644
--- a/etc/gnome-mplayer.profile
+++ b/etc/gnome-mplayer.profile
@@ -12,6 +12,6 @@ protocol unix,inet,inet6
12seccomp 12seccomp
13shell none 13shell none
14 14
15private-bin gnome-mplayer 15private-bin gnome-mplayer,mplayer
16private-dev 16private-dev
17private-tmp 17private-tmp
diff --git a/etc/gpg-agent.profile b/etc/gpg-agent.profile
index b0ebdf43c..59c7383d7 100644
--- a/etc/gpg-agent.profile
+++ b/etc/gpg-agent.profile
@@ -14,9 +14,12 @@ nosound
14protocol unix 14protocol unix
15seccomp 15seccomp
16netfilter 16netfilter
17no3d
17shell none 18shell none
18tracelog 19tracelog
19 20
21blacklist /tmp/.X11-unix
22
20# private-bin gpg-agent,gpg 23# private-bin gpg-agent,gpg
21private-tmp 24private-tmp
22private-dev 25private-dev
diff --git a/etc/gpg.profile b/etc/gpg.profile
index 31372eb90..d711c6f3e 100644
--- a/etc/gpg.profile
+++ b/etc/gpg.profile
@@ -15,9 +15,12 @@ protocol unix
15seccomp 15seccomp
16netfilter 16netfilter
17net none 17net none
18no3d
18shell none 19shell none
19tracelog 20tracelog
20 21
22blacklist /tmp/.X11-unix
23
21# private-bin gpg,gpg-agent 24# private-bin gpg,gpg-agent
22private-tmp 25private-tmp
23private-dev 26private-dev
diff --git a/etc/highlight.profile b/etc/highlight.profile
index f95f3924a..4bab18349 100644
--- a/etc/highlight.profile
+++ b/etc/highlight.profile
@@ -13,10 +13,14 @@ protocol unix
13seccomp 13seccomp
14netfilter 14netfilter
15net none 15net none
16no3d
16shell none 17shell none
17tracelog 18tracelog
18 19
20blacklist /tmp/.X11-unix
21
19private-bin highlight 22private-bin highlight
23# private-etc none
20private-tmp 24private-tmp
21private-dev 25private-dev
22 26
diff --git a/etc/less.profile b/etc/less.profile
index 08758aead..c01dfc466 100644
--- a/etc/less.profile
+++ b/etc/less.profile
@@ -5,7 +5,10 @@ include /etc/firejail/default.profile
5 5
6net none 6net none
7nosound 7nosound
8no3d
8shell none 9shell none
9tracelog 10tracelog
10 11
12blacklist /tmp/.X11-unix
13
11private-dev 14private-dev
diff --git a/etc/lynx.profile b/etc/lynx.profile
index 6e150f62e..3e8d72103 100644
--- a/etc/lynx.profile
+++ b/etc/lynx.profile
@@ -9,12 +9,15 @@ nogroups
9nonewprivs 9nonewprivs
10noroot 10noroot
11nosound 11nosound
12no3d
12protocol unix,inet,inet6 13protocol unix,inet,inet6
13seccomp 14seccomp
14netfilter 15netfilter
15shell none 16shell none
16tracelog 17tracelog
17 18
19blacklist /tmp/.X11-unix
20
18# private-bin lynx 21# private-bin lynx
19private-tmp 22private-tmp
20private-dev 23private-dev
diff --git a/etc/mediainfo.profile b/etc/mediainfo.profile
index c07a9a9e8..65d12c49e 100644
--- a/etc/mediainfo.profile
+++ b/etc/mediainfo.profile
@@ -9,6 +9,7 @@ nogroups
9nonewprivs 9nonewprivs
10noroot 10noroot
11nosound 11nosound
12no3d
12protocol unix 13protocol unix
13seccomp 14seccomp
14netfilter 15netfilter
@@ -16,6 +17,8 @@ net none
16shell none 17shell none
17tracelog 18tracelog
18 19
20blacklist /tmp/.X11-unix
21
19private-bin mediainfo 22private-bin mediainfo
20private-tmp 23private-tmp
21private-dev 24private-dev
diff --git a/etc/mutt.profile b/etc/mutt.profile
index 2718421c5..5a714de4a 100644
--- a/etc/mutt.profile
+++ b/etc/mutt.profile
@@ -33,8 +33,11 @@ nogroups
33nonewprivs 33nonewprivs
34noroot 34noroot
35nosound 35nosound
36no3d
36protocol unix,inet,inet6 37protocol unix,inet,inet6
37seccomp 38seccomp
38shell none 39shell none
39 40
41blacklist /tmp/.X11-unix
42
40private-dev 43private-dev
diff --git a/etc/odt2txt.profile b/etc/odt2txt.profile
index 329275022..c4e28f70e 100644
--- a/etc/odt2txt.profile
+++ b/etc/odt2txt.profile
@@ -13,9 +13,12 @@ protocol unix
13seccomp 13seccomp
14netfilter 14netfilter
15net none 15net none
16no3d
16shell none 17shell none
17tracelog 18tracelog
18 19
20blacklist /tmp/.X11-unix
21
19private-bin odt2txt 22private-bin odt2txt
20private-tmp 23private-tmp
21private-dev 24private-dev
diff --git a/etc/pdftotext.profile b/etc/pdftotext.profile
index 632c9d15e..fe9e9e3cd 100644
--- a/etc/pdftotext.profile
+++ b/etc/pdftotext.profile
@@ -13,9 +13,12 @@ protocol unix
13seccomp 13seccomp
14netfilter 14netfilter
15net none 15net none
16no3d
16shell none 17shell none
17tracelog 18tracelog
18 19
20blacklist /tmp/.X11-unix
21
19private-bin pdftotext 22private-bin pdftotext
20private-tmp 23private-tmp
21private-dev 24private-dev
diff --git a/etc/ssh-agent.profile b/etc/ssh-agent.profile
index 548ede37d..bea3a6061 100644
--- a/etc/ssh-agent.profile
+++ b/etc/ssh-agent.profile
@@ -12,5 +12,8 @@ caps.drop all
12netfilter 12netfilter
13nonewprivs 13nonewprivs
14noroot 14noroot
15no3d
15protocol unix,inet,inet6 16protocol unix,inet,inet6
16seccomp 17seccomp
18
19blacklist /tmp/.X11-unix
diff --git a/etc/strings.profile b/etc/strings.profile
index 2b7724b11..2bbab1366 100644
--- a/etc/strings.profile
+++ b/etc/strings.profile
@@ -7,5 +7,6 @@ net none
7nosound 7nosound
8shell none 8shell none
9tracelog 9tracelog
10
11private-dev 10private-dev
11no3d
12blacklist /tmp/.X11-unix
diff --git a/etc/tracker.profile b/etc/tracker.profile
index 217631216..7f4f371eb 100644
--- a/etc/tracker.profile
+++ b/etc/tracker.profile
@@ -12,12 +12,15 @@ nogroups
12nonewprivs 12nonewprivs
13noroot 13noroot
14nosound 14nosound
15no3d
15protocol unix 16protocol unix
16seccomp 17seccomp
17netfilter 18netfilter
18shell none 19shell none
19tracelog 20tracelog
20 21
22blacklist /tmp/.X11-unix
23
21# private-bin tracker 24# private-bin tracker
22# private-tmp 25# private-tmp
23# private-dev 26# private-dev
diff --git a/etc/w3m.profile b/etc/w3m.profile
index d765217cf..7ee91bb70 100644
--- a/etc/w3m.profile
+++ b/etc/w3m.profile
@@ -11,12 +11,15 @@ nogroups
11nonewprivs 11nonewprivs
12noroot 12noroot
13nosound 13nosound
14no3d
14protocol unix,inet,inet6 15protocol unix,inet,inet6
15seccomp 16seccomp
16netfilter 17netfilter
17shell none 18shell none
18tracelog 19tracelog
19 20
21blacklist /tmp/.X11-unix
22
20# private-bin w3m 23# private-bin w3m
21private-tmp 24private-tmp
22private-dev 25private-dev
diff --git a/etc/wget.profile b/etc/wget.profile
index d9bca2acc..ff4b92bae 100644
--- a/etc/wget.profile
+++ b/etc/wget.profile
@@ -10,10 +10,12 @@ nonewprivs
10noroot 10noroot
11nogroups 11nogroups
12nosound 12nosound
13no3d
13protocol unix,inet,inet6 14protocol unix,inet,inet6
14seccomp 15seccomp
15shell none 16shell none
16 17
18blacklist /tmp/.X11-unix
17 19
18# private-bin wget 20# private-bin wget
19# private-etc resolv.conf 21# private-etc resolv.conf
diff --git a/etc/xpra.profile b/etc/xpra.profile
index 8584e4e5b..32be90b19 100644
--- a/etc/xpra.profile
+++ b/etc/xpra.profile
@@ -14,6 +14,8 @@ shell none
14seccomp 14seccomp
15protocol unix,inet,inet6 15protocol unix,inet,inet6
16 16
17# blacklist /tmp/.X11-unix
18
17# private-bin 19# private-bin
18private-dev 20private-dev
19private-tmp 21private-tmp