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(data): enum_users dual-write users key (MOD-056 partial)

Mafifrizibc8c83025666
diff --git a/NORMALIZER_CONTRACT_AUDIT.md b/NORMALIZER_CONTRACT_AUDIT.md
index 5c9b79c..efce3bf 100644
--- a/NORMALIZER_CONTRACT_AUDIT.md
+++ b/NORMALIZER_CONTRACT_AUDIT.md
@@ -80,9 +80,10 @@ Tabel di bawah ini memetakan seluruh 9 capability yang memiliki handler di `ares
| `pivot_paths` | `cloud.identity_federation_abuse` | — | `pivot_paths` | ❌ **MISMATCH** (MOD-051) | Tidak ada handler normalizer (`no handler`). Analisis jalur pivot lintas-cloud hilang dari `ArtifactStore`. |
| `aws_privesc_paths` | `cloud.aws_privesc` | — | `aws_privesc_paths` | ❌ **MISMATCH** (MOD-052) | Tidak ada handler normalizer (`no handler`). Jalur eskalasi hak akses IAM hilang dari `ArtifactStore`. |
| `iam_privesc_paths` | `cloud.aws_privesc` | — | `iam_privesc_paths` | ⚠️ **NEW KEY** (aws_privesc, handler pending) | Key baru pasca-fix MOD-052 untuk memisahkan output privesc IAM dari `aws_findings` milik `cloud.aws`. Handler normalizer pending. |
-| `spn_list` (inner keys) | `ad.enum_spn` | `s["spns"]` OR `s["spn"]` | `s["spn_list"]` | ❌ **MISMATCH** (MOD-054) | Inner object key mismatch (`spn_list` vs `spns`), menyebabkan atribut `UserArtifact.spns` bernilai list kosong `[]`. |
-| `valid_credentials` | `ad.laps_enum` | `list[dict]` | `int` (`found`) | ❌ **MISMATCH** (MOD-055) | Type confusion (integer count vs `list[dict]`). Normalizer memblokir tipe non-list sehingga menghasilkan 0 artifact. |
-| `password_policy` | `ad.enum_users` | — | `password_policy` | ❌ **MISMATCH** (MOD-056) | Unhandled output telemetry (`no handler`). Data ambang lockout domain hilang dari `ArtifactStore`. |
+| `spn_list` (inner keys) | `ad.enum_spn` | `s["spns"]` OR `s["spn_list"]` | `spns`, `spn_list` | ✅ **FIXED** (MOD-054) | Inner object key synchronized (`spn_list` & `spns`), `UserArtifact.spns` populated properly. |
+| `valid_credentials` | `ad.laps_enum` | `laps_passwords` / `valid_credentials` | direct vault write + OPSEC raw (`has_password: True`) | ✅ **FIXED** (MOD-055) | Passwords stored directly to vault (Gate 6 validated); raw output OPSEC-safe with `has_password: True`. |
+| `user_list` / `users` | `ad.enum_users` | `users` OR `user_list` | `users`, `user_list` | ✅ **FIXED** (MOD-056 partial) | Dual-write `raw["users"]` and `raw["user_list"]` implemented. |
+| `password_policy` | `ad.enum_users` | — | `password_policy` | ❌ **MISMATCH, no handler, DEFERRED** | Unhandled output telemetry (`no handler`). Ditunda ke batch fix serentak. |
---
diff --git a/ares/modules/ad/enum_users.py b/ares/modules/ad/enum_users.py
index bd6baf8..075342f 100644
--- a/ares/modules/ad/enum_users.py
+++ b/ares/modules/ad/enum_users.py
@@ -128,7 +128,7 @@ class ADEnumUsersModule(BaseModule[DomainAuthParams, ModuleResult]):
# Cryptographic Evidence Records with SHA-256 Merkle Provenance
evidence_chain: list[EvidenceRecord] = []
- for user in raw.get("user_list", []):
+ for user in (raw.get("users") or raw.get("user_list", [])):
username_val = user.get("samAccountName", user.get("username", "unknown"))
ev = EvidenceRecord(
artifact_id=f"user-{str(username_val).lower()}",
@@ -224,7 +224,7 @@ class ADEnumUsersModule(BaseModule[DomainAuthParams, ModuleResult]):
raise
except Exception as exc:
raise NetworkError(f"LDAP failed on {dc}: {exc}") from exc
- raw = {"user_list": users, "password_policy": policy}
+ raw = {"user_list": users, "users": users, "password_policy": policy}
# ISU-07: produce UserArtifact objects for ArtifactIntelEngine
try:
from ares.normalize.artifacts import UserArtifact, ArtifactStore
@@ -393,7 +393,8 @@ class ADEnumUsersModule(BaseModule[DomainAuthParams, ModuleResult]):
pass
def _analyze(self, raw):
- users, policy = raw.get("user_list",[]), raw.get("password_policy",{})
+ users = raw.get("users") or raw.get("user_list", [])
+ policy = raw.get("password_policy", {})
dormant = [u for u in users if u.get("enabled") and (u.get("days_since_login") or 0) > 90]
if dormant:
self.finding(title=f"Dormant Active Accounts ({len(dormant)})",
diff --git a/tests/unit/test_artifact_normalizer_pipeline.py b/tests/unit/test_artifact_normalizer_pipeline.py
index dc2d979..fbdd12b 100644
--- a/tests/unit/test_artifact_normalizer_pipeline.py
+++ b/tests/unit/test_artifact_normalizer_pipeline.py
@@ -100,6 +100,56 @@ def test_enum_users_pipeline_recovers_users(normalizer: ArtifactNormalizer, stor
assert users[0].is_admin is True
+async def test_enum_users_dual_write_users_key_mod_056(normalizer: ArtifactNormalizer, store: ArtifactStore):
+ """
+ MOD-056: ad.enum_users dual-writes raw['users'] and raw['user_list'].
+ Normalizer ingests both keys successfully into UserArtifact.
+ """
+ from unittest.mock import patch
+ from tests.unit.modules.test_modules import _make_module
+ from ares.modules.ad.enum_users import ADEnumUsersModule
+
+ mod, _ = _make_module(ADEnumUsersModule)
+ mock_users = [
+ {
+ "samAccountName": "alice",
+ "enabled": True,
+ "noExpiry": False,
+ "noPreauth": True,
+ "isAdmin": True,
+ "badPwdCount": 0,
+ "days_since_login": 10,
+ "days_since_pwd": 20,
+ }
+ ]
+ mock_policy = {"minPwdLength": 8, "pwdHistoryLength": 5, "lockoutThreshold": 5}
+
+ with patch.object(mod, "_ldap_query_sync", return_value=(mock_users, mock_policy)):
+ findings, raw = await mod.run(
+ dc="10.0.0.1",
+ username="analyst",
+ password="fake_password",
+ domain="corp.local",
+ )
+
+ # Verify dual-write in module raw output
+ assert "users" in raw
+ assert "user_list" in raw
+ assert raw["users"] == mock_users
+ assert raw["user_list"] == mock_users
+
+ # Verify normalizer reads "users"
+ added = normalizer.normalize("ad.enum_users", ["users"], raw, store)
+ assert added == 1
+ users = store.users()
+ assert len(users) == 1
+ assert users[0].username == "alice"
+ assert users[0].is_admin is True
+ assert users[0].no_preauth is True
+
+
+
def test_enum_computers_pipeline_recovers_computers(normalizer: ArtifactNormalizer, store: ArtifactStore):
"""ad.enum_computers writes raw['computer_list']; normalizer must ingest via fallback."""
raw = {