From aaa3aade20aa57ba708a87507e69379e1fa84f1d Mon Sep 17 00:00:00 2001
From: vakarisz <vakarisz@yahoo.com>
Date: Tue, 17 May 2022 15:29:55 +0300
Subject: [PATCH 01/13] Island: Define repository interfaces for config and
 edge

---
 monkey/monkey_island/cc/dal/IRepository.py    | 59 +++++++++++++++++++
 monkey/monkey_island/cc/services/config.py    |  7 +++
 monkey/monkey_island/cc/services/edge/edge.py |  3 +
 3 files changed, 69 insertions(+)
 create mode 100644 monkey/monkey_island/cc/dal/IRepository.py

diff --git a/monkey/monkey_island/cc/dal/IRepository.py b/monkey/monkey_island/cc/dal/IRepository.py
new file mode 100644
index 000000000..8dd84a330
--- /dev/null
+++ b/monkey/monkey_island/cc/dal/IRepository.py
@@ -0,0 +1,59 @@
+from abc import ABC
+from typing import Any, Optional, Sequence
+
+from monkey_island.cc.models import Config, Monkey
+from monkey_island.cc.models.edge import Edge
+
+
+class IRepository(ABC):
+
+    # Config
+    ###############################################
+
+    # This returns the current config
+    # TODO investigate if encryption should be here or where
+    def get_config(self) -> dict:
+        pass
+
+    def set_config(self, config: dict):
+        pass
+
+    # Used when only a subset of config is submitted, for example only PBAFiles
+    # Used by passing keys, like ['monkey', 'post_breach_actions', 'linux_filename']
+    # Using a list is less ambiguous IMO, than using . notation
+    def set_config_field(self, key_list: Sequence[str], value: Any):
+        pass
+
+    # Used when only a subset of config is needed, for example only PBAFiles
+    # Used by passing keys, like ['monkey', 'post_breach_actions', 'linux_filename']
+    # Using a list is less ambiguous IMO, than using . notation
+    # TODO Still in doubt about encryption, this should probably be determined automatically
+    def get_config_field(self, key_list: Sequence[str]) -> Any:
+        pass
+
+    # Edges
+    ###############################################
+
+    def get_all_edges(self):
+        pass
+
+    def get_edge(self, src_node_id: str, dst_node_id: str) -> Edge:
+        pass
+
+    def save_edge(self, edge: Edge):
+        pass
+
+    def get_by_dst_node(self, dst_node_id: str) -> Sequence[Edge]:
+        pass
+
+    # If tunnel is None then it gets all edges, if True/False then gets only
+    # tunneling/non-tunneling edges
+    def get_by_src_node(self, src_node_id: str, tunnel: Optional[bool] = None) -> Sequence[Edge]:
+        pass
+
+    def get_by_id(self, edge_id: str) -> Edge:
+        pass
+
+    # Scan telemetries might change the label once we know more about the target system
+    def set_label(self, edge_id: str, label: str):
+        pass
diff --git a/monkey/monkey_island/cc/services/config.py b/monkey/monkey_island/cc/services/config.py
index f0977ef66..293d1bffb 100644
--- a/monkey/monkey_island/cc/services/config.py
+++ b/monkey/monkey_island/cc/services/config.py
@@ -70,6 +70,9 @@ class ConfigService:
         :param is_island: If True, will include island specific configuration parameters.
         :return: The entire global config.
         """
+
+        # is_initial_config and should_decrypt are only there to compare if we are on the
+        # default configuration or did user modified it already
         config = (
             mongo.db.config.find_one({"name": "initial" if is_initial_config else "newconfig"})
             or {}
@@ -95,9 +98,12 @@ class ConfigService:
         :return: The value of the requested config key.
         """
         config_key = functools.reduce(lambda x, y: x + "." + y, config_key_as_arr)
+
+        # This should just call get_config from repository. If None, then call get_default prob
         config = mongo.db.config.find_one(
             {"name": "initial" if is_initial_config else "newconfig"}, {config_key: 1}
         )
+
         for config_key_part in config_key_as_arr:
             config = config[config_key_part]
         if should_decrypt:
@@ -141,6 +147,7 @@ class ConfigService:
     def get_config_schema():
         return SCHEMA
 
+    # Not added to interface because it's doable by get_config_field + set_config_field
     @staticmethod
     def add_item_to_config_set_if_dont_exist(item_path_array, item_value, should_encrypt):
         item_key = ".".join(item_path_array)
diff --git a/monkey/monkey_island/cc/services/edge/edge.py b/monkey/monkey_island/cc/services/edge/edge.py
index dae19ccd8..c62aae7a4 100644
--- a/monkey/monkey_island/cc/services/edge/edge.py
+++ b/monkey/monkey_island/cc/services/edge/edge.py
@@ -65,6 +65,9 @@ class EdgeService(Edge):
         except DoesNotExist:
             return []
 
+    # TODO it's not entirelly clear why the tunnel is unset in
+    #  monkey/monkey_island/cc/services/telemetry/processing/tunnel.py:15
+    # Either way this can be done by fetching, modifying and saving
     def disable_tunnel(self):
         self.tunnel = False
         self.save()

From 6438afbcd59d6bb0218f1b5219fa1fdc987c8b75 Mon Sep 17 00:00:00 2001
From: vakarisz <vakarisz@yahoo.com>
Date: Wed, 18 May 2022 13:02:48 +0300
Subject: [PATCH 02/13] Island: Add a bunch of IRepository interfaces for data
 entities

---
 .../monkey_island/cc/dal/IAgentRepository.py  | 15 ++++++++++
 .../monkey_island/cc/dal/IAttackRepository.py | 24 +++++++++++++++
 .../monkey_island/cc/dal/IConfigRepository.py | 30 +++++++++++++++++++
 .../monkey_island/cc/dal/IEdgeRepository.py   | 30 +++++++++++++++++++
 .../cc/dal/IMachineRepository.py              | 19 ++++++++++++
 .../monkey_island/cc/dal/IReportRepository.py | 14 +++++++++
 .../cc/dal/ISimulationRepository.py           | 11 +++++++
 .../cc/dal/ITelemetryRepository.py            | 20 +++++++++++++
 8 files changed, 163 insertions(+)
 create mode 100644 monkey/monkey_island/cc/dal/IAgentRepository.py
 create mode 100644 monkey/monkey_island/cc/dal/IAttackRepository.py
 create mode 100644 monkey/monkey_island/cc/dal/IConfigRepository.py
 create mode 100644 monkey/monkey_island/cc/dal/IEdgeRepository.py
 create mode 100644 monkey/monkey_island/cc/dal/IMachineRepository.py
 create mode 100644 monkey/monkey_island/cc/dal/IReportRepository.py
 create mode 100644 monkey/monkey_island/cc/dal/ISimulationRepository.py
 create mode 100644 monkey/monkey_island/cc/dal/ITelemetryRepository.py

