mal-toolbox 1.1.0__tar.gz → 1.1.2__tar.gz

{mal_toolbox-1.1.0/mal_toolbox.egg-info → mal_toolbox-1.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mal-toolbox
-Version: 1.1.0
+Version: 1.1.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>, Sandor Berglund <sandor@kth.se>
 License: Apache Software License
@@ -23,6 +23,8 @@ Requires-Dist: antlr4-tools
 Requires-Dist: antlr4-python3-runtime
 Requires-Dist: docopt
 Requires-Dist: PyYAML
+Requires-Dist: py2neo
+Requires-Dist: networkx
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Dynamic: license-file
@@ -177,8 +179,30 @@ attack_graph = AttackGraph(lang_graph, model)
 ```
 
 
+## Contributing
+
+# CI Pipeline
+
+Checks are made with:
+
+- `mypy`
+- `ruff`
+- `pytest`
+
+Make sure pipeline passes before PR is marked "Ready for review".
+
 # Tests
 There are unit tests inside of ./tests.
-Before running the tests, make sure to install the requirements in ./tests/requirements.txt with `python -m pip install -r ./tests/requirements.txt`.
 
 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
+
+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/).
+
+2. Get the PR reviewed and merged to `main`.
+
+3. Tag the latest commit on `main` with the new version number.
+
+4. Push the tag.

{mal_toolbox-1.1.0 → mal_toolbox-1.1.2}/README.md

@@ -148,8 +148,30 @@ attack_graph = AttackGraph(lang_graph, model)
 ```
 
 
+## Contributing
+
+# CI Pipeline
+
+Checks are made with:
+
+- `mypy`
+- `ruff`
+- `pytest`
+
+Make sure pipeline passes before PR is marked "Ready for review".
+
 # Tests
 There are unit tests inside of ./tests.
-Before running the tests, make sure to install the requirements in ./tests/requirements.txt with `python -m pip install -r ./tests/requirements.txt`.
 
 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
+
+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/).
+
+2. Get the PR reviewed and merged to `main`.
+
+3. Tag the latest commit on `main` with the new version number.
+
+4. Push the tag.

