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(ad): normalize LDAP bind format in enum_acl and laps_enum (MOD-057)

Mafifrizi41cec575f1f2
diff --git a/ares/modules/ad/enum_acl.py b/ares/modules/ad/enum_acl.py
index afe3b39..63870e9 100644
--- a/ares/modules/ad/enum_acl.py
+++ b/ares/modules/ad/enum_acl.py
@@ -12,6 +12,7 @@ from ares.core.campaign import Finding, Severity
from ares.core.security import sanitize_hostname, sanitize_ldap
from ares.core.tracing import trace_module
from ares.core.errors import ModuleValidationError
+from ares.modules.ad.dependencies import build_ad_bind_plan
from ares.modules.params import DomainAuthParams
from ares.sdk import (
BaseModule,
@@ -223,20 +224,22 @@ class ADEnumACLModule(BaseModule[DomainAuthParams, ModuleResult]):
from ldap3 import Server, Connection, ALL, NTLM, SUBTREE, Tls
from ldap3.core.exceptions import LDAPBindError
+ bind_plan = build_ad_bind_plan(username, domain)
conn = None
for port, use_ssl in [(636, True), (389, False)]:
try:
tls_arg = Tls(validate=ssl.CERT_NONE) if use_ssl else None
server = Server(dc, port=port, use_ssl=use_ssl,
tls=tls_arg, get_info=ALL, connect_timeout=10)
- conn = Connection(
- server,
- user=f"{domain.upper()}\\{username}",
- password=password,
- authentication=NTLM,
- auto_bind=ldap3.AUTO_BIND_NONE,
- receive_timeout=30,
- )
+ conn_kwargs = {
+ "user": bind_plan.user,
+ "password": password,
+ "auto_bind": ldap3.AUTO_BIND_NONE,
+ "receive_timeout": 30,
+ }
+ if bind_plan.mode == "ntlm":
+ conn_kwargs["authentication"] = NTLM
+ conn = Connection(server, **conn_kwargs)
if not conn.bind():
raise LDAPBindError(f"Bind failed: {conn.result}")
break
diff --git a/ares/modules/ad/laps_enum.py b/ares/modules/ad/laps_enum.py
index 0f80ab5..615b559 100644
--- a/ares/modules/ad/laps_enum.py
+++ b/ares/modules/ad/laps_enum.py
@@ -23,6 +23,7 @@ from typing import Any
from ares.core.campaign import Finding, Severity
from ares.core.logger import audit, get_logger
from ares.core.security import sanitize_hostname, sanitize_ldap
+from ares.modules.ad.dependencies import build_ad_bind_plan
from ares.modules.params import LAPSEnumParams
from ares.sdk import (
BaseModule,
@@ -317,15 +318,22 @@ class LAPSEnumModule(BaseModule[LAPSEnumParams, ModuleResult]):
from ldap3 import Server, Connection, ALL, NTLM, SUBTREE, Tls
from ldap3.core.exceptions import LDAPBindError
+ bind_plan = build_ad_bind_plan(username, domain)
conn = None
for port, use_ssl in [(636, True), (389, False)]:
try:
tls_arg = Tls(validate=ssl.CERT_NONE) if use_ssl else None
server = Server(dc, port=port, use_ssl=use_ssl, tls=tls_arg,
get_info=ALL, connect_timeout=10)
- conn = Connection(server, user=f"{domain.upper()}\\{username}",
- password=password, authentication=NTLM,
- auto_bind=ldap3.AUTO_BIND_NONE, receive_timeout=30)
+ conn_kwargs = {
+ "user": bind_plan.user,
+ "password": password,
+ "auto_bind": ldap3.AUTO_BIND_NONE,
+ "receive_timeout": 30,
+ }
+ if bind_plan.mode == "ntlm":
+ conn_kwargs["authentication"] = NTLM
+ conn = Connection(server, **conn_kwargs)
if not conn.bind():
conn = None
else:
diff --git a/tests/unit/modules/test_ad_bind_plan_mod057.py b/tests/unit/modules/test_ad_bind_plan_mod057.py
new file mode 100644
index 0000000..bb7be74
--- /dev/null
+++ b/tests/unit/modules/test_ad_bind_plan_mod057.py
@@ -0,0 +1,100 @@
+"""Unit test for MOD-057: normalize LDAP bind format in enum_acl and laps_enum using build_ad_bind_plan."""
+from unittest.mock import MagicMock, patch
+import pytest
+
+from ares.core.campaign import Campaign, NoiseProfile, ScopeEntry
+from ares.core.config import AresSettings
+from ares.core.noise import NoiseController
+from ares.modules.ad.dependencies import build_ad_bind_plan
+from ares.modules.ad.enum_acl import ADEnumACLModule
+from ares.modules.ad.laps_enum import LAPSEnumModule
+
+
+def _make_module(cls):
+ settings = AresSettings(
+ ares_secret_key="test-secret-key-32chars-minimum!!",
+ ares_encryption_key="test-encryption-key-32chars-min!!",
+ )
+ campaign = Campaign(
+ name="AD-Test",
+ client="Unit-Testing",
+ scope=[ScopeEntry(cidr="10.0.0.0/8")],
+ noise_profile=NoiseProfile.NORMAL,
+ )
+ noise = NoiseController(campaign)
+ return cls(settings=settings, campaign=campaign, noise=noise)
+
+
+def test_build_ad_bind_plan_formats():
+ """Verify build_ad_bind_plan handles UPN, NetBIOS, and plain username."""
+ # UPN
+ upn_plan = build_ad_bind_plan("[email protected]", "corp.local")
+ assert upn_plan.mode == "simple"
+ assert upn_plan.user == "[email protected]"
+ assert upn_plan.username_format == "upn"
+
+ # NetBIOS
+ netbios_plan = build_ad_bind_plan("CORP\\alice", "corp.local")
+ assert netbios_plan.mode == "ntlm"
+ assert netbios_plan.user == "CORP\\alice"
+ assert netbios_plan.username_format == "netbios"
+
+ # Plain with domain
+ plain_plan = build_ad_bind_plan("alice", "corp.local")
+ assert plain_plan.mode == "simple"
+ assert plain_plan.user == "[email protected]"
+ assert plain_plan.username_format == "plain_to_upn"
+
+
+@patch("ldap3.Connection")
+@patch("ldap3.Server")
+def test_enum_acl_uses_build_ad_bind_plan(mock_server, mock_connection):
+ """MOD-057: enum_acl._enum_acls_sync uses build_ad_bind_plan rather than raw string concat."""
+ conn_instance = MagicMock()
+ conn_instance.bind.return_value = True
+ conn_instance.entries = []
+ conn_instance.result = {}
+ mock_connection.return_value = conn_instance
+
+ module = _make_module(ADEnumACLModule)
+
+ # Test with UPN: should use simple bind and [email protected], NOT CORP.LOCAL\[email protected]
+ module._enum_acls_sync(
+ dc="10.0.0.1",
+ username="[email protected]",
+ password="Password123!",
+ domain="corp.local",
+ )
+
+ mock_connection.assert_called()
+ call_kwargs = mock_connection.call_args[1]
+ assert call_kwargs["user"] == "[email protected]"
+ # For UPN, simple bind is used (no NTLM in kwargs)
+ assert "authentication" not in call_kwargs
+
+
+@patch("ldap3.Connection")
+@patch("ldap3.Server")
+def test_laps_enum_uses_build_ad_bind_plan(mock_server, mock_connection):
+ """MOD-057: laps_enum._query_laps_sync uses build_ad_bind_plan rather than raw string concat."""
+ conn_instance = MagicMock()
+ conn_instance.bind.return_value = True
+ conn_instance.entries = []
+ conn_instance.result = {}
+ mock_connection.return_value = conn_instance
+
+ module = _make_module(LAPSEnumModule)
+
+ # Test with NetBIOS: should use NTLM authentication
+ entries = module._query_laps_sync(
+ dc="10.0.0.1",
+ username="CORP\\admin",
+ password="Password123!",
+ domain="corp.local",
+ )
+
+ mock_connection.assert_called()
+ call_kwargs = mock_connection.call_args[1]
+ assert call_kwargs["user"] == "CORP\\admin"
+ from ldap3 import NTLM
+ assert call_kwargs.get("authentication") == NTLM