mal-toolbox 0.3.0__py3-none-any.whl → 0.3.2__py3-none-any.whl

{mal_toolbox-0.3.0.dist-info → mal_toolbox-0.3.2.dist-info}/METADATA

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

@@ -1,15 +1,15 @@
-maltoolbox/__init__.py,sha256=q_M3mEsQW1IFQ5xVZ3fK0gVyt8r_c2kxUC3ZDAtPmII,2088
+maltoolbox/__init__.py,sha256=vx87VNBoaH04yj1qjSU_ZKIhOFj9Zyf_04HJBNWkLEg,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/attackgraph/__init__.py,sha256=AHDyX6dAkx3mDic2K56v1xche9N6ofDfbaHkKbdJ2qQ,230
 maltoolbox/attackgraph/attacker.py,sha256=dKMAcOwlNM3LL8qh1tBJuzjFxlTNG-QI2st1LzP8Ofc,4030
-maltoolbox/attackgraph/attackgraph.py,sha256=A5TjDE-B4c0hY28M4IVwHVFhM_ww2eAt7uITjSUCNKc,32495
+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=s66EQcHlldn7XLCWxZ2FRjZTgk8o3V0mD4LnRaImdCw,6836
 maltoolbox/attackgraph/analyzers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-maltoolbox/attackgraph/analyzers/apriori.py,sha256=iH1KvKbMi9J3_1qia8FXI80O3ZMQ1LP67HkXbqweq-c,8802
+maltoolbox/attackgraph/analyzers/apriori.py,sha256=pLTZBJDOMbmMQpHQ7V-hocvaNvtFnjklr3TJ0sdEakc,8986
 maltoolbox/ingestors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maltoolbox/ingestors/neo4j.py,sha256=gjQQqk0HVI8ojIqwS1ymt7-_ZvDOTNi8AcczDAlvsGs,8310
 maltoolbox/language/__init__.py,sha256=9p5nvVqDCKEhXbDMIz1MtwZ9GN7x1jmUUXbpjEwuqnw,269
@@ -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.0.dist-info/AUTHORS,sha256=zxLrLe8EY39WtRKlAY4Oorx4Z2_LHV2ApRvDGZgY7xY,127
-mal_toolbox-0.3.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-mal_toolbox-0.3.0.dist-info/METADATA,sha256=Yfkp5QVZL6W4DIsYkQqRQU3HpTC6dkrVCHsfchgb4k0,6158
-mal_toolbox-0.3.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-mal_toolbox-0.3.0.dist-info/entry_points.txt,sha256=oqby5O6cUP_OHCm70k_iYPA6UlbTBf7se1i3XwdK3uU,56
-mal_toolbox-0.3.0.dist-info/top_level.txt,sha256=phqRVLRKGdSUgRY03mcpi2cmbbDo5YGjkV4gkqHFFcM,11
-mal_toolbox-0.3.0.dist-info/RECORD,,
+mal_toolbox-0.3.2.dist-info/AUTHORS,sha256=zxLrLe8EY39WtRKlAY4Oorx4Z2_LHV2ApRvDGZgY7xY,127
+mal_toolbox-0.3.2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+mal_toolbox-0.3.2.dist-info/METADATA,sha256=zapHEbzodvqPAbblBrCnrEm2buIGWPFGQXtdwUoib1E,6158
+mal_toolbox-0.3.2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+mal_toolbox-0.3.2.dist-info/entry_points.txt,sha256=oqby5O6cUP_OHCm70k_iYPA6UlbTBf7se1i3XwdK3uU,56
+mal_toolbox-0.3.2.dist-info/top_level.txt,sha256=phqRVLRKGdSUgRY03mcpi2cmbbDo5YGjkV4gkqHFFcM,11
+mal_toolbox-0.3.2.dist-info/RECORD,,

maltoolbox/__init__.py

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

maltoolbox/attackgraph/analyzers/apriori.py

@@ -178,11 +178,19 @@ def prune_unviable_and_unnecessary_nodes(graph: AttackGraph) -> None:
     graph       - the attack graph for which we wish to remove the
                   the nodes which are not viable or necessary.
     """
-    logger.debug('Prune unviable and unnecessary nodes from the attack graph.')
+    logger.debug(
+        'Prune unviable and unnecessary nodes from the attack graph.')
+
+    nodes_to_remove = set()
     for node in graph.nodes.values():
-        if (node.type == 'or' or node.type == 'and') and \
+        if node.type in ('or', 'and') and \
             (not node.is_viable or not node.is_necessary):
-            graph.remove_node(node)
+            nodes_to_remove.add(node)
+
+    # Do the removal separatly so we don't remove
+    # nodes from a set we are looping over
+    for node in nodes_to_remove:
+        graph.remove_node(node)
 
 
 def propagate_viability_from_unviable_node(

maltoolbox/attackgraph/attackgraph.py

@@ -808,11 +808,16 @@ class AttackGraph():
         """
         if logger.isEnabledFor(logging.DEBUG):
             # Avoid running json.dumps when not in debug
-            logger.debug('Remove attacker "%s" with id:%d.',
-                attacker.name,
-                attacker.id)
-        for node in attacker.reached_attack_steps:
+            logger.debug(
+                'Remove attacker "%s" with id:%d.',
+                attacker.name, attacker.id
+            )
+
+        # Copy set - we can not remove elements from a set we are looping over
+        nodes_to_uncompromise = set(attacker.reached_attack_steps)
+        for node in nodes_to_uncompromise:
             attacker.undo_compromise(node)
+
         if not isinstance(attacker.id, int):
-            raise ValueError(f'Invalid attacker id.')
+            raise ValueError(f'Invalid attacker id: {attacker.id}')
         del self.attackers[attacker.id]