diff options
author | netblue30 <netblue30@yahoo.com> | 2016-11-27 08:50:49 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-27 08:50:49 -0500 |
commit | 910bfdfcd823d223fa506d369a54320c45dbd129 (patch) | |
tree | 6b1acbbe3e6ccb2de334f6676fac5236c78418ed | |
parent | fixes (diff) | |
parent | additional files for pluma and xed (diff) | |
download | firejail-910bfdfcd823d223fa506d369a54320c45dbd129.tar.gz firejail-910bfdfcd823d223fa506d369a54320c45dbd129.tar.zst firejail-910bfdfcd823d223fa506d369a54320c45dbd129.zip |
Merge pull request #941 from Fred-Barclay/text_editors
Text editors
-rw-r--r-- | README | 1 | ||||
-rw-r--r-- | README.md | 13 | ||||
-rw-r--r-- | RELNOTES | 2 | ||||
-rw-r--r-- | etc/disable-programs.inc | 2 | ||||
-rw-r--r-- | etc/pluma.profile | 21 | ||||
-rw-r--r-- | etc/xed.profile | 21 | ||||
-rw-r--r-- | platform/debian/conffiles | 2 | ||||
-rw-r--r-- | src/firecfg/firecfg.config | 2 |
8 files changed, 56 insertions, 8 deletions
@@ -80,6 +80,7 @@ Fred-Barclay (https://github.com/Fred-Barclay) | |||
80 | - evince profile enhancement | 80 | - evince profile enhancement |
81 | - tightened Spotify profile | 81 | - tightened Spotify profile |
82 | - added xiphos and Tor Browser Bundle profiles | 82 | - added xiphos and Tor Browser Bundle profiles |
83 | - added xed and pluma profiles | ||
83 | valoq (https://github.com/valoq) | 84 | valoq (https://github.com/valoq) |
84 | - lots of profile fixes | 85 | - lots of profile fixes |
85 | - added support for /srv in --whitelist feature | 86 | - added support for /srv in --whitelist feature |
@@ -56,10 +56,9 @@ Use this issue to request new profiles: https://github.com/netblue30/firejail/is | |||
56 | 56 | ||
57 | ````` | 57 | ````` |
58 | ## New Profiles | 58 | ## New Profiles |
59 | xiphos, Tor Browser Bundle, display (imagemagik), Wire, mumble, zoom,Guayadeque, qemu, keypass2 | 59 | xiphos, Tor Browser Bundle, display (imagemagik), Wire, mumble, zoom, Guayadeque, qemu, keypass2, |
60 | amarok, ark, atool, bleachbit, brasero, dolphin, dragon, elinks, enchant, exiftool, file-roller, gedit | 60 | amarok, ark, atool, bleachbit, brasero, dolphin, dragon, elinks, enchant, exiftool, file-roller, gedit, |
61 | gjs, gnome-books, gnome-clocks, gnome-documents, gnome-maps, gnome-music, gnome-photos, gnome-weather | 61 | gjs, gnome-books, gnome-clocks, gnome-documents, gnome-maps, gnome-music, gnome-photos, gnome-weather, |
62 | goobox, gpa, gpg, gpg-agent, highlight, img2txt, k3b, kate, lynx, mediainfo, nautilus, odt2txt, pdftotext | 62 | goobox, gpa, gpg, gpg-agent, highlight, img2txt, k3b, kate, lynx, mediainfo, nautilus, odt2txt, pdftotext, |
63 | simple-scan, skanlite, ssh-agent, tracker, transmission-cli, transmission-show, w3m, xfburn, xpra, wget | 63 | simple-scan, skanlite, ssh-agent, tracker, transmission-cli, transmission-show, w3m, xfburn, xpra, wget, |
64 | 64 | xed, pluma | |
65 | |||
@@ -10,7 +10,7 @@ firejail (0.9.45) baseline; urgency=low | |||
10 | * feature: AppImage type 2 support | 10 | * feature: AppImage type 2 support |
11 | * feature: test coverage (gcov) support | 11 | * feature: test coverage (gcov) support |
12 | * new profiles: xiphos, Tor Browser Bundle, display (imagemagik), Wire, | 12 | * new profiles: xiphos, Tor Browser Bundle, display (imagemagik), Wire, |
13 | * new profiles: mumble, zoom, Guayadeque, qemu, keypass2 | 13 | * new profiles: mumble, zoom, Guayadeque, qemu, keypass2, xed, pluma |
14 | * bugfixes | 14 | * bugfixes |
15 | -- netblue30 <netblue30@yahoo.com> Sun, 23 Oct 2016 08:00:00 -0500 | 15 | -- netblue30 <netblue30@yahoo.com> Sun, 23 Oct 2016 08:00:00 -0500 |
16 | 16 | ||
diff --git a/etc/disable-programs.inc b/etc/disable-programs.inc index f4e66dc66..e2b7a4929 100644 --- a/etc/disable-programs.inc +++ b/etc/disable-programs.inc | |||
@@ -23,6 +23,8 @@ blacklist ${HOME}/.config/xviewer | |||
23 | blacklist ${HOME}/.config/libreoffice | 23 | blacklist ${HOME}/.config/libreoffice |
24 | blacklist ${HOME}/.config/pix | 24 | blacklist ${HOME}/.config/pix |
25 | blacklist ${HOME}/.config/mate/eom | 25 | blacklist ${HOME}/.config/mate/eom |
26 | blacklist ${HOME}/.config/xed | ||
27 | blacklist %{HOME}/.config/pluma | ||
26 | blacklist ${HOME}/.kde/share/apps/okular | 28 | blacklist ${HOME}/.kde/share/apps/okular |
27 | blacklist ${HOME}/.kde/share/config/okularrc | 29 | blacklist ${HOME}/.kde/share/config/okularrc |
28 | blacklist ${HOME}/.kde/share/config/okularpartrc | 30 | blacklist ${HOME}/.kde/share/config/okularpartrc |
diff --git a/etc/pluma.profile b/etc/pluma.profile new file mode 100644 index 000000000..895cc2369 --- /dev/null +++ b/etc/pluma.profile | |||
@@ -0,0 +1,21 @@ | |||
1 | # Firejail profile for Xed | ||
2 | noblacklist ${HOME}/.config/pluma | ||
3 | |||
4 | include /etc/firejail/disable-common.inc | ||
5 | include /etc/firejail/disable-programs.inc | ||
6 | include /etc/firejail/disable-devel.inc | ||
7 | include /etc/firejail/disable-passwdmgr.inc | ||
8 | |||
9 | caps.drop all | ||
10 | net none | ||
11 | nogroups | ||
12 | nonewprivs | ||
13 | noroot | ||
14 | nosound | ||
15 | seccomp | ||
16 | shell none | ||
17 | tracelog | ||
18 | |||
19 | private-bin pluma | ||
20 | private-dev | ||
21 | private-tmp | ||
diff --git a/etc/xed.profile b/etc/xed.profile new file mode 100644 index 000000000..051710a70 --- /dev/null +++ b/etc/xed.profile | |||
@@ -0,0 +1,21 @@ | |||
1 | # Firejail profile for Xed | ||
2 | noblacklist ${HOME}/.config/xed | ||
3 | |||
4 | include /etc/firejail/disable-common.inc | ||
5 | include /etc/firejail/disable-programs.inc | ||
6 | include /etc/firejail/disable-devel.inc | ||
7 | include /etc/firejail/disable-passwdmgr.inc | ||
8 | |||
9 | caps.drop all | ||
10 | net none | ||
11 | nogroups | ||
12 | nonewprivs | ||
13 | noroot | ||
14 | nosound | ||
15 | seccomp | ||
16 | shell none | ||
17 | tracelog | ||
18 | |||
19 | private-bin xed | ||
20 | private-dev | ||
21 | private-tmp | ||
diff --git a/platform/debian/conffiles b/platform/debian/conffiles index 2c1164a43..5776f3889 100644 --- a/platform/debian/conffiles +++ b/platform/debian/conffiles | |||
@@ -148,6 +148,7 @@ | |||
148 | /etc/firejail/pdftotext.profile | 148 | /etc/firejail/pdftotext.profile |
149 | /etc/firejail/pidgin.profile | 149 | /etc/firejail/pidgin.profile |
150 | /etc/firejail/pix.profile | 150 | /etc/firejail/pix.profile |
151 | /etc/firejail/pluma.profile | ||
151 | /etc/firejail/polari.profile | 152 | /etc/firejail/polari.profile |
152 | /etc/firejail/psi-plus.profile | 153 | /etc/firejail/psi-plus.profile |
153 | /etc/firejail/qbittorrent.profile | 154 | /etc/firejail/qbittorrent.profile |
@@ -208,6 +209,7 @@ | |||
208 | /etc/firejail/wine.profile | 209 | /etc/firejail/wine.profile |
209 | /etc/firejail/wire.profile | 210 | /etc/firejail/wire.profile |
210 | /etc/firejail/xchat.profile | 211 | /etc/firejail/xchat.profile |
212 | /etc/firejail/xed.profile | ||
211 | /etc/firejail/xfburn.profile | 213 | /etc/firejail/xfburn.profile |
212 | /etc/firejail/xiphos.profile | 214 | /etc/firejail/xiphos.profile |
213 | /etc/firejail/xpdf.profile | 215 | /etc/firejail/xpdf.profile |
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config index c6a2bad83..764e9e501 100644 --- a/src/firecfg/firecfg.config +++ b/src/firecfg/firecfg.config | |||
@@ -195,9 +195,11 @@ ranger | |||
195 | keepass | 195 | keepass |
196 | keepass2 | 196 | keepass2 |
197 | keepassx | 197 | keepassx |
198 | pluma | ||
198 | ssh | 199 | ssh |
199 | tracker | 200 | tracker |
200 | xiphos | 201 | xiphos |
202 | xed | ||
201 | xpra | 203 | xpra |
202 | 204 | ||
203 | # weather/climate | 205 | # weather/climate |