Changed simulation-type to include 'intensive-stress-test'.

Author: ashiven

README.md

@@ -155,7 +155,7 @@ There are two configuration files that need to be supplied before launching the
       "teams": "<int> <required> <the number of teams that should participate in the simulation>",
       "services": "<List(string)> <required> <the repository names of the services that should be used for the simulation>",
       "checker-ports": "<List(int)> <required> <the port numbers of the service checkers. the order should be the same as in services>",
-      "simulation-type": "<string> <required> <the type of simulation to run. choose between 'realistic' and 'stress-test'>",
+      "simulation-type": "<string> <required> <the type of simulation to run. choose between 'realistic', 'basic-stress-test', 'stress-test' and 'intesive-stress-test'>",
       "scoreboard-file": "<string> <optional> <the path to a scoreboard file in json format from a past competition that will be used to derive a team experience distribution for the simulation>"
    },
    "ctf-json": {

config/config.json

@@ -18,7 +18,7 @@
       "teams": "<int> <required> <the number of teams that should participate in the simulation>",
       "services": "<List(string)> <required> <the repository names of the services that should be used for the simulation>",
       "checker-ports": "<List(int)> <required> <the port numbers of the service checkers. the order should be the same as in services>",
-      "simulation-type": "<string> <required> <the type of simulation to run. choose between 'realistic', 'basic-stress-test' and 'stress-test'>",
+      "simulation-type": "<string> <required> <the type of simulation to run. choose between 'realistic', 'basic-stress-test', 'stress-test' and 'intesive-stress-test'>",
       "scoreboard-file": "<string> <optional> <the path to a scoreboard file in json format from a past competition that will be used to derive a team experience distribution for the simulation>"
    },
    "ctf-json": {

enosimulator/setup/setup.py

@@ -282,9 +282,13 @@ def _generate_service(
             "name": service,
             "flagsPerRoundMultiplier": 30
             if simulation_type == "basic-stress-test"
+            else 10
+            if simulation_type == "intensive-stress-test"
             else 1,
             "noisesPerRoundMultiplier": 30
             if simulation_type == "basic-stress-test"
+            else 10
+            if simulation_type == "intensive-stress-test"
             else 1,
             "havocsPerRoundMultiplier": 1,
             "weightFactor": 1,

enosimulator/setup/setup_helper/team_generator.py

@@ -125,7 +125,10 @@ def __init__(self, config: Config):
         if self.config.settings.simulation_type == "basic-stress-test":
             self.team_distribution = {Experience.HAXXOR: 1}
 
-        elif self.config.settings.simulation_type == "stress-test":
+        elif self.config.settings.simulation_type in (
+            "stress-test",
+            "intensive-stress-test",
+        ):
             self.team_distribution = {Experience.HAXXOR: self.config.settings.teams}
 
         else:

enosimulator/simulation/orchestrator.py

@@ -203,32 +203,34 @@ def _create_exploit_requests(
                             or other_team.address == team.address
                         ):
                             continue
+
                         try:
-                            attack_info = ",".join(
-                                self.attack_info["services"][
-                                    self.service_info[service][1]
-                                ][other_team.address][str(round_id)][str(flagstore_id)]
-                            )
+                            service_name = self.service_info[service][1]
+                            attack_info = self.attack_info["services"][service_name][
+                                other_team.address
+                            ][str(round_id)][str(flagstore_id)]
                         except:
                             attack_info = None
 
-                        exploit_request = checker_request(
-                            method="exploit",
-                            round_id=round_id,
-                            team_id=other_team.id,
-                            team_name=other_team.name,
-                            variant_id=flagstore_id,
-                            service_address=other_team.address,
-                            flag_regex=FLAG_REGEX_ASCII,
-                            flag=None,
-                            flag_hash=FLAG_HASH,
-                            unique_variant_index=None,
-                            attack_info=attack_info,
-                        )
-
-                        exploit_requests[
-                            other_team.name, service, flagstore
-                        ] = exploit_request
+                        if attack_info:
+                            for info in attack_info:
+                                exploit_request = checker_request(
+                                    method="exploit",
+                                    round_id=round_id,
+                                    team_id=other_team.id,
+                                    team_name=other_team.name,
+                                    variant_id=flagstore_id,
+                                    service_address=other_team.address,
+                                    flag_regex=FLAG_REGEX_ASCII,
+                                    flag=None,
+                                    flag_hash=FLAG_HASH,
+                                    unique_variant_index=None,
+                                    attack_info=info,
+                                )
+
+                                exploit_requests[
+                                    other_team.name, service, flagstore, info
+                                ] = exploit_request
 
         return exploit_requests
 
@@ -237,7 +239,7 @@ async def _send_exploit_requests(
     ) -> List[str]:
         flags = []
         for (
-            (team_name, service, flagstore),
+            (team_name, service, flagstore, _info),
             exploit_request,
         ) in exploit_requests.items():
             exploit_checker_ip = self.private_to_public_ip[team.address]

enosimulator/types_.py

@@ -183,6 +183,7 @@ def from_(settings):
         if settings["simulation-type"] not in [
             "stress-test",
             "basic-stress-test",
+            "intensive-stress-test",
             "realistic",
         ]:
             raise ValueError("Invalid simulation type in config file.")

infra/azure/templates/data/engine.sh

@@ -69,7 +69,7 @@ if [ -f "./docker-compose.yml" ]; then
 fi
 
 # Start the engine
-echo -e "\033[32m[+] Starting EnoEngine...\033[0m"
+echo -e "\033[32m[+] Starting EnoEngine ...\033[0m"
 cd EnoEngine
 retry sudo dotnet build
 retry sudo docker compose up -d

infra/hetzner/templates/data/engine.sh

@@ -69,7 +69,7 @@ if [ -f "./docker-compose.yml" ]; then
 fi
 
 # Start the engine
-echo -e "\033[32m[+] Starting EnoEngine...\033[0m"
+echo -e "\033[32m[+] Starting EnoEngine ...\033[0m"
 cd EnoEngine
 retry sudo dotnet build
 retry sudo docker compose up -d

tests/test_setup.py

@@ -36,8 +36,20 @@ def test_team_generator_stress_test(setup_container):
     assert len(ctf_json_teams) == 3
     assert len(ctf_json_teams) == len(setup_teams)
 
+def test_team_generator_intensive_stress_test(setup_container):
+    setup_container.reset_singletons()
+    setup_container.configuration.config.from_dict(
+        {"settings": {"teams": 3, "simulation-type": "intensive-stress-test"}}
+    )
+    team_generator = setup_container.team_generator()
+    assert all([exp.name == "HAXXOR" for exp in team_generator.team_distribution])
+
+    ctf_json_teams, setup_teams = team_generator.generate()
+    assert len(ctf_json_teams) == 3
+    assert len(ctf_json_teams) == len(setup_teams)
+
 
-def test_team_generator_realistic(setup_container, test_setup_dir):
+def test_team_generator_realistic(setup_container):
     setup_container.reset_singletons()
     setup_container.configuration.config.from_dict(
         {"settings": {"teams": 15, "simulation-type": "realistic"}}

tests/test_simulation.py

@@ -374,7 +374,7 @@ async def test_orchestrator_send_exploit_requests(simulation_container):
     orchestrator.service_info = service_info
 
     exploit_requests = {
-        ("TestTeam2", "CVExchange", "Flagstore0"): CheckerTaskMessage(
+        ("TestTeam2", "CVExchange", "Flagstore0", "12"): CheckerTaskMessage(
             task_id=10,
             method=CheckerMethod.EXPLOIT,
             address="10.1.2.1",
@@ -391,7 +391,7 @@ async def test_orchestrator_send_exploit_requests(simulation_container):
             flag_hash="ignore_flag_hash",
             attack_info="12",
         ),
-        ("TestTeam2", "CVExchange", "Flagstore1"): CheckerTaskMessage(
+        ("TestTeam2", "CVExchange", "Flagstore1", "13"): CheckerTaskMessage(
             task_id=10,
             method=CheckerMethod.EXPLOIT,
             address="10.1.2.1",
@@ -419,13 +419,17 @@ async def test_orchestrator_send_exploit_requests(simulation_container):
     assert mock_client.post.call_count == 2
     mock_client.post.assert_any_call(
         "http://234.123.12.32:7331",
-        data=req_to_json(exploit_requests[("TestTeam2", "CVExchange", "Flagstore0")]),
+        data=req_to_json(
+            exploit_requests[("TestTeam2", "CVExchange", "Flagstore0", "12")]
+        ),
         headers={"Content-Type": "application/json"},
         timeout=10,
     )
     mock_client.post.assert_any_call(
         "http://234.123.12.32:7331",
-        data=req_to_json(exploit_requests[("TestTeam2", "CVExchange", "Flagstore1")]),
+        data=req_to_json(
+            exploit_requests[("TestTeam2", "CVExchange", "Flagstore1", "13")]
+        ),
         headers={"Content-Type": "application/json"},
         timeout=10,
     )