From 208c080989d6ff593270242fcfeda909203693b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= <raphael@offensive-security.com>
Date: Thu, 29 Oct 2020 15:38:40 +0100
Subject: [PATCH] Ensure initial user is part of kaboxer group

---
 .../usr/lib/live/config/0031-kali-user-setup  |  9 ++++++
 simple-cdd/profiles/kali.postinst             | 28 +++++++++++++++----
 2 files changed, 32 insertions(+), 5 deletions(-)

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 04f19a7..8b941f9 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
@@ -12,8 +12,17 @@ configure_zsh() {
     chsh --shell /usr/bin/zsh kali
 }
 
+configure_kaboxer() {
+    addgroup --system kaboxer || true  # Ensures the group exists
+
+    adduser kali kaboxer
+}
+
 # Set "kali" as password for the user kali
 usermod -p 'AqLUsDitNnTsw' kali
 
 # Change default shell to zsh
 configure_zsh
+
+# Add kali user to the kaboxer group
+configure_kaboxer
diff --git a/simple-cdd/profiles/kali.postinst b/simple-cdd/profiles/kali.postinst
index 6be8adc..ee3d72c 100755
--- a/simple-cdd/profiles/kali.postinst
+++ b/simple-cdd/profiles/kali.postinst
@@ -18,6 +18,16 @@ END
     apt-get update
 }
 
+get_user_list() {
+    for user in $(cd /home && ls); do
+	if ! getent passwd "$user" >/dev/null; then
+	    echo "WARNING: user '$user' is invalid but /home/$user exists"
+	    continue
+	fi
+	echo "$user"
+    done
+}
+
 configure_zsh() {
     if grep -q 'nozsh' /proc/cmdline; then
 	echo "INFO: user opted out of zsh by default"
@@ -27,15 +37,23 @@ configure_zsh() {
 	echo "INFO: /usr/bin/zsh is not available"
 	return
     fi
-    for user in $(cd /home && ls); do
-	if ! getent passwd $user >/dev/null; then
-	    echo "WARNING: user '$user' is invalid but /home/$user exists"
-	    continue
-	fi
+    for user in $(get_user_list); do
 	echo "INFO: changing default shell of user '$user' to zsh"
 	chsh --shell /usr/bin/zsh $user
     done
 }
 
+configure_kaboxer() {
+    # Create the group if needed
+    addgroup --system kaboxer || 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
+}
+
 configure_sources_list
 configure_zsh
+configure_kaboxer