mal-toolbox 0.1.10__tar.gz → 0.1.11__tar.gz

{mal_toolbox-0.1.10/mal_toolbox.egg-info → mal_toolbox-0.1.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mal-toolbox
-Version: 0.1.10
+Version: 0.1.11
 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

{mal_toolbox-0.1.10 → mal_toolbox-0.1.11/mal_toolbox.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mal-toolbox
-Version: 0.1.10
+Version: 0.1.11
 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

{mal_toolbox-0.1.10 → mal_toolbox-0.1.11}/maltoolbox/__init__.py

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-# MAL Toolbox v0.1.10
+# MAL Toolbox v0.1.11
 # 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.10'
+__version__ = '0.1.11'
 __authors__ = ['Andrei Buhaiu',
     'Giuseppe Nebbione',
     'Nikolaos Kakouros',

{mal_toolbox-0.1.10 → mal_toolbox-0.1.11}/maltoolbox/model.py

@@ -207,6 +207,10 @@ class Model():
         )
         self.assets.append(asset)
 
+    def remove_attacker(self, attacker: AttackerAttachment) -> None:
+        """Remove attacker"""
+        self.attackers.remove(attacker)
+
     def remove_asset(self, asset: SchemaGeneratedClass) -> None:
         """Remove an asset from the model.
 
@@ -659,7 +663,7 @@ class Model():
 
         if asset.extras:
             # Add optional metadata to dict
-            asset_dict['extras'] = asset.extras
+            asset_dict['extras'] = asset.extras.as_dict()
 
         return (asset.id, asset_dict)
 

{mal_toolbox-0.1.10 → mal_toolbox-0.1.11}/pyproject.toml

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

{mal_toolbox-0.1.10 → mal_toolbox-0.1.11}/tests/test_model.py

@@ -195,6 +195,27 @@ def test_attacker_attachment_remove_asset(model: Model):
     assert attacker2.entry_points[0][1] == ['read']
 
 
+def test_add_remove_attacker(model: Model):
+    """"""
+
+    asset1 = create_application_asset(model, "Asset1")
+    model.add_asset(asset1)
+
+    attacker1 = AttackerAttachment()
+    model.add_attacker(attacker1)
+    attacker2 = AttackerAttachment()
+    model.add_attacker(attacker2)
+
+    attacker1.add_entry_point(asset1, 'read')
+    attacker1.add_entry_point(asset1, 'access')
+    attacker2.add_entry_point(asset1, 'read')
+
+    assert len(model.attackers) == 2
+    model.remove_attacker(attacker1)
+    assert len(model.attackers) == 1
+    model.remove_attacker(attacker2)
+    assert len(model.attackers) == 0
+
 def test_model_add_asset(model: Model):
     """Make sure assets are added correctly"""
 
@@ -815,6 +836,7 @@ def test_model_save_and_load_model_from_scratch(model: Model):
 
     # Create and add 3 applications
     p1 = create_application_asset(model, "Program 1")
+    p1.extras = {"testing": "testing"}
     p2 = create_application_asset(model, "Program 2")
     p3 = create_application_asset(model, "Program 3")
     model.add_asset(p1)