mal-toolbox 1.0.7__tar.gz → 1.1.1__tar.gz

{mal_toolbox-1.0.7/mal_toolbox.egg-info → mal_toolbox-1.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mal-toolbox
-Version: 1.0.7
+Version: 1.1.1
 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>, Sandor Berglund <sandor@kth.se>
 License: Apache Software License
@@ -23,6 +23,7 @@ Requires-Dist: antlr4-tools
 Requires-Dist: antlr4-python3-runtime
 Requires-Dist: docopt
 Requires-Dist: PyYAML
+Requires-Dist: py2neo
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Dynamic: license-file

{mal_toolbox-1.0.7 → mal_toolbox-1.1.1/mal_toolbox.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mal-toolbox
-Version: 1.0.7
+Version: 1.1.1
 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>, Sandor Berglund <sandor@kth.se>
 License: Apache Software License
@@ -23,6 +23,7 @@ Requires-Dist: antlr4-tools
 Requires-Dist: antlr4-python3-runtime
 Requires-Dist: docopt
 Requires-Dist: PyYAML
+Requires-Dist: py2neo
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Dynamic: license-file

{mal_toolbox-1.0.7 → mal_toolbox-1.1.1}/mal_toolbox.egg-info/requires.txt

@@ -3,6 +3,7 @@ antlr4-tools
 antlr4-python3-runtime
 docopt
 PyYAML
+py2neo
 
 [dev]
 pytest

{mal_toolbox-1.0.7 → mal_toolbox-1.1.1}/maltoolbox/__init__.py

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-# MAL Toolbox v1.0.7
+# MAL Toolbox v1.1.1
 # Copyright 2025, Andrei Buhaiu.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,7 +21,7 @@ MAL-Toolbox Framework
 """
 
 __title__ = "maltoolbox"
-__version__ = "1.0.7"
+__version__ = "1.1.1"
 __authors__ = [
     "Andrei Buhaiu",
     "Giuseppe Nebbione",

{mal_toolbox-1.0.7 → mal_toolbox-1.1.1}/maltoolbox/attackgraph/attackgraph.py

@@ -91,6 +91,9 @@ class AttackGraph():
     """Graph representation of attack steps"""
     def __init__(self, lang_graph: LanguageGraph, model: Optional[Model] = None):
         self.nodes: dict[int, AttackGraphNode] = {}
+        self.attack_steps: list[AttackGraphNode] = []
+        self.defense_steps: list[AttackGraphNode] = []
+
         # Dictionaries used in optimization to get nodes by id or full name
         # faster
         self._full_name_to_node: dict[str, AttackGraphNode] = {}
@@ -665,6 +668,14 @@ class AttackGraph():
         )
 
         self.nodes[node_id] = node
+
+        # Add to different lists depending on types
+        # Useful but not vital for functionality
+        if node.type in ('or', 'and'):
+            self.attack_steps.append(node)
+        if node.type == 'defense':
+            self.defense_steps.append(node)
+
         self._full_name_to_node[node.full_name] = node
 
         return node

{mal_toolbox-1.0.7 → mal_toolbox-1.1.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mal-toolbox"
-version = "1.0.7"
+version = "1.1.1"
 authors = [
   { name="Andrei Buhaiu", email="buhaiu@kth.se" },
   { name="Joakim Loxdal", email="loxdal@kth.se" },
@@ -18,6 +18,7 @@ dependencies = [
   "antlr4-python3-runtime",
   "docopt",
   "PyYAML",
+  "py2neo"
 ]
 license = {text = "Apache Software License"}
 keywords = ["mal"]