diff --git a/monkey/monkey_island/cc/dal/IAgentRepository.py b/monkey/monkey_island/cc/dal/IAgentRepository.py
new file mode 100644
index 000000000..5a784e5d2
--- /dev/null
+++ b/monkey/monkey_island/cc/dal/IAgentRepository.py
@@ -0,0 +1,15 @@
+from abc import ABC
+from typing import Optional, Sequence
+
+from monkey_island.cc.models import Monkey
+
+
+class IAgentRepository(ABC):
+    # TODO rename Monkey document to Agent
+    def save_agent(self, agent: Monkey):
+        pass
+
+    def get_agents(
+        self, id: Optional[str] = None, running: Optional[bool] = None
+    ) -> Sequence[Monkey]:
+        pass
diff --git a/monkey/monkey_island/cc/dal/IAttackRepository.py b/monkey/monkey_island/cc/dal/IAttackRepository.py
new file mode 100644
index 000000000..f1c6c0213
--- /dev/null
+++ b/monkey/monkey_island/cc/dal/IAttackRepository.py
@@ -0,0 +1,24 @@
+from abc import ABC
+from typing import Sequence
+
+from monkey_island.cc.models.attack import Mitigation
+
+
+class IRepository(ABC):
+    # Att&ck just add not implemented raises
+    ######################################
+    # This will likely stay the same as mitigations are external data
+    def save_mitigations(self, mitigations: Sequence[Mitigation]):
+        pass
+
+    # This will likely remain if we plan to keep the report actionable
+    def get_mitigation_by_technique(self, technique_id: str) -> Mitigation:
+        pass
+
+    # This could go away, since attack report is not costly to generate and we'll refactor it
+    def save_attack_report(self, attack_report: dict):
+        raise NotImplementedError
+
+    # This will probably go away once we use endpoints instead
+    def get_attack_report(self):
+        raise NotImplementedError
diff --git a/monkey/monkey_island/cc/dal/IConfigRepository.py b/monkey/monkey_island/cc/dal/IConfigRepository.py
new file mode 100644
index 000000000..70e59a89f
--- /dev/null
+++ b/monkey/monkey_island/cc/dal/IConfigRepository.py
@@ -0,0 +1,30 @@
+from abc import ABC
+from typing import Any, Mapping, Sequence
+
+
+class IConfigRepository(ABC):
+
+    # Config
+    ###############################################
+
+    # This returns the current config
+    # TODO investigate if encryption should be here or where
+    # TODO potentially should be a DTO as well, but it's structure is defined in schema already
+    def get_config(self) -> Mapping:
+        pass
+
+    def set_config(self, config: dict):
+        pass
+
+    # Used when only a subset of config is submitted, for example only PBAFiles
+    # Used by passing keys, like ['monkey', 'post_breach_actions', 'linux_filename']
+    # Using a list is less ambiguous IMO, than using . notation
+    def set_config_field(self, key_list: Sequence[str], value: Any):
+        pass
+
+    # Used when only a subset of config is needed, for example only PBAFiles
+    # Used by passing keys, like ['monkey', 'post_breach_actions', 'linux_filename']
+    # Using a list is less ambiguous IMO, than using . notation
+    # TODO Still in doubt about encryption, this should probably be determined automatically
+    def get_config_field(self, key_list: Sequence[str]) -> Any:
+        pass
diff --git a/monkey/monkey_island/cc/dal/IEdgeRepository.py b/monkey/monkey_island/cc/dal/IEdgeRepository.py
new file mode 100644
index 000000000..3b1393f31
--- /dev/null
+++ b/monkey/monkey_island/cc/dal/IEdgeRepository.py
@@ -0,0 +1,30 @@
+from abc import ABC
+from typing import Optional, Sequence
+
+from monkey_island.cc.models.edge import Edge
+
+
+class IEdgeRepository(ABC):
+    def get_all_edges(self):
+        pass
+
+    def get_edges(self, src_machine_id: str, dst_machine_id: str) -> Sequence[Edge]:
+        pass
+
+    def save_edge(self, edge: Edge):
+        pass
+
+    def get_by_dst(self, dst_machine_id: str) -> Sequence[Edge]:
+        pass
+
+    # If tunnel is None then it gets all edges, if True/False then gets only
+    # tunneling/non-tunneling edges
+    def get_by_src(self, src_machine_id: str, tunnel: Optional[bool] = None) -> Sequence[Edge]:
+        pass
+
+    def get_by_id(self, edge_id: str) -> Edge:
+        pass
+
+    # Scan telemetries might change the label once we know more about the target system
+    def set_label(self, edge_id: str, label: str):
+        pass
diff --git a/monkey/monkey_island/cc/dal/IMachineRepository.py b/monkey/monkey_island/cc/dal/IMachineRepository.py
new file mode 100644
index 000000000..99e7f49dc
--- /dev/null
+++ b/monkey/monkey_island/cc/dal/IMachineRepository.py
@@ -0,0 +1,19 @@
+from abc import ABC
+from typing import Optional, Sequence
+
+
+class IMachineRepository(ABC):
+    # TODO define Machine object(ORM model)
+    def save_machine(self, machine: Machine):
+        pass
+
+    # TODO define Machine object(ORM model)
+    # TODO define or re-use machine state.
+    def get_machines(
+        self,
+        id: Optional[str] = None,
+        ips: Optional[Sequence[str]] = None,
+        state: Optional[MachineState] = None,
+        is_island: Optional[bool] = None,
+    ) -> Sequence[Machine]:
+        pass
diff --git a/monkey/monkey_island/cc/dal/IReportRepository.py b/monkey/monkey_island/cc/dal/IReportRepository.py
new file mode 100644
index 000000000..6891c3c50
--- /dev/null
+++ b/monkey/monkey_island/cc/dal/IReportRepository.py
@@ -0,0 +1,14 @@
+from abc import ABC
+
+from monkey_island.cc.models import Report
+
+
+class IReportRepository(ABC):
+    # Report (potentially should go away if split up into proper endpoints/services)
+    #################################
+    def save_report(self, report: Report):
+        pass
+
+    # Should return only one
+    def get_report(self) -> Report:
+        pass
diff --git a/monkey/monkey_island/cc/dal/ISimulationRepository.py b/monkey/monkey_island/cc/dal/ISimulationRepository.py
new file mode 100644
index 000000000..96cc3dc17
--- /dev/null
+++ b/monkey/monkey_island/cc/dal/ISimulationRepository.py
@@ -0,0 +1,11 @@
+from abc import ABC
+
+
+class ISimulationRepository(ABC):
+    # TODO define simulation object. It should contain metadata about simulation,
+    # like start, end times, mode and last forced stop of all monkeys
+    def save_simulation(self, simulation: Simulation):
+        pass
+
+    def get_simulation(self):
+        pass
diff --git a/monkey/monkey_island/cc/dal/ITelemetryRepository.py b/monkey/monkey_island/cc/dal/ITelemetryRepository.py
new file mode 100644
index 000000000..69aa2ff35
--- /dev/null
+++ b/monkey/monkey_island/cc/dal/ITelemetryRepository.py
@@ -0,0 +1,20 @@
+from abc import ABC
+from typing import Optional, Sequence
+
+from monkey_island.cc.models.telemetries.telemetry import Telemetry
+
+
+class ITelemetryRepository(ABC):
+    def save_telemetry(self, telemetry: Telemetry):
+        pass
+
+    # TODO define all telemetry types
+    # Potentially we'll need to define each telem type separately. As it stands there's no way to
+    # get exploit telemetries by exploiter for example
+    def get_telemetries(
+        self,
+        id: Optional[str] = None,
+        type: Optional[TelemetryType] = None,
+        monkey_id: Optional[str] = None,
+    ) -> Sequence[Telemetry]:
+        pass

