chore: apply ruff fixes

Author: Carlos-Projects

mcpscope/api/routes.py

@@ -11,7 +11,9 @@
 from mcpscope.models.finding import Severity
 from mcpscope.models.security_event import SecurityEvent
 from mcp_taxonomy import (
-    AttackCategory, Severity as TaxSeverity, DetectionMethod,
+    AttackCategory,
+    Severity as TaxSeverity,
+    DetectionMethod,
     palisade_finding_to_taxonomy,
     mcpguard_event_to_taxonomy,
     mcpwn_finding_to_taxonomy,
@@ -92,20 +94,24 @@ def normalize_taxonomy(body: dict):
         )
     else:
         return JSONResponse({"error": f"Unknown source: {source}"}, status_code=400)
-    return JSONResponse({
-        "source": event.source,
-        "attack_category": event.attack_category.value,
-        "severity": event.severity.value,
-        "confidence": event.confidence.value,
-        "detection_method": event.detection_method.value if isinstance(event.detection_method, DetectionMethod) else event.detection_method,
-        "title": event.title,
-        "description": event.description,
-        "recommendation": event.recommendation,
-        "target": event.target,
-        "snippet": event.snippet[:200] if event.snippet else "",
-        "blocked": event.blocked,
-        "risk_score": event.risk_score,
-    })
+    return JSONResponse(
+        {
+            "source": event.source,
+            "attack_category": event.attack_category.value,
+            "severity": event.severity.value,
+            "confidence": event.confidence.value,
+            "detection_method": event.detection_method.value
+            if isinstance(event.detection_method, DetectionMethod)
+            else event.detection_method,
+            "title": event.title,
+            "description": event.description,
+            "recommendation": event.recommendation,
+            "target": event.target,
+            "snippet": event.snippet[:200] if event.snippet else "",
+            "blocked": event.blocked,
+            "risk_score": event.risk_score,
+        }
+    )
 
 
 def _session_value(password: str, client_ip: str) -> str:
@@ -122,7 +128,7 @@ def login_page(request: Request):
 
 
 @router.post("/api/login")
-def login(request: Request, response: Response, body: dict = None):
+def login(request: Request, response: Response, body: dict | None = None):
     cfg = request.app.state
     if not cfg.dashboard_password:
         return JSONResponse({"error": "Dashboard auth not configured"}, status_code=403)

mcpscope/api/server.py

@@ -17,7 +17,7 @@
 
 
 class JSONLogFormatter(logging.Formatter):
