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(api): handle Campaign and Finding model instances safely in db row converters

Mafifrizibaa62e034c87
diff --git a/ares/api/server.py b/ares/api/server.py
index c8622f5..01eb74a 100644
--- a/ares/api/server.py
+++ b/ares/api/server.py
@@ -113,7 +113,18 @@ from ares.modules.base import normalize_module_metadata
logger = get_logger("ares.api.server")
-def _campaign_from_db_row(row: dict[str, Any]) -> Campaign:
+def _campaign_from_db_row(row: Any) -> Campaign:
+ if isinstance(row, Campaign):
+ return row
+ if not isinstance(row, dict):
+ if hasattr(row, "items"):
+ pass
+ 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}
if data.get("status") == "active":
data["status"] = "running"
@@ -149,7 +160,18 @@ def _campaign_from_db_row(row: dict[str, Any]) -> Campaign:
return Campaign(**data)
-def _finding_from_db_row(row: dict[str, Any], *, report_confirmed: bool = False) -> Finding:
+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
+ 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
evidence: dict[str, Any] = {}