From e0b40372708ff0dbc407ae9216b8dac3c3116740 Mon Sep 17 00:00:00 2001
From: vakarisz <vakarisz@yahoo.com>
Date: Wed, 18 May 2022 13:03:24 +0300
Subject: [PATCH 03/13] Island: Add notes/explanations/thoughs in the services

---
 .../cc/services/netmap/net_edge.py            |  2 +
 monkey/monkey_island/cc/services/node.py      | 44 ++++++++++++-------
 .../cc/services/reporting/report.py           |  5 +++
 3 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/monkey/monkey_island/cc/services/netmap/net_edge.py b/monkey/monkey_island/cc/services/netmap/net_edge.py
index 1c0b649d0..bae69fdc7 100644
--- a/monkey/monkey_island/cc/services/netmap/net_edge.py
+++ b/monkey/monkey_island/cc/services/netmap/net_edge.py
@@ -21,6 +21,8 @@ class NetEdgeService:
     def _get_standard_net_edges():
         return [DisplayedEdgeService.edge_to_net_edge(x) for x in EdgeService.get_all_edges()]
 
+    # If we save the island machine as a standard machine, we won't need these
+    # methods
     @staticmethod
     def _get_uninfected_island_net_edges():
         edges = []
diff --git a/monkey/monkey_island/cc/services/node.py b/monkey/monkey_island/cc/services/node.py
index abf41e715..e144ed0a6 100644
--- a/monkey/monkey_island/cc/services/node.py
+++ b/monkey/monkey_island/cc/services/node.py
@@ -80,6 +80,11 @@ class NodeService:
             domain_name = " (" + node["domain_name"] + ")"
         return node["os"]["version"] + " : " + node["ip_addresses"][0] + domain_name
 
+    # A lot of methods like these duplicate between monkey and node.
+    # That's a result of poor entity model, because both nodes and monkeys
+    # store the same information. It's best to extract the machine specific data
+    # to "Machine" entity (like IP's and os) and agent specific data to "Agent" (like alive,
+    # parent, etc)
     @staticmethod
     def get_monkey_os(monkey):
         os = "unknown"
@@ -183,15 +188,15 @@ class NodeService:
         tunnel_host_id = NodeService.get_monkey_by_ip(tunnel_host_ip)["_id"]
         NodeService.unset_all_monkey_tunnels(monkey_id)
         mongo.db.monkey.update(
-            {"_id": monkey_id}, {"$set": {"tunnel": tunnel_host_id}}, upsert=False
+                {"_id": monkey_id}, {"$set": {"tunnel": tunnel_host_id}}, upsert=False
         )
         monkey_label = NodeService.get_label_for_endpoint(monkey_id)
         tunnel_host_label = NodeService.get_label_for_endpoint(tunnel_host_id)
         tunnel_edge = EdgeService.get_or_create_edge(
-            src_node_id=monkey_id,
-            dst_node_id=tunnel_host_id,
-            src_label=monkey_label,
-            dst_label=tunnel_host_label,
+                src_node_id=monkey_id,
+                dst_node_id=tunnel_host_id,
+                src_label=monkey_label,
+                dst_label=tunnel_host_label,
         )
         tunnel_edge.tunnel = True
         tunnel_edge.ip_address = tunnel_host_ip
@@ -200,13 +205,13 @@ class NodeService:
     @staticmethod
     def insert_node(ip_address, domain_name=""):
         new_node_insert_result = mongo.db.node.insert_one(
-            {
-                "ip_addresses": [ip_address],
-                "domain_name": domain_name,
-                "exploited": False,
-                "propagated": False,
-                "os": {"type": "unknown", "version": "unknown"},
-            }
+                {
+                    "ip_addresses": [ip_address],
+                    "domain_name": domain_name,
+                    "exploited": False,
+                    "propagated": False,
+                    "os": {"type": "unknown", "version": "unknown"},
+                }
         )
         return mongo.db.node.find_one({"_id": new_node_insert_result.inserted_id})
 
@@ -221,6 +226,11 @@ class NodeService:
     def get_monkey_by_id(monkey_id):
         return mongo.db.monkey.find_one({"_id": ObjectId(monkey_id)})
 
+    # GUID is generated from uuid.getnode() and represents machine it was ran on
+    # All monkeys that ran on the same machine will have the same GUID, but
+    # we can just store the monkeys on the same machine document/have one to many relationship
+    # GUID could be stored on machine to uniquely identify the same machine even after the
+    # ip, domain name or other changes. Not entirely sure it's necessary
     @staticmethod
     def get_monkey_by_guid(monkey_guid):
         return mongo.db.monkey.find_one({"guid": monkey_guid})
@@ -237,10 +247,12 @@ class NodeService:
     def get_node_by_id(node_id):
         return mongo.db.node.find_one({"_id": ObjectId(node_id)})
 
+    # This is only used to determine if report is the latest or if we need to
+    # generate a new one. This info should end up in Simulation entity instead.
     @staticmethod
     def update_monkey_modify_time(monkey_id):
         mongo.db.monkey.update(
-            {"_id": monkey_id}, {"$set": {"modifytime": datetime.now()}}, upsert=False
+                {"_id": monkey_id}, {"$set": {"modifytime": datetime.now()}}, upsert=False
         )
 
     @staticmethod
@@ -256,9 +268,11 @@ class NodeService:
     @staticmethod
     def add_communication_info(monkey, info):
         mongo.db.monkey.update(
-            {"guid": monkey["guid"]}, {"$set": {"command_control_channel": info}}, upsert=False
+                {"guid": monkey["guid"]}, {"$set": {"command_control_channel": info}}, upsert=False
         )
 
+    # TODO this returns a mock island agent
+    # It's better to just initialize the island machine on reset I think
     @staticmethod
     def get_monkey_island_monkey():
         ip_addresses = local_ip_addresses()
@@ -329,7 +343,7 @@ class NodeService:
     @staticmethod
     def get_hostname_by_id(node_id):
         return NodeService.get_node_hostname(
-            mongo.db.monkey.find_one({"_id": node_id}, {"hostname": 1})
+                mongo.db.monkey.find_one({"_id": node_id}, {"hostname": 1})
         )
 
     @staticmethod
diff --git a/monkey/monkey_island/cc/services/reporting/report.py b/monkey/monkey_island/cc/services/reporting/report.py
index 69a252580..28748d0fa 100644
--- a/monkey/monkey_island/cc/services/reporting/report.py
+++ b/monkey/monkey_island/cc/services/reporting/report.py
@@ -57,6 +57,7 @@ class ReportService:
     def initialize(cls, aws_service: AWSService):
         cls._aws_service = aws_service
 
