mal-simulator 3.3.0__tar.gz → 3.3.1__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (88) hide show
  1. {mal_simulator-3.3.0/mal_simulator.egg-info → mal_simulator-3.3.1}/PKG-INFO +1 -1
  2. {mal_simulator-3.3.0 → mal_simulator-3.3.1/mal_simulator.egg-info}/PKG-INFO +1 -1
  3. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/__init__.py +2 -2
  4. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/dyna_mal_simulator/process_assoc_traversal.py +6 -3
  5. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/mal_simulator/attack_surface.py +5 -3
  6. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/scenario/scenario.py +2 -3
  7. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/pyproject.toml +6 -1
  8. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/tests/test_dyna_mal_simulator.py +36 -0
  9. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/AUTHORS +0 -0
  10. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/LICENSE +0 -0
  11. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/README.md +0 -0
  12. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/mal_simulator.egg-info/SOURCES.txt +0 -0
  13. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/mal_simulator.egg-info/dependency_links.txt +0 -0
  14. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/mal_simulator.egg-info/entry_points.txt +0 -0
  15. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/mal_simulator.egg-info/requires.txt +0 -0
  16. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/mal_simulator.egg-info/top_level.txt +0 -0
  17. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/__main__.py +0 -0
  18. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/config/__init__.py +0 -0
  19. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/config/agent_settings.py +0 -0
  20. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/config/agent_settings_factories.py +0 -0
  21. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/config/node_property_rule.py +0 -0
  22. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/config/sim_settings.py +0 -0
  23. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/dyna_mal_simulator/__init__.py +0 -0
  24. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/dyna_mal_simulator/attacker_step.py +0 -0
  25. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/dyna_mal_simulator/defender_step.py +0 -0
  26. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/dyna_mal_simulator/graph_state.py +0 -0
  27. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/dyna_mal_simulator/model_effects.py +0 -0
  28. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/dyna_mal_simulator/model_state.py +0 -0
  29. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/dyna_mal_simulator/simulator.py +0 -0
  30. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/dyna_mal_simulator/simulator_state.py +0 -0
  31. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/envs/__init__.py +0 -0
  32. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/envs/base_classes.py +0 -0
  33. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/envs/graph/__init__.py +0 -0
  34. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/envs/graph/graph_env.py +0 -0
  35. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/envs/graph/mal_spaces.py +0 -0
  36. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/envs/graph/serialization.py +0 -0
  37. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/envs/graph/utils.py +0 -0
  38. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/envs/graph/wrapper.py +0 -0
  39. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/mal_simulator/__init__.py +0 -0
  40. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/mal_simulator/agent_state.py +0 -0
  41. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/mal_simulator/agent_states.py +0 -0
  42. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/mal_simulator/attacker_state.py +0 -0
  43. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/mal_simulator/attacker_state_factories.py +0 -0
  44. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/mal_simulator/attacker_step.py +0 -0
  45. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/mal_simulator/defender_state.py +0 -0
  46. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/mal_simulator/defender_state_factories.py +0 -0
  47. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/mal_simulator/defender_step.py +0 -0
  48. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/mal_simulator/defense_surface.py +0 -0
  49. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/mal_simulator/event_logger.py +0 -0
  50. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/mal_simulator/false_alerts.py +0 -0
  51. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/mal_simulator/graph_processing.py +0 -0
  52. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/mal_simulator/graph_state.py +0 -0
  53. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/mal_simulator/graph_utils.py +0 -0
  54. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/mal_simulator/node_getters.py +0 -0
  55. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/mal_simulator/observability.py +0 -0
  56. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/mal_simulator/reset_agent.py +0 -0
  57. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/mal_simulator/rewards.py +0 -0
  58. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/mal_simulator/run_simulation.py +0 -0
  59. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/mal_simulator/simulator.py +0 -0
  60. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/mal_simulator/simulator_state.py +0 -0
  61. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/mal_simulator/simulator_static_data.py +0 -0
  62. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/mal_simulator/state_query.py +0 -0
  63. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/mal_simulator/ttc_utils.py +0 -0
  64. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/policies/__init__.py +0 -0
  65. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/policies/attackers/__init__.py +0 -0
  66. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/policies/attackers/searchers.py +0 -0
  67. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/policies/attackers/shortest_path.py +0 -0
  68. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/policies/attackers/ttc_soft_min.py +0 -0
  69. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/policies/decision_agent.py +0 -0
  70. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/policies/defenders/__init__.py +0 -0
  71. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/policies/defenders/heuristic_agent.py +0 -0
  72. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/policies/keyboard_input.py +0 -0
  73. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/policies/passive_agent.py +0 -0
  74. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/policies/random_agent.py +0 -0
  75. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/policies/utils/path_finding.py +0 -0
  76. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/scenario/__init__.py +0 -0
  77. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/types.py +0 -0
  78. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/malsim/visualization/malsim_gui_client.py +0 -0
  79. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/setup.cfg +0 -0
  80. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/tests/test_attacker.py +0 -0
  81. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/tests/test_attacker_settings.py +0 -0
  82. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/tests/test_defender.py +0 -0
  83. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/tests/test_event_logger.py +0 -0
  84. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/tests/test_graph_processing.py +0 -0
  85. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/tests/test_main.py +0 -0
  86. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/tests/test_mal_simulator.py +0 -0
  87. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/tests/test_scenario.py +0 -0
  88. {mal_simulator-3.3.0 → mal_simulator-3.3.1}/tests/test_ttc_utils.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: mal-simulator
