From e470475f021f1a7e91e46c61ab68a01c4bd631eb Mon Sep 17 00:00:00 2001
From: Ben <g0tmi1k@kakli.org>
Date: Tue, 11 May 2021 15:18:12 +0100
Subject: [PATCH] Update default generated files

---
 .../includes.installer/kali-finish-install    | 25 ++++++++++++-------
 simple-cdd/profiles/kali.postinst             | 25 ++++++++++++-------
 2 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/kali-config/common/includes.installer/kali-finish-install b/kali-config/common/includes.installer/kali-finish-install
index 462ba03..1aaac7a 100755
--- a/kali-config/common/includes.installer/kali-finish-install
+++ b/kali-config/common/includes.installer/kali-finish-install
@@ -51,17 +51,24 @@ configure_zsh() {
     done
 }
 
-configure_kaboxer() {
-    # Create the group if needed
-    addgroup --system kaboxer || true
+# This is generically named in case we want to add other groups in the future.
+configure_usergroups() {
+  # Create the kaboxer group if needed
+  addgroup --system kaboxer || true
+  # Create the wireshark group if needed
+  addgroup --system wireshark || true
 
-    # Add the users to the group
-    for user in $(get_user_list); do
-	echo "INFO: adding user '$user' to group 'kaboxer'"
-	adduser $user kaboxer || true
-    done
+  # kaboxer - for kaboxer
+  # dialout - for serial access
+  # 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'"
+      usermod -a -G "$kali_groups" $user || true
+  done
 }
 
 configure_sources_list
 configure_zsh
-configure_kaboxer
+configure_usergroups
diff --git a/simple-cdd/profiles/kali.postinst b/simple-cdd/profiles/kali.postinst
index 462ba03..1aaac7a 100755
--- a/simple-cdd/profiles/kali.postinst
+++ b/simple-cdd/profiles/kali.postinst
@@ -51,17 +51,24 @@ configure_zsh() {
     done
 }
 
-configure_kaboxer() {
-    # Create the group if needed
-    addgroup --system kaboxer || true
+# This is generically named in case we want to add other groups in the future.
+configure_usergroups() {
+  # Create the kaboxer group if needed
+  addgroup --system kaboxer || true
+  # Create the wireshark group if needed
+  addgroup --system wireshark || true
 
-    # Add the users to the group
-    for user in $(get_user_list); do
-	echo "INFO: adding user '$user' to group 'kaboxer'"
-	adduser $user kaboxer || true
-    done
+  # kaboxer - for kaboxer
+  # dialout - for serial access
+  # 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'"
+      usermod -a -G "$kali_groups" $user || true
+  done
 }
 
 configure_sources_list
 configure_zsh
-configure_kaboxer
+configure_usergroups