From 7c182fccb24e769c4926d2731c20450d58d117df Mon Sep 17 00:00:00 2001 From: Chris Long Date: Sun, 25 Jul 2021 22:31:45 -0700 Subject: [PATCH] Convert AWS remote-exec to use script instead of inline --- AWS/Terraform/main.tf | 56 ++++++++++++++++++++--------- AWS/Terraform/scripts/bootstrap.ps1 | 40 +++++++++++++++++++++ AWS/Terraform/scripts/coveware.ps1 | 0 Vagrant/post_build_checks.sh | 1 - ci/build_machine_bootstrap.sh | 1 - 5 files changed, 79 insertions(+), 19 deletions(-) create mode 100644 AWS/Terraform/scripts/bootstrap.ps1 create mode 100644 AWS/Terraform/scripts/coveware.ps1 diff --git a/AWS/Terraform/main.tf b/AWS/Terraform/main.tf index 68d672e..845e280 100644 --- a/AWS/Terraform/main.tf +++ b/AWS/Terraform/main.tf @@ -211,12 +211,20 @@ resource "aws_instance" "logger" { resource "aws_instance" "dc" { instance_type = "t3.medium" + provisioner "file" { + source = "scripts/bootstrap.ps1" + destination = "C:\\Temp\\script.ps1" + + connection { + type = "winrm" + user = "vagrant" + password = "vagrant" + host = coalesce(self.public_ip, self.private_ip) + } + } + provisioner "remote-exec" { - inline = [ - "choco install -force -y winpcap", - "ipconfig /renew", - "powershell.exe -c \"Add-Content 'c:\\windows\\system32\\drivers\\etc\\hosts' ' 192.168.38.103 wef.windomain.local'\"", - ] + inline = ["powershell.exe -File C:\\Temp\\script.ps1"] connection { type = "winrm" @@ -245,13 +253,20 @@ resource "aws_instance" "dc" { resource "aws_instance" "wef" { instance_type = "t3.medium" + provisioner "file" { + source = "scripts/bootstrap.ps1" + destination = "C:\\Temp\\script.ps1" + + connection { + type = "winrm" + user = "vagrant" + password = "vagrant" + host = coalesce(self.public_ip, self.private_ip) + } + } + provisioner "remote-exec" { - inline = [ - "choco install -force -y winpcap", - "powershell.exe -c \"Add-Content 'c:\\windows\\system32\\drivers\\etc\\hosts' ' 192.168.38.102 dc.windomain.local'\"", - "powershell.exe -c \"Add-Content 'c:\\windows\\system32\\drivers\\etc\\hosts' ' 192.168.38.102 windomain.local'\"", - "ipconfig /renew", - ] + inline = ["powershell.exe -File C:\\Temp\\script.ps1"] connection { type = "winrm" @@ -280,13 +295,20 @@ resource "aws_instance" "wef" { resource "aws_instance" "win10" { instance_type = "t2.large" + provisioner "file" { + source = "scripts/bootstrap.ps1" + destination = "C:\\Temp\\script.ps1" + + connection { + type = "winrm" + user = "vagrant" + password = "vagrant" + host = coalesce(self.public_ip, self.private_ip) + } + } + provisioner "remote-exec" { - inline = [ - "choco install -force -y winpcap", - "powershell.exe -c \"Add-Content 'c:\\windows\\system32\\drivers\\etc\\hosts' ' 192.168.38.102 dc.windomain.local'\"", - "powershell.exe -c \"Add-Content 'c:\\windows\\system32\\drivers\\etc\\hosts' ' 192.168.38.102 windomain.local'\"", - "ipconfig /renew", - ] + inline = ["powershell.exe -File C:\\Temp\\script.ps1"] connection { type = "winrm" diff --git a/AWS/Terraform/scripts/bootstrap.ps1 b/AWS/Terraform/scripts/bootstrap.ps1 new file mode 100644 index 0000000..3b164ce --- /dev/null +++ b/AWS/Terraform/scripts/bootstrap.ps1 @@ -0,0 +1,40 @@ +# Purpose: Prepare the AWS AMIs for use + +# Install npcap so Wireshark recognizes the AWS network adapters +Start-Job -ScriptBlock { choco install -y --force npcap --version 0.86 } + +# Hardcode IP addresses in the HOSTS file +If ($env:COMPUTERNAME -eq "DC") { + Add-Content 'c:\\windows\\system32\\drivers\\etc\\hosts' ' 192.168.38.103 wef.windomain.local' + Add-Content 'c:\\windows\\system32\\drivers\\etc\\hosts' ' 192.168.38.104 win10.windomain.local' +} +Else { + Add-Content 'c:\\windows\\system32\\drivers\\etc\\hosts' ' 192.168.38.102 dc.windomain.local' + Add-Content 'c:\\windows\\system32\\drivers\\etc\\hosts' ' 192.168.38.102 windomain.local' +} + +# Keep renewing the IP address until the domain controller is set as a DNS server +while (!(Get-DNSClientServerAddress | Where-Object { $_.ServerAddresses -eq "192.168.38.102" })) { + write-host "Waiting to receive the correct DNS settings from DHCP..."; + start-sleep 1; + ipconfig /renew +} + +# Check if gpupdate works +if ($env:COMPUTERNAME -ne "DC") { + Write-Host "Attempting a Group Policy Update..." + Try { + Start-Process gpupdate -ArgumentList "/force" -RedirectStandardOutput "c:\Temp\gpupdate_stdout.txt" -RedirectStandardError "c:\Temp\gpupdate_stderr.txt" -ErrorAction Stop + $stdout = (Get-Content "c:\Temp\gpupdate_stdout.txt") + Write-Host "$stdout" + } + Catch { + $ErrorMessage = $_.Exception.Message + Write-Host "Error: $ErrorMessage" + $stderr = (Get-Content "c:\Temp\gpupdate_stderr.txt") + Write-Host $stderr + } +} + + + diff --git a/AWS/Terraform/scripts/coveware.ps1 b/AWS/Terraform/scripts/coveware.ps1 new file mode 100644 index 0000000..e69de29 diff --git a/Vagrant/post_build_checks.sh b/Vagrant/post_build_checks.sh index bbf1d46..1ab9ce5 100755 --- a/Vagrant/post_build_checks.sh +++ b/Vagrant/post_build_checks.sh @@ -65,4 +65,3 @@ post_build_checks() { } post_build_checks -exit 0 diff --git a/ci/build_machine_bootstrap.sh b/ci/build_machine_bootstrap.sh index ae61792..3dc0007 100755 --- a/ci/build_machine_bootstrap.sh +++ b/ci/build_machine_bootstrap.sh @@ -113,7 +113,6 @@ main() { /bin/bash "$DL_DIR/Vagrant/post_build_checks.sh" } main -exit 0 EOF chmod +x /opt/DetectionLab/build.sh