2776813df3
The Sep 2026 decomposition (PR #102117) makes internal import paths a non-API: names now live in the focused modules that define them. This commit is the ONLY thing keeping the old paths alive, so external plugins have time to update. It is deliberately a single, unsquashed commit: git revert <this sha> removes every shim, stub and manifest at once on the announced date. Nothing in-tree may depend on these pointers: scripts/check_compat_pointers.py (wired into lint.yml) fails CI if it does. What it adds (see COMPAT_MANIFEST.md, compat_manifest.json): - 332 facade modules get one delimited `PLUGIN-COMPAT` block appended at the end of the file - 1,172 moved names resolved lazily via a module `__getattr__` (PEP 562) — never a top-level import, so no import cycles; facades that already had `__getattr__` get a chained one - 592 third-party/stdlib names the old modules used to expose, with their original import statements - 266 public definitions that had been deleted as unused, restored byte-for-byte from the pre-decomposition tree (+40 private helpers and 16 imports pulled in only because a restored definition needs them) - 3 deleted modules recreated as re-export stubs (gateway/startup_watchdog, hermes_cli/observability/ relay_runtime, tools/environments/modal_utils) - private names (`_x`) get no pointer: they were never API (3,792 skipped) Verified: all 335 touched modules import under a fresh HERMES_HOME and every manifest name resolves; the lint reports zero in-tree uses; ruff clean; targeted suites unchanged.
155 lines
7.2 KiB
Python
155 lines
7.2 KiB
Python
#!/usr/bin/env python3
|
|
"""Advisory NVIDIA SkillEvaluator Tier 1 scan for skill installs — alongside (never instead of) skills_guard,
|
|
the enforcement layer. Contract: warn, don't block (the upstream PII scanner false-positives on
|
|
``git@github.com`` / ``op://``); prompt only for secrets-class criticals (``--force`` / non-interactive proceed
|
|
with a loud warning); a missing/crashing/timed-out/unparseable scanner is a no-op. Toggle
|
|
``skills.tier1_advisory`` (default on). Binary: ``uv tool install --python 3.13
|
|
"skillevaluator @ git+https://github.com/NVIDIA/SkillEvaluator.git@v0.1.0"``."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
import logging
|
|
import shutil
|
|
import subprocess
|
|
import tempfile
|
|
from dataclasses import dataclass, field
|
|
from pathlib import Path
|
|
from typing import List
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
SCANNER_BIN = "skillevaluator"
|
|
# Keyless, deterministic checks (schema/quality are index-pipeline hygiene, not install-time signal). `security`
|
|
# invokes NVIDIA SkillSpector (static rules, no LLM); when absent it reports status="incomplete".
|
|
TIER1_CHECKS = "pii,unicode,lint,license,security"
|
|
SCAN_TIMEOUT_SECONDS = 120
|
|
|
|
# pii_patterns.yaml categories indicating a possible REAL credential (not PII hygiene) — the only prompt-worthy ones.
|
|
SECRETS_CLASS_CHECKS = frozenset({"database_credentials", "hardcoded_secrets", "jwt_tokens", "webhook_urls",
|
|
"aws_identifiers", "github_tokens", "private_keys"})
|
|
|
|
|
|
@dataclass
|
|
class Tier1Finding:
|
|
check: str # e.g. "emails", "database_credentials"
|
|
validator: str # e.g. "PII Scan"
|
|
severity: str # "critical" | "high" | "medium" | "low" | "info"
|
|
message: str
|
|
file: str = ""
|
|
line: int = 0
|
|
suggestion: str = ""
|
|
|
|
@property
|
|
def is_secrets_class(self) -> bool:
|
|
return self.check in SECRETS_CLASS_CHECKS
|
|
|
|
def location(self) -> str:
|
|
return f"{self.file}:{self.line}" if self.file and self.line else self.file or "?"
|
|
|
|
|
|
@dataclass
|
|
class Tier1Report:
|
|
available: bool # scanner ran and produced a report
|
|
passed: bool = True
|
|
findings: List[Tier1Finding] = field(default_factory=list)
|
|
incomplete_checks: List[str] = field(default_factory=list)
|
|
error: str = "" # why the scan is unavailable (debug only)
|
|
|
|
@property
|
|
def advisory_findings(self) -> List[Tier1Finding]:
|
|
return [f for f in self.findings if not f.is_secrets_class]
|
|
|
|
@property
|
|
def secrets_findings(self) -> List[Tier1Finding]:
|
|
return [f for f in self.findings if f.is_secrets_class]
|
|
|
|
|
|
def tier1_advisory_enabled() -> bool:
|
|
"""``skills.tier1_advisory`` (default True; safe because the scan is a no-op without the binary)."""
|
|
try:
|
|
from hermes_cli.config import load_config
|
|
skills_cfg = load_config().get("skills") or {}
|
|
value = skills_cfg.get("tier1_advisory", True) if isinstance(skills_cfg, dict) else True
|
|
return value.strip().lower() not in ("false", "0", "no", "off") if isinstance(value, str) else bool(value)
|
|
except Exception:
|
|
return True
|
|
|
|
|
|
def _parse_report(report: dict) -> Tier1Report:
|
|
"""Reduce a SkillEvaluator JSON report to install-relevant findings. Findings from ``status == "incomplete"``
|
|
validators are kept (partial evidence is evidence) but excluded from the pass/fail signal."""
|
|
findings: List[Tier1Finding] = []
|
|
incomplete: List[str] = []
|
|
failed = False
|
|
for res in report.get("results", []) or []:
|
|
validator = str(res.get("validator", "unknown"))
|
|
if str(res.get("status", "")).lower() == "incomplete":
|
|
incomplete.append(validator)
|
|
else:
|
|
failed = failed or not res.get("passed", True)
|
|
findings.extend(Tier1Finding(
|
|
check=str(f.get("check_name", "")), validator=validator, severity=str(f.get("severity", "info")).lower(),
|
|
message=str(f.get("message", ""))[:200], file=str(f.get("file_path", "")),
|
|
line=int(f.get("line_number") or 0), suggestion=str(f.get("suggestion", ""))[:200])
|
|
for f in res.get("findings", []) or [] if isinstance(f, dict))
|
|
return Tier1Report(available=True, passed=not failed and not findings, findings=findings,
|
|
incomplete_checks=incomplete)
|
|
|
|
|
|
def run_tier1_scan(skill_dir: Path, timeout: int = SCAN_TIMEOUT_SECONDS) -> Tier1Report:
|
|
"""Run SkillEvaluator Tier 1 over one skill dir; any failure returns ``available=False``, never raises."""
|
|
unavailable = lambda why: Tier1Report(available=False, error=why) # noqa: E731
|
|
if shutil.which(SCANNER_BIN) is None:
|
|
return unavailable("scanner not on PATH")
|
|
with tempfile.TemporaryDirectory(prefix="se-tier1-") as outdir:
|
|
try:
|
|
subprocess.run([SCANNER_BIN, "validate", str(skill_dir), "--checks", TIER1_CHECKS, "--no-dedup",
|
|
"-r", "json", "-o", outdir], capture_output=True, text=True, encoding="utf-8", errors="replace",
|
|
stdin=subprocess.DEVNULL, timeout=timeout)
|
|
except subprocess.TimeoutExpired:
|
|
return unavailable(f"scan timed out after {timeout}s")
|
|
except OSError as exc:
|
|
return unavailable(f"scanner failed to launch: {exc}")
|
|
if not (reports := sorted(Path(outdir).glob("skillevaluator-output-*.json"))):
|
|
return unavailable("scanner produced no JSON report")
|
|
try:
|
|
parsed = json.loads(reports[-1].read_text(encoding="utf-8"))
|
|
except (json.JSONDecodeError, OSError) as exc:
|
|
return unavailable(f"unparseable report: {exc}")
|
|
return _parse_report(parsed) if isinstance(parsed, dict) else unavailable("unexpected report shape")
|
|
|
|
|
|
def format_tier1_report(report: Tier1Report, limit: int = 10) -> str:
|
|
"""Plain-text advisory summary for console display ("" when unavailable)."""
|
|
if not report.available:
|
|
return ""
|
|
lines: List[str] = []
|
|
if not report.findings:
|
|
lines.append("SkillEvaluator Tier 1: no findings from completed checks." if report.incomplete_checks
|
|
else "SkillEvaluator Tier 1: no findings.")
|
|
else:
|
|
lines.append(f"SkillEvaluator Tier 1 (advisory): {len(report.findings)} finding(s) — informational, "
|
|
"verify before relying on this skill.")
|
|
shown = report.secrets_findings + report.advisory_findings
|
|
lines.extend(f" [{'SECRETS' if f.is_secrets_class else f.severity.upper()}] {f.location()} — {f.message}"
|
|
for f in shown[:limit])
|
|
if len(shown) > limit:
|
|
lines.append(f" … and {len(shown) - limit} more")
|
|
if report.incomplete_checks:
|
|
lines.append(f" (not run: {', '.join(report.incomplete_checks)} — no opinion from these checks)")
|
|
return "\n".join(lines)
|
|
|
|
|
|
# ---- BEGIN PLUGIN-COMPAT (revert-scheduled; see COMPAT_MANIFEST.md) ----
|
|
# Names external plugins imported from this module before the Sep 2026 decomposition.
|
|
# Internal code MUST NOT use these (scripts/check_compat_pointers.py fails CI if it does).
|
|
# The whole block is removed by reverting the commit that added it.
|
|
from typing import Optional # noqa: F401,E402
|
|
|
|
SCANNER_NAME = "skillevaluator-tier1"
|
|
|
|
def scanner_available() -> bool:
|
|
return shutil.which(SCANNER_BIN) is not None
|
|
# ---- END PLUGIN-COMPAT ----
|