From 29e8c85049d3bffecd6eba0a1f3c585d1cd030b5 Mon Sep 17 00:00:00 2001 From: Kaj Forney Date: Wed, 26 Sep 2018 17:27:02 -0600 Subject: [PATCH 1/6] Fix MATE and additional software installation. Former-commit-id: a0df6c1457467169593524aef1ae02e1ed7fdd68 --- .../kali-config/variant-mate/package-lists/kali.list.chroot | 2 ++ runme.sh | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/live-build-config/kali-config/variant-mate/package-lists/kali.list.chroot b/modules/live-build-config/kali-config/variant-mate/package-lists/kali.list.chroot index 9a4e749f..4d63b199 100644 --- a/modules/live-build-config/kali-config/variant-mate/package-lists/kali.list.chroot +++ b/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 diff --git a/runme.sh b/runme.sh index 7bcf686f..f5403d0a 100755 --- a/runme.sh +++ b/runme.sh @@ -57,7 +57,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 @@ -74,7 +74,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 From 0002f9d9b5bf7fb76dc5d6f61a6c7d91f36554c5 Mon Sep 17 00:00:00 2001 From: Kaj Forney Date: Wed, 26 Sep 2018 17:29:32 -0600 Subject: [PATCH 2/6] Remove debug pauses. Former-commit-id: c11cdc927b46b298d81cbe312010eb7f7ad67e03 --- runme.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/runme.sh b/runme.sh index f5403d0a..1cca8964 100755 --- a/runme.sh +++ b/runme.sh @@ -65,7 +65,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/ ;; @@ -83,7 +82,6 @@ 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/ ;; From 04a665f51914a54bc947ebe3dc743c5d150e9c8b Mon Sep 17 00:00:00 2001 From: Kaj Forney Date: Wed, 26 Sep 2018 18:26:26 -0600 Subject: [PATCH 3/6] Fix Parrot iso path. Former-commit-id: 995690aefada2daa230479050c06551e1480a5db --- runme.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runme.sh b/runme.sh index 1cca8964..e504eef3 100755 --- a/runme.sh +++ b/runme.sh @@ -83,7 +83,7 @@ Parrot) cd build/parrot-build ./build.sh build variant-$DESKTOP amd64 - cp *.iso ../../images/ + cp ../*.iso ../../images/ ;; esac From a89faaa624861329f62b2342b6bf08a525f24d04 Mon Sep 17 00:00:00 2001 From: Kaj Forney Date: Thu, 27 Sep 2018 00:58:56 -0600 Subject: [PATCH 4/6] Add the rest of the desktop environments. Former-commit-id: e93aac4cc44563238605e6a81f4802c64e23dc09 --- config/software.list.chroot | 35 ++++++---- filesystem/etc/ssh/sshd_config | 121 +++++++++++++++++++++++++++++++++ runme.sh | 10 +-- 3 files changed, 149 insertions(+), 17 deletions(-) create mode 100644 filesystem/etc/ssh/sshd_config diff --git a/config/software.list.chroot b/config/software.list.chroot index 5bfa4baf..e73e9077 100644 --- a/config/software.list.chroot +++ b/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 \ No newline at end of file +ufw + +#Privacy tools +tor +proxychains +scrub +bleachbit + +#Extra pentesting tools +vega +metagoofil + +#Office/productivity tools +screenfetch +cherrytree +libreoffice +gimp +audacity +vlc \ No newline at end of file diff --git a/filesystem/etc/ssh/sshd_config b/filesystem/etc/ssh/sshd_config new file mode 100644 index 00000000..e2f34f6b --- /dev/null +++ b/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 diff --git a/runme.sh b/runme.sh index e504eef3..2d4e2d1d 100755 --- a/runme.sh +++ b/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 \ -"gnome" "GNOME" \ -"mate" "MATE Desktop Environment" \ +DESKTOP=$(whiptail --backtitle "Pentest Build Script" --title "Desktop Environment" --menu "Choose a desktop:" 15 50 6 \ +"gnome" "GNOME 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" \ From 103ffbb6ac05ee98857d8f1c28b25550e15b8552 Mon Sep 17 00:00:00 2001 From: Kaj Forney Date: Thu, 27 Sep 2018 01:06:41 -0600 Subject: [PATCH 5/6] Remove missing ParrotSec package. Former-commit-id: cc0696888387969b487452c1c23ee75effa7bef9 --- .../package-lists/parrot-cinnamon.list.chroot | 1 - .../parrot-variant-lxde/package-lists/parrot-lxde.list.chroot | 1 - .../parrot-variant-xfce/package-lists/parrot-xfce.list.chroot | 1 - 3 files changed, 3 deletions(-) diff --git a/modules/parrot-build/templates/parrot-variant-cinnamon/package-lists/parrot-cinnamon.list.chroot b/modules/parrot-build/templates/parrot-variant-cinnamon/package-lists/parrot-cinnamon.list.chroot index 0069d8f0..705bb027 100644 --- a/modules/parrot-build/templates/parrot-variant-cinnamon/package-lists/parrot-cinnamon.list.chroot +++ b/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 diff --git a/modules/parrot-build/templates/parrot-variant-lxde/package-lists/parrot-lxde.list.chroot b/modules/parrot-build/templates/parrot-variant-lxde/package-lists/parrot-lxde.list.chroot index 8bc2dc09..98319eeb 100644 --- a/modules/parrot-build/templates/parrot-variant-lxde/package-lists/parrot-lxde.list.chroot +++ b/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 diff --git a/modules/parrot-build/templates/parrot-variant-xfce/package-lists/parrot-xfce.list.chroot b/modules/parrot-build/templates/parrot-variant-xfce/package-lists/parrot-xfce.list.chroot index f99d68a8..a82d8e39 100644 --- a/modules/parrot-build/templates/parrot-variant-xfce/package-lists/parrot-xfce.list.chroot +++ b/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 From c029610b66606347775eeac04fc14a0ba33160ed Mon Sep 17 00:00:00 2001 From: Kaj Forney Date: Thu, 27 Sep 2018 01:34:25 -0600 Subject: [PATCH 6/6] Update VS Code. Former-commit-id: d19e58a5bae96a43a2b16f76ae816afab7eafe38 --- debs/code_1.26.1-1534444688_amd64.deb.REMOVED.git-id | 1 - debs/code_1.27.2-1536736588_amd64.deb.REMOVED.git-id | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 debs/code_1.26.1-1534444688_amd64.deb.REMOVED.git-id create mode 100644 debs/code_1.27.2-1536736588_amd64.deb.REMOVED.git-id diff --git a/debs/code_1.26.1-1534444688_amd64.deb.REMOVED.git-id b/debs/code_1.26.1-1534444688_amd64.deb.REMOVED.git-id deleted file mode 100644 index 8d92c46f..00000000 --- a/debs/code_1.26.1-1534444688_amd64.deb.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -2b42038ffa021a427f2708223949d41cca25782e \ No newline at end of file diff --git a/debs/code_1.27.2-1536736588_amd64.deb.REMOVED.git-id b/debs/code_1.27.2-1536736588_amd64.deb.REMOVED.git-id new file mode 100644 index 00000000..18a918d3 --- /dev/null +++ b/debs/code_1.27.2-1536736588_amd64.deb.REMOVED.git-id @@ -0,0 +1 @@ +2566de50bf26552ae21eb4a31e54307e36b66e8d \ No newline at end of file