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(data): enum_spn internal key sync spn_list→spns (MOD-054)
Mafifrizif0825df31c3b
diff --git a/ares/modules/ad/enum_spn.py b/ares/modules/ad/enum_spn.pyindex b539e95..d9e9f42 100644--- a/ares/modules/ad/enum_spn.py+++ b/ares/modules/ad/enum_spn.py@@ -62,12 +62,12 @@ class ADEnumSPNModule(BaseModule[DomainAuthParams, ModuleResult]):OPSEC: LOWMITRE: "T1558.003","T1087.002"- OUTPUTS: "spn_list"+ OUTPUTS: "spns", "spn_list""""MODULE_ID="ad.enum_spn"; MODULE_NAME="AD SPN Enumeration"; MODULE_CATEGORY="ad"MODULE_DESCRIPTION="Find SPN accounts (Kerberoasting candidates)"MODULE_AUTHOR = "ARES Team <[email protected]>"- OPSEC_LEVEL=OpsecLevel.LOW; REQUIRES=[]; OUTPUTS=["spn_list"]+ OPSEC_LEVEL=OpsecLevel.LOW; REQUIRES=[]; OUTPUTS=["spns", "spn_list"]MITRE_TECHNIQUES=["T1558.003","T1087.002"]PARAMS_MODEL = DomainAuthParams@@ -121,14 +121,14 @@ class ADEnumSPNModule(BaseModule[DomainAuthParams, ModuleResult]):# Cryptographic Evidence Records with SHA-256 Merkle Provenanceevidence_chain: list[EvidenceRecord] = []- for spn in raw.get("spn_list", []):+ for spn in (raw.get("spns") or raw.get("spn_list", [])):ev = EvidenceRecord(- artifact_id=f"spn-{spn.get('samAccountName', 'unknown').lower()}",+ artifact_id=f"spn-{(spn.get('samAccountName') or spn.get('name') or 'unknown').lower()}",source_target=dc,collected_by=self.MODULE_ID,data={- "samAccountName": spn.get("samAccountName"),- "spns": spn.get("spns"),+ "samAccountName": spn.get("samAccountName") or spn.get("name"),+ "spns": spn.get("spns") or spn.get("spn_list"),"memberOf": spn.get("memberOf"),},tags=["ad", "spn", "kerberoasting", "enumeration"],@@ -219,6 +219,7 @@ class ADEnumSPNModule(BaseModule[DomainAuthParams, ModuleResult]):raise NetworkError(f"LDAP SPN failed: {exc}") from exccategory, message = classify_enum_spn_outcome(len(spns))raw = {+ "spns": spns,"spn_list": spns,"outcome_category": category,"outcome_message": message,@@ -231,10 +232,10 @@ class ADEnumSPNModule(BaseModule[DomainAuthParams, ModuleResult]):store = ArtifactStore()for spn_entry in spns:artifact = UserArtifact(- username=spn_entry.get("samAccountName", ""),+ username=spn_entry.get("samAccountName") or spn_entry.get("name", ""),domain=domain,enabled=True,- spns=spn_entry.get("spns", []),+ spns=spn_entry.get("spns") or spn_entry.get("spn_list", []),is_service=True,)store.add(artifact)@@ -338,13 +339,16 @@ class ADEnumSPNModule(BaseModule[DomainAuthParams, ModuleResult]):is_admin = any("Domain Admins" in g or "Enterprise Admins" in g for g in groups)+ spn_values = [str(s) for s in (e.servicePrincipalName.values or [])]spns.append({- "name": str(e.sAMAccountName),- "spn_list": [str(s) for s in (e.servicePrincipalName.values or [])],- "is_admin": is_admin,- "uses_rc4": (enc_raw == 0) or bool(enc_raw & 0x4),+ "name": str(e.sAMAccountName),+ "samAccountName": str(e.sAMAccountName),+ "spns": spn_values,+ "spn_list": spn_values,+ "is_admin": is_admin,+ "uses_rc4": (enc_raw == 0) or bool(enc_raw & 0x4),"days_since_pwd": _days_since_ts(e.pwdLastSet.value),- "enabled": not bool(uac & 0x0002),+ "enabled": not bool(uac & 0x0002),})except Exception:pass # skip malformed entry@@ -362,7 +366,7 @@ class ADEnumSPNModule(BaseModule[DomainAuthParams, ModuleResult]):passdef _analyze(self, raw):- spns = raw.get("spn_list",[])+ spns = raw.get("spns") or raw.get("spn_list", [])if not spns: returnrc4 = [s for s in spns if s.get("uses_rc4")]privd = [s for s in spns if s.get("is_admin")]diff --git a/ares/normalize/artifacts.py b/ares/normalize/artifacts.pyindex dd57061..662f207 100644--- a/ares/normalize/artifacts.py+++ b/ares/normalize/artifacts.py@@ -671,7 +671,9 @@ class ArtifactNormalizer:for s in spns:if not isinstance(s, dict):continue- spn_entries = s.get("spns", s.get("spn", []))+ spn_entries = s.get("spns") or s.get("spn_list") or s.get("spn", [])+ if isinstance(spn_entries, str):+ spn_entries = [spn_entries]artifact = UserArtifact(username = s.get("samAccountName", s.get("name", s.get("username", ""))),domain = s.get("domain", ""),diff --git a/tests/unit/test_artifact_normalizer_pipeline.py b/tests/unit/test_artifact_normalizer_pipeline.pyindex b32d40b..8745215 100644--- a/tests/unit/test_artifact_normalizer_pipeline.py+++ b/tests/unit/test_artifact_normalizer_pipeline.py@@ -141,6 +141,60 @@ def test_enum_spn_pipeline_recovers_spns(normalizer: ArtifactNormalizer, store:assert users[0].is_kerberoastable is True+def test_enum_spn_internal_key_sync_mod_054(normalizer: ArtifactNormalizer, store: ArtifactStore):+ """MOD-054: ad.enum_spn writes spns & spn_list with non-empty SPNs inside entries."""+ from ares.modules.ad.enum_spn import ADEnumSPNModule++ assert "spns" in ADEnumSPNModule.OUTPUTS+ assert "spn_list" in ADEnumSPNModule.OUTPUTS++ # Format produced by _fetch_spns_sync after fix:+ spn_entries = [+ {+ "name": "svc_sql",+ "samAccountName": "svc_sql",+ "spns": ["MSSQLSvc/sql01.corp.local:1433"],+ "spn_list": ["MSSQLSvc/sql01.corp.local:1433"],+ "is_admin": True,+ "uses_rc4": True,+ "days_since_pwd": 45,+ "enabled": True,+ }+ ]+ raw = {+ "spns": spn_entries,+ "spn_list": spn_entries,+ "outcome_category": "confirmed_findings",+ "outcome_message": "Found 1 service principal candidate(s).",+ }++ added = normalizer.normalize("ad.enum_spn", ["spns"], raw, store)+ assert added == 1+ users = store.users()+ assert len(users) == 1+ assert users[0].username == "svc_sql"+ assert users[0].spns == ["MSSQLSvc/sql01.corp.local:1433"]+ assert users[0].is_kerberoastable is True++ # Test backward-compat fallback when inner dict only has spn_list:+ store2 = ArtifactStore()+ raw_compat = {+ "spn_list": [+ {+ "name": "svc_iis",+ "spn_list": ["HTTP/iis.corp.local"],+ "enabled": True,+ }+ ]+ }+ added2 = normalizer.normalize("ad.enum_spn", ["spn_list"], raw_compat, store2)+ assert added2 == 1+ users2 = store2.users()+ assert len(users2) == 1+ assert users2[0].username == "svc_iis"+ assert users2[0].spns == ["HTTP/iis.corp.local"]++def test_host_vuln_pipeline_recovers_target(normalizer: ArtifactNormalizer, store: ArtifactStore):"""linux.privesc writes raw['target']; normalizer must ingest via fallback."""raw = {