Updated region and added tf wrapper

.gitignore

@@ -23,6 +23,7 @@
 /nbdist/
 /.nb-gradle/
 /build/
-.terraform/*
+.terraform
 terraform.tfstate
+terraform.tfstate.backup
 terraform.tfstate.lock

README.md

@@ -8,7 +8,7 @@ This application and exercises will take you through some of the OWASP top 10 Vu
 2. `git clone git://github.com/ScaleSec/vulnado`
 3. `cd vulnado`
 4. `docker-compose up`
-5. Open a browser and navigate to the client to make sure it's working: [http://localhost:1337](docker-compose up)
+5. Open a browser and navigate to the client to make sure it's working: [http://localhost:1337](http://localhost:1337)
 6. Then back in your terminal verify you have connection to your API server: `nc -vz localhost 8080`
 
 ## Architecture

reverse_shell/main.tf

@@ -33,7 +33,7 @@ resource "aws_route_table" "r" {
 resource "aws_subnet" "subnet" {
   vpc_id     = "${aws_vpc.main.id}"
   cidr_block = "${var.subnet_cidr}"
-  availability_zone = "${var.region}a"
+  availability_zone = "${var.region}b"
   map_public_ip_on_launch = true
   tags = {
     Name = "tmp_vulnado_rev_shell_subnet"
@@ -73,10 +73,12 @@ resource "aws_security_group" "sg" {
 
 data "aws_ami" "amznlinux" {
   most_recent = true
+  owners = ["amazon"]
 
   filter {
     name   = "name"
     values = ["amzn2-ami-hvm-2.0.20181114-x86_64-gp2"]
+
   }
 }
 

reverse_shell/tf

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+TF_VAR_public_key=$(cat ~/.ssh/id_rsa.pub) terraform $@
+echo
+echo ===================
+echo === SSH Command ===
+echo ===================
+echo ssh ec2-user@$(aws --region us-west-1 ec2 describe-instances --filters  "Name=tag:Name,Values=VulnadoReverseShellReceiver" | jq -r '.Reservations[0].Instances[0]|.PublicIpAddress')

reverse_shell/variables.tf

@@ -3,7 +3,7 @@ variable "public_key" {
 }
 
 variable "region" {
-  default = "us-west-2"
+  default = "us-west-1"
 }
 
 variable "vpc_cidr" {
@@ -12,4 +12,4 @@ variable "vpc_cidr" {
 
 variable "subnet_cidr" {
   default = "10.42.0.0/24"
-}
+}