mal-toolbox 0.3.8__py3-none-any.whl → 0.3.10__py3-none-any.whl

{mal_toolbox-0.3.8.dist-info → mal_toolbox-0.3.10.dist-info}/METADATA

@@ -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.dist-info → mal_toolbox-0.3.10.dist-info}/RECORD

@@ -1,11 +1,11 @@
-maltoolbox/__init__.py,sha256=luFz396EdgvSGGbotQyIVqNr9fTI2pKpytq-TSvuAzg,2088
+maltoolbox/__init__.py,sha256=cf1wAw8jm8XYUjWxnAdMa6w0EbnWks374FnyBJ1ZcHE,2090
 maltoolbox/__main__.py,sha256=PSg8vFS8X-klJBJdSzrg0aLh9ykZgbcoSSEy3DTQoQQ,3499
 maltoolbox/exceptions.py,sha256=0YjPx2v1yYumZ2o7pVZ1s_jS-GAb3Ng979KEFhROSNY,1399
 maltoolbox/file_utils.py,sha256=tBR8Kjl8IoFzAtYaLNHNALuQrdMT3pD1ZpczHm1pu2g,1875
-maltoolbox/model.py,sha256=H7hmnTQVz6Uublih2bPfoQGNLvUjBWRnXUQ6SW6jJc8,24051
+maltoolbox/model.py,sha256=Y3FKyWyRGPzJlpP92XRrWS52xVeKaz9rgOLoQJvJ808,24008
 maltoolbox/attackgraph/__init__.py,sha256=AHDyX6dAkx3mDic2K56v1xche9N6ofDfbaHkKbdJ2qQ,230
-maltoolbox/attackgraph/attacker.py,sha256=EwlzVinscBKO84QrCvy2W1jxXqTHrrufOovO3t6Xi2A,4113
-maltoolbox/attackgraph/attackgraph.py,sha256=5ejaqeTF6QNc_75p_jgvC9-33-4J0PaaHUFBi_oQy20,32663
+maltoolbox/attackgraph/attacker.py,sha256=Lq7g_uFDvThU0wah-CiYA6oTshxt1TlgPJfkojlSyRQ,3132
+maltoolbox/attackgraph/attackgraph.py,sha256=QEfWblZDBpvX7o17LL3LHf1gyB080fTGt7uVC8082mM,32537
 maltoolbox/attackgraph/node.py,sha256=Ec67_u_8qf_MgCHaUg4wIbZFC013GWxbIsC8EjoguzE,6465
 maltoolbox/attackgraph/query.py,sha256=iuaLAc3bMnQefgGa1g62re8-3yQrgBW_cS5W_DgWEjY,6835
 maltoolbox/attackgraph/analyzers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -20,10 +20,10 @@ maltoolbox/language/compiler/mal_parser.py,sha256=sUoaE43l2VKg-Dou30mk2wlVS1FvdO
 maltoolbox/translators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maltoolbox/translators/securicad.py,sha256=PJYjieioWN5tE_oKm83dtgV5UkC8EUH9Vsy3-FxBtUo,7017
 maltoolbox/translators/updater.py,sha256=8bisZnzMWjGaG5tu8jdF-Oq6bPwIjXkVO-_yZDGc6cA,8652
-mal_toolbox-0.3.8.dist-info/AUTHORS,sha256=zxLrLe8EY39WtRKlAY4Oorx4Z2_LHV2ApRvDGZgY7xY,127
-mal_toolbox-0.3.8.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-mal_toolbox-0.3.8.dist-info/METADATA,sha256=Rh4CAdFqZL4lBzkeDzzqOv8_j4BZqjxc0fe65DjnLAY,6158
-mal_toolbox-0.3.8.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-mal_toolbox-0.3.8.dist-info/entry_points.txt,sha256=oqby5O6cUP_OHCm70k_iYPA6UlbTBf7se1i3XwdK3uU,56
-mal_toolbox-0.3.8.dist-info/top_level.txt,sha256=phqRVLRKGdSUgRY03mcpi2cmbbDo5YGjkV4gkqHFFcM,11
-mal_toolbox-0.3.8.dist-info/RECORD,,
+mal_toolbox-0.3.10.dist-info/AUTHORS,sha256=zxLrLe8EY39WtRKlAY4Oorx4Z2_LHV2ApRvDGZgY7xY,127
+mal_toolbox-0.3.10.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+mal_toolbox-0.3.10.dist-info/METADATA,sha256=pUsc7KK-BgKpqSRt8MwDRugVnV1M3JhPUMCRqJWcP5U,6159
+mal_toolbox-0.3.10.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+mal_toolbox-0.3.10.dist-info/entry_points.txt,sha256=oqby5O6cUP_OHCm70k_iYPA6UlbTBf7se1i3XwdK3uU,56
+mal_toolbox-0.3.10.dist-info/top_level.txt,sha256=phqRVLRKGdSUgRY03mcpi2cmbbDo5YGjkV4gkqHFFcM,11
+mal_toolbox-0.3.10.dist-info/RECORD,,

{mal_toolbox-0.3.8.dist-info → mal_toolbox-0.3.10.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (75.8.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

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",

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.

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 _:

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(