From dcc68914bd4aa776187a7af01845ecbacde7859f Mon Sep 17 00:00:00 2001
From: Ilija Lazoroski <ilija.la@live.com>
Date: Mon, 10 Jan 2022 14:17:48 +0100
Subject: [PATCH] BB: Add log4j machines to monkey zoo

---
 envs/monkey_zoo/docs/fullDocs.md        | 74 ++++++++++++++++++++++---
 envs/monkey_zoo/terraform/images.tf     | 16 ++++++
 envs/monkey_zoo/terraform/monkey_zoo.tf | 30 ++++++++++
 3 files changed, 113 insertions(+), 7 deletions(-)

diff --git a/envs/monkey_zoo/docs/fullDocs.md b/envs/monkey_zoo/docs/fullDocs.md
index d10525aa1..71a373843 100644
--- a/envs/monkey_zoo/docs/fullDocs.md
+++ b/envs/monkey_zoo/docs/fullDocs.md
@@ -35,8 +35,12 @@ This document describes Infection Monkey’s test network, how to deploy and use
 [Nr. 3-46 Powershell](#_Toc536021480)<br>
 [Nr. 3-47 Powershell](#_Toc536021481)<br>
 [Nr. 3-48 Powershell](#_Toc536021482)<br>
-[Nr. 250 MonkeyIsland](#_Toc536021483)<br>
-[Nr. 251 MonkeyIsland](#_Toc536021484)<br>
+[Nr. 3-49 Log4j Solr](#_Toc536021483)<br>
+[Nr. 3-50 Log4j Solr](#_Toc536021484)<br>
+[Nr. 3-51 Log4j Tomcat](#_Toc536021485)<br>
+[Nr. 3-52 Log4j Tomcat](#_Toc536021486)<br>
+[Nr. 250 MonkeyIsland](#_Toc536021487)<br>
+[Nr. 251 MonkeyIsland](#_Toc536021488)<br>
 [Network topography](#network-topography)<br>
 
 # Warning\!
@@ -1201,7 +1205,7 @@ Update all requirements using deployment script:<br>
 <table>
 <thead>
 <tr class="header">
-<th><p><span id="_Toc536021482" class="anchor"></span>Nr. <strong>3-49 Log4j Solr</strong></p>
+<th><p><span id="_Toc536021483" class="anchor"></span>Nr. <strong>3-49 Log4j Solr</strong></p>
 <p>(10.2.3.49)</p></th>
 <th>(Vulnerable)</th>
 </tr>
@@ -1229,7 +1233,7 @@ Update all requirements using deployment script:<br>
 <table>
 <thead>
 <tr class="header">
-<th><p><span id="_Toc536021482" class="anchor"></span>Nr. <strong>3-50 Log4j-solr</strong></p>
+<th><p><span id="_Toc536021484" class="anchor"></span>Nr. <strong>3-50 Log4j Solr</strong></p>
 <p>(10.2.3.50)</p></th>
 <th>(Vulnerable)</th>
 </tr>
@@ -1245,7 +1249,7 @@ Update all requirements using deployment script:<br>
 </tr>
 <tr class="odd">
 <td>Default server’s port:</td>
-<td>-</td>
+<td>8983</td>
 </tr>
 <tr class="even">
 <td>Notes:</td>
@@ -1257,7 +1261,63 @@ Update all requirements using deployment script:<br>
 <table>
 <thead>
 <tr class="header">
-<th><p><span id="_Toc536021483" class="anchor"></span>Nr. <strong>250 MonkeyIsland</strong></p>
+<th><p><span id="_Toc536021485" class="anchor"></span>Nr. <strong>3-51 Log4j Tomcat</strong></p>
+<p>(10.2.3.51)</p></th>
+<th>(Vulnerable)</th>
+</tr>
+</thead>
+<tbody>
+<tr class="odd">
+<td>OS:</td>
+<td><strong>Ubuntu 18.04LTS</strong></td>
+</tr>
+<tr class="even">
+<td>Software:</td>
+<td>Apache Tomcat 8.0.36</td>
+</tr>
+<tr class="odd">
+<td>Default server’s port:</td>
+<td>8080</td>
+</tr>
+<tr class="even">
+<td>Notes:</td>
+<td></td>
+</tr>
+</tbody>
+</table>
+
+<table>
+<thead>
+<tr class="header">
+<th><p><span id="_Toc536021486" class="anchor"></span>Nr. <strong>3-52 Log4j-tomcat</strong></p>
+<p>(10.2.3.52)</p></th>
+<th>(Vulnerable)</th>
+</tr>
+</thead>
+<tbody>
+<tr class="odd">
+<td>OS:</td>
+<td><strong>Windows Server 2016 x64</strong></td>
+</tr>
+<tr class="even">
+<td>Software:</td>
+<td>Apache Tomcat 8.0.36</td>
+</tr>
+<tr class="odd">
+<td>Default server’s port:</td>
+<td>8080</td>
+</tr>
+<tr class="even">
+<td>Notes:</td>
+<td>User: m0nk3y, Password: Tomcat@22</td>
+</tr>
+</tbody>
+</table>
+
+<table>
+<thead>
+<tr class="header">
+<th><p><span id="_Toc536021487" class="anchor"></span>Nr. <strong>250 MonkeyIsland</strong></p>
 <p>(10.2.2.250)</p></th>
 <th></th>
 </tr>
@@ -1289,7 +1349,7 @@ Update all requirements using deployment script:<br>
 <table>
 <thead>
 <tr class="header">
-<th><p><span id="_Toc536021484" class="anchor"></span>Nr. <strong>251 MonkeyIsland</strong></p>
+<th><p><span id="_Toc536021488" class="anchor"></span>Nr. <strong>251 MonkeyIsland</strong></p>
 <p>(10.2.2.251)</p></th>
 <th></th>
 </tr>
diff --git a/envs/monkey_zoo/terraform/images.tf b/envs/monkey_zoo/terraform/images.tf
index 05cc05048..b5a2fbee7 100644
--- a/envs/monkey_zoo/terraform/images.tf
+++ b/envs/monkey_zoo/terraform/images.tf
@@ -77,6 +77,22 @@ data "google_compute_image" "powershell-3-45" {
   name = "powershell-3-45"
   project = local.monkeyzoo_project
 }
+data "google_compute_image" "log4j-solr-49" {
+  name = "log4j-solr-49"
+  project = local.monkeyzoo_project
+}
+data "google_compute_image" "log4j-solr-50" {
+  name = "log4j-solr-50"
+  project = local.monkeyzoo_project
+}
+data "google_compute_image" "log4j-tomcat-51" {
+  name = "log4j-tomcat-51"
+  project = local.monkeyzoo_project
+}
+data "google_compute_image" "log4j-solr-50" {
+  name = "log4j-solr-50"
+  project = local.monkeyzoo_project
+}
 data "google_compute_image" "weblogic-18" {
   name = "weblogic-18"
   project = local.monkeyzoo_project
diff --git a/envs/monkey_zoo/terraform/monkey_zoo.tf b/envs/monkey_zoo/terraform/monkey_zoo.tf
index 4b64b4a31..c545af20c 100644
--- a/envs/monkey_zoo/terraform/monkey_zoo.tf
+++ b/envs/monkey_zoo/terraform/monkey_zoo.tf
@@ -418,6 +418,36 @@ resource "google_compute_instance_from_template" "log4j-solr-50" {
   }
 }
 
+resource "google_compute_instance_from_template" "log4j-tomcat-51" {
+  name = "${local.resource_prefix}log4j-tomcat-51"
+  source_instance_template = local.default_linux
+  boot_disk{
+    initialize_params {
+      image = data.google_compute_image.log4j-tomcat-51.self_link
+    }
+    auto_delete = true
+  }
+  network_interface {
+    subnetwork="${local.resource_prefix}monkeyzoo-main"
+    network_ip="10.2.3.51"
+  }
+}
+
+resource "google_compute_instance_from_template" "log4j-tomcat-52" {
+  name = "${local.resource_prefix}log4j-tomcat-52"
+  source_instance_template = local.default_windows
+  boot_disk{
+    initialize_params {
+      image = data.google_compute_image.log4j-tomcat-52.self_link
+    }
+    auto_delete = true
+  }
+  network_interface {
+    subnetwork="${local.resource_prefix}monkeyzoo-main"
+    network_ip="10.2.3.52"
+  }
+}
+
 /* We need to alter monkey's behavior for this to upload 32-bit monkey instead of 64-bit (not yet developed)
 resource "google_compute_instance_from_template" "upgrader-17" {
   name = "${local.resource_prefix}upgrader-17"