3
- Version: 3.3.0
3
+ Version: 3.3.1
4
4
  Summary: A MAL compliant simulator.
5
5
  Author-email: Andrei Buhaiu <buhaiu@kth.se>, Joakim Loxdal <loxdal@kth.se>, Jakob Nyberg <jaknyb@kth.se>, Nikolaos Kakouros <nkak@kth.se>, Sandor Berglund <sandorb@kth.se>
6
6
  License: Apache Software License
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: mal-simulator
3
- Version: 3.3.0
3
+ Version: 3.3.1
4
4
  Summary: A MAL compliant simulator.
5
5
  Author-email: Andrei Buhaiu <buhaiu@kth.se>, Joakim Loxdal <loxdal@kth.se>, Jakob Nyberg <jaknyb@kth.se>, Nikolaos Kakouros <nkak@kth.se>, Sandor Berglund <sandorb@kth.se>
6
6
  License: Apache Software License
@@ -1,4 +1,4 @@
1
- # MAL Simulator v3.3.0
1
+ # MAL Simulator v3.3.1
2
2
  # Copyright 2025, Andrei Buhaiu.
3
3
  #
4
4
  # Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,7 +26,7 @@ from malsim.scenario import Scenario
26
26
  from malsim.config import AttackerSettings, DefenderSettings
27
27
 
28
28
  __title__ = 'malsim'
