mal-toolbox 0.1.3__tar.gz → 0.1.5__tar.gz

{mal_toolbox-0.1.3/mal_toolbox.egg-info → mal_toolbox-0.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mal-toolbox
-Version: 0.1.3
+Version: 0.1.5
 Summary: A collection of tools used to create MAL models and attack graphs.
 Author-email: Andrei Buhaiu <buhaiu@kth.se>, Giuseppe Nebbione <nebbione@kth.se>, Nikolaos Kakouros <nkak@kth.se>, Jakob Nyberg <jaknyb@kth.se>, Joakim Loxdal <loxdal@kth.se>
 License: Apache Software License

{mal_toolbox-0.1.3 → mal_toolbox-0.1.5/mal_toolbox.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mal-toolbox
-Version: 0.1.3
+Version: 0.1.5
 Summary: A collection of tools used to create MAL models and attack graphs.
 Author-email: Andrei Buhaiu <buhaiu@kth.se>, Giuseppe Nebbione <nebbione@kth.se>, Nikolaos Kakouros <nkak@kth.se>, Jakob Nyberg <jaknyb@kth.se>, Joakim Loxdal <loxdal@kth.se>
 License: Apache Software License

{mal_toolbox-0.1.3 → mal_toolbox-0.1.5}/maltoolbox/__init__.py

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-# MAL Toolbox v0.1.3
+# MAL Toolbox v0.1.5
 # 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.1.3'
+__version__ = '0.1.5'
 __authors__ = ['Andrei Buhaiu',
     'Giuseppe Nebbione',
     'Nikolaos Kakouros',

{mal_toolbox-0.1.3 → mal_toolbox-0.1.5}/maltoolbox/attackgraph/attackgraph.py

@@ -287,6 +287,7 @@ class AttackGraph():
                 'mitre_info' in node_dict else None
             ag_node.tags = node_dict['tags'] if \
                 'tags' in node_dict else []
+            ag_node.extras = node_dict.get('extras', [])
 
             # Add AttackGraphNode to AttackGraph
             attack_graph.add_node(ag_node, node_id=node_dict['id'])

{mal_toolbox-0.1.3 → mal_toolbox-0.1.5}/maltoolbox/language/languagegraph.py

@@ -622,7 +622,7 @@ class LanguageGraph():
                     new_dep_chain,
                     attack_step)
 
-            case 'subtype':
+            case 'subType':
                 # Create a subType tuple entry that applies to the next
                 # component of the step expression and changes the target
                 # asset to the subasset.
@@ -651,7 +651,7 @@ class LanguageGraph():
                     return (None, None, None)
 
                 new_dep_chain = DependencyChain(
-                    type = 'subtype',
+                    type = 'subType',
                     next_link = result_dep_chain)
                 new_dep_chain.subtype = subtype_asset
                 return (subtype_asset,
@@ -748,19 +748,18 @@ class LanguageGraph():
                                 new_dep_chain
                             )
 
-                case 'subtype':
-                    #TODO FIX BUG: new_dep_chain is undefined
-                    # result_reverse_chain = self.reverse_dep_chain(
-                    #     new_dep_chain.next_link,
-                    #     reverse_chain
-                    # )
-                    # new_dep_chain = DependencyChain(
-                    #     type = 'subtype',
-                    #     next_link = result_reverse_chain
-                    # )
-                    # new_dep_chain.subtype = dep_chain.subtype
-                    # return new_dep_chain
-                    return reverse_chain
+                case 'subType':
+                    result_reverse_chain = self.reverse_dep_chain(
+                        dep_chain.next_link,
+                        reverse_chain
+                    )
+                    new_dep_chain = DependencyChain(
+                        type = 'subType',
+                        next_link = result_reverse_chain
+                    )
+                    new_dep_chain.subtype = dep_chain.subtype
+                    return new_dep_chain
+                    # return reverse_chain
 
                 case _:
                     msg = 'Unknown assoc chain element "%s"'
@@ -1001,7 +1000,7 @@ class LanguageGraph():
                 attack_steps[step['name']] = copy.deepcopy(step)
             else:
                 if attack_steps[step['name']]['reaches'] is not None and \
-                        'stepExpression' in \
+                        'stepExpressions' in \
                         attack_steps[step['name']]['reaches']:
                     attack_steps[step['name']]['reaches']['stepExpressions'].\
                         extend(step['reaches']['stepExpressions'])

{mal_toolbox-0.1.3 → mal_toolbox-0.1.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mal-toolbox"
-version = "0.1.3"
+version = "0.1.5"
 authors = [
   { name="Andrei Buhaiu", email="buhaiu@kth.se" },
   { name="Giuseppe Nebbione", email="nebbione@kth.se" },