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: stabilize doctor dependency checks
Mafifrizi82b7c0b302c0
diff --git a/ares/cli/typer_main.py b/ares/cli/typer_main.pyindex d4b0626..0174f1e 100644--- a/ares/cli/typer_main.py+++ b/ares/cli/typer_main.py@@ -31,6 +31,7 @@ import typerfrom rich.console import Consolefrom rich.table import Tablefrom rich.panel import Panel+from rich.markup import escapefrom rich import print as rprintapp = typer.Typer(@@ -1058,7 +1059,8 @@ def _display_result(module_id: str, result: dict) -> None:@app.command("doctor")def doctor() -> None:"""Check all prerequisites and configuration. Run this first."""- import importlib, shutil, os+ import importlib, shutil, os, re+ from importlib import metadata as importlib_metadatafrom pathlib import Pathconsole.print("\n[bold]ARES Doctor[/bold] — prerequisite check\n")@@ -1067,14 +1069,15 @@ def doctor() -> None:def check(label: str, status: str, detail: str = "") -> None:nonlocal ok, warn, fail+ suffix = f" [dim]{escape(str(detail))}[/dim]" if detail else ""if status == "ok":- console.print(f" [green]✅[/green] {label}" + (f" [dim]{detail}[/dim]" if detail else ""))+ console.print(f" [green]✅[/green] {label}" + suffix)ok += 1elif status == "warn":- console.print(f" [yellow]⚠️ [/yellow] {label}" + (f" [dim]{detail}[/dim]" if detail else ""))+ console.print(f" [yellow]⚠️ [/yellow] {label}" + suffix)warn += 1else:- console.print(f" [red]❌[/red] {label}" + (f" [dim]{detail}[/dim]" if detail else ""))+ console.print(f" [red]❌[/red] {label}" + suffix)fail += 1# Python version@@ -1110,13 +1113,20 @@ def doctor() -> None:# ── impacket version ──────────────────────────────────────────────────────try:import impacket- ver_str = getattr(impacket, "__version__", "0.0.0")- parts = [int(x) for x in ver_str.split(".")[:2]]- if parts >= [0, 11]:+ try:+ ver_str = importlib_metadata.version("impacket")+ except importlib_metadata.PackageNotFoundError:+ ver_str = getattr(impacket, "__version__", "")++ version_match = re.search(r"(\d+)\.(\d+)", ver_str)+ if version_match and [int(version_match.group(1)), int(version_match.group(2))] >= [0, 11]:check(f"impacket {ver_str}", "ok", ">= 0.11 required")- else:+ elif version_match:check(f"impacket {ver_str}", "fail",f"too old ({ver_str}) — upgrade: pip install --upgrade impacket")+ else:+ check("impacket", "warn",+ "installed, but version could not be detected — expected >= 0.11")except ImportError:check("impacket", "fail", "pip install ares-redteam[ad]")diff --git a/tests/unit/test_cli_doctor.py b/tests/unit/test_cli_doctor.pynew file mode 100644index 0000000..77a4bc9--- /dev/null+++ b/tests/unit/test_cli_doctor.py@@ -0,0 +1,32 @@+from __future__ import annotations++import importlib.metadata+import sys+import types+++def test_doctor_uses_distribution_metadata_for_impacket(monkeypatch, tmp_path, capsys):+ from ares.cli.typer_main import doctor++ fake_impacket = types.ModuleType("impacket")+ fake_paramiko = types.ModuleType("paramiko")+ fake_paramiko.__version__ = "3.4.0"++ def fake_version(package_name: str) -> str:+ if package_name == "impacket":+ return "0.13.1"+ raise importlib.metadata.PackageNotFoundError(package_name)++ monkeypatch.chdir(tmp_path)+ (tmp_path / ".env").write_text("ARES_SECRET_KEY=test\n", encoding="utf-8")+ monkeypatch.setattr(importlib.metadata, "version", fake_version)+ monkeypatch.setitem(sys.modules, "impacket", fake_impacket)+ monkeypatch.setitem(sys.modules, "paramiko", fake_paramiko)+ monkeypatch.setitem(sys.modules, "ldap3", None)++ doctor()++ output = capsys.readouterr().out+ assert "impacket 0.13.1" in output+ assert "too old (0.0.0)" not in output+ assert "ares-redteam[ad]" in output