forked from p15670423/monkey
81 lines
7.5 KiB
Plaintext
81 lines
7.5 KiB
Plaintext
{
|
|
"id": "AzD8XysWg1BBXCjCDkfq",
|
|
"name": "Add a new configuration setting to the Agent ⚙",
|
|
"dod": "Make the max victim number that Monkey will find before stopping configurable by the user instead of constant.",
|
|
"description": "# Make something configurable\n\nIn this unit, you will learn how to add a configuration option to Monkey and how to use it in the Monkey Agent code. \n\n![computer fire](https://media.giphy.com/media/7J4P7cUur2DlErijp3/giphy.gif \"computer fire\")\n\n## Why is this important?\n\nEnabling users to configure the Monkey's behaviour gives them a lot more freedom in how they want to use the Monkey and enables more use cases.\n\n## What is \"Max victims to find\"?\n\nThe Monkey has a function which finds \"victim\" machines on the network for the Monkey to try and exploit. It's called `get_victim_machines`. This function accepts an argument which limits how many machines the Monkey should find.\n\nWe want to make that value editable by the user instead of constant in the code.\n\n## Manual testing\n\n1. After you've performed the required changes, reload the Server and check your value exists in the Internal tab of the config (see image).\n\n\n\n2. Set the new value to 1, and run Monkey locally (from source). See that the Monkey only scans one machine.",
|
|
"summary": "* When changing config schema by adding or deleting keys, you need to update the Blackbox Test configurations as well [here](https://github.com/guardicore/monkey/tree/develop/envs/monkey_zoo/blackbox/island_configs).",
|
|
"diff": "diff --git a/monkey/infection_monkey/config.py b/monkey/infection_monkey/config.py\nindex 1fbcb876..67ed19de 100644\n--- a/monkey/infection_monkey/config.py\n+++ b/monkey/infection_monkey/config.py\n@@ -120,9 +120,6 @@\n exploiter_classes = []\n system_info_collector_classes = []\n \n- # how many victims to look for in a single scan iteration\n- victims_max_find = 100\n-\n # how many victims to exploit before stopping\n victims_max_exploit = 100\n \ndiff --git a/monkey/infection_monkey/monkey.py b/monkey/infection_monkey/monkey.py\nindex 444bde45..ff23f671 100644\n--- a/monkey/infection_monkey/monkey.py\n+++ b/monkey/infection_monkey/monkey.py\n@@ -154,7 +154,7 @@\n if not self._keep_running or not WormConfiguration.alive:\n break\n \n- machines = self._network.get_victim_machines(max_find=WormConfiguration.victims_max_find,\n+ machines = self._network.get_victim_machines(max_find=100,\n stop_callback=ControlClient.check_for_stop)\n is_empty = True\n for machine in machines:\ndiff --git a/monkey/monkey_island/cc/services/config_schema/internal.py b/monkey/monkey_island/cc/services/config_schema/internal.py\nindex bdbae246..d6042d35 100644\n--- a/monkey/monkey_island/cc/services/config_schema/internal.py\n+++ b/monkey/monkey_island/cc/services/config_schema/internal.py\n@@ -40,12 +40,6 @@\n \"title\": \"Monkey\",\n \"type\": \"object\",\n \"properties\": {\n- \"victims_max_find\": {\n- \"title\": \"Max victims to find\",\n- \"type\": \"integer\",\n- \"default\": 100,\n- \"description\": \"Determines the maximum number of machines the monkey is allowed to scan\"\n- },\n \"victims_max_exploit\": {\n \"title\": \"Max victims to exploit\",\n \"type\": \"integer\",\n",
|
|
"tests": [],
|
|
"hints": [
|
|
"Look for `victims_max_exploit` - it's rather similar."
|
|
],
|
|
"app_version": "0.2.1",
|
|
"file_version": "1.0.3",
|
|
"swimmPatch": {
|
|
"monkey/infection_monkey/config.py": {
|
|
"diffType": "MODIFIED",
|
|
"fileDiffHeader": "diff --git a/monkey/infection_monkey/config.py b/monkey/infection_monkey/config.py\nindex 1fbcb876..67ed19de 100644\n--- a/monkey/infection_monkey/config.py\n+++ b/monkey/infection_monkey/config.py",
|
|
"hunks": [
|
|
{
|
|
"swimmHunkMetadata": {},
|
|
"hunkDiffLines": [
|
|
"@@ -120,9 +120,6 @@",
|
|
" exploiter_classes = []",
|
|
" system_info_collector_classes = []",
|
|
" ",
|
|
"- # how many victims to look for in a single scan iteration",
|
|
"- victims_max_find = 100",
|
|
"-",
|
|
" # how many victims to exploit before stopping",
|
|
" victims_max_exploit = 100",
|
|
" "
|
|
]
|
|
}
|
|
]
|
|
},
|
|
"monkey/infection_monkey/monkey.py": {
|
|
"diffType": "MODIFIED",
|
|
"fileDiffHeader": "diff --git a/monkey/infection_monkey/monkey.py b/monkey/infection_monkey/monkey.py\nindex 444bde45..ff23f671 100644\n--- a/monkey/infection_monkey/monkey.py\n+++ b/monkey/infection_monkey/monkey.py",
|
|
"hunks": [
|
|
{
|
|
"swimmHunkMetadata": {},
|
|
"hunkDiffLines": [
|
|
"@@ -154,7 +154,7 @@",
|
|
" if not self._keep_running or not WormConfiguration.alive:",
|
|
" break",
|
|
" ",
|
|
"- machines = self._network.get_victim_machines(max_find=WormConfiguration.victims_max_find,",
|
|
"+ machines = self._network.get_victim_machines(max_find=100,",
|
|
" stop_callback=ControlClient.check_for_stop)",
|
|
" is_empty = True",
|
|
" for machine in machines:"
|
|
]
|
|
}
|
|
]
|
|
},
|
|
"monkey/monkey_island/cc/services/config_schema/internal.py": {
|
|
"diffType": "MODIFIED",
|
|
"fileDiffHeader": "diff --git a/monkey/monkey_island/cc/services/config_schema/internal.py b/monkey/monkey_island/cc/services/config_schema/internal.py\nindex bdbae246..d6042d35 100644\n--- a/monkey/monkey_island/cc/services/config_schema/internal.py\n+++ b/monkey/monkey_island/cc/services/config_schema/internal.py",
|
|
"hunks": [
|
|
{
|
|
"swimmHunkMetadata": {},
|
|
"hunkDiffLines": [
|
|
"@@ -40,12 +40,6 @@",
|
|
" \"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\","
|
|
]
|
|
}
|
|
]
|
|
}
|
|
}
|
|
} |