From 11dfdae854bb483758aa9b53945a5b639a3b1227 Mon Sep 17 00:00:00 2001
From: Steev Klimaszewski <steev@kali.org>
Date: Fri, 2 Apr 2021 11:30:06 -0500
Subject: [PATCH] Install wireshark setuid

This installs wireshark setuid and also adds the kali (or user chosen during installation) to the wireshark group.
---
 bin/kali-finish-install                                      | 5 ++++-
 .../includes.chroot/usr/lib/live/config/0031-kali-user-setup | 3 ++-
 kali-config/common/includes.installer/preseed.cfg            | 2 +-
 kali-config/common/preseed/kali.cfg.chroot                   | 2 ++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/bin/kali-finish-install b/bin/kali-finish-install
index 0babf39..1aaac7a 100755
--- a/bin/kali-finish-install
+++ b/bin/kali-finish-install
@@ -55,10 +55,13 @@ configure_zsh() {
 configure_usergroups() {
   # Create the kaboxer group if needed
   addgroup --system kaboxer || true
+  # Create the wireshark group if needed
+  addgroup --system wireshark || true
 
   # kaboxer - for kaboxer
   # dialout - for serial access
-  kali_groups="kaboxer,dialout"
+  # wireshark - capture sessions in wireshark
+  kali_groups="kaboxer,dialout,wireshark"
 
   for user in $(get_user_list); do
       echo "INFO: adding user '$user' to groups '$kali_groups'"
diff --git a/kali-config/common/includes.chroot/usr/lib/live/config/0031-kali-user-setup b/kali-config/common/includes.chroot/usr/lib/live/config/0031-kali-user-setup
index fccc5a5..31accfe 100755
--- a/kali-config/common/includes.chroot/usr/lib/live/config/0031-kali-user-setup
+++ b/kali-config/common/includes.chroot/usr/lib/live/config/0031-kali-user-setup
@@ -17,7 +17,8 @@ configure_usergroups() {
     addgroup --system kaboxer || true  # Ensures the group exists
     # kaboxer - for kaboxer
     # dialout - for serial port access
-    kali_groups="kaboxer,dialout"
+    # wireshark - capture sessions without being root
+    kali_groups="kaboxer,dialout,wireshark"
 
     usermod -a -G $kali_groups kali
 }
diff --git a/kali-config/common/includes.installer/preseed.cfg b/kali-config/common/includes.installer/preseed.cfg
index be02641..ba059eb 100644
--- a/kali-config/common/includes.installer/preseed.cfg
+++ b/kali-config/common/includes.installer/preseed.cfg
@@ -54,6 +54,6 @@ samba-common samba-common/dhcp boolean false
 macchanger macchanger/automatically_run boolean false
 kismet-capture-common kismet-capture-common/install-users string 
 kismet-capture-common kismet-capture-common/install-setuid boolean true
-wireshark-common wireshark-common/install-setuid boolean false
+wireshark-common wireshark-common/install-setuid boolean true
 sslh sslh/inetd_or_standalone select standalone
 atftpd atftpd/use_inetd boolean false
diff --git a/kali-config/common/preseed/kali.cfg.chroot b/kali-config/common/preseed/kali.cfg.chroot
index e3d3e95..7c1d27e 100644
--- a/kali-config/common/preseed/kali.cfg.chroot
+++ b/kali-config/common/preseed/kali.cfg.chroot
@@ -3,3 +3,5 @@
 # Do not register it in inetd so that its status can be controlled
 # individually
 atftpd atftpd/use_inetd boolean false
+# Install wireshark setuid
+wireshark-common wireshark-common/install-setuid boolean true