aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README1
-rw-r--r--RELNOTES4
-rw-r--r--etc/chromium.profile1
-rw-r--r--etc/conkeror.profile1
-rw-r--r--etc/deluge.profile2
-rw-r--r--etc/dnscrypt-proxy.profile1
-rw-r--r--etc/dropbox.profile2
-rw-r--r--etc/evince.profile1
-rw-r--r--etc/fbreader.profile1
-rw-r--r--etc/filezilla.profile1
-rw-r--r--etc/firefox.profile1
-rw-r--r--etc/google-chrome-beta.profile1
-rw-r--r--etc/google-chrome-unstable.profile1
-rw-r--r--etc/google-chrome.profile1
-rw-r--r--etc/midori.profile1
-rw-r--r--etc/opera-beta.profile1
-rw-r--r--etc/opera.profile1
-rw-r--r--etc/qbittorrent.profile1
-rw-r--r--etc/rtorrent.profile1
-rw-r--r--etc/skype.profile1
-rw-r--r--etc/spotify.profile1
-rw-r--r--etc/steam.profile1
-rw-r--r--etc/thunderbird.profile1
-rw-r--r--etc/transmission-gtk.profile2
-rw-r--r--etc/transmission-qt.profile1
-rw-r--r--etc/weechat.profile1
-rw-r--r--etc/wine.profile1
-rw-r--r--src/firejail/fs_trace.c5
-rw-r--r--src/firejail/profile.c4
-rw-r--r--src/man/firejail-profile.txt4
30 files changed, 42 insertions, 4 deletions
diff --git a/README b/README
index 2dc6c0768..6b0f396a3 100644
--- a/README
+++ b/README
@@ -26,6 +26,7 @@ rogshdo (https://github.com/rogshdo)
26avoidr (https://github.com/avoidr) 26avoidr (https://github.com/avoidr)
27 - whitelist fix 27 - whitelist fix
28 - recently-used.xbel fix 28 - recently-used.xbel fix
29 - added parole profile
29 - blacklist ncat, manpage fixes, 30 - blacklist ncat, manpage fixes,
30 - hostname support in profile file 31 - hostname support in profile file
31 - Google Chrome profile rework 32 - Google Chrome profile rework
diff --git a/RELNOTES b/RELNOTES
index 2a98c43a6..a799b7893 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,6 +1,6 @@
1firejail (0.9.35) baseline; urgency=low 1firejail (0.9.35) baseline; urgency=low
2 * added unbound, dnscrypt-proxy, BitlBee, HexChat, WeeChat 2 * added unbound, dnscrypt-proxy, BitlBee, HexChat, WeeChat,
3 and rtorrent profiles 3 parole and rtorrent profiles
4 * Google Chrome profile rework 4 * Google Chrome profile rework
5 * added google-chrome-stable profile 5 * added google-chrome-stable profile
6 * added google-chrome-beta profile 6 * added google-chrome-beta profile
diff --git a/etc/chromium.profile b/etc/chromium.profile
index 76dc6b234..61b75f7a6 100644
--- a/etc/chromium.profile
+++ b/etc/chromium.profile
@@ -9,6 +9,7 @@ include /etc/firejail/disable-common.inc
9# 9#
10 10
11netfilter 11netfilter
12tracelog
12whitelist ${DOWNLOADS} 13whitelist ${DOWNLOADS}
13whitelist ~/.config/chromium 14whitelist ~/.config/chromium
14whitelist ~/.cache/chromium 15whitelist ~/.cache/chromium
diff --git a/etc/conkeror.profile b/etc/conkeror.profile
index 7c1384523..dde756754 100644
--- a/etc/conkeror.profile
+++ b/etc/conkeror.profile
@@ -7,6 +7,7 @@ caps.drop all
7seccomp 7seccomp
8protocol unix,inet,inet6 8protocol unix,inet,inet6
9netfilter 9netfilter
10tracelog
10noroot 11noroot
11whitelist ~/.conkeror.mozdev.org 12whitelist ~/.conkeror.mozdev.org
12whitelist ~/Downloads 13whitelist ~/Downloads
diff --git a/etc/deluge.profile b/etc/deluge.profile
index 6ca5d33a4..98c2e4fc5 100644
--- a/etc/deluge.profile
+++ b/etc/deluge.profile
@@ -12,5 +12,7 @@ caps.drop all
12seccomp 12seccomp
13protocol unix,inet,inet6 13protocol unix,inet,inet6
14netfilter 14netfilter
15tracelog
15noroot 16noroot
16 17
18
diff --git a/etc/dnscrypt-proxy.profile b/etc/dnscrypt-proxy.profile
index e0c5c93a3..8a57a8975 100644
--- a/etc/dnscrypt-proxy.profile
+++ b/etc/dnscrypt-proxy.profile
@@ -5,4 +5,5 @@ include /etc/firejail/disable-mgmt.inc
5private 5private
6private-dev 6private-dev
7seccomp.drop mount,umount2,ptrace,kexec_load,kexec_file_load,open_by_handle_at,init_module,finit_module,delete_module,iopl,ioperm,swapon,swapoff,syslog,process_vm_readv,process_vm_writev,sysfs,_sysctl,adjtimex,clock_adjtime,lookup_dcookie,perf_event_open,fanotify_init,kcmp,add_key,request_key,keyctl,uselib,acct,modify_ldt,pivot_root,io_setup,io_destroy,io_getevents,io_submit,io_cancel,remap_file_pages,mbind,get_mempolicy,set_mempolicy,migrate_pages,move_pages,vmsplice,perf_event_open 7seccomp.drop mount,umount2,ptrace,kexec_load,kexec_file_load,open_by_handle_at,init_module,finit_module,delete_module,iopl,ioperm,swapon,swapoff,syslog,process_vm_readv,process_vm_writev,sysfs,_sysctl,adjtimex,clock_adjtime,lookup_dcookie,perf_event_open,fanotify_init,kcmp,add_key,request_key,keyctl,uselib,acct,modify_ldt,pivot_root,io_setup,io_destroy,io_getevents,io_submit,io_cancel,remap_file_pages,mbind,get_mempolicy,set_mempolicy,migrate_pages,move_pages,vmsplice,perf_event_open
8tracelog
8 9
diff --git a/etc/dropbox.profile b/etc/dropbox.profile
index 52be5a8be..c0b7e6342 100644
--- a/etc/dropbox.profile
+++ b/etc/dropbox.profile
@@ -11,3 +11,5 @@ caps
11seccomp 11seccomp
12protocol unix,inet,inet6 12protocol unix,inet,inet6
13noroot 13noroot
14tracelog
15
diff --git a/etc/evince.profile b/etc/evince.profile
index 34d8162b3..977a2bd68 100644
--- a/etc/evince.profile
+++ b/etc/evince.profile
@@ -12,3 +12,4 @@ caps.drop all
12seccomp 12seccomp
13protocol unix,inet,inet6 13protocol unix,inet,inet6
14noroot 14noroot
15tracelog
diff --git a/etc/fbreader.profile b/etc/fbreader.profile
index f94fc28df..1a530a867 100644
--- a/etc/fbreader.profile
+++ b/etc/fbreader.profile
@@ -13,5 +13,6 @@ caps.drop all
13seccomp 13seccomp
14protocol unix,inet,inet6 14protocol unix,inet,inet6
15netfilter 15netfilter
16tracelog
16noroot 17noroot
17 18
diff --git a/etc/filezilla.profile b/etc/filezilla.profile
index ba8649067..3f20fe755 100644
--- a/etc/filezilla.profile
+++ b/etc/filezilla.profile
@@ -11,5 +11,6 @@ seccomp
11protocol unix,inet,inet6 11protocol unix,inet,inet6
12noroot 12noroot
13netfilter 13netfilter
14tracelog
14 15
15 16
diff --git a/etc/firefox.profile b/etc/firefox.profile
index aa7808c37..2e8b2fa02 100644
--- a/etc/firefox.profile
+++ b/etc/firefox.profile
@@ -8,6 +8,7 @@ caps.drop all
8seccomp 8seccomp
9protocol unix,inet,inet6,netlink 9protocol unix,inet,inet6,netlink
10netfilter 10netfilter
11tracelog
11noroot 12noroot
12whitelist ${DOWNLOADS} 13whitelist ${DOWNLOADS}
13whitelist ~/.mozilla 14whitelist ~/.mozilla
diff --git a/etc/google-chrome-beta.profile b/etc/google-chrome-beta.profile
index 6122876bf..d08a5f41d 100644
--- a/etc/google-chrome-beta.profile
+++ b/etc/google-chrome-beta.profile
@@ -9,6 +9,7 @@ include /etc/firejail/disable-common.inc
9# 9#
10 10
11netfilter 11netfilter
12tracelog
12whitelist ${DOWNLOADS} 13whitelist ${DOWNLOADS}
13whitelist ~/.config/google-chrome-beta 14whitelist ~/.config/google-chrome-beta
14whitelist ~/.cache/google-chrome-beta 15whitelist ~/.cache/google-chrome-beta
diff --git a/etc/google-chrome-unstable.profile b/etc/google-chrome-unstable.profile
index 7b8b12d04..06b1399e1 100644
--- a/etc/google-chrome-unstable.profile
+++ b/etc/google-chrome-unstable.profile
@@ -9,6 +9,7 @@ include /etc/firejail/disable-common.inc
9# 9#
10 10
11netfilter 11netfilter
12tracelog
12whitelist ${DOWNLOADS} 13whitelist ${DOWNLOADS}
13whitelist ~/.config/google-chrome-unstable 14whitelist ~/.config/google-chrome-unstable
14whitelist ~/.cache/google-chrome-unstable 15whitelist ~/.cache/google-chrome-unstable
diff --git a/etc/google-chrome.profile b/etc/google-chrome.profile
index 351490d7f..7d2580116 100644
--- a/etc/google-chrome.profile
+++ b/etc/google-chrome.profile
@@ -9,6 +9,7 @@ include /etc/firejail/disable-common.inc
9# 9#
10 10
11netfilter 11netfilter
12tracelog
12whitelist ${DOWNLOADS} 13whitelist ${DOWNLOADS}
13whitelist ~/.config/google-chrome 14whitelist ~/.config/google-chrome
14whitelist ~/.cache/google-chrome 15whitelist ~/.cache/google-chrome
diff --git a/etc/midori.profile b/etc/midori.profile
index 77a6fb984..9722d0313 100644
--- a/etc/midori.profile
+++ b/etc/midori.profile
@@ -8,4 +8,5 @@ caps.drop all
8seccomp 8seccomp
9protocol unix,inet,inet6 9protocol unix,inet,inet6
10netfilter 10netfilter
11tracelog
11 12
diff --git a/etc/opera-beta.profile b/etc/opera-beta.profile
index c1672abce..ab8f55e28 100644
--- a/etc/opera-beta.profile
+++ b/etc/opera-beta.profile
@@ -5,6 +5,7 @@ include /etc/firejail/disable-secret.inc
5include /etc/firejail/disable-common.inc 5include /etc/firejail/disable-common.inc
6include /etc/firejail/disable-devel.inc 6include /etc/firejail/disable-devel.inc
7netfilter 7netfilter
8tracelog
8whitelist ~/.config/opera-beta 9whitelist ~/.config/opera-beta
9whitelist ${DOWNLOADS} 10whitelist ${DOWNLOADS}
10whitelist ~/.cache/opera-beta 11whitelist ~/.cache/opera-beta
diff --git a/etc/opera.profile b/etc/opera.profile
index a76806ed0..c307e7703 100644
--- a/etc/opera.profile
+++ b/etc/opera.profile
@@ -5,6 +5,7 @@ include /etc/firejail/disable-secret.inc
5include /etc/firejail/disable-common.inc 5include /etc/firejail/disable-common.inc
6include /etc/firejail/disable-devel.inc 6include /etc/firejail/disable-devel.inc
7netfilter 7netfilter
8tracelog
8whitelist ~/.config/opera 9whitelist ~/.config/opera
9whitelist ${DOWNLOADS} 10whitelist ${DOWNLOADS}
10whitelist ~/.cache/opera 11whitelist ~/.cache/opera
diff --git a/etc/qbittorrent.profile b/etc/qbittorrent.profile
index dd50c779e..af5a6f697 100644
--- a/etc/qbittorrent.profile
+++ b/etc/qbittorrent.profile
@@ -12,5 +12,6 @@ caps.drop all
12seccomp 12seccomp
13protocol unix,inet,inet6 13protocol unix,inet,inet6
14netfilter 14netfilter
15tracelog
15noroot 16noroot
16 17
diff --git a/etc/rtorrent.profile b/etc/rtorrent.profile
index c2c0356d9..03aa8a71f 100644
--- a/etc/rtorrent.profile
+++ b/etc/rtorrent.profile
@@ -7,4 +7,5 @@ caps.drop all
7seccomp 7seccomp
8protocol unix,inet,inet6 8protocol unix,inet,inet6
9netfilter 9netfilter
10tracelog
10noroot 11noroot
diff --git a/etc/skype.profile b/etc/skype.profile
index 4d2d042cc..f1519b0ff 100644
--- a/etc/skype.profile
+++ b/etc/skype.profile
@@ -6,6 +6,7 @@ include /etc/firejail/disable-common.inc
6include /etc/firejail/disable-devel.inc 6include /etc/firejail/disable-devel.inc
7caps.drop all 7caps.drop all
8netfilter 8netfilter
9tracelog
9noroot 10noroot
10seccomp 11seccomp
11protocol unix,inet,inet6 12protocol unix,inet,inet6
diff --git a/etc/spotify.profile b/etc/spotify.profile
index 414660857..0063564ae 100644
--- a/etc/spotify.profile
+++ b/etc/spotify.profile
@@ -16,5 +16,6 @@ caps.drop all
16seccomp 16seccomp
17protocol unix,inet,inet6 17protocol unix,inet,inet6
18netfilter 18netfilter
19tracelog
19noroot 20noroot
20 21
diff --git a/etc/steam.profile b/etc/steam.profile
index 5b9244567..af49580ce 100644
--- a/etc/steam.profile
+++ b/etc/steam.profile
@@ -7,6 +7,7 @@ include /etc/firejail/disable-common.inc
7include /etc/firejail/disable-devel.inc 7include /etc/firejail/disable-devel.inc
8caps.drop all 8caps.drop all
9netfilter 9netfilter
10tracelog
10noroot 11noroot
11seccomp 12seccomp
12protocol unix,inet,inet6 13protocol unix,inet,inet6
diff --git a/etc/thunderbird.profile b/etc/thunderbird.profile
index d234d777e..f608f5467 100644
--- a/etc/thunderbird.profile
+++ b/etc/thunderbird.profile
@@ -21,5 +21,6 @@ caps.drop all
21seccomp 21seccomp
22protocol unix,inet,inet6 22protocol unix,inet,inet6
23netfilter 23netfilter
24tracelog
24noroot 25noroot
25 26
diff --git a/etc/transmission-gtk.profile b/etc/transmission-gtk.profile
index b0dfdbfad..1245a514b 100644
--- a/etc/transmission-gtk.profile
+++ b/etc/transmission-gtk.profile
@@ -13,4 +13,6 @@ seccomp
13protocol unix,inet,inet6 13protocol unix,inet,inet6
14netfilter 14netfilter
15noroot 15noroot
16tracelog
17
16 18
diff --git a/etc/transmission-qt.profile b/etc/transmission-qt.profile
index 7aca04fe7..1af714953 100644
--- a/etc/transmission-qt.profile
+++ b/etc/transmission-qt.profile
@@ -12,5 +12,6 @@ caps.drop all
12seccomp 12seccomp
13protocol unix,inet,inet6 13protocol unix,inet,inet6
14netfilter 14netfilter
15tracelog
15noroot 16noroot
16 17
diff --git a/etc/weechat.profile b/etc/weechat.profile
index 79e3ae774..1a9fa02b3 100644
--- a/etc/weechat.profile
+++ b/etc/weechat.profile
@@ -7,4 +7,5 @@ caps.drop all
7seccomp 7seccomp
8protocol unix,inet,inet6 8protocol unix,inet,inet6
9netfilter 9netfilter
10tracelog
10noroot 11noroot
diff --git a/etc/wine.profile b/etc/wine.profile
index 8a7f66773..6d1106993 100644
--- a/etc/wine.profile
+++ b/etc/wine.profile
@@ -8,5 +8,6 @@ include /etc/firejail/disable-common.inc
8include /etc/firejail/disable-devel.inc 8include /etc/firejail/disable-devel.inc
9caps.drop all 9caps.drop all
10netfilter 10netfilter
11tracelog
11noroot 12noroot
12seccomp 13seccomp
diff --git a/src/firejail/fs_trace.c b/src/firejail/fs_trace.c
index f555a6693..55a1b9c7a 100644
--- a/src/firejail/fs_trace.c
+++ b/src/firejail/fs_trace.c
@@ -59,8 +59,11 @@ void fs_trace(void) {
59 errExit("fopen"); 59 errExit("fopen");
60 if (arg_trace) 60 if (arg_trace)
61 fprintf(fp, "%s/firejail/libtrace.so\n", LIBDIR); 61 fprintf(fp, "%s/firejail/libtrace.so\n", LIBDIR);
62 else if (arg_tracelog) 62 else if (arg_tracelog) {
63 fprintf(fp, "%s/firejail/libtracelog.so\n", LIBDIR); 63 fprintf(fp, "%s/firejail/libtracelog.so\n", LIBDIR);
64 if (!arg_quiet)
65 printf("Blacklist violations are logged to syslog\n");
66 }
64 else 67 else
65 assert(0); 68 assert(0);
66 69
diff --git a/src/firejail/profile.c b/src/firejail/profile.c
index 50fdeda7e..366a56e13 100644
--- a/src/firejail/profile.c
+++ b/src/firejail/profile.c
@@ -120,6 +120,10 @@ int profile_check_line(char *ptr, int lineno) {
120 arg_shell_none = 1; 120 arg_shell_none = 1;
121 return 0; 121 return 0;
122 } 122 }
123 else if (strcmp(ptr, "tracelog") == 0) {
124 arg_tracelog = 1;
125 return 0;
126 }
123 else if (strcmp(ptr, "private") == 0) { 127 else if (strcmp(ptr, "private") == 0) {
124 arg_private = 1; 128 arg_private = 1;
125 return 0; 129 return 0;
diff --git a/src/man/firejail-profile.txt b/src/man/firejail-profile.txt
index 90aca5130..600b82d3d 100644
--- a/src/man/firejail-profile.txt
+++ b/src/man/firejail-profile.txt
@@ -158,7 +158,9 @@ All modifications are discarded when the sandbox is closed.
158Build a new user home in a temporary filesystem, and mount-bind file_or_directory. 158Build a new user home in a temporary filesystem, and mount-bind file_or_directory.
159The modifications to file_or_directory are persistent, everything else is discarded 159The modifications to file_or_directory are persistent, everything else is discarded
160when the sandbox is closed. 160when the sandbox is closed.
161 161.TP
162\f\ tracelog
163Blacklist violations logged to syslog.
162.SH Filters 164.SH Filters
163\fBcaps\fR and \fBseccomp\fR enable Linux capabilities and seccomp filters. Examples: 165\fBcaps\fR and \fBseccomp\fR enable Linux capabilities and seccomp filters. Examples:
164 166