diff options
author | netblue30 <netblue30@yahoo.com> | 2017-02-20 11:01:47 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-20 11:01:47 -0500 |
commit | a1670beeea375ac01611c170bce451630b42657d (patch) | |
tree | acef4eed556ae5e35597f4009de4900110800a7f | |
parent | fix kino profile chekcin (diff) | |
parent | extra thunar files (diff) | |
download | firejail-a1670beeea375ac01611c170bce451630b42657d.tar.gz firejail-a1670beeea375ac01611c170bce451630b42657d.tar.zst firejail-a1670beeea375ac01611c170bce451630b42657d.zip |
Merge pull request #1108 from Fred-Barclay/thunar
Thunar
-rw-r--r-- | README | 3 | ||||
-rw-r--r-- | README.md | 4 | ||||
-rw-r--r-- | RELNOTES | 2 | ||||
-rw-r--r-- | etc/Thunar.profile | 23 | ||||
-rw-r--r-- | etc/disable-programs.inc | 2 | ||||
-rw-r--r-- | etc/thunar.profile | 1 | ||||
-rw-r--r-- | platform/debian/conffiles | 2 | ||||
-rw-r--r-- | src/firecfg/firecfg.config | 2 |
8 files changed, 34 insertions, 5 deletions
@@ -98,6 +98,7 @@ Fred-Barclay (https://github.com/Fred-Barclay) | |||
98 | - fixed palemoon and qbittorrent profiles | 98 | - fixed palemoon and qbittorrent profiles |
99 | - compile/install scripts for --git-install/--git-uninstall commands | 99 | - compile/install scripts for --git-install/--git-uninstall commands |
100 | - tighten keepassx | 100 | - tighten keepassx |
101 | - added Thunar profile | ||
101 | valoq (https://github.com/valoq) | 102 | valoq (https://github.com/valoq) |
102 | - lots of profile fixes | 103 | - lots of profile fixes |
103 | - added support for /srv in --whitelist feature | 104 | - added support for /srv in --whitelist feature |
@@ -407,4 +408,4 @@ pstn (https://github.com/pstn) | |||
407 | Alexey Kuznetsov (kuznet@ms2.inr.ac.ru) | 408 | Alexey Kuznetsov (kuznet@ms2.inr.ac.ru) |
408 | - src/lib/libnetlink.c extracted from iproute2 software package | 409 | - src/lib/libnetlink.c extracted from iproute2 software package |
409 | 410 | ||
410 | Copyright (C) 2014-2016 Firejail Authors | 411 | Copyright (C) 2014-2017 Firejail Authors |
@@ -155,6 +155,4 @@ goobox, gpa, gpg, gpg-agent, highlight, img2txt, k3b, kate, lynx, mediainfo, nau | |||
155 | simple-scan, skanlite, ssh-agent, tracker, transmission-cli, transmission-show, w3m, xfburn, xpra, wget, | 155 | simple-scan, skanlite, ssh-agent, tracker, transmission-cli, transmission-show, w3m, xfburn, xpra, wget, |
156 | xed, pluma, Cryptocat, Bless, Gnome 2048, Gnome Calculator, Gnome Contacts, JD-GUI, Lollypop, MultiMC5, | 156 | xed, pluma, Cryptocat, Bless, Gnome 2048, Gnome Calculator, Gnome Contacts, JD-GUI, Lollypop, MultiMC5, |
157 | PDFSam, Pithos, Xonotic, wireshark, keepassx2, QupZilla, FossaMail, Uzbl browser, xmms, iridium browser, | 157 | PDFSam, Pithos, Xonotic, wireshark, keepassx2, QupZilla, FossaMail, Uzbl browser, xmms, iridium browser, |
158 | Kino | 158 | Kino, Thunar |
159 | |||
160 | |||
@@ -36,7 +36,7 @@ firejail (0.9.45) baseline; urgency=low | |||
36 | * new profiles: Cryptocat, Bless, Gnome 2048, Gnome Calculator, | 36 | * new profiles: Cryptocat, Bless, Gnome 2048, Gnome Calculator, |
37 | * new profiles: Gnome Contacts, JD-GUI, Lollypop, MultiMC5, PDFSam, Pithos, | 37 | * new profiles: Gnome Contacts, JD-GUI, Lollypop, MultiMC5, PDFSam, Pithos, |
38 | * new profies: Xonotic, wireshark, keepassx2, QupZilla, FossaMail, | 38 | * new profies: Xonotic, wireshark, keepassx2, QupZilla, FossaMail, |
39 | * new profiles: Uzbl browser, iridium browser | 39 | * new profiles: Uzbl browser, iridium browser, Thunar |
40 | * bugfixes | 40 | * bugfixes |
41 | -- netblue30 <netblue30@yahoo.com> Sun, 23 Oct 2016 08:00:00 -0500 | 41 | -- netblue30 <netblue30@yahoo.com> Sun, 23 Oct 2016 08:00:00 -0500 |
42 | 42 | ||
diff --git a/etc/Thunar.profile b/etc/Thunar.profile new file mode 100644 index 000000000..5a27177e0 --- /dev/null +++ b/etc/Thunar.profile | |||
@@ -0,0 +1,23 @@ | |||
1 | # This file is overwritten during software install. | ||
2 | # Persistent customizations should go in a .local file. | ||
3 | include /etc/firejail/Thunar.local | ||
4 | |||
5 | # Firejail profile for thunar | ||
6 | noblacklist ~/.config/Thunar | ||
7 | noblacklist ~/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml | ||
8 | |||
9 | include /etc/firejail/disable-common.inc | ||
10 | include /etc/firejail/disable-programs.inc | ||
11 | include /etc/firejail/disable-devel.inc | ||
12 | include /etc/firejail/disable-passwdmgr.inc | ||
13 | |||
14 | caps.drop all | ||
15 | netfilter | ||
16 | nogroups | ||
17 | nonewprivs | ||
18 | noroot | ||
19 | nosound | ||
20 | protocol unix | ||
21 | seccomp | ||
22 | shell none | ||
23 | tracelog | ||
diff --git a/etc/disable-programs.inc b/etc/disable-programs.inc index 802812fe7..cf654825a 100644 --- a/etc/disable-programs.inc +++ b/etc/disable-programs.inc | |||
@@ -70,6 +70,7 @@ blacklist ${HOME}/.config/Mumble | |||
70 | blacklist ${HOME}/.config/QuiteRss | 70 | blacklist ${HOME}/.config/QuiteRss |
71 | blacklist ${HOME}/.config/QuiteRssrc | 71 | blacklist ${HOME}/.config/QuiteRssrc |
72 | blacklist ${HOME}/.config/Slack | 72 | blacklist ${HOME}/.config/Slack |
73 | blacklist ${HOME}/.config/Thunar | ||
73 | blacklist ${HOME}/.config/VirtualBox | 74 | blacklist ${HOME}/.config/VirtualBox |
74 | blacklist ${HOME}/.config/Wire | 75 | blacklist ${HOME}/.config/Wire |
75 | blacklist ${HOME}/.config/ardour4 | 76 | blacklist ${HOME}/.config/ardour4 |
@@ -149,6 +150,7 @@ blacklist ${HOME}/.config/wireshark | |||
149 | blacklist ${HOME}/.config/xchat | 150 | blacklist ${HOME}/.config/xchat |
150 | blacklist ${HOME}/.config/xed | 151 | blacklist ${HOME}/.config/xed |
151 | blacklist ${HOME}/.config/xfburn | 152 | blacklist ${HOME}/.config/xfburn |
153 | blacklist ${HOME}/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml | ||
152 | blacklist ${HOME}/.config/xplayer | 154 | blacklist ${HOME}/.config/xplayer |
153 | blacklist ${HOME}/.config/xreader | 155 | blacklist ${HOME}/.config/xreader |
154 | blacklist ${HOME}/.config/xviewer | 156 | blacklist ${HOME}/.config/xviewer |
diff --git a/etc/thunar.profile b/etc/thunar.profile new file mode 100644 index 000000000..868f80912 --- /dev/null +++ b/etc/thunar.profile | |||
@@ -0,0 +1 @@ | |||
include /etc/firejail/Thunar.profile | |||
diff --git a/platform/debian/conffiles b/platform/debian/conffiles index e004e93ce..edaf1781b 100644 --- a/platform/debian/conffiles +++ b/platform/debian/conffiles | |||
@@ -247,3 +247,5 @@ | |||
247 | /etc/firejail/iridium-browser.profile | 247 | /etc/firejail/iridium-browser.profile |
248 | /etc/firejail/iridium.profile | 248 | /etc/firejail/iridium.profile |
249 | /etc/firejail/kino.profile | 249 | /etc/firejail/kino.profile |
250 | /etc/firejail/Thunar.profile | ||
251 | /etc/firejail/thunar.profile | ||
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config index d5030bae0..7c959cd04 100644 --- a/src/firecfg/firecfg.config +++ b/src/firecfg/firecfg.config | |||
@@ -191,6 +191,8 @@ keepass2 | |||
191 | keepassx | 191 | keepassx |
192 | keepassx2 | 192 | keepassx2 |
193 | pluma | 193 | pluma |
194 | Thunar | ||
195 | thunar | ||
194 | tracker | 196 | tracker |
195 | wireshark | 197 | wireshark |
196 | xiphos | 198 | xiphos |