29
- __version__ = '3.3.0'
29
+ __version__ = '3.3.1'
30
30
  __authors__ = [
31
31
  'Andrei Buhaiu',
32
32
  'Joakim Loxdal',
@@ -288,9 +288,12 @@ def parse_removal(
288
288
  f'Node {node.name} does not have a model asset, '
289
289
  'so cannot traverse to self.'
290
290
  )
291
- for field_name, associated_assets in asset.associated_assets.items():
292
- if node.model_asset in associated_assets:
293
- removals.add((asset, field_name, node.model_asset))
291
+ if asset == node.model_asset:
292
+ removals.add((asset, assoc_traversal.field_name, node.model_asset))
293
+ else:
294
+ for field_name, assed_assets in asset.associated_assets.items():
295
+ if node.model_asset in assed_assets:
296
+ removals.add((asset, field_name, node.model_asset))
294
297
 
295
298
  removal_candidates = asset.associated_assets.get(
296
299
  assoc_traversal.field_name, set()
@@ -30,9 +30,11 @@ def get_effects_of_attack_step(
30
30
  while potential_effects:
31
31
  effect = potential_effects.popleft()
32
32
  has_visited = performed | set(effects)
33
- if effect not in has_visited and node_is_traversable(
34
- sim_state, has_visited, effect
35
- ):
33
+
34
+ if (
35
+ effect not in has_visited
36
+ or not sim_state.settings.attack_surface.skip_compromised
37
+ ) and node_is_traversable(sim_state, has_visited, effect):
36
38
  effects.add(effect)
37
39
  potential_effects += (
38
40
  n for n in effect.children if n.causal_mode == 'effect'
@@ -213,9 +213,8 @@ def _validate_scenario_dict(scenario_dict: dict[str, Any]) -> None:
213
213
  raise RuntimeError(
214
214
  f"Only one of '{key_or_keys}' is allowed in scenario file"
215
215
  )
216
- elif isinstance(key_or_keys, str):
217
- if key_or_keys not in scenario_dict:
218
- raise RuntimeError(f"Setting '{key_or_keys}' required in scenario file")
216
+ elif isinstance(key_or_keys, str) and key_or_keys not in scenario_dict:
217
+ raise RuntimeError(f"Setting '{key_or_keys}' required in scenario file")
219
218
 
220
219
 
221
220
  def path_relative_to_file_dir(rel_path: str, file: TextIO) -> str:
@@ -1,6 +1,6 @@
1
1
  [project]
2
2
  name = "mal-simulator"
3
- version = "3.3.0"
3
+ version = "3.3.1"
4
4
  authors = [
5
5
  { name="Andrei Buhaiu", email="buhaiu@kth.se" },
6
6
  { name="Joakim Loxdal", email="loxdal@kth.se" },
@@ -62,6 +62,11 @@ include = ["malsim*"]
62
62
 
63
63
  [tool.pytest.ini_options]
64
64
  pythonpath = ['.']
65
+ filterwarnings = [
66
+ "ignore:.*Overriding environment.*",
67
+ "ignore:.*to numpy array.*"
68
+ ]
69
+ markers = ["integration: deselected during CI"]
65
70
 
66
71
  [tool.mypy]
67
72
  strict = true
@@ -1046,3 +1046,39 @@ def test_no_memory_growth_over_repeated_simulations() -> None:
1046
1046
  'after repeatedly running independent simulations - this suggests a '
1047
1047
  'memory leak in DynaMalSimulator'
1048
1048
  )
1049
+
1050
+
1051
+ def test_repeated_effects() -> None:
1052
+ """Check that when a dynamic effect is performed on an effect,
1053
+ that this happens repeatedly when skip_compromised = false
1054
+ """
1055
+ top = 'tests/testdata/scenarios/dynamal_example_scenarios/basic/'
1056
+ scenario_file_path = top + 'repeat_effect_scenario.yml'
1057
+ scenario = Scenario.load_from_file(scenario_file_path)
1058
+ sim = DynaMalSimulator.from_scenario(scenario)
1059
+ sim.reset()
1060
+
1061
+ n = 5
1062
+ for i in range(1, n):
1063
+ if sim.sim_state.attack_graph.model is not None:
1064
+ assert len(sim.sim_state.attack_graph.model.assets) == i
1065
+ sim.step({'Attacker': ['root:add']})
1066
+
1067
+ if sim.sim_state.attack_graph.model is not None:
1068
+ assert len(sim.sim_state.attack_graph.model.assets) == n
1069
+
1070
+
1071
+ def test_remove_self() -> None:
1072
+ """Check that R> self / self works"""
1073
+ top = 'tests/testdata/scenarios/dynamal_example_scenarios/basic/'
1074
+ scenario_file_path = top + 'remove_self_scenario.yml'
1075
+ scenario = Scenario.load_from_file(scenario_file_path)
1076
+ sim = DynaMalSimulator.from_scenario(scenario)
1077
+ sim.reset()
1078
+
1079
+ if sim.sim_state.attack_graph.model is not None:
1080
+ assert len(sim.sim_state.attack_graph.model.assets) == 1
1081
+
1082
+ sim.step({'Attacker': ['root:removeSelf']})
1083
+ if sim.sim_state.attack_graph.model is not None:
1084
+ assert len(sim.sim_state.attack_graph.model.assets) == 0
File without changes
File without changes
File without changes
File without changes