{mal_toolbox-1.1.0 → mal_toolbox-1.1.2/mal_toolbox.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mal-toolbox
-Version: 1.1.0
+Version: 1.1.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>, Sandor Berglund <sandor@kth.se>
 License: Apache Software License
@@ -23,6 +23,8 @@ Requires-Dist: antlr4-tools
 Requires-Dist: antlr4-python3-runtime
 Requires-Dist: docopt
 Requires-Dist: PyYAML
+Requires-Dist: py2neo
+Requires-Dist: networkx
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Dynamic: license-file
@@ -177,8 +179,30 @@ attack_graph = AttackGraph(lang_graph, model)
 ```
 
 
+## Contributing
+
+# CI Pipeline
+
+Checks are made with:
+
+- `mypy`
+- `ruff`
+- `pytest`
+
+Make sure pipeline passes before PR is marked "Ready for review".
+
 # Tests
 There are unit tests inside of ./tests.
-Before running the tests, make sure to install the requirements in ./tests/requirements.txt with `python -m pip install -r ./tests/requirements.txt`.
 
 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
+
+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/).
+
+2. Get the PR reviewed and merged to `main`.
+
+3. Tag the latest commit on `main` with the new version number.
+
+4. Push the tag.

{mal_toolbox-1.1.0 → mal_toolbox-1.1.2}/mal_toolbox.egg-info/SOURCES.txt

@@ -26,7 +26,7 @@ maltoolbox/language/compiler/mal_parser.py
 maltoolbox/patternfinder/__init__.py
 maltoolbox/patternfinder/attackgraph_patterns.py
 maltoolbox/translators/__init__.py
-maltoolbox/translators/securicad.py
+maltoolbox/translators/networkx.py
 maltoolbox/translators/updater.py
 maltoolbox/visualization/__init__.py
 maltoolbox/visualization/draw_io_utils.py

{mal_toolbox-1.1.0 → mal_toolbox-1.1.2}/mal_toolbox.egg-info/requires.txt

@@ -3,6 +3,8 @@ antlr4-tools
 antlr4-python3-runtime
 docopt
 PyYAML
+py2neo
+networkx
 
 [dev]
 pytest

{mal_toolbox-1.1.0 → mal_toolbox-1.1.2}/maltoolbox/__init__.py

@@ -1,5 +1,4 @@
-# -*- encoding: utf-8 -*-
-# MAL Toolbox v1.1.0
+# MAL Toolbox v1.1.2
 # Copyright 2025, Andrei Buhaiu.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,12 +15,11 @@
 #
 
 
-"""
-MAL-Toolbox Framework
+"""MAL-Toolbox Framework
 """
 
 __title__ = "maltoolbox"
-__version__ = "1.1.0"
+__version__ = "1.1.2"
 __authors__ = [
     "Andrei Buhaiu",
     "Giuseppe Nebbione",
@@ -34,11 +32,12 @@ __docformat__ = "restructuredtext en"
 
 __all__ = ()
 
-import os
-import yaml
 import logging
+import os
 from typing import Any
 
+import yaml
+
 config: dict[str, Any] = {
     "logging": {
         "log_level": logging.INFO,

{mal_toolbox-1.1.0 → mal_toolbox-1.1.2}/maltoolbox/__main__.py

@@ -1,5 +1,4 @@
-"""
-Command-line interface for MAL toolbox operations
+"""Command-line interface for MAL toolbox operations
 
 Usage:
     maltoolbox compile <lang_file> <output_file>
@@ -8,6 +7,7 @@ Usage:
     maltoolbox visualize-model [--neo4j] [--graphviz] [-drawio] <model_file> <lang_file>
 
 Arguments:
+---------
     <model_file>    Path to JSON instance model file.
     <lang_file>     Path to .mar or .mal file containing MAL spec.
     <output_file>   Path to write the result of the compilation (yml/json).
@@ -19,30 +19,34 @@ Options:
   -d --drawio       Export draw.io file
 
 Notes:
+-----
     - <lang_file> can be either a .mar file (generated by the older MAL
       compiler) or a .mal file containing the DSL written in MAL.
+
 """
 
-import logging
 import json
+import logging
+
 import docopt
 
 from . import log_configs, neo4j_configs
-from .attackgraph import create_attack_graph, AttackGraph
+from .attackgraph import AttackGraph, create_attack_graph
 from .language.compiler import MalCompiler
 from .language.languagegraph import LanguageGraph
+from .model import Model
 from .translators.updater import load_model_from_older_version
 from .visualization import (
-    render_model,
-    render_attack_graph,
-    ingest_model_neo4j,
+    create_drawio_file_with_images,
     ingest_attack_graph_neo4j,
-    create_drawio_file_with_images
+    ingest_model_neo4j,
+    render_attack_graph,
+    render_model,
 )
-from .model import Model
 
 logger = logging.getLogger(__name__)
 
+
 def generate_attack_graph(
         model_file: str,
         lang_file: str
@@ -50,8 +54,10 @@ def generate_attack_graph(
     """Create an attack graph
 
     Args:
+    ----
     model_file      - path to the model file
     lang_file       - path to the language file
+
     """
     attack_graph = create_attack_graph(lang_file, model_file)
     if log_configs['attackgraph_file']:
@@ -60,6 +66,7 @@ def generate_attack_graph(
         )
     return attack_graph
 
+
 def compile(lang_file: str, output_file: str) -> None:
     """Compile language and dump into output file"""
     compiler = MalCompiler()
@@ -107,5 +114,6 @@ def main():
         if args['--drawio']:
             create_drawio_file_with_images(model)
 
+
 if __name__ == "__main__":
     main()

{mal_toolbox-1.1.0 → mal_toolbox-1.1.2}/maltoolbox/attackgraph/__init__.py

@@ -1,5 +1,4 @@
-"""
-Contains tools used to generate attack graphs from MAL instance
+"""Contains tools used to generate attack graphs from MAL instance
 models and analyze attack graphs.
 """
 
@@ -7,8 +6,8 @@ from .attackgraph import AttackGraph, create_attack_graph
 from .node import AttackGraphNode
 
 __all__ = [
-    "Attacker",
     "AttackGraph",
     "AttackGraphNode",
+    "Attacker",
     "create_attack_graph"
 ]