mal-toolbox 0.3.8__tar.gz → 0.3.10__tar.gz

{mal_toolbox-0.3.8/mal_toolbox.egg-info → mal_toolbox-0.3.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mal-toolbox
-Version: 0.3.8
+Version: 0.3.10
 Summary: A collection of tools used to create MAL models and attack graphs.
 Author-email: Andrei Buhaiu <buhaiu@kth.se>, Joakim Loxdal <loxdal@kth.se>, Nikolaos Kakouros <nkak@kth.se>, Jakob Nyberg <jaknyb@kth.se>, Giuseppe Nebbione <nebbione@kth.se>
 License: Apache Software License

{mal_toolbox-0.3.8 → mal_toolbox-0.3.10/mal_toolbox.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mal-toolbox
-Version: 0.3.8
+Version: 0.3.10
 Summary: A collection of tools used to create MAL models and attack graphs.
 Author-email: Andrei Buhaiu <buhaiu@kth.se>, Joakim Loxdal <loxdal@kth.se>, Nikolaos Kakouros <nkak@kth.se>, Jakob Nyberg <jaknyb@kth.se>, Giuseppe Nebbione <nebbione@kth.se>
 License: Apache Software License

{mal_toolbox-0.3.8 → mal_toolbox-0.3.10}/maltoolbox/__init__.py

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-# MAL Toolbox v0.3.8
+# MAL Toolbox v0.3.10
 # Copyright 2025, Andrei Buhaiu.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,7 +21,7 @@ MAL-Toolbox Framework
 """
 
 __title__ = "maltoolbox"
-__version__ = "0.3.8"
+__version__ = "0.3.10"
 __authors__ = [
     "Andrei Buhaiu",
     "Giuseppe Nebbione",

{mal_toolbox-0.3.8 → mal_toolbox-0.3.10}/maltoolbox/attackgraph/attacker.py

@@ -3,7 +3,6 @@ MAL-Toolbox Attack Graph Attacker Class
 """
 
 from __future__ import annotations
-import copy
 import logging
 
 from typing import Optional
@@ -18,15 +17,15 @@ class Attacker:
     def __init__(
         self,
         name: str,
-        entry_points: set[AttackGraphNode],
-        reached_attack_steps: set[AttackGraphNode],
+        entry_points: Optional[set[AttackGraphNode]] = None,
+        reached_attack_steps: Optional[set[AttackGraphNode]] = None,
         attacker_id: Optional[int] = None
     ):
         self.name = name
         self.id = attacker_id
-        self.entry_points = entry_points
+        self.entry_points = entry_points or set()
         self.reached_attack_steps: set[AttackGraphNode] = set()
-        for node in reached_attack_steps:
+        for node in reached_attack_steps or {}:
             self.compromise(node)
 
     def to_dict(self) -> dict:
@@ -49,36 +48,6 @@ class Attacker:
     def __repr__(self) -> str:
         return f'Attacker(name: "{self.name}", id: {self.id})'
 
-    def __deepcopy__(self, memo) -> Attacker:
-        """Deep copy an Attacker
-        The deepcopy will copy over attacker specific information, name and
-        id, but it will not copy relations to attack graph nodes, reached
-        attack steps or entry points. These references should be recreated
-        when deepcopying the attack graph itself.
-
-        """
-
-        # Check if the object is already in the memo dictionary
-        if id(self) in memo:
-            return memo[id(self)]
-
-        copied_attacker = Attacker(
-            name = self.name,
-            attacker_id = self.id,
-            entry_points = set(),
-            reached_attack_steps = set()
-        )
-
-        # Remember that self was already copied
-        memo[id(self)] = copied_attacker
-
-        copied_attacker.entry_points = copy.deepcopy(
-            self.entry_points, memo = memo)
-        copied_attacker.reached_attack_steps = copy.deepcopy(
-            self.reached_attack_steps, memo = memo)
-
-        return copied_attacker
-
     def compromise(self, node: AttackGraphNode) -> None:
         """
         Have the attacker compromise the node given as a parameter.

{mal_toolbox-0.3.8 → mal_toolbox-0.3.10}/maltoolbox/attackgraph/attackgraph.py

@@ -249,11 +249,7 @@ class AttackGraph():
                     _ag_node.parents.add(parent)
 
         for attacker in serialized_attackers.values():
-            ag_attacker = Attacker(
-                name = attacker['name'],
-                entry_points = set(),
-                reached_attack_steps = set()
-            )
+            ag_attacker = Attacker(name = attacker['name'])
             attack_graph.add_attacker(
                 attacker = ag_attacker,
                 attacker_id = int(attacker['id']),
@@ -330,11 +326,7 @@ class AttackGraph():
                 logger.error(msg)
                 raise AttackGraphException(msg)
 
-            attacker = Attacker(
-                name = attacker_info.name,
-                entry_points = set(),
-                reached_attack_steps = set()
-            )
+            attacker = Attacker(name = attacker_info.name)
             self.add_attacker(attacker)
 
             for (asset, attack_steps) in attacker_info.entry_points:
@@ -497,11 +489,13 @@ class AttackGraph():
                     target_assets,
                     expr_chain.left_link
                 )
-                rh_targets = self._follow_expr_chain(
-                    model,
-                    lh_targets,
-                    expr_chain.right_link
-                )
+                rh_targets = set()
+                for lh_target in lh_targets:
+                    rh_targets |= self._follow_expr_chain(
+                        model,
+                        {lh_target},
+                        expr_chain.right_link
+                    )
                 return rh_targets
 
             case _:

{mal_toolbox-0.3.8 → mal_toolbox-0.3.10}/maltoolbox/model.py

@@ -464,7 +464,6 @@ class Model():
             attackers_info = serialized_object['attackers']
             for attacker_id in attackers_info:
                 attacker = AttackerAttachment(name = attackers_info[attacker_id]['name'])
-                attacker.entry_points = []
                 for asset_name, entry_points_dict in \
                         attackers_info[attacker_id]['entry_points'].items():
                     target_asset = model.get_asset_by_id(

{mal_toolbox-0.3.8 → mal_toolbox-0.3.10}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mal-toolbox"
-version = "0.3.8"
+version = "0.3.10"
 authors = [
   { name="Andrei Buhaiu", email="buhaiu@kth.se" },
   { name="Joakim Loxdal", email="loxdal@kth.se" },

{mal_toolbox-0.3.8 → mal_toolbox-0.3.10}/tests/test_model.py

@@ -455,14 +455,12 @@ def test_model_add_attacker(model: Model):
 
     # Add attacker 1
     attacker1 = AttackerAttachment()
-    attacker1.entry_points = []
     model.add_attacker(attacker1)
     assert attacker1.name == f'Attacker:{attacker1.id}'
 
     # Add attacker 2 with explicit id set (can be duplicate id)
     attacker2_id = attacker1.id
     attacker2 = AttackerAttachment()
-    attacker2.entry_points = []
     model.add_attacker(attacker2, attacker_id=attacker2_id)
 
     # Add attacker 2 with explicit id set (can be duplicate id)
@@ -515,7 +513,6 @@ def test_model_get_attacker_by_id(model: Model):
 
     # Add attacker 1
     attacker1 = AttackerAttachment()
-    attacker1.entry_points = []
     model.add_attacker(attacker1)
 
     assert attacker1.id is not None