mal-toolbox 0.3.4__py3-none-any.whl → 0.3.6__py3-none-any.whl

{mal_toolbox-0.3.4.dist-info → mal_toolbox-0.3.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mal-toolbox
-Version: 0.3.4
+Version: 0.3.6
 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.4.dist-info → mal_toolbox-0.3.6.dist-info}/RECORD

@@ -1,10 +1,10 @@
-maltoolbox/__init__.py,sha256=hZCoM58rmBiJvbjPRpzNVFgNlhml32Pq7NB0fb0kIKs,2088
+maltoolbox/__init__.py,sha256=IPS2eQ4uAhZ4Axdc_vu-lHK7nXXT_peN_nMQn5Ci_qY,2088
 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=XCneM5Hdl2GQhtgXYq0SUAlHBksXn7okevIsSKMSwVY,24084
+maltoolbox/model.py,sha256=H7hmnTQVz6Uublih2bPfoQGNLvUjBWRnXUQ6SW6jJc8,24051
 maltoolbox/attackgraph/__init__.py,sha256=AHDyX6dAkx3mDic2K56v1xche9N6ofDfbaHkKbdJ2qQ,230
-maltoolbox/attackgraph/attacker.py,sha256=dKMAcOwlNM3LL8qh1tBJuzjFxlTNG-QI2st1LzP8Ofc,4030
+maltoolbox/attackgraph/attacker.py,sha256=EwlzVinscBKO84QrCvy2W1jxXqTHrrufOovO3t6Xi2A,4113
 maltoolbox/attackgraph/attackgraph.py,sha256=5ejaqeTF6QNc_75p_jgvC9-33-4J0PaaHUFBi_oQy20,32663
 maltoolbox/attackgraph/node.py,sha256=Ec67_u_8qf_MgCHaUg4wIbZFC013GWxbIsC8EjoguzE,6465
 maltoolbox/attackgraph/query.py,sha256=TPr0yDK_ZpRWO4BVTZ64_ATNjLnrglU3Jh1QGkhLeE0,7441
@@ -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.4.dist-info/AUTHORS,sha256=zxLrLe8EY39WtRKlAY4Oorx4Z2_LHV2ApRvDGZgY7xY,127
-mal_toolbox-0.3.4.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-mal_toolbox-0.3.4.dist-info/METADATA,sha256=bP52aB2aNCsIIBk6J4_tPhUI0B5q_xm44sNI-TSaUtU,6158
-mal_toolbox-0.3.4.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-mal_toolbox-0.3.4.dist-info/entry_points.txt,sha256=oqby5O6cUP_OHCm70k_iYPA6UlbTBf7se1i3XwdK3uU,56
-mal_toolbox-0.3.4.dist-info/top_level.txt,sha256=phqRVLRKGdSUgRY03mcpi2cmbbDo5YGjkV4gkqHFFcM,11
-mal_toolbox-0.3.4.dist-info/RECORD,,
+mal_toolbox-0.3.6.dist-info/AUTHORS,sha256=zxLrLe8EY39WtRKlAY4Oorx4Z2_LHV2ApRvDGZgY7xY,127
+mal_toolbox-0.3.6.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+mal_toolbox-0.3.6.dist-info/METADATA,sha256=lJ1tUZbqDf4d808Y4w_WPZcL0jyrgxpi9i4Ljsijipc,6158
+mal_toolbox-0.3.6.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+mal_toolbox-0.3.6.dist-info/entry_points.txt,sha256=oqby5O6cUP_OHCm70k_iYPA6UlbTBf7se1i3XwdK3uU,56
+mal_toolbox-0.3.6.dist-info/top_level.txt,sha256=phqRVLRKGdSUgRY03mcpi2cmbbDo5YGjkV4gkqHFFcM,11
+mal_toolbox-0.3.6.dist-info/RECORD,,

