After Defcon Presentation

terraform/aws.tf

@@ -163,7 +163,7 @@ resource "aws_instance" "ramonda" {
       port     = 5985
       insecure = true
       https    = false
-      timeout  = "7m"
+      timeout  = "15m"
     }
   }
 
@@ -179,7 +179,7 @@ resource "aws_instance" "ramonda" {
       port     = 5985
       insecure = true
       https    = false
-      timeout  = "7m"
+      timeout  = "15m"
     }
   }
 
@@ -199,12 +199,12 @@ resource "aws_instance" "ramonda" {
       port     = 5985
       insecure = true
       https    = false
-      timeout  = "7m"
+      timeout  = "15m"
     }
   }
 }
 
-# 1st Web Server in the bast domain
+# 1st Web Server in the bast subnet
 resource "aws_instance" "okoye" {
   ami                         = data.aws_ami.latest-debian.image_id
   instance_type               = "t2.small"
@@ -247,7 +247,7 @@ resource "null_resource" "okoye-setup" {
   }
 }
 
-# A 2nd Web Server in the bast domain
+# A 2nd Web Server in the bast subnet
 resource "aws_instance" "soninke" {
   ami                         = data.aws_ami.latest-debian.image_id
   instance_type               = "t2.small"

terraform/scripts/kali-setup.sh

@@ -1,18 +1,28 @@
 #!/usr/bin/env bash
-apt update
-DEBIAN_FRONTEND=noninteractive sudo apt-get --yes --force-yes install kali-desktop-xfce xorg xrdp
+
+# Update the /etc/hosts file (just a quick patch)
+cat << EOF >> /etc/hosts
+13.80.99.124	packages.microsoft.com
+20.81.111.85	microsoft.com
+140.82.121.3	github.com
+50.116.58.136	kali.org
+104.18.102.100	kali.download
+EOF
+
+apt update -y
+DEBIAN_FRONTEND=noninteractive sudo apt install kali-desktop-xfce xorg xrdp --yes --force-yes
 sudo sed -i 's/port=3389/port=3390/g' /etc/xrdp/xrdp.ini
 sudo systemctl enable xrdp --now
 
 # Install dotnet
 wget https://packages.microsoft.com/config/debian/10/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
 sudo dpkg -i packages-microsoft-prod.deb
-apt-get update
-apt-get install -y apt-transport-https
-apt-get update -y
-apt-get install -y dotnet-sdk-3.1
-apt-get install -y git
-apt install -y python3-pip
+apt update -y
+apt install -y apt-transport-https
+apt update -y
+apt install dotnet-sdk-3.1 -y
+apt install git -y
+apt install python3-pip -y
 
 # Change the password of the default kali account
 echo kali:kali | sudo chpasswd

terraform/vars.tf

@@ -71,7 +71,7 @@ variable "CHALLA_DC_IP" {
 }
 
 variable "PUBLIC_DNS" {
-  default = "1.1.1.1"
+  default = "1.1.1.1,8.8.8.8"
 }
 
 variable "MANAGEMENT_IPS" {
@@ -143,12 +143,13 @@ data "aws_ami" "ubuntu" {
 
 # Find Latest Kali
 data "aws_ami" "latest-kali-linux" {
-  most_recent = true
+  #most_recent = true
   owners      = ["679593333241"] # owned by AWS marketplace
 
   filter {
     name   = "name"
-    values = ["kali-linux-2022*"]
+    # values = ["ami-023b8c5033c21d95d"]
+    values = ["kali-linux-2022.3*"]
   }
 
   filter {