refactor(monitoring): N2 - tach monitoring_tab.py, CanonicalAuditLogger, MonitoringQueryService, go circular import, sandbox matrix
- ui/monitoring_tab.py (1546 dong) tach thanh presentation/monitoring/** (container + 7 tab/card + shared helper), ui/monitoring_tab.py con lai re-export shim de app.py khong doi. - infrastructure/telemetry/audit_logger.py: CanonicalAuditLogger, core/audit_log.py thanh wrapper mong, tuong thich nguoc 100% voi schema .jsonl cu. - application/monitoring/monitoring_query_service.py: MonitoringQueryService read-only, filter/sort/pagination, khong import PySide6. - Go circular import model_pricing<->usage_tracker va agent_security<-> agent_security_alert (core/agent_security_types.py moi). - infrastructure/sandbox/sandbox_capabilities.py: SandboxCapabilityMatrix theo OS (Windows/Linux/macOS), chua dau noi vao core/sandbox_manager.py. - conftest.py: sua loi checkout khong ten cowork_local khien pytest import nham thu muc khac. - 77 test moi, 167/167 pass. QA da xac nhan UI/business logic khong doi (xem evidence/report/unified_report.html). Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Sonnet 5
parent
86c27e2e79
commit
40b12ecb15
@@ -0,0 +1 @@
|
||||
"""Infrastructure sandbox package: OS-specific sandbox capability adapters."""
|
||||
@@ -0,0 +1,179 @@
|
||||
"""Sandbox capability matrix — which isolation backends exist on which OS,
|
||||
and which one a given risk tier should prefer.
|
||||
|
||||
Pure policy/data: no subprocess execution, no PySide6, no dependency on
|
||||
``core/sandbox_manager.py`` (that module owns the actual execution and isn't
|
||||
in this task's editable scope — this matrix is a standalone, independently
|
||||
testable module ready for that module's owner to wire in later).
|
||||
|
||||
The Windows entries mirror what ``core/sandbox_manager.py`` +
|
||||
``core/appcontainer_sandbox.py``/``core/windows_sandbox_vm.py``/
|
||||
``core/integrity_sandbox.py`` already implement today. Linux/macOS entries
|
||||
are declared but marked ``implemented=False`` — today those platforms have no
|
||||
real isolation backend (confirmed: ``core/appcontainer_sandbox.py`` and
|
||||
``core/windows_sandbox_vm.py`` both hard-return ``False`` off Windows) — so
|
||||
this matrix reports that honestly instead of pretending capabilities that
|
||||
don't exist yet. Adding a real Linux/macOS backend later is a 1-line flip of
|
||||
``implemented`` plus whatever backend module implements it; adding a whole
|
||||
new OS is a call to :func:`register_profile`, no changes to
|
||||
:class:`SandboxCapabilityMatrix` itself.
|
||||
"""
|
||||
from __future__ import annotations
|
||||
|
||||
import sys
|
||||
from dataclasses import dataclass
|
||||
from typing import Dict, Optional, Tuple
|
||||
|
||||
# Plain string constants (like core/audit_log.py's ``Kind``) rather than an
|
||||
# Enum, so a brand-new OS can be registered without editing a closed type.
|
||||
WINDOWS = "windows"
|
||||
LINUX = "linux"
|
||||
MACOS = "macos"
|
||||
UNKNOWN = "unknown"
|
||||
|
||||
# Risk tiers — same vocabulary as security/command_risk_classifier.RiskLevel,
|
||||
# kept as plain strings here so this module has zero dependency on the
|
||||
# ``security/`` package (out of scope for this task).
|
||||
SAFE = "SAFE"
|
||||
MODERATE = "MODERATE"
|
||||
HIGH = "HIGH"
|
||||
CRITICAL = "CRITICAL"
|
||||
|
||||
BLOCKED = "blocked"
|
||||
DIRECT = "direct"
|
||||
|
||||
|
||||
def detect_os(platform_name: Optional[str] = None) -> str:
|
||||
"""``platform_name`` defaults to ``sys.platform`` but can be injected for
|
||||
testing (e.g. ``detect_os("linux")``, ``detect_os("darwin")``)."""
|
||||
name = platform_name if platform_name is not None else sys.platform
|
||||
if name.startswith("win"):
|
||||
return WINDOWS
|
||||
if name.startswith("linux"):
|
||||
return LINUX
|
||||
if name.startswith("darwin"):
|
||||
return MACOS
|
||||
return UNKNOWN
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class SandboxBackend:
|
||||
name: str
|
||||
isolation_level: str # "none" | "resource_limits" | "restricted_token" | "namespace" | "seatbelt" | "full_vm"
|
||||
implemented: bool # whether a real backend exists today, vs. a declared placeholder
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class OsSandboxProfile:
|
||||
operating_system: str
|
||||
backends: Tuple[SandboxBackend, ...]
|
||||
# risk tier -> ordered list of preferred backend names (first available wins)
|
||||
routing: Dict[str, Tuple[str, ...]]
|
||||
|
||||
|
||||
def _profile(operating_system: str, backends: Tuple[SandboxBackend, ...],
|
||||
routing: Dict[str, Tuple[str, ...]]) -> OsSandboxProfile:
|
||||
return OsSandboxProfile(operating_system=operating_system, backends=backends, routing=routing)
|
||||
|
||||
|
||||
_WINDOWS_PROFILE = _profile(
|
||||
WINDOWS,
|
||||
backends=(
|
||||
SandboxBackend(DIRECT, "none", True),
|
||||
SandboxBackend("integrity_job_wfp", "resource_limits", True),
|
||||
SandboxBackend("appcontainer", "restricted_token", True),
|
||||
SandboxBackend("windows_sandbox", "full_vm", True),
|
||||
),
|
||||
routing={
|
||||
SAFE: ("integrity_job_wfp", DIRECT),
|
||||
MODERATE: ("integrity_job_wfp", DIRECT),
|
||||
HIGH: ("appcontainer", "integrity_job_wfp"),
|
||||
CRITICAL: ("windows_sandbox", "appcontainer", BLOCKED),
|
||||
},
|
||||
)
|
||||
|
||||
_LINUX_PROFILE = _profile(
|
||||
LINUX,
|
||||
backends=(
|
||||
SandboxBackend(DIRECT, "none", True),
|
||||
SandboxBackend("namespaces_bubblewrap", "namespace", False), # not implemented yet
|
||||
),
|
||||
routing={
|
||||
SAFE: (DIRECT,),
|
||||
MODERATE: (DIRECT,),
|
||||
HIGH: ("namespaces_bubblewrap", BLOCKED),
|
||||
CRITICAL: (BLOCKED,),
|
||||
},
|
||||
)
|
||||
|
||||
_MACOS_PROFILE = _profile(
|
||||
MACOS,
|
||||
backends=(
|
||||
SandboxBackend(DIRECT, "none", True),
|
||||
SandboxBackend("sandbox_exec", "seatbelt", False), # not implemented yet
|
||||
),
|
||||
routing={
|
||||
SAFE: (DIRECT,),
|
||||
MODERATE: (DIRECT,),
|
||||
HIGH: ("sandbox_exec", BLOCKED),
|
||||
CRITICAL: (BLOCKED,),
|
||||
},
|
||||
)
|
||||
|
||||
_UNKNOWN_PROFILE = _profile(
|
||||
UNKNOWN,
|
||||
backends=(),
|
||||
routing={SAFE: (BLOCKED,), MODERATE: (BLOCKED,), HIGH: (BLOCKED,), CRITICAL: (BLOCKED,)},
|
||||
)
|
||||
|
||||
_PROFILES: Dict[str, OsSandboxProfile] = {
|
||||
WINDOWS: _WINDOWS_PROFILE,
|
||||
LINUX: _LINUX_PROFILE,
|
||||
MACOS: _MACOS_PROFILE,
|
||||
UNKNOWN: _UNKNOWN_PROFILE,
|
||||
}
|
||||
|
||||
|
||||
def register_profile(profile: OsSandboxProfile) -> None:
|
||||
"""Extension point for a brand-new OS: build an :class:`OsSandboxProfile`
|
||||
and register it once — no change to :class:`SandboxCapabilityMatrix`
|
||||
needed. Overwrites any existing profile for the same
|
||||
``operating_system`` name (lets a caller override the built-in Windows/
|
||||
Linux/macOS profiles too, e.g. once a real Linux backend ships)."""
|
||||
_PROFILES[profile.operating_system] = profile
|
||||
|
||||
|
||||
class SandboxCapabilityMatrix:
|
||||
"""Answers, for one OS: which backends are actually available today, and
|
||||
which one a given risk tier should prefer. Read-only policy — does not
|
||||
execute anything."""
|
||||
|
||||
def __init__(self, operating_system: Optional[str] = None,
|
||||
allow_direct_fallback: bool = True) -> None:
|
||||
self.operating_system = operating_system if operating_system is not None else detect_os()
|
||||
self._profile = _PROFILES.get(self.operating_system, _UNKNOWN_PROFILE)
|
||||
self.allow_direct_fallback = allow_direct_fallback
|
||||
|
||||
def all_backends(self) -> Tuple[SandboxBackend, ...]:
|
||||
"""Every backend declared for this OS, implemented or not."""
|
||||
return self._profile.backends
|
||||
|
||||
def available_backends(self) -> Tuple[SandboxBackend, ...]:
|
||||
"""Only backends with a real implementation today."""
|
||||
return tuple(b for b in self._profile.backends if b.implemented)
|
||||
|
||||
def select_backend(self, risk_level: str) -> str:
|
||||
"""The backend name to use for ``risk_level`` on this OS — the first
|
||||
available (implemented) backend in that tier's preference order, else
|
||||
``"direct"`` when allowed for a non-CRITICAL tier, else ``"blocked"``."""
|
||||
available_names = {b.name for b in self.available_backends()}
|
||||
preferred = self._profile.routing.get(risk_level.upper(), ())
|
||||
for name in preferred:
|
||||
if name == BLOCKED:
|
||||
return BLOCKED
|
||||
if name in available_names:
|
||||
return name
|
||||
if (self.allow_direct_fallback and DIRECT in available_names
|
||||
and risk_level.upper() != CRITICAL):
|
||||
return DIRECT
|
||||
return BLOCKED
|
||||
Reference in New Issue
Block a user