mal-toolbox 0.1.5__tar.gz → 0.1.7__tar.gz

{mal_toolbox-0.1.5/mal_toolbox.egg-info → mal_toolbox-0.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mal-toolbox
-Version: 0.1.5
+Version: 0.1.7
 Summary: A collection of tools used to create MAL models and attack graphs.
 Author-email: Andrei Buhaiu <buhaiu@kth.se>, Giuseppe Nebbione <nebbione@kth.se>, Nikolaos Kakouros <nkak@kth.se>, Jakob Nyberg <jaknyb@kth.se>, Joakim Loxdal <loxdal@kth.se>
 License: Apache Software License
@@ -33,6 +33,8 @@ MAL ([Meta Attack Language](https://mal-lang.org/)) models and attack graphs.
 Attack graphs can be used to run simulations (see MAL Simulator) or analysis.
 MAL Toolbox also gives the ability to view the AttackGraph/Model graphically in neo4j.
 
+[Documentation](https://mal-lang.org/mal-toolbox/index.html)(Work in progress)
+
 ## The Language Module
 
 The language module provides various tools to process MAL languages.

{mal_toolbox-0.1.5 → mal_toolbox-0.1.7}/README.md

@@ -6,6 +6,8 @@ MAL ([Meta Attack Language](https://mal-lang.org/)) models and attack graphs.
 Attack graphs can be used to run simulations (see MAL Simulator) or analysis.
 MAL Toolbox also gives the ability to view the AttackGraph/Model graphically in neo4j.
 
+[Documentation](https://mal-lang.org/mal-toolbox/index.html)(Work in progress)
+
 ## The Language Module
 
 The language module provides various tools to process MAL languages.
@@ -99,4 +101,4 @@ To find code examples and tutorials, visit the
 There are unit tests inside of ./tests.
 Before running the tests, make sure to install the requirements in ./tests/requirements.txt with `python -m pip install -r ./tests/requirements.txt`.
 
-To run all tests, use the `pytest` command. To run just a specific file or test function use `pytest tests/<filename>` or `pytest -k <function_name>`.
+To run all tests, use the `pytest` command. To run just a specific file or test function use `pytest tests/<filename>` or `pytest -k <function_name>`.

{mal_toolbox-0.1.5 → mal_toolbox-0.1.7/mal_toolbox.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mal-toolbox
-Version: 0.1.5
+Version: 0.1.7
 Summary: A collection of tools used to create MAL models and attack graphs.
 Author-email: Andrei Buhaiu <buhaiu@kth.se>, Giuseppe Nebbione <nebbione@kth.se>, Nikolaos Kakouros <nkak@kth.se>, Jakob Nyberg <jaknyb@kth.se>, Joakim Loxdal <loxdal@kth.se>
 License: Apache Software License
@@ -33,6 +33,8 @@ MAL ([Meta Attack Language](https://mal-lang.org/)) models and attack graphs.
 Attack graphs can be used to run simulations (see MAL Simulator) or analysis.
 MAL Toolbox also gives the ability to view the AttackGraph/Model graphically in neo4j.
 
+[Documentation](https://mal-lang.org/mal-toolbox/index.html)(Work in progress)
+
 ## The Language Module
 
 The language module provides various tools to process MAL languages.

{mal_toolbox-0.1.5 → mal_toolbox-0.1.7}/maltoolbox/__init__.py

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-# MAL Toolbox v0.1.5
+# MAL Toolbox v0.1.7
 # Copyright 2024, Andrei Buhaiu.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,7 +21,7 @@ MAL-Toolbox Framework
 """
 
 __title__ = 'maltoolbox'
-__version__ = '0.1.5'
+__version__ = '0.1.7'
 __authors__ = ['Andrei Buhaiu',
     'Giuseppe Nebbione',
     'Nikolaos Kakouros',

{mal_toolbox-0.1.5 → mal_toolbox-0.1.7}/maltoolbox/attackgraph/attackgraph.py

@@ -287,7 +287,7 @@ class AttackGraph():
                 'mitre_info' in node_dict else None
             ag_node.tags = node_dict['tags'] if \
                 'tags' in node_dict else []
-            ag_node.extras = node_dict.get('extras', [])
+            ag_node.extras = node_dict.get('extras', {})
 
             # Add AttackGraphNode to AttackGraph
             attack_graph.add_node(ag_node, node_id=node_dict['id'])

{mal_toolbox-0.1.5 → mal_toolbox-0.1.7}/maltoolbox/model.py

@@ -31,7 +31,79 @@ class AttackerAttachment:
     """Used to attach attackers to attack step entrypoints of assets"""
     id: Optional[int] = None
     name: Optional[str] = None
-    entry_points: list[tuple] = field(default_factory=lambda: [])
+    entry_points: list[tuple[SchemaGeneratedClass, list[str]]] = \
+        field(default_factory=lambda: [])
+
+
+    def add_entrypoint(
+            self, asset: SchemaGeneratedClass, attackstep_name: str):
+        """Add an entrypoint to an AttackerAttachment
+
+        self.entry_points contain tuples, first element of each tuple
+        is an asset, second element is a list of attack step names that
+        are entry points for the attacker.
+
+        Args:
+        asset           - the asset to add entrypoint to
+        attackstep_name - the name of the attack step to add as an entrypoint
+        """
+
+        logger.debug(
+            f'Add entry point "{attackstep_name}" on asset "{asset.name}" '
+            f'to AttackerAttachment "{self.name}".'
+        )
+
+        # Get the entrypoint tuple for the asset if it already exists
+        entrypoint_tuple = next((ep_tuple for ep_tuple in self.entry_points
+                                 if ep_tuple[0] == asset), None)
+
+        if entrypoint_tuple:
+            if attackstep_name not in entrypoint_tuple[1]:
+                # If it exists and does not already have the attack step,
+                # add it
+                entrypoint_tuple[1].append(attackstep_name)
+            else:
+                logger.info(
+                    f'Entry point "{attackstep_name}" on asset "{asset.name}"'
+                    f' already existed for AttackerAttachment "{self.name}".'
+                )
+        else:
+            # Otherwise, create the entrypoint tuple and the initial entry
+            # point
+            self.entry_points.append((asset, [attackstep_name]))
+
+    def remove_entrypoint(
+            self, asset: SchemaGeneratedClass, attackstep_name: str):
+        """Remove an entrypoint from an AttackerAttachment if it exists"""
+
+        logger.debug(
+            f'Remove entry point "{attackstep_name}" on asset "{asset.name}" '
+            f'from AttackerAttachment "{self.name}".'
+        )
+
+        # Get the entrypoint tuple for the asset if it exists
+        entrypoint_tuple = next((ep_tuple for ep_tuple in self.entry_points
+                                 if ep_tuple[0] == asset), None)
+
+        if entrypoint_tuple:
+            if attackstep_name in entrypoint_tuple[1]:
+                # If it exists and not already has the attack step, add it
+                entrypoint_tuple[1].remove(attackstep_name)
+            else:
+                logger.warning(
+                    f'Failed to find entry point "{attackstep_name}" on '
+                    f'asset "{asset.name}" for AttackerAttachment '
+                    f'"{self.name}". Nothing to remove.'
+                )
+
+            if not entrypoint_tuple[1]:
+                self.entry_points.remove(entrypoint_tuple)
+        else:
+            logger.warning(
+                f'Failed to find entry points on asset "{asset.name}" '
+                f'for AttackerAttachment "{self.name}". Nothing to remove.'
+            )
+
 
 class Model():
     """An implementation of a MAL language with assets and associations"""

{mal_toolbox-0.1.5 → mal_toolbox-0.1.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mal-toolbox"
-version = "0.1.5"
+version = "0.1.7"
 authors = [
   { name="Andrei Buhaiu", email="buhaiu@kth.se" },
   { name="Giuseppe Nebbione", email="nebbione@kth.se" },

{mal_toolbox-0.1.5 → mal_toolbox-0.1.7}/tests/test_model.py

@@ -51,6 +51,94 @@ def create_association(
 
 ### Tests
 
+def test_attacker_attachment_add_entrypoint(model: Model):
+    """"""
+
+    asset1 = create_application_asset(model, "Asset1")
+    asset2 = create_application_asset(model, "Asset2")
+    model.add_asset(asset1)
+    model.add_asset(asset2)
+
+    # Add attacker 1
+    attacker1 = AttackerAttachment()
+    model.add_attacker(attacker1)
+
+    attacker1.add_entrypoint(asset1, 'read')
+    assert len(attacker1.entry_points) == 1
+    assert attacker1.entry_points[0][0] == asset1
+    assert attacker1.entry_points[0][1] == ['read']
+
+    attacker1.add_entrypoint(asset1, 'access')
+    assert len(attacker1.entry_points) == 1
+    assert attacker1.entry_points[0][0] == asset1
+    assert attacker1.entry_points[0][1] == ['read', 'access']
+
+    # Try to add already existing entry point
+    attacker1.add_entrypoint(asset1, 'access')
+    assert len(attacker1.entry_points) == 1
+    assert attacker1.entry_points[0][0] == asset1
+    assert attacker1.entry_points[0][1] == ['read', 'access']
+
+    attacker1.add_entrypoint(asset2, 'access')
+    assert len(attacker1.entry_points) == 2
+    assert attacker1.entry_points[1][0] == asset2
+    assert attacker1.entry_points[1][1] == ['access']
+
+
+def test_attacker_attachment_remove_entrypoint(model: Model):
+    """"""
+
+    asset1 = create_application_asset(model, "Asset1")
+    asset2 = create_application_asset(model, "Asset2")
+    model.add_asset(asset1)
+    model.add_asset(asset2)
+
+    # Add attacker 1
+    attacker1 = AttackerAttachment()
+    model.add_attacker(attacker1)
+
+    attacker1.add_entrypoint(asset1, 'read')
+    attacker1.add_entrypoint(asset1, 'access')
+    attacker1.add_entrypoint(asset2, 'access')
+
+    assert len(attacker1.entry_points) == 2
+    assert attacker1.entry_points[0][0] == asset1
+    assert attacker1.entry_points[0][1] == ['read', 'access']
+    assert attacker1.entry_points[1][0] == asset2
+    assert attacker1.entry_points[1][1] == ['access']
+
+    attacker1.remove_entrypoint(asset1, 'read')
+    assert len(attacker1.entry_points) == 2
+    assert attacker1.entry_points[0][0] == asset1
+    assert attacker1.entry_points[0][1] == ['access']
+    assert attacker1.entry_points[1][0] == asset2
+    assert attacker1.entry_points[1][1] == ['access']
+
+    # Try to remove inexistent entry point, but the asset is still present in
+    # the list of entry points
+    attacker1.remove_entrypoint(asset1, 'read')
+    assert len(attacker1.entry_points) == 2
+    assert attacker1.entry_points[0][0] == asset1
+    assert attacker1.entry_points[0][1] == ['access']
+    assert attacker1.entry_points[1][0] == asset2
+    assert attacker1.entry_points[1][1] == ['access']
+
+    attacker1.remove_entrypoint(asset1, 'access')
+    assert len(attacker1.entry_points) == 1
+    assert attacker1.entry_points[0][0] == asset2
+    assert attacker1.entry_points[0][1] == ['access']
+
+    # Try to remove inexistent entry point, where the asset is no longer in
+    # the list of entry points
+    attacker1.remove_entrypoint(asset1, 'access')
+    assert len(attacker1.entry_points) == 1
+    assert attacker1.entry_points[0][0] == asset2
+    assert attacker1.entry_points[0][1] == ['access']
+
+    attacker1.remove_entrypoint(asset2, 'access')
+    assert len(attacker1.entry_points) == 0
+
+
 def test_model_add_asset(model: Model):
     """Make sure assets are added correctly"""