mirror of
https://github.com/norandom/OpenUltraSAST.git
synced 2026-10-16 11:49:28 +00:00
Replace the hardcoded skill-name stub with a real, routable skill index. - skills.py (zero-dep): SkillDescriptor inventory (~22 ToB skills with routing metadata — languages, tags, vulnerability classes, stages — plus a short operating checklist each), aligned with the spec's routing examples. route_skills scores by vulnerability-class/tag/stage signal with a language filter+bonus, and never selects on a pure language match. route_skills_for_target derives vuln classes from tags; select_skill_context packs checklists into a char budget; skill_chunks chunks the guidance into the `skills` retrieval namespace. - hunter.select_skill_snippets now delegates to the router (existing C-memory and crypto+auth routing expectations preserved). - hunter_harness._describe feeds the budget-capped routed skill context into the HarnessX hunter prompt (the genuine consumer of skill_budget_chars). - 8.4 zero-dep guard extended to cover skills.py. tests/test_skills.py (9 tests: C parser → memory/fuzzing, crypto → constant-time/ vector, language-mismatch + language-only exclusion, stage filtering, budget cap, namespace chunking). openrouter-sast-harness Phase 14 checked off. 188 passed, 4 skipped; ruff + mypy clean; detection gate PASS. Co-Authored-By: Claude Opus 4.8 <[email protected]>
169 lines
5.5 KiB
Python
169 lines
5.5 KiB
Python
from __future__ import annotations
|
|
|
|
import json
|
|
from concurrent.futures import ThreadPoolExecutor
|
|
from dataclasses import asdict, dataclass
|
|
from pathlib import Path
|
|
from typing import Literal
|
|
|
|
from .findings import StaticFinding, quick_scan_findings
|
|
from .policy import CwePolicy
|
|
from .preprocess import FileTarget
|
|
from .rank import RankingScore
|
|
from .ruleset import PatternRule
|
|
|
|
HunterTier = Literal["A", "B", "C"]
|
|
|
|
|
|
@dataclass(frozen=True)
|
|
class HunterBudget:
|
|
tier: HunterTier
|
|
max_targets: int
|
|
max_findings_per_target: int
|
|
retrieval_budget_chars: int
|
|
skill_budget_chars: int
|
|
|
|
|
|
@dataclass(frozen=True)
|
|
class HunterTask:
|
|
target: FileTarget
|
|
ranking: RankingScore
|
|
tier: HunterTier
|
|
budget: HunterBudget
|
|
selected_skills: list[str]
|
|
retrieval_context: str
|
|
|
|
|
|
@dataclass(frozen=True)
|
|
class HunterTrajectory:
|
|
scan_id: str
|
|
target_path: str
|
|
tier: HunterTier
|
|
priority: float
|
|
selected_skills: list[str]
|
|
retrieval_context_chars: int
|
|
findings: list[str]
|
|
status: str
|
|
|
|
|
|
@dataclass(frozen=True)
|
|
class HunterPoolResult:
|
|
findings: list[StaticFinding]
|
|
trajectories: list[HunterTrajectory]
|
|
|
|
|
|
DEFAULT_BUDGETS = {
|
|
"A": HunterBudget(tier="A", max_targets=20, max_findings_per_target=20, retrieval_budget_chars=6000, skill_budget_chars=2500),
|
|
"B": HunterBudget(tier="B", max_targets=40, max_findings_per_target=10, retrieval_budget_chars=4000, skill_budget_chars=1500),
|
|
"C": HunterBudget(tier="C", max_targets=80, max_findings_per_target=5, retrieval_budget_chars=2000, skill_budget_chars=800),
|
|
}
|
|
|
|
|
|
def assign_tier(priority: float) -> HunterTier:
|
|
if priority >= 3:
|
|
return "A"
|
|
if priority >= 2:
|
|
return "B"
|
|
return "C"
|
|
|
|
|
|
def schedule_hunter_tasks(
|
|
targets: list[FileTarget],
|
|
rankings: list[RankingScore],
|
|
*,
|
|
retrieval_context_by_path: dict[str, str] | None = None,
|
|
) -> list[HunterTask]:
|
|
target_by_path = {target.path: target for target in targets}
|
|
retrieval_context_by_path = retrieval_context_by_path or {}
|
|
scheduled: list[HunterTask] = []
|
|
per_tier_counts: dict[HunterTier, int] = {"A": 0, "B": 0, "C": 0}
|
|
|
|
for ranking in sorted(rankings, key=lambda item: (-item.priority, item.path)):
|
|
target = target_by_path.get(ranking.path)
|
|
if target is None:
|
|
continue
|
|
tier = assign_tier(ranking.priority)
|
|
budget = DEFAULT_BUDGETS[tier]
|
|
if per_tier_counts[tier] >= budget.max_targets:
|
|
continue
|
|
per_tier_counts[tier] += 1
|
|
scheduled.append(
|
|
HunterTask(
|
|
target=target,
|
|
ranking=ranking,
|
|
tier=tier,
|
|
budget=budget,
|
|
selected_skills=select_skill_snippets(target),
|
|
retrieval_context=retrieval_context_by_path.get(target.path, "")[: budget.retrieval_budget_chars],
|
|
)
|
|
)
|
|
return scheduled
|
|
|
|
|
|
def run_hunter_pool(
|
|
root: Path,
|
|
targets: list[FileTarget],
|
|
rankings: list[RankingScore],
|
|
*,
|
|
scan_id: str,
|
|
ruleset: tuple[PatternRule, ...] | None = None,
|
|
policy: dict[str, CwePolicy] | None = None,
|
|
) -> HunterPoolResult:
|
|
tasks = schedule_hunter_tasks(targets, rankings, retrieval_context_by_path=build_retrieval_context_by_path(root, targets))
|
|
findings: list[StaticFinding] = []
|
|
trajectories: list[HunterTrajectory] = []
|
|
max_workers = min(8, max(1, len(tasks)))
|
|
with ThreadPoolExecutor(max_workers=max_workers) as executor:
|
|
for task_findings, trajectory in executor.map(lambda task: _run_hunter_task(root, scan_id, task, ruleset, policy), tasks):
|
|
findings.extend(task_findings)
|
|
trajectories.append(trajectory)
|
|
return HunterPoolResult(findings=sorted(findings, key=lambda item: item.finding_id), trajectories=trajectories)
|
|
|
|
|
|
def write_hunter_trajectories(trajectories: list[HunterTrajectory], path: Path) -> None:
|
|
path.parent.mkdir(parents=True, exist_ok=True)
|
|
path.write_text("".join(json.dumps(asdict(trajectory), sort_keys=True) + "\n" for trajectory in trajectories))
|
|
|
|
|
|
def build_retrieval_context_by_path(root: Path, targets: list[FileTarget], *, max_chars: int = 6000) -> dict[str, str]:
|
|
contexts: dict[str, str] = {}
|
|
for target in targets:
|
|
source = _read_source(root / target.path, max_chars=max_chars)
|
|
if source:
|
|
contexts[target.path] = f"[repo_code] {target.path}\n{source}"
|
|
return contexts
|
|
|
|
|
|
def select_skill_snippets(target: FileTarget, *, max_snippets: int = 4) -> list[str]:
|
|
"""Route the target to its most relevant Trail of Bits skills (ids), via the skill index."""
|
|
from .skills import route_skill_ids
|
|
|
|
return route_skill_ids(target, max_snippets=max_snippets)
|
|
|
|
|
|
def _run_hunter_task(
|
|
root: Path,
|
|
scan_id: str,
|
|
task: HunterTask,
|
|
ruleset: tuple[PatternRule, ...] | None = None,
|
|
policy: dict[str, CwePolicy] | None = None,
|
|
) -> tuple[list[StaticFinding], HunterTrajectory]:
|
|
findings = quick_scan_findings(root, [task.target], [task.ranking], ruleset, policy)[: task.budget.max_findings_per_target]
|
|
return findings, HunterTrajectory(
|
|
scan_id=scan_id,
|
|
target_path=task.target.path,
|
|
tier=task.tier,
|
|
priority=task.ranking.priority,
|
|
selected_skills=task.selected_skills,
|
|
retrieval_context_chars=len(task.retrieval_context),
|
|
findings=[finding.finding_id for finding in findings],
|
|
status="completed",
|
|
)
|
|
|
|
|
|
def _read_source(path: Path, *, max_chars: int) -> str:
|
|
try:
|
|
return path.read_text(errors="ignore")[:max_chars]
|
|
except OSError:
|
|
return ""
|