Updated monkeyzoo images and added tunneling-11

envs/monkey_zoo/docs/fullDocs.md

@@ -500,6 +500,42 @@ fullTest.conf is a good config to start, because it covers all machines.
 </tbody>
 </table>
 
+<table>
+<thead>
+<tr class="header">
+<th><p><span id="_Toc536021463" class="anchor"></span>Nr. <strong>11</strong> Tunneling M3</p>
+<p>(10.2.0.11)</p></th>
+<th>(Exploitable)</th>
+</tr>
+</thead>
+<tbody>
+<tr class="odd">
+<td>OS:</td>
+<td><strong>Ubuntu 16.04.05 x64</strong></td>
+</tr>
+<tr class="even">
+<td>Software:</td>
+<td>OpenSSL</td>
+</tr>
+<tr class="odd">
+<td>Default service’s port:</td>
+<td>22</td>
+</tr>
+<tr class="even">
+<td>Root password:</td>
+<td>3Q=(Ge(+&w]*</td>
+</tr>
+<tr class="odd">
+<td>Server’s config:</td>
+<td>Default</td>
+</tr>
+<tr class="even">
+<td>Notes:</td>
+<td>Accessible only trough Nr.10</td>
+</tr>
+</tbody>
+</table>
+
 <table>
 <thead>
 <tr class="header">

envs/monkey_zoo/terraform/images.tf

@@ -26,23 +26,27 @@ data "google_compute_image" "shellshock-8" {
   project = "${local.monkeyzoo_project}"
 }
 data "google_compute_image" "tunneling-9" {
-  name = "tunneling-9-v2"
+  name = "tunneling-9"
   project = "${local.monkeyzoo_project}"
 }
 data "google_compute_image" "tunneling-10" {
-  name = "tunneling-10-v2"
+  name = "tunneling-10"
+  project = "${local.monkeyzoo_project}"
+}
+data "google_compute_image" "tunneling-11" {
+  name = "tunneling-11"
   project = "${local.monkeyzoo_project}"
 }
 data "google_compute_image" "sshkeys-11" {
-  name = "sshkeys-11-v2"
+  name = "sshkeys-11"
   project = "${local.monkeyzoo_project}"
 }
 data "google_compute_image" "sshkeys-12" {
-  name = "sshkeys-12-v2"
+  name = "sshkeys-12"
   project = "${local.monkeyzoo_project}"
 }
 data "google_compute_image" "mimikatz-14" {
-  name = "mimikatz-14-v2"
+  name = "mimikatz-14"
   project = "${local.monkeyzoo_project}"
 }
 data "google_compute_image" "mimikatz-15" {
@@ -58,7 +62,7 @@ data "google_compute_image" "weblogic-18" {
   project = "${local.monkeyzoo_project}"
 }
 data "google_compute_image" "weblogic-19" {
-  name = "weblogic-19-v2"
+  name = "weblogic-19"
   project = "${local.monkeyzoo_project}"
 }
 data "google_compute_image" "smb-20" {
@@ -78,7 +82,7 @@ data "google_compute_image" "struts2-23" {
   project = "${local.monkeyzoo_project}"
 }
 data "google_compute_image" "struts2-24" {
-  name = "struts-24-v2"
+  name = "struts2-24"
   project = "${local.monkeyzoo_project}"
 }
 data "google_compute_image" "island-linux-250" {
@@ -88,4 +92,4 @@ data "google_compute_image" "island-linux-250" {
 data "google_compute_image" "island-windows-251" {
   name = "island-windows-251"
   project = "${local.monkeyzoo_project}"
-}
+}

envs/monkey_zoo/terraform/monkey_zoo.tf

@@ -15,6 +15,11 @@ resource "google_compute_network" "tunneling" {
   auto_create_subnetworks = false
 }
 
+resource "google_compute_network" "tunneling2" {
+  name                    = "tunneling2"
+  auto_create_subnetworks = false
+}
+
 resource "google_compute_subnetwork" "monkeyzoo-main" {
   name            = "monkeyzoo-main"
   ip_cidr_range   = "10.2.2.0/24"
@@ -27,6 +32,12 @@ resource "google_compute_subnetwork" "tunneling-main" {
   network         = "${google_compute_network.tunneling.self_link}"
 }
 
+resource "google_compute_subnetwork" "tunneling2-main" {
+  name            = "tunneling2-main"
+  ip_cidr_range   = "10.2.0.0/27"
+  network         = "${google_compute_network.tunneling2.self_link}"
+}
+
 resource "google_compute_instance_from_template" "hadoop-2" {
   name         = "hadoop-2"
   source_instance_template = "${local.default_ubuntu}"
@@ -149,7 +160,6 @@ resource "google_compute_instance_from_template" "tunneling-9" {
   network_interface{
     subnetwork="tunneling-main"
     network_ip="10.2.1.9"
-    
   }
   network_interface{
     subnetwork="monkeyzoo-main"
@@ -170,6 +180,25 @@ resource "google_compute_instance_from_template" "tunneling-10" {
     subnetwork="tunneling-main"
     network_ip="10.2.1.10"
   }
+  network_interface{
+    subnetwork="tunneling2-main"
+    network_ip="10.2.0.10"
+  }
+}
+
+resource "google_compute_instance_from_template" "tunneling-11" {
+  name         = "tunneling-11"
+  source_instance_template = "${local.default_ubuntu}"
+  boot_disk{
+    initialize_params {
+      image = "${data.google_compute_image.tunneling-11.self_link}"
+    }
+    auto_delete = true
+  }
+  network_interface{
+    subnetwork="tunneling2-main"
+    network_ip="10.2.0.11"
+  }
 }
 
 resource "google_compute_instance_from_template" "sshkeys-11" {
@@ -428,4 +457,4 @@ resource "google_compute_instance_from_template" "island-windows-251" {
       // network_tier = "STANDARD"
     }
   }
-}
+}