mal-toolbox 0.3.5__tar.gz → 0.3.6__tar.gz

{mal_toolbox-0.3.5/mal_toolbox.egg-info → mal_toolbox-0.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mal-toolbox
-Version: 0.3.5
+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.5 → mal_toolbox-0.3.6/mal_toolbox.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mal-toolbox
-Version: 0.3.5
+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.5 → mal_toolbox-0.3.6}/maltoolbox/__init__.py

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-# MAL Toolbox v0.3.5
+# MAL Toolbox v0.3.6
 # 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.5"
+__version__ = "0.3.6"
 __authors__ = [
     "Andrei Buhaiu",
     "Giuseppe Nebbione",

{mal_toolbox-0.3.5 → mal_toolbox-0.3.6}/maltoolbox/model.py

@@ -245,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
@@ -649,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:
@@ -667,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):

{mal_toolbox-0.3.5 → mal_toolbox-0.3.6}/pyproject.toml

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

{mal_toolbox-0.3.5 → mal_toolbox-0.3.6}/tests/test_model.py

@@ -230,16 +230,23 @@ def test_model_add_asset_duplicate_name(model: Model):
     assert len(model.assets) == 2
 
 
-def test_model_remove_asset(model: Model):
+def test_model_remove_asset_with_association(model: Model):
     """Remove assets from a model"""
 
     # Add two program assets to the model
     asset1 = model.add_asset(asset_type = 'Application')
     asset2 = model.add_asset(asset_type = 'Application')
+    asset1.add_associated_assets('hostApp', {asset2})
 
+    assert asset1.associated_assets == {'hostApp': {asset2}}
+    assert asset2.associated_assets == {'appExecutedApps': {asset1}}
     num_assets_before = len(model.assets)
+
     model.remove_asset(asset1)
 
+    assert asset1.associated_assets == {}
+    assert asset2.associated_assets == {}
+
     # Make sure asset asset1 was deleted, but asset2 still exists
     assert asset1 not in model.assets.values()
     assert asset2 in model.assets.values()
@@ -362,6 +369,7 @@ def test_model_remove_associated_asset(model: Model):
     # removed from assets and model
     asset1.remove_associated_assets(
         fieldname = 'appExecutedApps', assets = {asset2})
+
     assert 'appExecutedApps' not in asset1.associated_assets
     assert 'hostApp' not in asset2.associated_assets