mal-toolbox 0.3.1__tar.gz → 0.3.3__tar.gz

{mal_toolbox-0.3.1/mal_toolbox.egg-info → mal_toolbox-0.3.3}/PKG-INFO

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

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

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

{mal_toolbox-0.3.1 → mal_toolbox-0.3.3}/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(

{mal_toolbox-0.3.1 → mal_toolbox-0.3.3}/maltoolbox/ingestors/neo4j.py

@@ -35,7 +35,7 @@ def ingest_attack_graph(graph,
 
     nodes = {}
     rels = []
-    for node in graph.nodes:
+    for node in graph.nodes.values():
         node_dict = node.to_dict()
         nodes[node.id] = Node(
             node_dict['asset'] if 'asset' in node_dict else node_dict['id'],
@@ -50,7 +50,7 @@ def ingest_attack_graph(graph,
                 in node_dict else 'N/A')
 
 
-    for node in graph.nodes:
+    for node in graph.nodes.values():
         for child in node.children:
             rels.append(Relationship(nodes[node.id], nodes[child.id]))
 

{mal_toolbox-0.3.1 → mal_toolbox-0.3.3}/pyproject.toml

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