Skip to content

armgit / ARES

Public Imported from GitHub
0

ARES - authorized red-team engagement automation with dashboard, campaign scope, module orchestration, OPSEC controls, encrypted vault, and reporting.

Keep descriptor parsing behind admission boundary

Mafifrizi8172aebe930e
diff --git a/ares/db/execution_lifecycle.py b/ares/db/execution_lifecycle.py
index 856c244..520b0b8 100644
--- a/ares/db/execution_lifecycle.py
+++ b/ares/db/execution_lifecycle.py
@@ -3583,8 +3583,7 @@ class ExecutionLifecycleStore:
return None
try:
from ares.modules.descriptors import (
- canonicalize_parameters,
- extract_destinations,
+ prepare_admission_parameters,
require_descriptor,
)
@@ -3594,9 +3593,10 @@ class ExecutionLifecycleStore:
descriptor.parameter_fields,
):
return None
- canonical = canonicalize_parameters(intent.module_id, intent.raw_parameters)
+ canonical, extracted = prepare_admission_parameters(
+ intent.module_id, intent.raw_parameters
+ )
values = {key: canonical.values[key] for key in sorted(canonical.values)}
- extracted = extract_destinations(intent.module_id, canonical)
destination_refs = tuple(
sorted(
{
diff --git a/ares/modules/descriptors.py b/ares/modules/descriptors.py
index 5863d28..7739dfe 100644
--- a/ares/modules/descriptors.py
+++ b/ares/modules/descriptors.py
@@ -9072,6 +9072,20 @@ def extract_destinations(
return tuple(extracted)
+def prepare_admission_parameters(
+ module_id: str,
+ raw_parameters: Mapping[str, Any],
+) -> tuple[CanonicalParameters, tuple[ExtractedDestination, ...]]:
+ """Prepare strict descriptor-bound values for lifecycle admission.
+
+ Keeping parameter parsing and destination extraction inside the descriptor
+ boundary prevents lifecycle persistence code from depending on the
+ audit-parser entry point directly.
+ """
+ canonical = canonicalize_parameters(module_id, raw_parameters)
+ return canonical, extract_destinations(module_id, canonical)
+
+
def readiness_summary() -> Mapping[str, object]:
blockers: dict[str, list[str]] = {}
for descriptor in FIRST_PARTY_DESCRIPTORS.values():
@@ -9202,6 +9216,7 @@ __all__ = [
"descriptor_semantic_digest",
"extract_destinations",
"get_descriptor",
+ "prepare_admission_parameters",
"readiness_summary",
"require_descriptor",
"validate_parameter_model_bindings",