Merge pull request #2 from kforney/master

Cleanup and add the rest of the desktop environments.

Former-commit-id: 71af74f4cacba227c8a3ff66a2d7b404bad83a7c

config/software.list.chroot

@@ -1,22 +1,31 @@
+#System utilities
 open-vm-tools-desktop
-libreoffice
-fuse
-guake
-htop
 exfat-fuse
 exfat-utils
+guake
+htop
 apt-file
-tor
-proxychains
-scrub
-vega
-bleachbit
-metagoofil
-screenfetch
-cherrytree
 cups
 cups-client
 foomatic-db
 cockpit
 fwbuilder
-gimp
+ufw
+
+#Privacy tools
+tor
+proxychains
+scrub
+bleachbit
+
+#Extra pentesting tools
+vega
+metagoofil
+
+#Office/productivity tools
+screenfetch
+cherrytree
+libreoffice
+gimp
+audacity
+vlc

debs/code_1.26.1-1534444688_amd64.deb.REMOVED.git-id

@@ -1 +0,0 @@
-2b42038ffa021a427f2708223949d41cca25782e

debs/code_1.27.2-1536736588_amd64.deb.REMOVED.git-id

@@ -0,0 +1 @@
+2566de50bf26552ae21eb4a31e54307e36b66e8d

filesystem/etc/ssh/sshd_config

@@ -0,0 +1,121 @@
+#	$OpenBSD: sshd_config,v 1.103 2018/04/09 20:41:22 tj Exp $
+
+# This is the sshd server system-wide configuration file.  See
+# sshd_config(5) for more information.
+
+# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin
+
+# The strategy used for options in the default sshd_config shipped with
+# OpenSSH is to specify options with their default value where
+# possible, but leave them commented.  Uncommented options override the
+# default value.
+
+#Port 22
+#AddressFamily any
+#ListenAddress 0.0.0.0
+#ListenAddress ::
+
+#HostKey /etc/ssh/ssh_host_rsa_key
+#HostKey /etc/ssh/ssh_host_ecdsa_key
+#HostKey /etc/ssh/ssh_host_ed25519_key
+
+# Ciphers and keying
+#RekeyLimit default none
+
+# Logging
+#SyslogFacility AUTH
+#LogLevel INFO
+
+# Authentication:
+
+#LoginGraceTime 2m
+PermitRootLogin yes
+#StrictModes yes
+#MaxAuthTries 6
+#MaxSessions 10
+
+#PubkeyAuthentication yes
+
+# Expect .ssh/authorized_keys2 to be disregarded by default in future.
+#AuthorizedKeysFile	.ssh/authorized_keys .ssh/authorized_keys2
+
+#AuthorizedPrincipalsFile none
+
+#AuthorizedKeysCommand none
+#AuthorizedKeysCommandUser nobody
+
+# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts
+#HostbasedAuthentication no
+# Change to yes if you don't trust ~/.ssh/known_hosts for
+# HostbasedAuthentication
+#IgnoreUserKnownHosts no
+# Don't read the user's ~/.rhosts and ~/.shosts files
+#IgnoreRhosts yes
+
+# To disable tunneled clear text passwords, change to no here!
+#PasswordAuthentication yes
+#PermitEmptyPasswords no
+
+# Change to yes to enable challenge-response passwords (beware issues with
+# some PAM modules and threads)
+ChallengeResponseAuthentication no
+
+# Kerberos options
+#KerberosAuthentication no
+#KerberosOrLocalPasswd yes
+#KerberosTicketCleanup yes
+#KerberosGetAFSToken no
+
+# GSSAPI options
+#GSSAPIAuthentication no
+#GSSAPICleanupCredentials yes
+#GSSAPIStrictAcceptorCheck yes
+#GSSAPIKeyExchange no
+
+# Set this to 'yes' to enable PAM authentication, account processing,
+# and session processing. If this is enabled, PAM authentication will
+# be allowed through the ChallengeResponseAuthentication and
+# PasswordAuthentication.  Depending on your PAM configuration,
+# PAM authentication via ChallengeResponseAuthentication may bypass
+# the setting of "PermitRootLogin without-password".
+# If you just want the PAM account and session checks to run without
+# PAM authentication, then enable this but set PasswordAuthentication
+# and ChallengeResponseAuthentication to 'no'.
+UsePAM yes
+
+#AllowAgentForwarding yes
+#AllowTcpForwarding yes
+#GatewayPorts no
+X11Forwarding yes
+#X11DisplayOffset 10
+#X11UseLocalhost yes
+#PermitTTY yes
+PrintMotd no
+#PrintLastLog yes
+#TCPKeepAlive yes
+#PermitUserEnvironment no
+#Compression delayed
+#ClientAliveInterval 0
+#ClientAliveCountMax 3
+#UseDNS no
+#PidFile /var/run/sshd.pid
+#MaxStartups 10:30:100
+#PermitTunnel no
+#ChrootDirectory none
+#VersionAddendum none
+
+# no default banner path
+#Banner none
+
+# Allow client to pass locale environment variables
+AcceptEnv LANG LC_*
+
+# override default of no subsystems
+Subsystem	sftp	/usr/lib/openssh/sftp-server
+
+# Example of overriding settings on a per-user basis
+#Match User anoncvs
+#	X11Forwarding no
+#	AllowTcpForwarding no
+#	PermitTTY no
+#	ForceCommand cvs server

