mal-toolbox 0.1.4__py3-none-any.whl → 0.1.5__py3-none-any.whl

{mal_toolbox-0.1.4.dist-info → mal_toolbox-0.1.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mal-toolbox
-Version: 0.1.4
+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.4.dist-info → mal_toolbox-0.1.5.dist-info}/RECORD

@@ -1,4 +1,4 @@
-maltoolbox/__init__.py,sha256=pHPdlKX8XdvxBUo1LThw-H2emwaKkipQp5f29FPKE3M,2776
+maltoolbox/__init__.py,sha256=rUX4r-INojlNiyot2JO3JG3x1xKFg6I5rBJp48kjj5A,2776
 maltoolbox/__main__.py,sha256=1lOOOme_y56VWrEE1jkarTt-WoUo9yilCo8sUrivyns,2680
 maltoolbox/default.conf,sha256=YLGBSJh2q8hn3RzRRBbib9F6E6pcvquoHeALMRtA0wU,295
 maltoolbox/exceptions.py,sha256=0YjPx2v1yYumZ2o7pVZ1s_jS-GAb3Ng979KEFhROSNY,1399
@@ -7,7 +7,7 @@ maltoolbox/model.py,sha256=V-tvAxdfypj3kHY1XFHd0yrAZi5cXGg1N-Bz8z_K_FU,26608
 maltoolbox/wrappers.py,sha256=BYYNcIdTlyumADQCPcy1xmPEabfmi0P1l9RcbdVWm9w,2002
 maltoolbox/attackgraph/__init__.py,sha256=F6maWV2PYSH5xtbqozeM3IolalWQqs-tdaCG2ywbqKI,102
 maltoolbox/attackgraph/attacker.py,sha256=hmJtgcwtQgz0r9J_0Pgm7ktfKpFE3dp-HJ2TOz1NiWw,2880
-maltoolbox/attackgraph/attackgraph.py,sha256=IVdWMXhL297UYjs9Xr_uotrMWwaklVHH8YO58v_kMAc,28197
+maltoolbox/attackgraph/attackgraph.py,sha256=cFtNiZN17g0mlOJWFfavlmAnSsUtNQNCC5qVdTkabMA,28254
 maltoolbox/attackgraph/node.py,sha256=XSjMPqCGtnMeTXJDS2QluLcK5sLlsxpFIFpy2twJ2PQ,4603
 maltoolbox/attackgraph/query.py,sha256=ukMfkSnixBenfeg5H1SokoSftGo-V4xPL5qpgSaeMN4,5232
 maltoolbox/attackgraph/analyzers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -16,7 +16,7 @@ maltoolbox/ingestors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 maltoolbox/ingestors/neo4j.py,sha256=jdulYsQ2eZT2r0Af_yYjyGkmVx4l5h8viu1Z70NjVAM,8811
 maltoolbox/language/__init__.py,sha256=OtqUWq8BRvqR5h8Hr4Smlnyz2az4w1pqyWYsbZDsolI,93
 maltoolbox/language/classes_factory.py,sha256=MNqiDemaflloVMRhjg1ZkUcQObKNEaGxAoXhNQQqem0,9983
-maltoolbox/language/languagegraph.py,sha256=QZaDwxbQHjbeoE10lXQhFwndcJxBNTZWKmmcloe4ejA,47115
+maltoolbox/language/languagegraph.py,sha256=f79ovmrGQb6tvY9ze-zqP031N6rApB9WsbZd5LRyhk8,47031
 maltoolbox/language/compiler/__init__.py,sha256=fJ22-FlXfr907WCPkqlr_eBTzPqsrg6m3i7J_ZWpuAo,840
 maltoolbox/language/compiler/mal_lexer.py,sha256=wocRzBkLbqYefpGvq2W77x7439-AdZKVgPWhRiRubXg,10776
 maltoolbox/language/compiler/mal_parser.py,sha256=M1EVZFV73TNfQHz2KJ8-iloqOD4KUhHyajszD8UrNow,91349
@@ -24,9 +24,9 @@ maltoolbox/language/compiler/mal_visitor.py,sha256=9gG06D7GZKlBY-62SmbIkRYkGBUBI
 maltoolbox/translators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maltoolbox/translators/securicad.py,sha256=FAIHnoqFTmNYbCGxLsK6pX5g1oiNFfPTqkT_3qq3GG8,6692
 maltoolbox/translators/updater.py,sha256=Ap08-AsU_7or5ESQvZL2i4nWz3B5pvgfftZyc_-Gd8M,4766
-mal_toolbox-0.1.4.dist-info/AUTHORS,sha256=zxLrLe8EY39WtRKlAY4Oorx4Z2_LHV2ApRvDGZgY7xY,127
-mal_toolbox-0.1.4.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-mal_toolbox-0.1.4.dist-info/METADATA,sha256=1ZsQvaslMtd_NaUAlHvSunRJuERiVmjSle_Wmb9hhys,5873
-mal_toolbox-0.1.4.dist-info/WHEEL,sha256=-oYQCr74JF3a37z2nRlQays_SX2MqOANoqVjBBAP2yE,91
-mal_toolbox-0.1.4.dist-info/top_level.txt,sha256=phqRVLRKGdSUgRY03mcpi2cmbbDo5YGjkV4gkqHFFcM,11
-mal_toolbox-0.1.4.dist-info/RECORD,,
+mal_toolbox-0.1.5.dist-info/AUTHORS,sha256=zxLrLe8EY39WtRKlAY4Oorx4Z2_LHV2ApRvDGZgY7xY,127
+mal_toolbox-0.1.5.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+mal_toolbox-0.1.5.dist-info/METADATA,sha256=nxeTdGyeJKiHyb4cOU51aCD_-mXpNBkI727fu8tOGJk,5873
+mal_toolbox-0.1.5.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
+mal_toolbox-0.1.5.dist-info/top_level.txt,sha256=phqRVLRKGdSUgRY03mcpi2cmbbDo5YGjkV4gkqHFFcM,11
+mal_toolbox-0.1.5.dist-info/RECORD,,

{mal_toolbox-0.1.4.dist-info → mal_toolbox-0.1.5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (71.0.3)
+Generator: setuptools (71.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

maltoolbox/__init__.py

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

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'])

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"'