mirror of
https://github.com/norandom/OpenUltraSAST.git
synced 2026-10-16 03:49:26 +00:00
feat(hardening): Phase 15 — redaction, retry/backoff, budgets, threat-model docs
Release-readiness hardening. - redaction.py (zero-dep): redact_secrets masks provider API keys, AWS/GitHub/Slack/ Google tokens, bearer tokens, URL-embedded credentials, PEM private keys, and sensitive key=value assignments. Wired into the trace writer and the markdown report (on by default), so scan artifacts never leak a credential quoted from source. - provider/openrouter.py: call_with_retry — exponential backoff on transient failures (HTTP 429/5xx, connection errors, timeouts); non-transient errors fail fast. Both the chat and embedding clients use it (max_attempts/retry_base_delay configurable). - config [hardening]: redact_secrets (default true) + max_findings (bounded-CI output cap, 0 = unlimited; truncation is severity-ordered and disclosed as a `budget` degradation). Agentic spend stays bounded by [harnessx] max_cost_usd/token_threshold. - docs/threat-model.md (trust boundaries, controls, sandbox limits) + docs/examples.md (six end-to-end walkthroughs); README "Security & hardening" section links both. - CI lint/typecheck/test/detection-gate/dagger gates already existed. tests/test_redaction.py, test_provider_retry.py, test_hardening_pipeline.py + config tests. 206 passed, 4 skipped; ruff + mypy clean; detection gate PASS. Co-Authored-By: Claude Opus 4.8 <[email protected]>
This commit is contained in:
co-authored by
Claude Opus 4.8
parent
3fd0057e5f
commit
b5e40318db
@@ -3,19 +3,56 @@ from __future__ import annotations
|
||||
import json
|
||||
import os
|
||||
import re
|
||||
import time
|
||||
import urllib.error
|
||||
import urllib.request
|
||||
from collections.abc import Callable
|
||||
from dataclasses import dataclass
|
||||
from typing import TypeVar, cast
|
||||
|
||||
|
||||
class OpenRouterError(RuntimeError):
|
||||
"""Raised when an OpenRouter request or response is invalid."""
|
||||
|
||||
|
||||
_TRANSIENT_STATUS = {429, 500, 502, 503, 504}
|
||||
_T = TypeVar("_T")
|
||||
|
||||
|
||||
def _is_transient(exc: Exception) -> bool:
|
||||
"""A network failure worth retrying (rate-limit, 5xx, connection error, timeout)."""
|
||||
if isinstance(exc, urllib.error.HTTPError):
|
||||
return exc.code in _TRANSIENT_STATUS
|
||||
return isinstance(exc, urllib.error.URLError | TimeoutError)
|
||||
|
||||
|
||||
def call_with_retry(
|
||||
operation: Callable[[], _T],
|
||||
*,
|
||||
attempts: int = 3,
|
||||
base_delay: float = 0.5,
|
||||
sleep: Callable[[float], None] = time.sleep,
|
||||
) -> _T:
|
||||
"""Run ``operation`` with exponential backoff on transient network failures."""
|
||||
last: Exception | None = None
|
||||
for attempt in range(attempts):
|
||||
try:
|
||||
return operation()
|
||||
except Exception as exc: # noqa: BLE001 — retry only transient failures; re-raise the rest
|
||||
last = exc
|
||||
if attempt + 1 < attempts and _is_transient(exc):
|
||||
sleep(base_delay * (2**attempt))
|
||||
continue
|
||||
raise
|
||||
raise last if last is not None else OpenRouterError("retry exhausted")
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class OpenRouterChatClient:
|
||||
api_key: str
|
||||
base_url: str = "https://openrouter.ai/api/v1"
|
||||
max_attempts: int = 3
|
||||
retry_base_delay: float = 0.5
|
||||
|
||||
@classmethod
|
||||
def from_env(cls) -> OpenRouterChatClient:
|
||||
@@ -35,9 +72,13 @@ class OpenRouterChatClient:
|
||||
},
|
||||
method="POST",
|
||||
)
|
||||
try:
|
||||
|
||||
def _do() -> dict[str, object]:
|
||||
with urllib.request.urlopen(request, timeout=timeout_seconds) as response:
|
||||
response_payload = json.loads(response.read().decode())
|
||||
return cast(dict[str, object], json.loads(response.read().decode()))
|
||||
|
||||
try:
|
||||
response_payload = call_with_retry(_do, attempts=self.max_attempts, base_delay=self.retry_base_delay)
|
||||
except (urllib.error.URLError, TimeoutError, json.JSONDecodeError) as exc:
|
||||
raise OpenRouterError(f"OpenRouter chat request failed: {exc}") from exc
|
||||
|
||||
@@ -49,6 +90,8 @@ class OpenRouterChatClient:
|
||||
class OpenRouterEmbeddingClient:
|
||||
api_key: str
|
||||
base_url: str = "https://openrouter.ai/api/v1"
|
||||
max_attempts: int = 3
|
||||
retry_base_delay: float = 0.5
|
||||
|
||||
@classmethod
|
||||
def from_env(cls) -> OpenRouterEmbeddingClient:
|
||||
@@ -68,9 +111,13 @@ class OpenRouterEmbeddingClient:
|
||||
},
|
||||
method="POST",
|
||||
)
|
||||
try:
|
||||
|
||||
def _do() -> dict[str, object]:
|
||||
with urllib.request.urlopen(request, timeout=timeout_seconds) as response:
|
||||
response_payload = json.loads(response.read().decode())
|
||||
return cast(dict[str, object], json.loads(response.read().decode()))
|
||||
|
||||
try:
|
||||
response_payload = call_with_retry(_do, attempts=self.max_attempts, base_delay=self.retry_base_delay)
|
||||
except (urllib.error.URLError, TimeoutError, json.JSONDecodeError) as exc:
|
||||
raise OpenRouterError(f"OpenRouter embedding request failed: {exc}") from exc
|
||||
return parse_embedding_response(response_payload)
|
||||
|
||||
Reference in New Issue
Block a user