modules/live-build-config/kali-config/variant-mate/package-lists/kali.list.chroot

@@ -29,3 +29,5 @@ xorg
 mate-archive-keyring
 #endif
 mate-desktop-environment
+gdm3
+mate-tweak

modules/parrot-build/templates/parrot-variant-cinnamon/package-lists/parrot-cinnamon.list.chroot

@@ -13,7 +13,6 @@ torchat
 vlc
 mpv
 electrum
-electrum-ltc
 
 ## desktop environment
 parrot-cinnamon

modules/parrot-build/templates/parrot-variant-lxde/package-lists/parrot-lxde.list.chroot

@@ -12,7 +12,6 @@ torchat
 vlc
 mpv
 electrum
-electrum-ltc
 
 ## desktop environment
 parrot-lxde

modules/parrot-build/templates/parrot-variant-xfce/package-lists/parrot-xfce.list.chroot

@@ -13,7 +13,6 @@ vlc
 mpv
 galculator
 electrum
-electrum-ltc
 
 ## desktop environment
 parrot-xfce

runme.sh

@@ -15,11 +15,13 @@ whiptail --backtitle "Pentest Build Script" --title "Welcome" --msgbox "This scr
 
 DISTRO=$(lsb_release -i -s)
 
-DESKTOP=$(whiptail --backtitle "Pentest Build Script" --title "Desktop Environment" --menu "Choose a desktop environment:" 10 40 4 \
+DESKTOP=$(whiptail --backtitle "Pentest Build Script" --title "Desktop Environment" --menu "Choose a desktop:" 15 50 6 \
-"gnome" "GNOME" \
+"gnome" "GNOME Desktop Environment" \
-"mate"  "MATE Desktop Environment" \
+"mate"  "MATE Advanced Traditional Environment" \
 "cinnamon"  "Cinnamon Desktop Environment" \
-"kde" "K Desktop Environment" 3>&1 1>&2 2>&3)
+"kde" "K Desktop Environment" \
+"xfce" "Xfce Desktop Environment" \
+"lxde" "Lightweight X11 Desktop Environment" 3>&1 1>&2 2>&3)
 
 REPO=$(whiptail --backtitle "Pentest Build Script" --title "Repository" --menu "Which repository are you going to use?" 10 60 2 \
 "default" "The distribution's default repository" \
@@ -57,7 +59,7 @@ Kali)
     cp -rv filesystem/* ./build/live-build-config/kali-config/common/includes.chroot/
     cp config/02-unattended-boot.binary ./build/live-build-config/kali-config/common/includes.installer/
     cp config/preseed.cfg ./build/live-build-config/kali-config/common/includes.installer/
-    cp config/software.list.chroot ./build/live-build-config/kali-config/variant-$DESKTOP/
+    cp config/software.list.chroot ./build/live-build-config/kali-config/variant-$DESKTOP/package-lists/
 
     if [ $REPO != "default" ];
     then
@@ -65,7 +67,6 @@ Kali)
     fi
 
     cd build/live-build-config
-    pause "Are you all ready to build?  Hit enter when you're ready (this will take a while...)"
     ./build.sh --distribution kali-rolling --variant $DESKTOP --verbose
     cp images/*.iso ../../images/
 ;;
@@ -74,7 +75,7 @@ Parrot)
     mkdir ./build/parrot-build/templates/parrot-variant-$DESKTOP/packages.chroot
     cp ./debs/*.deb build/parrot-build/templates/parrot-variant-$DESKTOP/packages.chroot/
     cp -rv filesystem/* ./build/parrot-build/templates/common/includes.chroot/
-    cp config/software.list.chroot ./build/parrot-build/templates/parrot-variant-$DESKTOP/
+    cp config/software.list.chroot ./build/parrot-build/templates/parrot-variant-$DESKTOP/package-lists/
 
     if [ $REPO != "default" ];
     then
@@ -83,9 +84,8 @@ Parrot)
     fi
 
     cd build/parrot-build
-    pause "Are you all ready to build?  Hit enter when you're ready (this will take a while...)"
     ./build.sh build variant-$DESKTOP amd64
-    cp *.iso ../../images/
+    cp ../*.iso ../../images/
 ;;
 esac