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.

fix(core): add missing uuid import in engine and fix db row conversion in api

Mafifrizi233487a4efe8
diff --git a/ares/api/server.py b/ares/api/server.py
index 01eb74a..221ec71 100644
--- a/ares/api/server.py
+++ b/ares/api/server.py
@@ -117,12 +117,12 @@ def _campaign_from_db_row(row: Any) -> Campaign:
if isinstance(row, Campaign):
return row
if not isinstance(row, dict):
- if hasattr(row, "items"):
- pass
+ if hasattr(row, "model_dump"):
+ row = row.model_dump()
+ elif hasattr(row, "items"):
+ row = dict(row.items())
elif hasattr(row, "__dict__"):
row = row.__dict__
- elif hasattr(row, "model_dump"):
- row = row.model_dump()
else:
return Campaign.model_validate(row)
data = {k: v for k, v in row.items() if k in Campaign.model_fields}
@@ -164,12 +164,12 @@ def _finding_from_db_row(row: Any, *, report_confirmed: bool = False) -> Finding
if isinstance(row, Finding):
return row
if not isinstance(row, dict):
- if hasattr(row, "items"):
- pass
+ if hasattr(row, "model_dump"):
+ row = row.model_dump()
+ elif hasattr(row, "items"):
+ row = dict(row.items())
elif hasattr(row, "__dict__"):
row = row.__dict__
- elif hasattr(row, "model_dump"):
- row = row.model_dump()
else:
return Finding.model_validate(row)
import json as _json
diff --git a/ares/core/engine.py b/ares/core/engine.py
index 00c5a6f..9315dc8 100644
--- a/ares/core/engine.py
+++ b/ares/core/engine.py
@@ -8,6 +8,7 @@ from __future__ import annotations
import asyncio
import re
import time
+import uuid
from dataclasses import dataclass, field
from enum import Enum
from typing import TYPE_CHECKING, Any, Callable, Coroutine
diff --git a/ares/modules/network/port_scan.py b/ares/modules/network/port_scan.py
index 6433df3..83eecee 100644
--- a/ares/modules/network/port_scan.py
+++ b/ares/modules/network/port_scan.py
@@ -296,7 +296,6 @@ class PortScanModule(BaseModule):
async def validate(self, ctx: "Any") -> None:
"""Pre-flight param checks before any network call."""
- from ares.core.context import ExecutionContext
from ares.core.errors import ModuleValidationError
if not isinstance(ctx, ExecutionContext):
return
@@ -440,7 +439,6 @@ class PortScanModule(BaseModule):
service_map: dict[int, str] = {
p: _PORT_NAMES.get(p, f"unknown-{p}") for p in open_ports
}
- findings: list[Finding] = []
# Finding for each high-value port
for port in open_ports:
diff --git a/tests/unit/test_staged_modules.py b/tests/unit/test_staged_modules.py
index 7791f04..f5aeb7c 100644
--- a/tests/unit/test_staged_modules.py
+++ b/tests/unit/test_staged_modules.py
@@ -81,3 +81,43 @@ class TestGhostForgeModule:
assert len(res.findings) >= 1
assert res.findings[0].mitre_technique == "T1649"
assert res.raw.get("pkinit_success") is True
+
+ @pytest.mark.asyncio
+ async def test_engine_persists_loot_from_module_output(self, tmp_path):
+ from ares.core.campaign import Campaign, ScopeEntry
+ from ares.core.engine import AresEngine
+ from ares.db.database import AresDatabase
+ db_path = str(tmp_path / "loot_test.db")
+ db = AresDatabase(db_path)
+ await db.connect()
+ campaign = Campaign(name="Loot Test", client="Client", scope=[ScopeEntry(cidr="10.10.10.0/24")], operator="operator")
+ await db.save_campaign(campaign)
+
+ from ares.core.execution_admission import _mint_test_dispatch_context, mark_terminal_committed
+
+ engine = AresEngine(db=db)
+ mod, _ = _make_module(GhostForgeModule)
+ engine.registry.register(mod)
+
+ dispatch_ctx = _mint_test_dispatch_context(engine, campaign.id, "ad.ghost_forge")
+ result = await engine.run_module(
+ "ad.ghost_forge",
+ campaign,
+ {
+ "dc": "10.10.10.1",
+ "domain": "CORP.LOCAL",
+ "ca_server": "ca.corp.local",
+ "ca_name": "CORP-CA",
+ "username": "audit_operator",
+ "password": "SecretPassword123!",
+ },
+ dispatch_context=dispatch_ctx,
+ )
+ assert str(result.status) in ("success", "done", "ModuleStatus.DONE")
+ mark_terminal_committed(dispatch_ctx)
+ await engine._finalize_committed_module_result(campaign, "ad.ghost_forge", result, dispatch_ctx)
+ loots = await db.get_loot(campaign.id)
+ assert len(loots) >= 1
+ assert any("TGT" in l["name"] for l in loots)
+ await db.close()
+