From 6782f806eb8fc4abc24ee240e041721964f4a3e3 Mon Sep 17 00:00:00 2001
From: vakarisz <vakarisz@yahoo.com>
Date: Fri, 7 Jan 2022 15:27:50 +0200
Subject: [PATCH] Zoo: add log4j solr machines to terraform scripts and docs

---
 envs/monkey_zoo/docs/fullDocs.md        | 56 +++++++++++++++++++++++++
 envs/monkey_zoo/terraform/monkey_zoo.tf | 45 ++++++++++++++++++++
 2 files changed, 101 insertions(+)

diff --git a/envs/monkey_zoo/docs/fullDocs.md b/envs/monkey_zoo/docs/fullDocs.md
index 9d8e8b3c4..d10525aa1 100644
--- a/envs/monkey_zoo/docs/fullDocs.md
+++ b/envs/monkey_zoo/docs/fullDocs.md
@@ -1198,6 +1198,62 @@ Update all requirements using deployment script:<br>
 </tbody>
 </table>
 
+<table>
+<thead>
+<tr class="header">
+<th><p><span id="_Toc536021482" class="anchor"></span>Nr. <strong>3-49 Log4j Solr</strong></p>
+<p>(10.2.3.49)</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 Solr 8.11.0</td>
+</tr>
+<tr class="odd">
+<td>Default server’s port:</td>
+<td>8983</td>
+</tr>
+<tr class="even">
+<td>Notes:</td>
+<td>User: m0nk3y, Password: m0nk3y</td>
+</tr>
+</tbody>
+</table>
+
+<table>
+<thead>
+<tr class="header">
+<th><p><span id="_Toc536021482" class="anchor"></span>Nr. <strong>3-50 Log4j-solr</strong></p>
+<p>(10.2.3.50)</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 solr 8.11.0</td>
+</tr>
+<tr class="odd">
+<td>Default server’s port:</td>
+<td>-</td>
+</tr>
+<tr class="even">
+<td>Notes:</td>
+<td>User: m0nk3y, Password: Passw0rd!</td>
+</tr>
+</tbody>
+</table>
+
 <table>
 <thead>
 <tr class="header">
diff --git a/envs/monkey_zoo/terraform/monkey_zoo.tf b/envs/monkey_zoo/terraform/monkey_zoo.tf
index cd9675732..4b64b4a31 100644
--- a/envs/monkey_zoo/terraform/monkey_zoo.tf
+++ b/envs/monkey_zoo/terraform/monkey_zoo.tf
@@ -373,6 +373,51 @@ resource "google_compute_instance_from_template" "powershell-3-45" {
   }
 }
 
+resource "google_compute_instance_from_template" "powershell-3-45" {
+  name = "${local.resource_prefix}powershell-3-45"
+  source_instance_template = local.default_windows
+  boot_disk{
+    initialize_params {
+      image = data.google_compute_image.powershell-3-45.self_link
+    }
+    auto_delete = true
+  }
+  network_interface {
+    subnetwork="${local.resource_prefix}monkeyzoo-main"
+    network_ip="10.2.3.45"
+  }
+}
+
+resource "google_compute_instance_from_template" "log4j-solr-49" {
+  name = "${local.resource_prefix}log4j-solr-49"
+  source_instance_template = local.default_linux
+  boot_disk{
+    initialize_params {
+      image = data.google_compute_image.log4j-solr-49.self_link
+    }
+    auto_delete = true
+  }
+  network_interface {
+    subnetwork="${local.resource_prefix}monkeyzoo-main"
+    network_ip="10.2.3.49"
+  }
+}
+
+resource "google_compute_instance_from_template" "log4j-solr-50" {
+  name = "${local.resource_prefix}log4j-solr-50"
+  source_instance_template = local.default_windows
+  boot_disk{
+    initialize_params {
+      image = data.google_compute_image.log4j-solr-50.self_link
+    }
+    auto_delete = true
+  }
+  network_interface {
+    subnetwork="${local.resource_prefix}monkeyzoo-main"
+    network_ip="10.2.3.50"
+  }
+}
+
 /* 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"