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

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

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

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

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

{mal_toolbox-0.3.3 → mal_toolbox-0.3.4}/maltoolbox/attackgraph/query.py

@@ -46,13 +46,26 @@ def is_node_traversable_by_attacker(
 
     match(node.type):
         case 'or':
+            for parent in node.parents:
+                if parent.is_compromised_by(attacker):
+                    logger.debug(
+                        '"%s"(%d) is traversable because it is viable, and '
+                        'of type "or", and its parent "%s(%d)" has already '
+                        'been compromised.',
+                        node.full_name,
+                        node.id,
+                        parent.full_name,
+                        parent.id
+                    )
+                    return True
             logger.debug(
-                '"%s"(%d) is traversable because it is viable and '
-                'of type "or".',
+                '"%s"(%d) is not traversable because while it is '
+                'viable, and of type "or", none of its parents '
+                'have been compromised.',
                 node.full_name,
                 node.id
             )
-            return True
+            return False
 
         case 'and':
             for parent in node.parents:

{mal_toolbox-0.3.3 → mal_toolbox-0.3.4}/maltoolbox/language/languagegraph.py

@@ -34,8 +34,8 @@ def disaggregate_attack_step_full_name(
 
 @dataclass
 class Detector:
-    context: Context
     name: Optional[str]
+    context: Context
     type: Optional[str]
     tprate: Optional[dict]
 
@@ -61,6 +61,8 @@ class Context(dict):
     def __str__(self) -> str:
         return str({label: asset.name for label, asset in self._context_dict.items()})
 
+    def __repr__(self) -> str:
+        return f"Context({str(self)}))"
 
 @dataclass
 class LanguageGraphAsset:

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

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