From db6552a136b40bd06352521bb6dc88f91f93ddf3 Mon Sep 17 00:00:00 2001
From: VakarisZ <vakarisz@yahoo.com>
Date: Thu, 23 Jul 2020 10:52:05 +0300
Subject: [PATCH] Moved "victims_max_exploit" and "victims_max_find" to
 "internal", increased "victims_max_exploit" default to 100

---
 monkey/infection_monkey/config.py             |  2 +-
 monkey/infection_monkey/example.conf          |  2 +-
 .../cc/services/config_schema/internal.py     | 18 +++++++++++++
 .../cc/services/config_schema/monkey.py       | 27 +++++--------------
 4 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/monkey/infection_monkey/config.py b/monkey/infection_monkey/config.py
index b87ef9ed8..1fbcb876b 100644
--- a/monkey/infection_monkey/config.py
+++ b/monkey/infection_monkey/config.py
@@ -135,7 +135,7 @@ class Configuration(object):
     victims_max_find = 100
 
     # how many victims to exploit before stopping
-    victims_max_exploit = 15
+    victims_max_exploit = 100
 
     # depth of propagation
     depth = 2
diff --git a/monkey/infection_monkey/example.conf b/monkey/infection_monkey/example.conf
index 4fb0200c8..cf9d2ed70 100644
--- a/monkey/infection_monkey/example.conf
+++ b/monkey/infection_monkey/example.conf
@@ -99,7 +99,7 @@
   ],
   "timeout_between_iterations": 10,
   "use_file_logging": true,
-  "victims_max_exploit": 15,
+  "victims_max_exploit": 100,
   "victims_max_find": 100,
   "post_breach_actions": []
   custom_PBA_linux_cmd = ""
diff --git a/monkey/monkey_island/cc/services/config_schema/internal.py b/monkey/monkey_island/cc/services/config_schema/internal.py
index 4ea950232..bdbae2461 100644
--- a/monkey/monkey_island/cc/services/config_schema/internal.py
+++ b/monkey/monkey_island/cc/services/config_schema/internal.py
@@ -1,3 +1,5 @@
+from monkey_island.cc.services.utils.typographic_symbols import WARNING_SIGN
+
 INTERNAL = {
     "title": "Internal",
     "type": "object",
@@ -38,6 +40,22 @@ INTERNAL = {
             "title": "Monkey",
             "type": "object",
             "properties": {
+                "victims_max_find": {
+                    "title": "Max victims to find",
+                    "type": "integer",
+                    "default": 100,
+                    "description": "Determines the maximum number of machines the monkey is allowed to scan"
+                },
+                "victims_max_exploit": {
+                    "title": "Max victims to exploit",
+                    "type": "integer",
+                    "default": 100,
+                    "description":
+                        "Determines the maximum number of machines the monkey"
+                        " is allowed to successfully exploit. " + WARNING_SIGN
+                        + " Note that setting this value too high may result in the monkey propagating to "
+                          "a high number of machines"
+                },
                 "internet_services": {
                     "title": "Internet services",
                     "type": "array",
diff --git a/monkey/monkey_island/cc/services/config_schema/monkey.py b/monkey/monkey_island/cc/services/config_schema/monkey.py
index d699da061..0f5db452f 100644
--- a/monkey/monkey_island/cc/services/config_schema/monkey.py
+++ b/monkey/monkey_island/cc/services/config_schema/monkey.py
@@ -93,38 +93,23 @@ MONKEY = {
                 },
             }
         },
-        "life_cycle": {
-            "title": "Life cycle",
+        "persistent_scanning": {
+            "title": "Persistent scanning",
             "type": "object",
             "properties": {
                 "max_iterations": {
                     "title": "Max iterations",
                     "type": "integer",
                     "default": 1,
-                    "description": "Determines how many iterations of the monkey's full lifecycle should occur"
-                },
-                "victims_max_find": {
-                    "title": "Max victims to find",
-                    "type": "integer",
-                    "default": 100,
-                    "description": "Determines the maximum number of machines the monkey is allowed to scan"
-                },
-                "victims_max_exploit": {
-                    "title": "Max victims to exploit",
-                    "type": "integer",
-                    "default": 15,
-                    "description":
-                        "Determines the maximum number of machines the monkey"
-                        " is allowed to successfully exploit. " + WARNING_SIGN
-                        + " Note that setting this value too high may result in the monkey propagating to "
-                          "a high number of machines"
+                    "description": "Determines how many iterations of the monkey's full lifecycle should occur "
+                                   "(how many times to do the scan)"
                 },
                 "timeout_between_iterations": {
                     "title": "Wait time between iterations",
                     "type": "integer",
                     "default": 100,
                     "description":
-                        "Determines for how long (in seconds) should the monkey wait between iterations"
+                        "Determines for how long (in seconds) should the monkey wait before starting another scan"
                 },
                 "retry_failed_explotation": {
                     "title": "Retry failed exploitation",
@@ -132,7 +117,7 @@ MONKEY = {
                     "default": True,
                     "description":
                         "Determines whether the monkey should retry exploiting machines"
-                        " it didn't successfully exploit on previous iterations"
+                        " it didn't successfully exploit on previous scans"
                 }
             }
         }