-    def format(self, record: logging.LoggerRecord) -> str:
+    def format(self, record: logging.LogRecord) -> str:
         return json.dumps(
             {
                 "time": self.formatTime(record, "%Y-%m-%dT%H:%M:%S"),

mcpscope/config.py

@@ -1,10 +1,20 @@
 from __future__ import annotations
 import json
+import os
 from pathlib import Path
 from dataclasses import dataclass, field
+from typing import Any
 
 DEFAULT_CONFIG_PATH = Path.home() / ".mcpscope" / "config.json"
 
+ENV_PREFIX = "MCPSCOPE_"
+FIELD_TYPE_MAP: dict[str, type] = {
+    "port": int,
+    "auto_refresh_seconds": int,
+    "max_upload_mb": int,
+    "log_json": bool,
+}
+
 
 @dataclass
 class Settings:
@@ -22,17 +32,24 @@ class Settings:
 
     @classmethod
     def load(cls, path: str | Path | None = None) -> Settings:
+        data: dict[str, Any] = {}
         path = Path(path) if path else DEFAULT_CONFIG_PATH
         if path.exists():
             try:
                 with open(path) as f:
-                    data = json.load(f)
-                return cls(
-                    **{k: v for k, v in data.items() if k in cls.__dataclass_fields__}
-                )
+                    data.update(json.load(f))
             except (json.JSONDecodeError, TypeError):
                 pass
-        return cls()
+        for field_name in cls.__dataclass_fields__:
+            env_key = f"{ENV_PREFIX}{field_name.upper()}"
+            if env_key in os.environ:
+                raw = os.environ[env_key]
+                field_type = FIELD_TYPE_MAP.get(field_name, str)
+                if field_type is bool:
+                    data[field_name] = raw.lower() in ("1", "true", "yes")
+                else:
+                    data[field_name] = field_type(raw)
+        return cls(**{k: v for k, v in data.items() if k in cls.__dataclass_fields__})
 
     def save(self, path: str | Path | None = None):
         path = Path(path) if path else DEFAULT_CONFIG_PATH

mcpscope/ingest/cisco_a2a.py

@@ -19,19 +19,32 @@ def parse(self, data: dict) -> list[Finding]:
         scanner = self.SCANNER_NAME
         target = data.get("target", data.get("card", data.get("endpoint", "unknown")))
 
-        raw_findings = data.get("findings", data.get("results", data.get("assessments", [])))
+        raw_findings = data.get(
+            "findings", data.get("results", data.get("assessments", []))
+        )
         if not isinstance(raw_findings, list):
-            raise ParseError(f"Expected 'findings' to be a list, got {type(raw_findings).__name__}")
+            raise ParseError(
+                f"Expected 'findings' to be a list, got {type(raw_findings).__name__}"
+            )
 
         for item in raw_findings:
             if not isinstance(item, dict):
                 continue
             threat_name = item.get("threat_name", "")
-            sev_raw = item.get("severity", item.get("risk", "info")).upper()
-            sev = Severity.CRITICAL if sev_raw == "CRITICAL" else (
-                Severity.HIGH if sev_raw == "HIGH" else (
-                    Severity.MEDIUM if sev_raw == "MEDIUM" else (
-                        Severity.LOW if sev_raw == "LOW" else Severity.INFO)))
+            sev_raw = (item.get("severity") or item.get("risk") or "info").upper()
+            sev = (
+                Severity.CRITICAL
+                if sev_raw == "CRITICAL"
+                else (
+                    Severity.HIGH
+                    if sev_raw == "HIGH"
+                    else (
+                        Severity.MEDIUM
+                        if sev_raw == "MEDIUM"
+                        else (Severity.LOW if sev_raw == "LOW" else Severity.INFO)
+                    )
+                )
+            )
             analyzer = item.get("analyzer", "unknown")
             summary = item.get("summary", "")
             description = item.get("description", summary)
@@ -44,29 +57,35 @@ def parse(self, data: dict) -> list[Finding]:
             if isinstance(item.get("details"), dict):
                 location = item["details"].get("field", "")
 
-            title = threat_name or f"[{analyzer}] {summary[:60]}" if summary else f"{analyzer} finding"
+            title = (
+                threat_name or f"[{analyzer}] {summary[:60]}"
+                if summary
+                else f"{analyzer} finding"
+            )
             if aitech:
                 title = f"[{aitech}] {aitech_name}"
             if aisubtech:
                 title = f"[{aisubtech}] {aisubtech_name or title}"
 
-            findings.append(Finding(
-                scan_id=target,
-                scanner=scanner,
-                tool_name=f"a2a-{analyzer.lower()}",
-                severity=sev,
-                title=title,
-                description=description or summary,
-                raw_data={
-                    "threat_name": threat_name,
-                    "analyzer": analyzer,
-                    "aitech": aitech,
-                    "aitech_name": aitech_name,
-                    "aisubtech": aisubtech,
-                    "aisubtech_name": aisubtech_name,
-                    "location": location,
-                    "details": item.get("details"),
-                },
-            ))
+            findings.append(
+                Finding(
+                    scan_id=target,
+                    scanner=scanner,
+                    tool_name=f"a2a-{analyzer.lower()}",
+                    severity=sev,
+                    title=title,
+                    description=description or summary,
+                    raw_data={
+                        "threat_name": threat_name,
+                        "analyzer": analyzer,
+                        "aitech": aitech,
+                        "aitech_name": aitech_name,
+                        "aisubtech": aisubtech,
+                        "aisubtech_name": aisubtech_name,
+                        "location": location,
+                        "details": item.get("details"),
+                    },
+                )
+            )
 
         return findings

mcpscope/scanner.py

@@ -2,7 +2,9 @@
 import json
 import subprocess
 import tempfile
+import uuid
 from pathlib import Path
+from typing import Any
 
 from mcpscope.ingest.cisco_mcp import CiscoMCPParser
 from mcpscope.ingest.mcpscan import MCPScanParser
@@ -12,7 +14,7 @@
 
 
 class ScannerRunner:
-    PARSERS = {
+    PARSERS: dict[str, dict[str, Any]] = {
         "mcp-scan": {
             "parser": MCPScanParser(),
             "install": "pip install mcp-scan",
@@ -68,6 +70,7 @@ def scan(
             raise RuntimeError("Scanner completed but no findings were detected")
 
         scan = ScanRun(
+            id=str(uuid.uuid4()),
             scanner=findings[0].scanner,
             target=target,
         )