mal-toolbox 1.2.1__tar.gz → 2.1.0__tar.gz

{mal_toolbox-1.2.1/mal_toolbox.egg-info → mal_toolbox-2.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mal-toolbox
-Version: 1.2.1
+Version: 2.1.0
 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>, Sandor Berglund <sandor@kth.se>
 License: Apache Software License
@@ -25,6 +25,8 @@ Requires-Dist: docopt
 Requires-Dist: PyYAML
 Requires-Dist: py2neo
 Requires-Dist: networkx
+Requires-Dist: tree-sitter-mal~=1.0.0
+Requires-Dist: tree-sitter
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Dynamic: license-file
@@ -36,37 +38,9 @@ MAL ([Meta Attack Language](https://mal-lang.org/)) models and attack graphs.
 
 Attack graphs can be used to run simulations in [MAL Simulator](https://github.com/mal-lang/mal-simulator) or run your own custom analysis on.
 
-- [MAL Toolbox Documentation](https://mal-lang.org/mal-toolbox/index.html)
+- [MAL Toolbox Wiki](https://github.com/mal-lang/mal-toolbox/wiki)
 - [MAL Toolbox tutorial](https://github.com/mal-lang/mal-toolbox-tutorial)
 
-## The Language Module
-
-The language module provides various tools to process MAL languages.
-
-## The Model Module
-
-With a MAL language a Model (a MAL instance model) can be created either
-from a model file or empty.
-
-The model class will store all of the relevant information to the MAL
-instance model, most importantly the assets and their associations.
-
-Model objects can be used to generate attack graphs with the AttackGraph module.
-
-## The Attack Graph Module
-
-The attack graph module contains tools used to generate attack graphs from
-existing MAL instance models and analyse MAL attack graphs. The function used
-to generate the attack graph is `generate_graph` and it requires the instance
-model and language specification. The resulting attack graph will contain
-nodes for each of the attack steps. The structure of the attack node data
-class can be seen in `attackgraph/node.py` file. Of note are the lists of
-children and parents which allow for easy reference to the other attack step
-nodes related and the asset field which will contain the object in the model
-instance to which this attack step belongs to, if this information is
-available.
-
-
 # Usage
 
 ## Installation
@@ -147,50 +121,9 @@ Notes:
       compiler) or a .mal file containing the DSL written in MAL.```
 ```
 
-## Code examples / Tutorial
-
-To find more code examples and tutorials, visit the
-[MAL Toolbox Tutorial](https://github.com/mal-lang/mal-toolbox-tutorial/tree/main) repository.
-
-### Load a language
-```python
-
-from maltoolbox.language import LanguageGraph
-
-# Will load the MAL language (.mal/.mar) or a saved language graph (yml/json)
-lang_graph = LanguageGraph.load_from_file(lang_file_path)
-
-```
-
-### Generate a model
-```python
-from maltoolbox.model import Model
-
-# Create an empty model
-instance_model = Model("Example Model", lang_graph)
-
-# Create and add assets of type supported by the MAL language
-asset1 = instance_model.add_asset('Application', 'Application1')
-asset2 = instance_model.add_asset('Application', 'Application2')
-
-# Create association between the assets
-asset1.add_associated_assets('appExecutedApps', asset2)
-```
-
-## Generate an attack graph
-
-```python
-
-from maltoolbox.attackgraph import AttackGraph
-
-attack_graph = AttackGraph(lang_graph, model)
-
-```
-
-
-## Contributing
+# Contributing
 
-# CI Pipeline
+## CI Pipeline
 
 Checks are made with:
 
@@ -200,12 +133,12 @@ Checks are made with:
 
 Make sure pipeline passes before PR is marked "Ready for review".
 
-# Tests
+## Tests
 There are unit tests inside of ./tests.
 
 To run all tests, use the `pytest` command. To run just a specific file or test function use `pytest tests/<filename>` or `pytest -k <function_name>`.
 
-# Making a release
+## Making a release
 
 1. Make a PR with one commit that updates the version number in `pyproject.toml` and `maltoolbox/__init__.py`.
 Follow [Semantic versioning](https://semver.org/).

{mal_toolbox-1.2.1 → mal_toolbox-2.1.0}/README.md

@@ -5,37 +5,9 @@ MAL ([Meta Attack Language](https://mal-lang.org/)) models and attack graphs.
 
 Attack graphs can be used to run simulations in [MAL Simulator](https://github.com/mal-lang/mal-simulator) or run your own custom analysis on.
 
-- [MAL Toolbox Documentation](https://mal-lang.org/mal-toolbox/index.html)
+- [MAL Toolbox Wiki](https://github.com/mal-lang/mal-toolbox/wiki)
 - [MAL Toolbox tutorial](https://github.com/mal-lang/mal-toolbox-tutorial)
 
-## The Language Module
-
-The language module provides various tools to process MAL languages.
-
-## The Model Module
-
-With a MAL language a Model (a MAL instance model) can be created either
-from a model file or empty.
-
-The model class will store all of the relevant information to the MAL
-instance model, most importantly the assets and their associations.
-
-Model objects can be used to generate attack graphs with the AttackGraph module.
-
-## The Attack Graph Module
-
-The attack graph module contains tools used to generate attack graphs from
-existing MAL instance models and analyse MAL attack graphs. The function used
-to generate the attack graph is `generate_graph` and it requires the instance
-model and language specification. The resulting attack graph will contain
-nodes for each of the attack steps. The structure of the attack node data
-class can be seen in `attackgraph/node.py` file. Of note are the lists of
-children and parents which allow for easy reference to the other attack step
-nodes related and the asset field which will contain the object in the model
-instance to which this attack step belongs to, if this information is
-available.
-
-
 # Usage
 
 ## Installation
@@ -116,50 +88,9 @@ Notes:
       compiler) or a .mal file containing the DSL written in MAL.```
 ```
 
-## Code examples / Tutorial
-
-To find more code examples and tutorials, visit the
-[MAL Toolbox Tutorial](https://github.com/mal-lang/mal-toolbox-tutorial/tree/main) repository.
-
-### Load a language
-```python
-
-from maltoolbox.language import LanguageGraph
-
-# Will load the MAL language (.mal/.mar) or a saved language graph (yml/json)
-lang_graph = LanguageGraph.load_from_file(lang_file_path)
-
-```
-
-### Generate a model
-```python
-from maltoolbox.model import Model
-
-# Create an empty model
-instance_model = Model("Example Model", lang_graph)
-
-# Create and add assets of type supported by the MAL language
-asset1 = instance_model.add_asset('Application', 'Application1')
-asset2 = instance_model.add_asset('Application', 'Application2')
-
-# Create association between the assets
-asset1.add_associated_assets('appExecutedApps', asset2)
-```
-
-## Generate an attack graph
-
-```python
-
-from maltoolbox.attackgraph import AttackGraph
-
-attack_graph = AttackGraph(lang_graph, model)
-
-```
-
-
-## Contributing
+# Contributing
 
-# CI Pipeline
+## CI Pipeline
 
 Checks are made with:
 
@@ -169,12 +100,12 @@ Checks are made with:
 
 Make sure pipeline passes before PR is marked "Ready for review".
 
-# Tests
+## Tests
 There are unit tests inside of ./tests.
 
 To run all tests, use the `pytest` command. To run just a specific file or test function use `pytest tests/<filename>` or `pytest -k <function_name>`.
 
-# Making a release
+## Making a release
 
 1. Make a PR with one commit that updates the version number in `pyproject.toml` and `maltoolbox/__init__.py`.
 Follow [Semantic versioning](https://semver.org/).

{mal_toolbox-1.2.1 → mal_toolbox-2.1.0/mal_toolbox.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mal-toolbox
-Version: 1.2.1
+Version: 2.1.0
 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>, Sandor Berglund <sandor@kth.se>
 License: Apache Software License
@@ -25,6 +25,8 @@ Requires-Dist: docopt
 Requires-Dist: PyYAML
 Requires-Dist: py2neo
 Requires-Dist: networkx
+Requires-Dist: tree-sitter-mal~=1.0.0
+Requires-Dist: tree-sitter
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Dynamic: license-file
@@ -36,37 +38,9 @@ MAL ([Meta Attack Language](https://mal-lang.org/)) models and attack graphs.
 
 Attack graphs can be used to run simulations in [MAL Simulator](https://github.com/mal-lang/mal-simulator) or run your own custom analysis on.
 
-- [MAL Toolbox Documentation](https://mal-lang.org/mal-toolbox/index.html)
+- [MAL Toolbox Wiki](https://github.com/mal-lang/mal-toolbox/wiki)
 - [MAL Toolbox tutorial](https://github.com/mal-lang/mal-toolbox-tutorial)
 
-## The Language Module
-
-The language module provides various tools to process MAL languages.
-
-## The Model Module
-
-With a MAL language a Model (a MAL instance model) can be created either
-from a model file or empty.
-
-The model class will store all of the relevant information to the MAL
-instance model, most importantly the assets and their associations.
-
-Model objects can be used to generate attack graphs with the AttackGraph module.
-
-## The Attack Graph Module
-
-The attack graph module contains tools used to generate attack graphs from
-existing MAL instance models and analyse MAL attack graphs. The function used
-to generate the attack graph is `generate_graph` and it requires the instance
-model and language specification. The resulting attack graph will contain
-nodes for each of the attack steps. The structure of the attack node data
-class can be seen in `attackgraph/node.py` file. Of note are the lists of
-children and parents which allow for easy reference to the other attack step
-nodes related and the asset field which will contain the object in the model
-instance to which this attack step belongs to, if this information is
-available.
-
-
 # Usage
 
 ## Installation
@@ -147,50 +121,9 @@ Notes:
       compiler) or a .mal file containing the DSL written in MAL.```
 ```
 
-## Code examples / Tutorial
-
-To find more code examples and tutorials, visit the
-[MAL Toolbox Tutorial](https://github.com/mal-lang/mal-toolbox-tutorial/tree/main) repository.
-
-### Load a language
-```python
-
-from maltoolbox.language import LanguageGraph
-
-# Will load the MAL language (.mal/.mar) or a saved language graph (yml/json)
-lang_graph = LanguageGraph.load_from_file(lang_file_path)
-
-```
-
-### Generate a model
-```python
-from maltoolbox.model import Model
-
-# Create an empty model
-instance_model = Model("Example Model", lang_graph)
-
-# Create and add assets of type supported by the MAL language
-asset1 = instance_model.add_asset('Application', 'Application1')
-asset2 = instance_model.add_asset('Application', 'Application2')
-
-# Create association between the assets
-asset1.add_associated_assets('appExecutedApps', asset2)
-```
-
-## Generate an attack graph
-
-```python
-
-from maltoolbox.attackgraph import AttackGraph
-
-attack_graph = AttackGraph(lang_graph, model)
-
-```
-
-
-## Contributing
+# Contributing
 
-# CI Pipeline
+## CI Pipeline
 
 Checks are made with:
 
@@ -200,12 +133,12 @@ Checks are made with:
 
 Make sure pipeline passes before PR is marked "Ready for review".
 
-# Tests
+## Tests
 There are unit tests inside of ./tests.
 
 To run all tests, use the `pytest` command. To run just a specific file or test function use `pytest tests/<filename>` or `pytest -k <function_name>`.
 
-# Making a release
+## Making a release
 
 1. Make a PR with one commit that updates the version number in `pyproject.toml` and `maltoolbox/__init__.py`.
 Follow [Semantic versioning](https://semver.org/).

{mal_toolbox-1.2.1 → mal_toolbox-2.1.0}/mal_toolbox.egg-info/SOURCES.txt

@@ -17,13 +17,31 @@ maltoolbox/py.typed
 maltoolbox/str_utils.py
 maltoolbox/attackgraph/__init__.py
 maltoolbox/attackgraph/attackgraph.py
+maltoolbox/attackgraph/factories.py
+maltoolbox/attackgraph/file_utils.py
+maltoolbox/attackgraph/generate.py
 maltoolbox/attackgraph/node.py
+maltoolbox/attackgraph/node_getters.py
+maltoolbox/attackgraph/ttcs.py
 maltoolbox/attackgraph/analyzers/__init__.py
 maltoolbox/language/__init__.py
+maltoolbox/language/detector.py
+maltoolbox/language/expression_chain.py
+maltoolbox/language/language_graph_asset.py
+maltoolbox/language/language_graph_assoc.py
+maltoolbox/language/language_graph_attack_step.py
+maltoolbox/language/language_graph_builder.py
+maltoolbox/language/language_graph_loaders.py
+maltoolbox/language/language_graph_lookup.py
+maltoolbox/language/language_graph_serialization.py
 maltoolbox/language/languagegraph.py
+maltoolbox/language/step_expression_processor.py
 maltoolbox/language/compiler/__init__.py
-maltoolbox/language/compiler/mal_lexer.py
-maltoolbox/language/compiler/mal_parser.py
+maltoolbox/language/compiler/distributions.py
+maltoolbox/language/compiler/exceptions.py
+maltoolbox/language/compiler/lang.py
+maltoolbox/language/compiler/mal_analyzer.py
+maltoolbox/language/compiler/mal_compiler.py
 maltoolbox/patternfinder/__init__.py
 maltoolbox/patternfinder/attackgraph_patterns.py
 maltoolbox/translators/__init__.py

{mal_toolbox-1.2.1 → mal_toolbox-2.1.0}/mal_toolbox.egg-info/requires.txt

@@ -5,6 +5,8 @@ docopt
 PyYAML
 py2neo
 networkx
+tree-sitter-mal~=1.0.0
+tree-sitter
 
 [dev]
 pytest

{mal_toolbox-1.2.1 → mal_toolbox-2.1.0}/maltoolbox/__init__.py

@@ -1,4 +1,4 @@
-# MAL Toolbox v1.2.1
+# MAL Toolbox v2.1.0
 # Copyright 2025, Andrei Buhaiu.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,7 +19,7 @@
 """
 
 __title__ = "maltoolbox"
-__version__ = "1.2.1"
+__version__ = "2.1.0"
 __authors__ = [
     "Andrei Buhaiu",
     "Giuseppe Nebbione",

{mal_toolbox-1.2.1 → mal_toolbox-2.1.0}/maltoolbox/attackgraph/__init__.py

@@ -2,12 +2,12 @@
 models and analyze attack graphs.
 """
 
-from .attackgraph import AttackGraph, create_attack_graph
+from .attackgraph import AttackGraph
+from .factories import create_attack_graph
 from .node import AttackGraphNode
 
 __all__ = [
     "AttackGraph",
     "AttackGraphNode",
-    "Attacker",
     "create_attack_graph"
 ]