maltoolbox/__init__.py

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
-# MAL Toolbox v0.3.4
-# Copyright 2024, Andrei Buhaiu.
+# MAL Toolbox v0.3.6
+# Copyright 2025, Andrei Buhaiu.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ MAL-Toolbox Framework
 """
 
 __title__ = "maltoolbox"
-__version__ = "0.3.4"
+__version__ = "0.3.6"
 __authors__ = [
     "Andrei Buhaiu",
     "Giuseppe Nebbione",

maltoolbox/attackgraph/attacker.py

@@ -23,9 +23,11 @@ class Attacker:
         attacker_id: Optional[int] = None
     ):
         self.name = name
-        self.entry_points = entry_points
-        self.reached_attack_steps = reached_attack_steps
         self.id = attacker_id
+        self.entry_points = entry_points
+        self.reached_attack_steps: set[AttackGraphNode] = set()
+        for node in reached_attack_steps:
+            self.compromise(node)
 
     def to_dict(self) -> dict:
         attacker_dict: dict = {

maltoolbox/model.py

@@ -152,11 +152,6 @@ class Model():
         self.lang_graph = lang_graph
         self.maltoolbox_version: str = mt_version
 
-        # Below sets used to check for duplicate names or ids,
-        # better for optimization than iterating over all assets
-        self.asset_ids: set[int] = set()
-        self.asset_names: set[str] = set()
-
 
     def add_asset(
             self,
@@ -192,16 +187,15 @@ class Model():
 
         # Set asset ID and check for duplicates
         asset_id = asset_id or self.next_id
-        if asset_id in self.asset_ids:
+        if asset_id in self.assets:
             raise ValueError(f'Asset index {asset_id} already in use.')
-        self.asset_ids.add(asset_id)
 
         self.next_id = max(asset_id + 1, self.next_id)
 
         if not name:
             name = asset_type + ':' + str(asset_id)
         else:
-            if name in self.asset_names:
+            if name in self._name_to_asset:
                 if allow_duplicate_names:
                     name = name + ':' + str(asset_id)
                 else:
@@ -209,7 +203,6 @@ class Model():
                         f'Asset name {name} is a duplicate'
                         ' and we do not allow duplicates.'
                     )
-        self.asset_names.add(name)
 
         lg_asset = self.lang_graph.assets[asset_type]
 
@@ -252,7 +245,10 @@ class Model():
             )
 
         # First remove all of the associated assets
-        for fieldname, assoc_assets in asset.associated_assets.items():
+        # We can not remove from the dict while iterating over it
+        # so we first have to copy the keys and then remove those assets
+        associated_fieldnames = dict(asset.associated_assets)
+        for fieldname, assoc_assets in associated_fieldnames.items():
             asset.remove_associated_assets(fieldname, assoc_assets)
 
         # Also remove all of the entry points
@@ -656,17 +652,13 @@ class ModelAsset:
                 other_fieldname, set()
             ).add(self)
 
-    def remove_associated_assets(self, fieldname: str,
-        assets: set[ModelAsset]):
+    def remove_associated_assets(
+            self, fieldname: str, assets: set[ModelAsset]):
         """ Remove the assets provided as a parameter from the set of
         associated assets dictionary entry corresponding to the fieldname
         parameter.
         """
-        self._associated_assets[fieldname] -= set(assets)
-        if len(self._associated_assets[fieldname]) == 0:
-            del self._associated_assets[fieldname]
-
-        # Also remove this asset to the associated assets' dictionaries
+        # Remove this asset from its associated assets' dictionaries
         lg_assoc = self.lg_asset.associations[fieldname]
         other_fieldname = lg_assoc.get_opposite_fieldname(fieldname)
         for asset in assets:
@@ -674,6 +666,11 @@ class ModelAsset:
             if len(asset._associated_assets[other_fieldname]) == 0:
                 del asset._associated_assets[other_fieldname]
 
+        # Remove associated assets from this asset
+        self._associated_assets[fieldname] -= set(assets)
+        if len(self._associated_assets[fieldname]) == 0:
+            del self._associated_assets[fieldname]
+
 
     @property
     def associated_assets(self):