mal-toolbox 0.3.3__py3-none-any.whl → 0.3.5__py3-none-any.whl

{mal_toolbox-0.3.3.dist-info → mal_toolbox-0.3.5.dist-info}/METADATA

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

@@ -1,29 +1,29 @@
-maltoolbox/__init__.py,sha256=KOtf1beGjcKq7VUvCHLBIam5toxmKjgI6EuEpGpk_aA,2088
+maltoolbox/__init__.py,sha256=k-H51l_Zc67HUyRK7pqhKe9LQ_IGX79UtA-eqrZrJI0,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/model.py,sha256=Gozh0sT7HXCgaQ0PMDdwP9CH_rgXjnmYweo1ei66xvQ,23799
 maltoolbox/attackgraph/__init__.py,sha256=AHDyX6dAkx3mDic2K56v1xche9N6ofDfbaHkKbdJ2qQ,230
-maltoolbox/attackgraph/attacker.py,sha256=dKMAcOwlNM3LL8qh1tBJuzjFxlTNG-QI2st1LzP8Ofc,4030
+maltoolbox/attackgraph/attacker.py,sha256=EwlzVinscBKO84QrCvy2W1jxXqTHrrufOovO3t6Xi2A,4113
 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/query.py,sha256=TPr0yDK_ZpRWO4BVTZ64_ATNjLnrglU3Jh1QGkhLeE0,7441
 maltoolbox/attackgraph/analyzers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maltoolbox/attackgraph/analyzers/apriori.py,sha256=pLTZBJDOMbmMQpHQ7V-hocvaNvtFnjklr3TJ0sdEakc,8986
 maltoolbox/ingestors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maltoolbox/ingestors/neo4j.py,sha256=W3AH3nymRQHI9N65HsSyyeQKcETPXmY_SLKc-iB4sBI,8328
 maltoolbox/language/__init__.py,sha256=9p5nvVqDCKEhXbDMIz1MtwZ9GN7x1jmUUXbpjEwuqnw,269
-maltoolbox/language/languagegraph.py,sha256=npP1lX1EE1rqqKNr9qTb4Jylvdn5JYApNyJhjwSebJs,67785
+maltoolbox/language/languagegraph.py,sha256=eBPTyoDpfc01ONEj321-RmIJV3DfVenYfHdVu0TiITo,67856
 maltoolbox/language/compiler/__init__.py,sha256=JQyAgDwJh1pU7AmuOhd1-d2b2PYXpgMVPtxnav8QHVc,15872
 maltoolbox/language/compiler/mal_lexer.py,sha256=BeifykDAt4PloRASOaLzBgWF35ev_zgD8lXMIsSHykc,12063
 maltoolbox/language/compiler/mal_parser.py,sha256=sUoaE43l2VKg-Dou30mk2wlVS1FvdOREwHNIyFe4IkY,114699
 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.3.dist-info/AUTHORS,sha256=zxLrLe8EY39WtRKlAY4Oorx4Z2_LHV2ApRvDGZgY7xY,127
-mal_toolbox-0.3.3.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-mal_toolbox-0.3.3.dist-info/METADATA,sha256=dZnRcj2VHu_oL87Zu4aA8XwG8lygJck0ulYHSV6NvAQ,6158
-mal_toolbox-0.3.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-mal_toolbox-0.3.3.dist-info/entry_points.txt,sha256=oqby5O6cUP_OHCm70k_iYPA6UlbTBf7se1i3XwdK3uU,56
-mal_toolbox-0.3.3.dist-info/top_level.txt,sha256=phqRVLRKGdSUgRY03mcpi2cmbbDo5YGjkV4gkqHFFcM,11
-mal_toolbox-0.3.3.dist-info/RECORD,,
+mal_toolbox-0.3.5.dist-info/AUTHORS,sha256=zxLrLe8EY39WtRKlAY4Oorx4Z2_LHV2ApRvDGZgY7xY,127
+mal_toolbox-0.3.5.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+mal_toolbox-0.3.5.dist-info/METADATA,sha256=GEueck0b9oEH59bosSJlO5lYi5nUQUhKfP3Fc4rVycY,6158
+mal_toolbox-0.3.5.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+mal_toolbox-0.3.5.dist-info/entry_points.txt,sha256=oqby5O6cUP_OHCm70k_iYPA6UlbTBf7se1i3XwdK3uU,56
+mal_toolbox-0.3.5.dist-info/top_level.txt,sha256=phqRVLRKGdSUgRY03mcpi2cmbbDo5YGjkV4gkqHFFcM,11
+mal_toolbox-0.3.5.dist-info/RECORD,,

maltoolbox/__init__.py

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
-# MAL Toolbox v0.3.3
-# Copyright 2024, Andrei Buhaiu.
+# MAL Toolbox v0.3.5
+# Copyright 2025, Andrei Buhaiu.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ MAL-Toolbox Framework
 """
 
 __title__ = "maltoolbox"
-__version__ = "0.3.3"
+__version__ = "0.3.5"
 __authors__ = [
     "Andrei Buhaiu",
     "Giuseppe Nebbione",

maltoolbox/attackgraph/attacker.py

@@ -23,9 +23,11 @@ class Attacker:
         attacker_id: Optional[int] = None
     ):
         self.name = name
-        self.entry_points = entry_points
-        self.reached_attack_steps = reached_attack_steps
         self.id = attacker_id
+        self.entry_points = entry_points
+        self.reached_attack_steps: set[AttackGraphNode] = set()
+        for node in reached_attack_steps:
+            self.compromise(node)
 
     def to_dict(self) -> dict:
         attacker_dict: dict = {

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:

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:

maltoolbox/model.py

@@ -152,11 +152,6 @@ class Model():
         self.lang_graph = lang_graph
         self.maltoolbox_version: str = mt_version
 
-        # Below sets used to check for duplicate names or ids,
-        # better for optimization than iterating over all assets
-        self.asset_ids: set[int] = set()
-        self.asset_names: set[str] = set()
-
 
     def add_asset(
             self,
@@ -192,16 +187,15 @@ class Model():
 
         # Set asset ID and check for duplicates
         asset_id = asset_id or self.next_id
-        if asset_id in self.asset_ids:
+        if asset_id in self.assets:
             raise ValueError(f'Asset index {asset_id} already in use.')
-        self.asset_ids.add(asset_id)
 
         self.next_id = max(asset_id + 1, self.next_id)
 
         if not name:
             name = asset_type + ':' + str(asset_id)
         else:
-            if name in self.asset_names:
+            if name in self._name_to_asset:
                 if allow_duplicate_names:
                     name = name + ':' + str(asset_id)
                 else:
@@ -209,7 +203,6 @@ class Model():
                         f'Asset name {name} is a duplicate'
                         ' and we do not allow duplicates.'
                     )
-        self.asset_names.add(name)
 
         lg_asset = self.lang_graph.assets[asset_type]