mal-toolbox 1.0.1__tar.gz → 1.0.2__tar.gz

{mal_toolbox-1.0.1/mal_toolbox.egg-info → mal_toolbox-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mal-toolbox
-Version: 1.0.1
+Version: 1.0.2
 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
@@ -86,13 +86,26 @@ pip install mal-toolbox
 
 ## Configuration
 You can use a `maltoolbox.yml` file in the current working directory to
-configure the toolbox. Alternatively, you can use the `MALTOOLBOX_CONFIG`
-environment variable to set a custom config file location:
+configure the toolbox.
+
+The config should look like this:
+```yml
+logging:
+  log_level: INFO
+  log_file: "logs/log.txt"
+  attackgraph_file: "logs/attackgraph.json"
+  model_file: "logs/model.yml"
+  langspec_file: "logs/langspec_file.yml"
+  langgraph_file: "logs/langspec_file.yml"
+```
+
+Alternatively, you can use the `MALTOOLBOX_CONFIG`
+environment variable to set a custom config file location.
 
-"""bash
+```bash
 # in your shell, e.g. bash do:
 export MALTOOLBOX_CONFIG=path/to/yml/config/file
-"""
+```
 
 The default configuration can be found here:
 

{mal_toolbox-1.0.1 → mal_toolbox-1.0.2}/README.md

@@ -60,13 +60,26 @@ pip install mal-toolbox
 
 ## Configuration
 You can use a `maltoolbox.yml` file in the current working directory to
-configure the toolbox. Alternatively, you can use the `MALTOOLBOX_CONFIG`
-environment variable to set a custom config file location:
+configure the toolbox.
+
+The config should look like this:
+```yml
+logging:
+  log_level: INFO
+  log_file: "logs/log.txt"
+  attackgraph_file: "logs/attackgraph.json"
+  model_file: "logs/model.yml"
+  langspec_file: "logs/langspec_file.yml"
+  langgraph_file: "logs/langspec_file.yml"
+```
+
+Alternatively, you can use the `MALTOOLBOX_CONFIG`
+environment variable to set a custom config file location.
 
-"""bash
+```bash
 # in your shell, e.g. bash do:
 export MALTOOLBOX_CONFIG=path/to/yml/config/file
-"""
+```
 
 The default configuration can be found here:
 

{mal_toolbox-1.0.1 → mal_toolbox-1.0.2/mal_toolbox.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mal-toolbox
-Version: 1.0.1
+Version: 1.0.2
 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
@@ -86,13 +86,26 @@ pip install mal-toolbox
 
 ## Configuration
 You can use a `maltoolbox.yml` file in the current working directory to
-configure the toolbox. Alternatively, you can use the `MALTOOLBOX_CONFIG`
-environment variable to set a custom config file location:
+configure the toolbox.
+
+The config should look like this:
+```yml
+logging:
+  log_level: INFO
+  log_file: "logs/log.txt"
+  attackgraph_file: "logs/attackgraph.json"
+  model_file: "logs/model.yml"
+  langspec_file: "logs/langspec_file.yml"
+  langgraph_file: "logs/langspec_file.yml"
+```
+
+Alternatively, you can use the `MALTOOLBOX_CONFIG`
+environment variable to set a custom config file location.
 
-"""bash
+```bash
 # in your shell, e.g. bash do:
 export MALTOOLBOX_CONFIG=path/to/yml/config/file
-"""
+```
 
 The default configuration can be found here:
 

{mal_toolbox-1.0.1 → mal_toolbox-1.0.2}/maltoolbox/__init__.py

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-# MAL Toolbox v1.0.1
+# MAL Toolbox v1.0.2
 # 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.1"
+__version__ = "1.0.2"
 __authors__ = [
     "Andrei Buhaiu",
     "Giuseppe Nebbione",

{mal_toolbox-1.0.1 → mal_toolbox-1.0.2}/maltoolbox/attackgraph/attackgraph.py

@@ -194,7 +194,7 @@ class AttackGraph():
                 ttc_dist = node_dict['ttc'],
                 existence_status = node_dict.get('existence_status', None)
             )
-            ag_node.tags = set(node_dict.get('tags', []))
+            ag_node.tags = list(node_dict.get('tags', []))
             ag_node.extras = node_dict.get('extras', {})
 
             if node_asset:

{mal_toolbox-1.0.1 → mal_toolbox-1.0.2}/maltoolbox/language/languagegraph.py

@@ -490,7 +490,7 @@ class LanguageGraphAttackStep:
     info: dict = field(default_factory = dict)
     inherits: Optional[LanguageGraphAttackStep] = None
     own_requires: list[ExpressionsChain] = field(default_factory=list)
-    tags: set = field(default_factory = set)
+    tags: list = field(default_factory = list)
     detectors: dict = field(default_factory = lambda: {})
 
 
@@ -968,7 +968,7 @@ class LanguageGraph():
                     children = {},
                     parents = {},
                     info = attack_step_dict['info'],
-                    tags = set(attack_step_dict['tags'])
+                    tags = list(attack_step_dict['tags'])
                 )
                 asset.attack_steps[attack_step_dict['name']] = \
                     attack_step_node
@@ -1692,7 +1692,7 @@ class LanguageGraph():
                     children = {},
                     parents = {},
                     info = attack_step_attribs['meta'],
-                    tags = set(attack_step_attribs['tags'])
+                    tags = list(attack_step_attribs['tags'])
                 )
                 langspec_dict[attack_step_node.full_name] = \
                     attack_step_attribs
@@ -1735,7 +1735,7 @@ class LanguageGraph():
                                 children = {},
                                 parents = {},
                                 info = attack_step.info,
-                                tags = set(attack_step.tags)
+                                tags = list(attack_step.tags)
                             )
                             attack_step_node.inherits = attack_step
                             asset.attack_steps[attack_step.name] = attack_step_node
@@ -1743,12 +1743,9 @@ class LanguageGraph():
                             # The inherited attack step was already overridden.
                             continue
                         else:
-                            asset.attack_steps[attack_step.name].inherits = \
-                                attack_step
-                            asset.attack_steps[attack_step.name].tags |= \
-                                attack_step.tags
-                            asset.attack_steps[attack_step.name].info |= \
-                                attack_step.info
+                            asset.attack_steps[attack_step.name].inherits = attack_step
+                            asset.attack_steps[attack_step.name].tags += attack_step.tags
+                            asset.attack_steps[attack_step.name].info |= attack_step.info
 
         # Then, link all of the attack step nodes according to their
         # associations.

{mal_toolbox-1.0.1 → mal_toolbox-1.0.2}/pyproject.toml

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