+    # This should pull from Simulation entity
     @staticmethod
     def get_first_monkey_time():
         return (
@@ -88,6 +89,7 @@ class ReportService:
 
         return st
 
+    # This shoud be replaced by a query to edges and get tunnel edges?
     @staticmethod
     def get_tunnels():
         return [
@@ -103,6 +105,7 @@ class ReportService:
             for tunnel in mongo.db.monkey.find({"tunnel": {"$exists": True}}, {"tunnel": 1})
         ]
 
+    # This should be replaced by machine query for "scanned" status
     @staticmethod
     def get_scanned():
         formatted_nodes = []
@@ -110,6 +113,8 @@ class ReportService:
         nodes = ReportService.get_all_displayed_nodes()
 
         for node in nodes:
+            # This information should be evident from the map, not sure a table/list is a good way
+            # to display it anyways
             nodes_that_can_access_current_node = node["accessible_from_nodes_hostnames"]
             formatted_nodes.append(
                 {

From ca951af5d058a2beb7bc7be465b5be320bb53bfb Mon Sep 17 00:00:00 2001
From: Ilija Lazoroski <ilija.la@live.com>
Date: Wed, 18 May 2022 13:25:52 +0200
Subject: [PATCH 04/13] Island: Add ITelemStoreRepository interface

---
 monkey/monkey_island/cc/dal/ITelemStoreRepository.py       | 7 +++++++
 .../cc/resources/blackbox/utils/telem_store.py             | 1 +
 2 files changed, 8 insertions(+)
 create mode 100644 monkey/monkey_island/cc/dal/ITelemStoreRepository.py

diff --git a/monkey/monkey_island/cc/dal/ITelemStoreRepository.py b/monkey/monkey_island/cc/dal/ITelemStoreRepository.py
new file mode 100644
index 000000000..bf5648b78
--- /dev/null
+++ b/monkey/monkey_island/cc/dal/ITelemStoreRepository.py
@@ -0,0 +1,7 @@
+from abc import ABC
+
+
+class ITelemStoreRepository(ABC):
+    def get_telemetries(self):
+        # Used to get ExportedTelem for the Telemtry Store
+        pass
diff --git a/monkey/monkey_island/cc/resources/blackbox/utils/telem_store.py b/monkey/monkey_island/cc/resources/blackbox/utils/telem_store.py
index 2130cef5a..8260c467d 100644
--- a/monkey/monkey_island/cc/resources/blackbox/utils/telem_store.py
+++ b/monkey/monkey_island/cc/resources/blackbox/utils/telem_store.py
@@ -60,6 +60,7 @@ class TestTelemStore:
         TestTelemStore.TELEMS_EXPORTED = True
         logger.info("Telemetries exported!")
 
+    # Should be private
     @staticmethod
     def get_unique_file_path_for_export_telem(target_dir: str, test_telem: ExportedTelem):
         telem_filename = TestTelemStore._get_filename_by_export_telem(test_telem)

From 8f048a9b34c5a6b92107ae7acc28c94815feb2fa Mon Sep 17 00:00:00 2001
From: vakarisz <vakarisz@yahoo.com>
Date: Wed, 18 May 2022 17:28:26 +0300
Subject: [PATCH 05/13] Island: Delete IRepository.py, because it's split up

---
 monkey/monkey_island/cc/dal/IRepository.py | 59 ----------------------
 1 file changed, 59 deletions(-)
 delete mode 100644 monkey/monkey_island/cc/dal/IRepository.py

diff --git a/monkey/monkey_island/cc/dal/IRepository.py b/monkey/monkey_island/cc/dal/IRepository.py
deleted file mode 100644
index 8dd84a330..000000000
--- a/monkey/monkey_island/cc/dal/IRepository.py
+++ /dev/null
@@ -1,59 +0,0 @@
-from abc import ABC
-from typing import Any, Optional, Sequence
-
-from monkey_island.cc.models import Config, Monkey
-from monkey_island.cc.models.edge import Edge
-
-
-class IRepository(ABC):
-
-    # Config
-    ###############################################
-
-    # This returns the current config
-    # TODO investigate if encryption should be here or where
-    def get_config(self) -> dict:
-        pass
-
-    def set_config(self, config: dict):
-        pass
-
-    # Used when only a subset of config is submitted, for example only PBAFiles
-    # Used by passing keys, like ['monkey', 'post_breach_actions', 'linux_filename']
-    # Using a list is less ambiguous IMO, than using . notation
-    def set_config_field(self, key_list: Sequence[str], value: Any):
-        pass
-
-    # Used when only a subset of config is needed, for example only PBAFiles
-    # Used by passing keys, like ['monkey', 'post_breach_actions', 'linux_filename']
-    # Using a list is less ambiguous IMO, than using . notation
-    # TODO Still in doubt about encryption, this should probably be determined automatically
-    def get_config_field(self, key_list: Sequence[str]) -> Any:
-        pass
-
-    # Edges
-    ###############################################
-
-    def get_all_edges(self):
-        pass
-
-    def get_edge(self, src_node_id: str, dst_node_id: str) -> Edge:
-        pass
-
-    def save_edge(self, edge: Edge):
-        pass
-
-    def get_by_dst_node(self, dst_node_id: str) -> Sequence[Edge]:
-        pass
-
-    # If tunnel is None then it gets all edges, if True/False then gets only
-    # tunneling/non-tunneling edges
-    def get_by_src_node(self, src_node_id: str, tunnel: Optional[bool] = None) -> Sequence[Edge]:
-        pass
-
-    def get_by_id(self, edge_id: str) -> Edge:
-        pass
-
-    # Scan telemetries might change the label once we know more about the target system
-    def set_label(self, edge_id: str, label: str):
-        pass

From 4bbd9981972210b11ff17d00682a71897cdb7c47 Mon Sep 17 00:00:00 2001
From: vakarisz <vakarisz@yahoo.com>
Date: Wed, 18 May 2022 17:29:38 +0300
Subject: [PATCH 06/13] Island: Add remaining repository interfaces

---
 monkey/monkey_island/cc/dal/ILogRepository.py      | 14 ++++++++++++++
 monkey/monkey_island/cc/dal/IStolenCredentials.py  | 13 +++++++++++++
 .../monkey_island/cc/dal/ITelemStoreRepository.py  |  9 +++++++--
 monkey/monkey_island/cc/dal/__init__.py            |  0
 .../cc/dal/attack/IMitigationsRepository.py        | 12 ++++++++++++
 .../cc/dal/zero_trust/IEventRepository.py          | 11 +++++++++++
 .../cc/dal/zero_trust/IFindingRepository.py        | 13 +++++++++++++
 monkey/monkey_island/cc/dal/zero_trust/__init__.py |  0
 8 files changed, 70 insertions(+), 2 deletions(-)
 create mode 100644 monkey/monkey_island/cc/dal/ILogRepository.py
 create mode 100644 monkey/monkey_island/cc/dal/IStolenCredentials.py
 create mode 100644 monkey/monkey_island/cc/dal/__init__.py
 create mode 100644 monkey/monkey_island/cc/dal/attack/IMitigationsRepository.py
 create mode 100644 monkey/monkey_island/cc/dal/zero_trust/IEventRepository.py
 create mode 100644 monkey/monkey_island/cc/dal/zero_trust/IFindingRepository.py
 create mode 100644 monkey/monkey_island/cc/dal/zero_trust/__init__.py

diff --git a/monkey/monkey_island/cc/dal/ILogRepository.py b/monkey/monkey_island/cc/dal/ILogRepository.py
new file mode 100644
index 000000000..3da83d167
--- /dev/null
+++ b/monkey/monkey_island/cc/dal/ILogRepository.py
@@ -0,0 +1,14 @@
+from abc import ABC
+from typing import Optional, Sequence
+
+
+class ILogRepository(ABC):
+    # Define log object
+    def get_logs(self, agent_id: Optional[str] = None) -> Sequence[Log]:
+        pass
+
+    def save_log(self, log: Log):
+        pass
+
+    def delete_log(self, agent_id: str):
+        pass
diff --git a/monkey/monkey_island/cc/dal/IStolenCredentials.py b/monkey/monkey_island/cc/dal/IStolenCredentials.py
new file mode 100644
index 000000000..00d8a4620
--- /dev/null
+++ b/monkey/monkey_island/cc/dal/IStolenCredentials.py
@@ -0,0 +1,13 @@
+from abc import ABC
+from typing import Sequence
+
+from monkey_island.cc.models import StolenCredentials
+
+
+# Consider removing this interface and just using the telemetry type
+class IStolenCredentialsRepository(ABC):
+    def get_stolen_credentials(self) -> Sequence[StolenCredentials]:
+        pass
+
+    def save_stolen_credentials(self, stolen_credentials: StolenCredentials):
+        pass
diff --git a/monkey/monkey_island/cc/dal/ITelemStoreRepository.py b/monkey/monkey_island/cc/dal/ITelemStoreRepository.py
index bf5648b78..0b791e474 100644
--- a/monkey/monkey_island/cc/dal/ITelemStoreRepository.py
+++ b/monkey/monkey_island/cc/dal/ITelemStoreRepository.py
@@ -1,7 +1,12 @@
 from abc import ABC
+from typing import Sequence
+
+from monkey_island.cc.models.exported_telem import ExportedTelem
 
 
 class ITelemStoreRepository(ABC):
-    def get_telemetries(self):
-        # Used to get ExportedTelem for the Telemtry Store
+    def get_telemetries(self) -> Sequence[ExportedTelem]:
+        pass
+
+    def save_telemetry(self, telemetry: ExportedTelem):
         pass
diff --git a/monkey/monkey_island/cc/dal/__init__.py b/monkey/monkey_island/cc/dal/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/monkey/monkey_island/cc/dal/attack/IMitigationsRepository.py b/monkey/monkey_island/cc/dal/attack/IMitigationsRepository.py
new file mode 100644
index 000000000..2a480b77a
--- /dev/null
+++ b/monkey/monkey_island/cc/dal/attack/IMitigationsRepository.py
@@ -0,0 +1,12 @@
+from abc import ABC
+from typing import Optional
+
+from monkey_island.cc.models.attack.attack_mitigations import AttackMitigations
+
+
+class IMitigationsRepository(ABC):
+    def get_mitigations(self, technique_id: Optional[str] = None) -> AttackMitigations:
+        pass
+
+    def save_mitigations(self, mitigations: AttackMitigations):
+        pass
diff --git a/monkey/monkey_island/cc/dal/zero_trust/IEventRepository.py b/monkey/monkey_island/cc/dal/zero_trust/IEventRepository.py
new file mode 100644
index 000000000..3f4af68c5
--- /dev/null
+++ b/monkey/monkey_island/cc/dal/zero_trust/IEventRepository.py
@@ -0,0 +1,11 @@
+from abc import ABC
+from typing import Optional, Sequence
+
+from monkey_island.cc.models.zero_trust.event import Event
+
+
+class IEventRepository(ABC):
+    def get_events(self, finding_id: Optional[str] = None) -> Sequence[Event]:
+        pass
+
+    # Events are saved in IFindingRepository, because finding had many events
diff --git a/monkey/monkey_island/cc/dal/zero_trust/IFindingRepository.py b/monkey/monkey_island/cc/dal/zero_trust/IFindingRepository.py
new file mode 100644
index 000000000..c66ee0e73
--- /dev/null
+++ b/monkey/monkey_island/cc/dal/zero_trust/IFindingRepository.py
@@ -0,0 +1,13 @@
+from abc import ABC
+from typing import Optional
+
+# Zero trust finding
+from monkey_island.cc.models.zero_trust.finding import Finding
+
+
+class IFindingRepository(ABC):
+    def get_findings(self, test: Optional[str] = None) -> Finding:
+        pass
+
+    def save_finding(self, finding: Finding):
+        pass
diff --git a/monkey/monkey_island/cc/dal/zero_trust/__init__.py b/monkey/monkey_island/cc/dal/zero_trust/__init__.py
new file mode 100644
index 000000000..e69de29bb

From 3b0ec975d2e00fabe6c24d1eb3c12324f0fdb47f Mon Sep 17 00:00:00 2001
From: vakarisz <vakarisz@yahoo.com>
Date: Wed, 18 May 2022 17:31:19 +0300
Subject: [PATCH 07/13] Island: Add comments in services and models

These comments explain/elaborate on changes needed for DAL implementation
---
 monkey/monkey_island/cc/models/agent_controls/agent_controls.py | 1 +
 monkey/monkey_island/cc/models/report/report_dal.py             | 2 ++
 .../cc/models/zero_trust/monkey_finding_details.py              | 1 +
 monkey/monkey_island/cc/services/infection_lifecycle.py         | 1 +
 4 files changed, 5 insertions(+)

diff --git a/monkey/monkey_island/cc/models/agent_controls/agent_controls.py b/monkey/monkey_island/cc/models/agent_controls/agent_controls.py
index 37903d5e7..93caa8433 100644
--- a/monkey/monkey_island/cc/models/agent_controls/agent_controls.py
+++ b/monkey/monkey_island/cc/models/agent_controls/agent_controls.py
@@ -1,6 +1,7 @@
 from mongoengine import Document, FloatField
 
 
+# TODO rename to Simulation, add other metadata
 class AgentControls(Document):
 
     # Timestamp of the last "kill all agents" command
diff --git a/monkey/monkey_island/cc/models/report/report_dal.py b/monkey/monkey_island/cc/models/report/report_dal.py
index be7bade9e..3b7ca65e9 100644
--- a/monkey/monkey_island/cc/models/report/report_dal.py
+++ b/monkey/monkey_island/cc/models/report/report_dal.py
@@ -32,6 +32,8 @@ def get_report() -> dict:
     return _decode_dot_char_before_mongo_insert(decrypt_dict(sensitive_fields, report_dict))
 
 
+# TODO remove this unnecessary encoding. I think these are legacy methods from back in the day
+# when usernames were used as keys. If not, we shouldn't use unknown data as keys.
 def _encode_dot_char_before_mongo_insert(report_dict):
     """
     mongodb doesn't allow for '.' and '$' in a key's name, this function replaces the '.'
diff --git a/monkey/monkey_island/cc/models/zero_trust/monkey_finding_details.py b/monkey/monkey_island/cc/models/zero_trust/monkey_finding_details.py
index 3568e0ee1..3aa3d0b87 100644
--- a/monkey/monkey_island/cc/models/zero_trust/monkey_finding_details.py
+++ b/monkey/monkey_island/cc/models/zero_trust/monkey_finding_details.py
@@ -7,6 +7,7 @@ from mongoengine import Document, EmbeddedDocumentListField
 from monkey_island.cc.models.zero_trust.event import Event
 
 
+# TODO just move events to the finding and remove this collection
 class MonkeyFindingDetails(Document):
     # SCHEMA
     events = EmbeddedDocumentListField(document_type=Event, required=False)
diff --git a/monkey/monkey_island/cc/services/infection_lifecycle.py b/monkey/monkey_island/cc/services/infection_lifecycle.py
index 865602168..2da5e90b7 100644
--- a/monkey/monkey_island/cc/services/infection_lifecycle.py
+++ b/monkey/monkey_island/cc/services/infection_lifecycle.py
@@ -15,6 +15,7 @@ logger = logging.getLogger(__name__)
 
 
 def set_stop_all(time: float):
+    # This will use Agent and Simulation repositories
     for monkey in Monkey.objects():
         monkey.config.should_stop = True
         monkey.save()

From f2a4be8de0da8a77bce0a9d7b84cb07188f18f4b Mon Sep 17 00:00:00 2001
From: vakarisz <vakarisz@yahoo.com>
Date: Thu, 19 May 2022 10:41:01 +0300
Subject: [PATCH 08/13] Island: Rename /dal to /repository

---
 monkey/monkey_island/cc/{dal => repository}/IAgentRepository.py  | 0
 monkey/monkey_island/cc/{dal => repository}/IAttackRepository.py | 0
 monkey/monkey_island/cc/{dal => repository}/IConfigRepository.py | 0
 monkey/monkey_island/cc/{dal => repository}/IEdgeRepository.py   | 0
 monkey/monkey_island/cc/{dal => repository}/ILogRepository.py    | 0
 .../monkey_island/cc/{dal => repository}/IMachineRepository.py   | 1 +
 monkey/monkey_island/cc/{dal => repository}/IReportRepository.py | 0
 .../cc/{dal => repository}/ISimulationRepository.py              | 0
 .../monkey_island/cc/{dal => repository}/IStolenCredentials.py   | 0
 .../cc/{dal => repository}/ITelemStoreRepository.py              | 0
 .../monkey_island/cc/{dal => repository}/ITelemetryRepository.py | 0
 monkey/monkey_island/cc/{dal => repository}/__init__.py          | 0
 .../cc/{dal => repository}/attack/IMitigationsRepository.py      | 0
 .../cc/{dal => repository}/zero_trust/IEventRepository.py        | 0
 .../cc/{dal => repository}/zero_trust/IFindingRepository.py      | 0
 .../monkey_island/cc/{dal => repository}/zero_trust/__init__.py  | 0
 16 files changed, 1 insertion(+)
 rename monkey/monkey_island/cc/{dal => repository}/IAgentRepository.py (100%)
 rename monkey/monkey_island/cc/{dal => repository}/IAttackRepository.py (100%)
 rename monkey/monkey_island/cc/{dal => repository}/IConfigRepository.py (100%)
 rename monkey/monkey_island/cc/{dal => repository}/IEdgeRepository.py (100%)
 rename monkey/monkey_island/cc/{dal => repository}/ILogRepository.py (100%)
 rename monkey/monkey_island/cc/{dal => repository}/IMachineRepository.py (85%)
 rename monkey/monkey_island/cc/{dal => repository}/IReportRepository.py (100%)
 rename monkey/monkey_island/cc/{dal => repository}/ISimulationRepository.py (100%)
 rename monkey/monkey_island/cc/{dal => repository}/IStolenCredentials.py (100%)
 rename monkey/monkey_island/cc/{dal => repository}/ITelemStoreRepository.py (100%)
 rename monkey/monkey_island/cc/{dal => repository}/ITelemetryRepository.py (100%)
 rename monkey/monkey_island/cc/{dal => repository}/__init__.py (100%)
 rename monkey/monkey_island/cc/{dal => repository}/attack/IMitigationsRepository.py (100%)
 rename monkey/monkey_island/cc/{dal => repository}/zero_trust/IEventRepository.py (100%)
 rename monkey/monkey_island/cc/{dal => repository}/zero_trust/IFindingRepository.py (100%)
 rename monkey/monkey_island/cc/{dal => repository}/zero_trust/__init__.py (100%)

diff --git a/monkey/monkey_island/cc/dal/IAgentRepository.py b/monkey/monkey_island/cc/repository/IAgentRepository.py
similarity index 100%
rename from monkey/monkey_island/cc/dal/IAgentRepository.py
rename to monkey/monkey_island/cc/repository/IAgentRepository.py
diff --git a/monkey/monkey_island/cc/dal/IAttackRepository.py b/monkey/monkey_island/cc/repository/IAttackRepository.py
similarity index 100%
rename from monkey/monkey_island/cc/dal/IAttackRepository.py
rename to monkey/monkey_island/cc/repository/IAttackRepository.py
diff --git a/monkey/monkey_island/cc/dal/IConfigRepository.py b/monkey/monkey_island/cc/repository/IConfigRepository.py
similarity index 100%
rename from monkey/monkey_island/cc/dal/IConfigRepository.py
rename to monkey/monkey_island/cc/repository/IConfigRepository.py
diff --git a/monkey/monkey_island/cc/dal/IEdgeRepository.py b/monkey/monkey_island/cc/repository/IEdgeRepository.py
similarity index 100%
rename from monkey/monkey_island/cc/dal/IEdgeRepository.py
rename to monkey/monkey_island/cc/repository/IEdgeRepository.py
diff --git a/monkey/monkey_island/cc/dal/ILogRepository.py b/monkey/monkey_island/cc/repository/ILogRepository.py
similarity index 100%
rename from monkey/monkey_island/cc/dal/ILogRepository.py
rename to monkey/monkey_island/cc/repository/ILogRepository.py
diff --git a/monkey/monkey_island/cc/dal/IMachineRepository.py b/monkey/monkey_island/cc/repository/IMachineRepository.py
similarity index 85%
rename from monkey/monkey_island/cc/dal/IMachineRepository.py
rename to monkey/monkey_island/cc/repository/IMachineRepository.py
index 99e7f49dc..da2526507 100644
--- a/monkey/monkey_island/cc/dal/IMachineRepository.py
+++ b/monkey/monkey_island/cc/repository/IMachineRepository.py
@@ -9,6 +9,7 @@ class IMachineRepository(ABC):
 
     # TODO define Machine object(ORM model)
     # TODO define or re-use machine state.
+    # TODO investigate where should the state be stored in edge or both edge and machine
     def get_machines(
         self,
         id: Optional[str] = None,
diff --git a/monkey/monkey_island/cc/dal/IReportRepository.py b/monkey/monkey_island/cc/repository/IReportRepository.py
similarity index 100%
rename from monkey/monkey_island/cc/dal/IReportRepository.py
rename to monkey/monkey_island/cc/repository/IReportRepository.py
diff --git a/monkey/monkey_island/cc/dal/ISimulationRepository.py b/monkey/monkey_island/cc/repository/ISimulationRepository.py
similarity index 100%
rename from monkey/monkey_island/cc/dal/ISimulationRepository.py
rename to monkey/monkey_island/cc/repository/ISimulationRepository.py
diff --git a/monkey/monkey_island/cc/dal/IStolenCredentials.py b/monkey/monkey_island/cc/repository/IStolenCredentials.py
similarity index 100%
rename from monkey/monkey_island/cc/dal/IStolenCredentials.py
rename to monkey/monkey_island/cc/repository/IStolenCredentials.py
diff --git a/monkey/monkey_island/cc/dal/ITelemStoreRepository.py b/monkey/monkey_island/cc/repository/ITelemStoreRepository.py
similarity index 100%
rename from monkey/monkey_island/cc/dal/ITelemStoreRepository.py
rename to monkey/monkey_island/cc/repository/ITelemStoreRepository.py
diff --git a/monkey/monkey_island/cc/dal/ITelemetryRepository.py b/monkey/monkey_island/cc/repository/ITelemetryRepository.py
similarity index 100%
rename from monkey/monkey_island/cc/dal/ITelemetryRepository.py
rename to monkey/monkey_island/cc/repository/ITelemetryRepository.py
diff --git a/monkey/monkey_island/cc/dal/__init__.py b/monkey/monkey_island/cc/repository/__init__.py
similarity index 100%
rename from monkey/monkey_island/cc/dal/__init__.py
rename to monkey/monkey_island/cc/repository/__init__.py
diff --git a/monkey/monkey_island/cc/dal/attack/IMitigationsRepository.py b/monkey/monkey_island/cc/repository/attack/IMitigationsRepository.py
similarity index 100%
rename from monkey/monkey_island/cc/dal/attack/IMitigationsRepository.py
rename to monkey/monkey_island/cc/repository/attack/IMitigationsRepository.py
diff --git a/monkey/monkey_island/cc/dal/zero_trust/IEventRepository.py b/monkey/monkey_island/cc/repository/zero_trust/IEventRepository.py
similarity index 100%
rename from monkey/monkey_island/cc/dal/zero_trust/IEventRepository.py
rename to monkey/monkey_island/cc/repository/zero_trust/IEventRepository.py
diff --git a/monkey/monkey_island/cc/dal/zero_trust/IFindingRepository.py b/monkey/monkey_island/cc/repository/zero_trust/IFindingRepository.py
similarity index 100%
rename from monkey/monkey_island/cc/dal/zero_trust/IFindingRepository.py
rename to monkey/monkey_island/cc/repository/zero_trust/IFindingRepository.py
diff --git a/monkey/monkey_island/cc/dal/zero_trust/__init__.py b/monkey/monkey_island/cc/repository/zero_trust/__init__.py
similarity index 100%
rename from monkey/monkey_island/cc/dal/zero_trust/__init__.py
rename to monkey/monkey_island/cc/repository/zero_trust/__init__.py

From ec4af2cc57ccc975184b63dda89cb4d311cdb018 Mon Sep 17 00:00:00 2001
From: vakarisz <vakarisz@yahoo.com>
Date: Fri, 20 May 2022 17:24:18 +0300
Subject: [PATCH 09/13] Island: Add INetMapRepository.py and a mock entities
 for it

---
 monkey/monkey_island/cc/models/netmap.py      | 17 +++++++++++
 .../cc/repository/IEdgeRepository.py          | 30 -------------------
 .../cc/repository/INetMapRepository.py        | 11 +++++++
 3 files changed, 28 insertions(+), 30 deletions(-)
 create mode 100644 monkey/monkey_island/cc/models/netmap.py
 delete mode 100644 monkey/monkey_island/cc/repository/IEdgeRepository.py
 create mode 100644 monkey/monkey_island/cc/repository/INetMapRepository.py

diff --git a/monkey/monkey_island/cc/models/netmap.py b/monkey/monkey_island/cc/models/netmap.py
new file mode 100644
index 000000000..4d482e686
--- /dev/null
+++ b/monkey/monkey_island/cc/models/netmap.py
@@ -0,0 +1,17 @@
+from dataclasses import dataclass
+from typing import Mapping, Sequence
+
+
+# This is the most concise way to represent a graph:
+# Machine id as key, Arch list as a value
+# Not sure how compatible this will be with ORM objects though,
+# might require more complex casting logic
+@dataclass
+class Netmap:
+    nodes: Mapping[str, Sequence[Arch]]
+
+
+@dataclass
+class Arch:
+    dst_machine: Machine
+    status: str
diff --git a/monkey/monkey_island/cc/repository/IEdgeRepository.py b/monkey/monkey_island/cc/repository/IEdgeRepository.py
deleted file mode 100644
index 3b1393f31..000000000
--- a/monkey/monkey_island/cc/repository/IEdgeRepository.py
+++ /dev/null
@@ -1,30 +0,0 @@
-from abc import ABC
-from typing import Optional, Sequence
-
-from monkey_island.cc.models.edge import Edge
-
-
-class IEdgeRepository(ABC):
-    def get_all_edges(self):
-        pass
-
-    def get_edges(self, src_machine_id: str, dst_machine_id: str) -> Sequence[Edge]:
-        pass
-
-    def save_edge(self, edge: Edge):
-        pass
-
-    def get_by_dst(self, dst_machine_id: str) -> Sequence[Edge]:
-        pass
-
-    # If tunnel is None then it gets all edges, if True/False then gets only
-    # tunneling/non-tunneling edges
-    def get_by_src(self, src_machine_id: str, tunnel: Optional[bool] = None) -> Sequence[Edge]:
-        pass
-
-    def get_by_id(self, edge_id: str) -> Edge:
-        pass
-
-    # Scan telemetries might change the label once we know more about the target system
-    def set_label(self, edge_id: str, label: str):
-        pass
diff --git a/monkey/monkey_island/cc/repository/INetMapRepository.py b/monkey/monkey_island/cc/repository/INetMapRepository.py
new file mode 100644
index 000000000..ad3c0e1bb
--- /dev/null
+++ b/monkey/monkey_island/cc/repository/INetMapRepository.py
@@ -0,0 +1,11 @@
+from abc import ABC
+
+
+class INetMapRepository(ABC):
+
+    # TODO Define NetMap object
+    def get_map(self) -> NetMap:
+        pass
+
+    def save_netmap(self, netmap: NetMap):
+        pass

From cfcb252df3be197aa5a34b2495443e33a8b40b1b Mon Sep 17 00:00:00 2001
From: vakarisz <vakarisz@yahoo.com>
Date: Fri, 20 May 2022 17:42:14 +0300
Subject: [PATCH 10/13] Island: Improved naming of the network map interface

---
 monkey/monkey_island/cc/models/{netmap.py => networkmap.py} | 6 +++---
 .../{INetMapRepository.py => INetworkMapRepository.py}      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename monkey/monkey_island/cc/models/{netmap.py => networkmap.py} (83%)
 rename monkey/monkey_island/cc/repository/{INetMapRepository.py => INetworkMapRepository.py} (82%)

diff --git a/monkey/monkey_island/cc/models/netmap.py b/monkey/monkey_island/cc/models/networkmap.py
similarity index 83%
rename from monkey/monkey_island/cc/models/netmap.py
rename to monkey/monkey_island/cc/models/networkmap.py
index 4d482e686..4f40b9f8b 100644
--- a/monkey/monkey_island/cc/models/netmap.py
+++ b/monkey/monkey_island/cc/models/networkmap.py
@@ -7,11 +7,11 @@ from typing import Mapping, Sequence
 # Not sure how compatible this will be with ORM objects though,
 # might require more complex casting logic
 @dataclass
-class Netmap:
-    nodes: Mapping[str, Sequence[Arch]]
+class NetworkMap:
+    nodes: Mapping[str, Sequence[Arc]]
 
 
 @dataclass
-class Arch:
+class Arc:
     dst_machine: Machine
     status: str
diff --git a/monkey/monkey_island/cc/repository/INetMapRepository.py b/monkey/monkey_island/cc/repository/INetworkMapRepository.py
similarity index 82%
rename from monkey/monkey_island/cc/repository/INetMapRepository.py
rename to monkey/monkey_island/cc/repository/INetworkMapRepository.py
index ad3c0e1bb..8a53dd044 100644
--- a/monkey/monkey_island/cc/repository/INetMapRepository.py
+++ b/monkey/monkey_island/cc/repository/INetworkMapRepository.py
@@ -1,7 +1,7 @@
 from abc import ABC
 
 
-class INetMapRepository(ABC):
+class INetworkMapRepository(ABC):
 
     # TODO Define NetMap object
     def get_map(self) -> NetMap:

From f43e76aca56afba903fbd4ee4cbabd88d7bf0479 Mon Sep 17 00:00:00 2001
From: vakarisz <vakarisz@yahoo.com>
Date: Fri, 20 May 2022 17:43:48 +0300
Subject: [PATCH 11/13] Island: Remove ITelemStoreRepository.py

Refactoring it is not worth it because we're not sure about the performance solution we'll need after the refactoring
---
 .../cc/repository/ITelemStoreRepository.py           | 12 ------------
 .../cc/resources/blackbox/utils/telem_store.py       |  2 +-
 2 files changed, 1 insertion(+), 13 deletions(-)
 delete mode 100644 monkey/monkey_island/cc/repository/ITelemStoreRepository.py

diff --git a/monkey/monkey_island/cc/repository/ITelemStoreRepository.py b/monkey/monkey_island/cc/repository/ITelemStoreRepository.py
deleted file mode 100644
index 0b791e474..000000000
--- a/monkey/monkey_island/cc/repository/ITelemStoreRepository.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from abc import ABC
-from typing import Sequence
-
-from monkey_island.cc.models.exported_telem import ExportedTelem
-
-
-class ITelemStoreRepository(ABC):
-    def get_telemetries(self) -> Sequence[ExportedTelem]:
-        pass
-
-    def save_telemetry(self, telemetry: ExportedTelem):
-        pass
diff --git a/monkey/monkey_island/cc/resources/blackbox/utils/telem_store.py b/monkey/monkey_island/cc/resources/blackbox/utils/telem_store.py
index 8260c467d..7dad4b48b 100644
--- a/monkey/monkey_island/cc/resources/blackbox/utils/telem_store.py
+++ b/monkey/monkey_island/cc/resources/blackbox/utils/telem_store.py
@@ -15,7 +15,7 @@ MAX_SAME_CATEGORY_TELEMS = 10000
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
-
+# TODO this will break with the IRepository implementation. Remove it
 class TestTelemStore:
     TELEMS_EXPORTED = False
 

From e32689a2b0d74629de5937364f92ded380554e92 Mon Sep 17 00:00:00 2001
From: vakarisz <vakarisz@yahoo.com>
Date: Tue, 24 May 2022 10:22:16 +0300
Subject: [PATCH 12/13] Island: Fix IAttackRepository class name

---
 monkey/monkey_island/cc/repository/IAttackRepository.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/monkey/monkey_island/cc/repository/IAttackRepository.py b/monkey/monkey_island/cc/repository/IAttackRepository.py
index f1c6c0213..5981bde67 100644
--- a/monkey/monkey_island/cc/repository/IAttackRepository.py
+++ b/monkey/monkey_island/cc/repository/IAttackRepository.py
@@ -4,7 +4,7 @@ from typing import Sequence
 from monkey_island.cc.models.attack import Mitigation
 
 
-class IRepository(ABC):
+class IAttackRepository(ABC):
     # Att&ck just add not implemented raises
     ######################################
     # This will likely stay the same as mitigations are external data

From 1077a846236238cac28fdf62dcd82c0c8125959c Mon Sep 17 00:00:00 2001
From: vakarisz <vakarisz@yahoo.com>
Date: Tue, 24 May 2022 10:27:07 +0300
Subject: [PATCH 13/13] Project: Ignore unused classes created for dal layer

---
 vulture_allowlist.py | 49 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/vulture_allowlist.py b/vulture_allowlist.py
index cec60a0c9..553c9780e 100644
--- a/vulture_allowlist.py
+++ b/vulture_allowlist.py
@@ -6,6 +6,20 @@ Vulture doesn't mark these as dead again.
 from infection_monkey.exploit.log4shell_utils.ldap_server import LDAPServerFactory
 from monkey_island.cc import app
 from monkey_island.cc.models import Report
+from monkey_island.cc.models.networkmap import Arc, NetworkMap
+from monkey_island.cc.repository.attack.IMitigationsRepository import IMitigationsRepository
+from monkey_island.cc.repository.IAgentRepository import IAgentRepository
+from monkey_island.cc.repository.IAttackRepository import IAttackRepository
+from monkey_island.cc.repository.IConfigRepository import IConfigRepository
+from monkey_island.cc.repository.ILogRepository import ILogRepository
+from monkey_island.cc.repository.IMachineRepository import IMachineRepository
+from monkey_island.cc.repository.INetworkMapRepository import INetworkMapRepository
+from monkey_island.cc.repository.IReportRepository import IReportRepository
+from monkey_island.cc.repository.ISimulationRepository import ISimulationRepository
+from monkey_island.cc.repository.IStolenCredentials import IStolenCredentialsRepository
+from monkey_island.cc.repository.ITelemetryRepository import ITelemetryRepository
+from monkey_island.cc.repository.zero_trust.IEventRepository import IEventRepository
+from monkey_island.cc.repository.zero_trust.IFindingRepository import IFindingRepository
 
 fake_monkey_dir_path  # unused variable (monkey/tests/infection_monkey/post_breach/actions/test_users_custom_pba.py:37)
 set_os_linux  # unused variable (monkey/tests/infection_monkey/post_breach/actions/test_users_custom_pba.py:37)
@@ -169,3 +183,38 @@ GCPHandler  # unused function (envs/monkey_zoo/blackbox/test_blackbox.py:57)
 architecture  # unused variable (monkey/infection_monkey/exploit/caching_agent_repository.py:25)
 
 response_code  # unused variable (monkey/monkey_island/cc/services/aws/aws_command_runner.py:26)
+
+# TODO DELETE AFTER RESOURCE REFACTORING
+NetworkMap
+Arc.dst_machine
+IMitigationsRepository.get_mitigations
+IMitigationsRepository.save_mitigations
+IAgentRepository.save_agent
+IAgentRepository.get_agents
+agent
+IAttackRepository.get_attack_report
+IAttackRepository.save_attack_report
+IAttackRepository.get_mitigation_by_technique
+IAttackRepository.save_mitigations
+IConfigRepository.set_config
+IConfigRepository.set_config_field
+IConfigRepository.get_config_field
+ILogRepository.get_logs
+ILogRepository.save_log
+ILogRepository.delete_log
+IMachineRepository.save_machine
+IMachineRepository.get_machines
+INetworkMapRepository.get_map
+INetworkMapRepository.save_netmap
+IReportRepository
+ISimulationRepository.save_simulation
+ISimulationRepository.get_simulation
+IStolenCredentialsRepository.get_stolen_credentials
+IStolenCredentialsRepository.save_stolen_credentials
+ITelemetryRepository.get_telemetries
+IEventRepository.get_events
+IFindingRepository.get_findings
+key_list
+simulation
+stolen_credentials
+netmap