diff options
author | netblue30 <netblue30@yahoo.com> | 2016-12-09 08:03:06 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-09 08:03:06 -0500 |
commit | a9a9651d91931e3d012f580bc7c091091661fa3a (patch) | |
tree | f795b9f65e33ee4742a9cba26e59f04a87685ef6 | |
parent | Merge pull request #960 from valoq/master (diff) | |
parent | Extra wireshark files (diff) | |
download | firejail-a9a9651d91931e3d012f580bc7c091091661fa3a.tar.gz firejail-a9a9651d91931e3d012f580bc7c091091661fa3a.tar.zst firejail-a9a9651d91931e3d012f580bc7c091091661fa3a.zip |
Merge pull request #963 from Fred-Barclay/wireshark
Wireshark
-rw-r--r-- | README | 1 | ||||
-rw-r--r-- | README.md | 4 | ||||
-rw-r--r-- | RELNOTES | 2 | ||||
-rw-r--r-- | etc/disable-programs.inc | 1 | ||||
-rw-r--r-- | etc/wireshark.profile | 22 | ||||
-rw-r--r-- | platform/debian/conffiles | 2 | ||||
-rw-r--r-- | src/firecfg/firecfg.config | 1 |
7 files changed, 30 insertions, 3 deletions
@@ -82,6 +82,7 @@ Fred-Barclay (https://github.com/Fred-Barclay) | |||
82 | - added xiphos and Tor Browser Bundle profiles | 82 | - added xiphos and Tor Browser Bundle profiles |
83 | - added xed and pluma profiles | 83 | - added xed and pluma profiles |
84 | - added Cryptocat profile | 84 | - added Cryptocat profile |
85 | - added wireshark profile | ||
85 | valoq (https://github.com/valoq) | 86 | valoq (https://github.com/valoq) |
86 | - lots of profile fixes | 87 | - lots of profile fixes |
87 | - added support for /srv in --whitelist feature | 88 | - added support for /srv in --whitelist feature |
@@ -88,5 +88,5 @@ amarok, ark, atool, bleachbit, brasero, dolphin, dragon, elinks, enchant, exifto | |||
88 | gjs, gnome-books, gnome-clocks, gnome-documents, gnome-maps, gnome-music, gnome-photos, gnome-weather, | 88 | gjs, gnome-books, gnome-clocks, gnome-documents, gnome-maps, gnome-music, gnome-photos, gnome-weather, |
89 | goobox, gpa, gpg, gpg-agent, highlight, img2txt, k3b, kate, lynx, mediainfo, nautilus, odt2txt, pdftotext, | 89 | goobox, gpa, gpg, gpg-agent, highlight, img2txt, k3b, kate, lynx, mediainfo, nautilus, odt2txt, pdftotext, |
90 | simple-scan, skanlite, ssh-agent, tracker, transmission-cli, transmission-show, w3m, xfburn, xpra, wget, | 90 | simple-scan, skanlite, ssh-agent, tracker, transmission-cli, transmission-show, w3m, xfburn, xpra, wget, |
91 | xed, pluma, Cryptocat Bless, Gnome 2048, Gnome Calculator, Gnome Contacts, JD-GUI, Lollypop, MultiMC5, | 91 | xed, pluma, Cryptocat, Bless, Gnome 2048, Gnome Calculator, Gnome Contacts, JD-GUI, Lollypop, MultiMC5, |
92 | PDFSam, Pithos, Xonotic | 92 | PDFSam, Pithos, Xonotic, wireshark |
@@ -16,7 +16,7 @@ firejail (0.9.45) baseline; urgency=low | |||
16 | * new profiles: mumble, zoom, Guayadeque, qemu, keypass2, xed, pluma, | 16 | * new profiles: mumble, zoom, Guayadeque, qemu, keypass2, xed, pluma, |
17 | * new profiles: Cryptocat, Bless, Gnome 2048, Gnome Calculator, | 17 | * new profiles: Cryptocat, Bless, Gnome 2048, Gnome Calculator, |
18 | * new profiles: Gnome Contacts, JD-GUI, Lollypop, MultiMC5, PDFSam, Pithos, | 18 | * new profiles: Gnome Contacts, JD-GUI, Lollypop, MultiMC5, PDFSam, Pithos, |
19 | * new profies: Xonotic | 19 | * new profies: Xonotic, wireshark |
20 | * bugfixes | 20 | * bugfixes |
21 | -- netblue30 <netblue30@yahoo.com> Sun, 23 Oct 2016 08:00:00 -0500 | 21 | -- netblue30 <netblue30@yahoo.com> Sun, 23 Oct 2016 08:00:00 -0500 |
22 | 22 | ||
diff --git a/etc/disable-programs.inc b/etc/disable-programs.inc index 48701b520..a9ca487c5 100644 --- a/etc/disable-programs.inc +++ b/etc/disable-programs.inc | |||
@@ -139,6 +139,7 @@ blacklist ${HOME}/.config/vivaldi | |||
139 | blacklist ${HOME}/.config/vlc | 139 | blacklist ${HOME}/.config/vlc |
140 | blacklist ${HOME}/.config/wesnoth | 140 | blacklist ${HOME}/.config/wesnoth |
141 | blacklist ${HOME}/.config/wire | 141 | blacklist ${HOME}/.config/wire |
142 | blacklist ${HOME}/.config/wireshark | ||
142 | blacklist ${HOME}/.config/xchat | 143 | blacklist ${HOME}/.config/xchat |
143 | blacklist ${HOME}/.config/xed | 144 | blacklist ${HOME}/.config/xed |
144 | blacklist ${HOME}/.config/xfburn | 145 | blacklist ${HOME}/.config/xfburn |
diff --git a/etc/wireshark.profile b/etc/wireshark.profile new file mode 100644 index 000000000..898fc787e --- /dev/null +++ b/etc/wireshark.profile | |||
@@ -0,0 +1,22 @@ | |||
1 | # Firejail profile for | ||
2 | noblacklist ${HOME}/.config/wireshark | ||
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 | netfilter | ||
11 | nogroups | ||
12 | nonewprivs | ||
13 | noroot | ||
14 | nosound | ||
15 | protocol unix,inet,inet6,netlink | ||
16 | seccomp | ||
17 | shell none | ||
18 | tracelog | ||
19 | |||
20 | private-bin wireshark | ||
21 | private-dev | ||
22 | private-tmp | ||
diff --git a/platform/debian/conffiles b/platform/debian/conffiles index 551e7ad36..97e7cf884 100644 --- a/platform/debian/conffiles +++ b/platform/debian/conffiles | |||
@@ -27,6 +27,7 @@ | |||
27 | /etc/firejail/conkeror.profile | 27 | /etc/firejail/conkeror.profile |
28 | /etc/firejail/corebird.profile | 28 | /etc/firejail/corebird.profile |
29 | /etc/firejail/cpio.profile | 29 | /etc/firejail/cpio.profile |
30 | /etc/firejail/cryptocat.profile | ||
30 | /etc/firejail/Cryptocat.profile | 31 | /etc/firejail/Cryptocat.profile |
31 | /etc/firejail/cyberfox.profile | 32 | /etc/firejail/cyberfox.profile |
32 | /etc/firejail/deadbeef.profile | 33 | /etc/firejail/deadbeef.profile |
@@ -209,6 +210,7 @@ | |||
209 | /etc/firejail/whitelist-common.inc | 210 | /etc/firejail/whitelist-common.inc |
210 | /etc/firejail/wine.profile | 211 | /etc/firejail/wine.profile |
211 | /etc/firejail/wire.profile | 212 | /etc/firejail/wire.profile |
213 | /etc/firejail/wireshark.profile | ||
212 | /etc/firejail/xchat.profile | 214 | /etc/firejail/xchat.profile |
213 | /etc/firejail/xed.profile | 215 | /etc/firejail/xed.profile |
214 | /etc/firejail/xfburn.profile | 216 | /etc/firejail/xfburn.profile |
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config index 369abdc20..c4f52e256 100644 --- a/src/firecfg/firecfg.config +++ b/src/firecfg/firecfg.config | |||
@@ -192,6 +192,7 @@ keepass2 | |||
192 | keepassx | 192 | keepassx |
193 | pluma | 193 | pluma |
194 | tracker | 194 | tracker |
195 | wireshark | ||
195 | xiphos | 196 | xiphos |
196 | xed | 197 | xed |
197 | 198 | ||