attackmap 0.4.1__tar.gz → 0.4.2__tar.gz

{attackmap-0.4.1/src/attackmap.egg-info → attackmap-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: attackmap
-Version: 0.4.1
+Version: 0.4.2
 Summary: AI-assisted defensive security analyzer for codebases — scans a repository, models assets and controls, finds cross-cutting weaknesses, and generates an evidence-grounded review with MITRE ATT&CK mappings and detection-engineering hints.
 Author: AttackMap Contributors
 Author-email: Matthew Davis <matthewd@matthewd.xyz>

{attackmap-0.4.1 → attackmap-0.4.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "attackmap"
-version = "0.4.1"
+version = "0.4.2"
 description = "AI-assisted defensive security analyzer for codebases — scans a repository, models assets and controls, finds cross-cutting weaknesses, and generates an evidence-grounded review with MITRE ATT&CK mappings and detection-engineering hints."
 readme = "README.md"
 requires-python = ">=3.11"

{attackmap-0.4.1 → attackmap-0.4.2}/src/attackmap/__init__.py

@@ -1,2 +1,2 @@
 __all__ = ["__version__"]
-__version__ = "0.4.1"
+__version__ = "0.4.2"

{attackmap-0.4.1 → attackmap-0.4.2}/src/attackmap/anomalies.py

@@ -36,10 +36,16 @@ from __future__ import annotations
 import re
 from dataclasses import dataclass
 from pathlib import Path
+from typing import TYPE_CHECKING
 
 from .models import Anomaly, Route, ScanResult
 from .srcpaths import is_test_file
 
+if TYPE_CHECKING:
+    from .progress import JsonScanProgress, ScanProgress
+
+    _Progress = ScanProgress | JsonScanProgress
+
 
 @dataclass
 class _SignalCtx:
@@ -106,8 +112,17 @@ _MIN_GROUP = 3
 _SCAFFOLD_RE = re.compile(r"^(?:api|rest|graphql|gql|v\d+(?:beta\d*|alpha\d*)?)$", re.IGNORECASE)
 
 
-def find_anomalies(scan: ScanResult, root: str | Path | None = None) -> list[Anomaly]:
-    """Return within-repo consistency outliers for the routes in ``scan``."""
+def find_anomalies(
+    scan: ScanResult,
+    root: str | Path | None = None,
+    progress: "_Progress | None" = None,
+) -> list[Anomaly]:
+    """Return within-repo consistency outliers for the routes in ``scan``.
+
+    On a large route surface the per-cohort source-window reads dominate this
+    pass, so when a ``progress`` reporter is supplied it drives a determinate
+    bar over the cohorts (rather than an open-ended spinner).
+    """
     root_path = Path(root or scan.root).resolve()
 
     routes = [r for r in scan.routes if not is_test_file(r.file)]
@@ -129,8 +144,13 @@ def find_anomalies(scan: ScanResult, root: str | Path | None = None) -> list[Ano
 
     ctx = _SignalCtx(root_path, line_cache, file_route_lines)
 
+    if progress is not None:
+        progress.begin(len(groups), "Anomaly / outlier detection")
+
     out: list[Anomaly] = []
     for key, members in groups.items():
+        if progress is not None:
+            progress.advance(key)
         if len(members) < _MIN_GROUP:
             continue
         if not _is_route_like_cohort(key, members):

{attackmap-0.4.1 → attackmap-0.4.2}/src/attackmap/cli.py

@@ -160,7 +160,11 @@ def analyze(
     scan = analyze_repository(repo_path, analyzers=active_analyzers, progress=scan_progress)
     if cve and scan.dependencies:
         typer.echo(f"Checking {len(scan.dependencies)} dependencies against OSV.dev…")
-        vulns, cve_summary = query_vulnerabilities(scan.dependencies)
+        scan_progress.stage(f"Checking {len(scan.dependencies)} dependencies against OSV.dev")
+        try:
+            vulns, cve_summary = query_vulnerabilities(scan.dependencies)
+        finally:
+            scan_progress.done()
         scan.vulnerabilities = vulns
         typer.echo(
             f"CVE lookup: {len(vulns)} vulnerabilit"
@@ -257,15 +261,19 @@ def analyze(
             typer.echo(
                 f"Generating narrative review via Claude (backend={llm_backend}, may take a minute)..."
             )
-            result = generate_llm_review(
-                scan,
-                attack_surfaces,
-                findings,
-                attack_paths,
-                model=llm_model,
-                effort=effort_value,  # type: ignore[arg-type]
-                backend=llm_backend,  # type: ignore[arg-type]
-            )
+            scan_progress.stage(f"Claude is writing the defensive review (backend={llm_backend})")
+            try:
+                result = generate_llm_review(
+                    scan,
+                    attack_surfaces,
+                    findings,
+                    attack_paths,
+                    model=llm_model,
+                    effort=effort_value,  # type: ignore[arg-type]
+                    backend=llm_backend,  # type: ignore[arg-type]
+                )
+            finally:
+                scan_progress.done()
         except LlmReviewError as exc:
             typer.echo(f"LLM review skipped: {exc}", err=True)
         else:
@@ -307,16 +315,23 @@ def analyze(
                 f"Hunting for vulnerability hypotheses via Claude "
                 f"({'adjudicated against source, ' if verify else ''}backend={llm_backend}, may take a minute)..."
             )
-            hunt_result = generate_llm_review(
-                scan,
-                attack_surfaces,
-                findings,
-                attack_paths,
-                model=llm_model,
-                effort=hunt_effort_value,  # type: ignore[arg-type]
-                backend=llm_backend,  # type: ignore[arg-type]
-                mode=hunt_mode,  # type: ignore[arg-type]
+            scan_progress.stage(
+                f"Claude is hunting exploit-chain hypotheses"
+                f"{' + verifying against source' if verify else ''} (backend={llm_backend})"
             )
+            try:
+                hunt_result = generate_llm_review(
+                    scan,
+                    attack_surfaces,
+                    findings,
+                    attack_paths,
+                    model=llm_model,
+                    effort=hunt_effort_value,  # type: ignore[arg-type]
+                    backend=llm_backend,  # type: ignore[arg-type]
+                    mode=hunt_mode,  # type: ignore[arg-type]
+                )
+            finally:
+                scan_progress.done()
         except LlmReviewError as exc:
             typer.echo(f"Vulnerability hunt skipped: {exc}", err=True)
         else:
@@ -359,16 +374,20 @@ def analyze(
             typer.echo(
                 f"Generating remediation suggestions via Claude (backend={llm_backend}, may take a minute)..."
             )
-            rem_result = generate_llm_review(
-                scan,
-                attack_surfaces,
-                findings,
-                attack_paths,
-                model=llm_model,
-                effort=rem_effort_value,  # type: ignore[arg-type]
-                backend=llm_backend,  # type: ignore[arg-type]
-                mode="remediate",
-            )
+            scan_progress.stage(f"Claude is drafting remediation suggestions (backend={llm_backend})")
+            try:
+                rem_result = generate_llm_review(
+                    scan,
+                    attack_surfaces,
+                    findings,
+                    attack_paths,
+                    model=llm_model,
+                    effort=rem_effort_value,  # type: ignore[arg-type]
+                    backend=llm_backend,  # type: ignore[arg-type]
+                    mode="remediate",
+                )
+            finally:
+                scan_progress.done()
         except LlmReviewError as exc:
             typer.echo(f"Remediation skipped: {exc}", err=True)
         else:

{attackmap-0.4.1 → attackmap-0.4.2}/src/attackmap/scanner.py

@@ -736,10 +736,9 @@ def scan_repo(
         progress.stage("Authorization (BOLA/IDOR)")
     result.authz_candidates = analyze_authz(result, root_path)
     # Anomaly / outlier pass (#78): the odd-one-out among sibling routes.
-    # Runs last so the full route list is assembled into cohorts.
-    if progress is not None:
-        progress.stage("Anomaly / outlier detection")
-    result.anomalies = find_anomalies(result, root_path)
+    # Runs last so the full route list is assembled into cohorts. It drives its
+    # own determinate per-cohort progress (the slow tail on big route surfaces).
+    result.anomalies = find_anomalies(result, root_path, progress=progress)
     if progress is not None:
         progress.done()
     return result

{attackmap-0.4.1 → attackmap-0.4.2/src/attackmap.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: attackmap
-Version: 0.4.1
+Version: 0.4.2
 Summary: AI-assisted defensive security analyzer for codebases — scans a repository, models assets and controls, finds cross-cutting weaknesses, and generates an evidence-grounded review with MITRE ATT&CK mappings and detection-engineering hints.
 Author: AttackMap Contributors
 Author-email: Matthew Davis <matthewd@matthewd.xyz>

{attackmap-0.4.1 → attackmap-0.4.2}/tests/test_anomalies.py

@@ -369,3 +369,29 @@ def test_auth_outlier_becomes_tagged_finding(tmp_path: Path) -> None:
     assert auth.severity == "high"
     assert auth.attack_techniques
     assert any("/api/users/export" in e for e in auth.evidence)
+
+
+def test_progress_reported_per_cohort(tmp_path: Path) -> None:
+    """find_anomalies drives a determinate begin/advance over cohorts (#status)."""
+    import io
+    import json
+
+    from attackmap.progress import JsonScanProgress
+
+    scan = _scan_with_routes(
+        tmp_path,
+        "views.py",
+        _AUTH_COHORT,
+        [
+            ("/api/users", "GET", '"/api/users")'),
+            ("/api/users/<id>", "GET", '"/api/users/<id>")'),
+            ("/api/users/export", "GET", '"/api/users/export")'),
+        ],
+    )
+    stream = io.StringIO()
+    find_anomalies(scan, progress=JsonScanProgress(stream=stream, min_interval=0.0))
+    events = [json.loads(line) for line in stream.getvalue().splitlines() if line.strip()]
+    begin = next(e for e in events if e["event"] == "begin")
+    assert begin["label"] == "Anomaly / outlier detection"
+    assert begin["total"] >= 1
+    assert any(e["event"] == "advance" for e in events)