feat(controls): Mandanten-Suppression — per-tenant Applicability-Override
Geteilte Schicht für alle Surfaces (Workspace-Anwälte, Cyber-Risiko-Projekt,
Admin): ein Mandant markiert ein Control als "nicht anwendbar" → in seinen
Use-Case-Ansichten (und künftig Repo-Scans) ausgeblendet.
- Migration 156: compliance.control_suppressions (PK tenant_id+control_uuid),
reversibel (active + reverted_*), auditierbar (actor/reason/created_at).
[migration-approved]
- Service control_suppression: suppress/revert/list_suppressions +
suppressed_control_uuids (geteilter Filter).
- Routes: GET/POST /v1/controls/suppressions + POST .../{uuid}/revert (X-Tenant-ID).
- controls_for_use_case: optionaler X-Tenant-ID + include_suppressed; suppressed
per Default versteckt (nie gelöscht), suppressed_count, suppressed-Flag pro
Control. Agenten/CRA ohne Tenant unberührt.
- Tests: Request-Validierung + import-safety (E2E-Zyklus gegen macmini bewiesen).
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -59,6 +59,7 @@ _ROUTER_MODULES = [
|
||||
"control_generator_routes",
|
||||
"crosswalk_routes",
|
||||
"use_case_controls_routes",
|
||||
"control_suppression_routes",
|
||||
"process_task_routes",
|
||||
"evidence_check_routes",
|
||||
"vvt_library_routes",
|
||||
|
||||
@@ -0,0 +1,65 @@
|
||||
"""Per-tenant control-suppression API (Applicability-Override).
|
||||
|
||||
GET /v1/controls/suppressions — tenant's suppressions (audit list)
|
||||
POST /v1/controls/suppressions — mark a control not-applicable
|
||||
POST /v1/controls/suppressions/{uuid}/revert — undo (kept for audit)
|
||||
|
||||
Tenant from X-Tenant-ID. Suppressed controls are hidden from the use-case views
|
||||
(and future repo scans) but never deleted. NOTE: no `from __future__ import
|
||||
annotations` — it breaks Pydantic v2; use Optional[...]."""
|
||||
|
||||
from typing import Any, Optional
|
||||
|
||||
from fastapi import APIRouter, Depends
|
||||
from pydantic import BaseModel
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from classroom_engine.database import get_db
|
||||
from compliance.api._http_errors import translate_domain_errors
|
||||
from compliance.api.tenant_utils import get_tenant_id
|
||||
from compliance.services import control_suppression as svc
|
||||
|
||||
router = APIRouter(prefix="/v1/controls/suppressions", tags=["control-suppressions"])
|
||||
|
||||
|
||||
class SuppressRequest(BaseModel):
|
||||
control_uuid: str
|
||||
reason: Optional[str] = None
|
||||
actor: Optional[str] = None
|
||||
|
||||
|
||||
class RevertRequest(BaseModel):
|
||||
reason: Optional[str] = None
|
||||
actor: Optional[str] = None
|
||||
|
||||
|
||||
@router.get("")
|
||||
async def list_suppressions(
|
||||
include_reverted: bool = False,
|
||||
tid: str = Depends(get_tenant_id),
|
||||
db: Session = Depends(get_db),
|
||||
) -> list[dict[str, Any]]:
|
||||
with translate_domain_errors():
|
||||
return svc.list_suppressions(db, tid, include_reverted)
|
||||
|
||||
|
||||
@router.post("")
|
||||
async def create_suppression(
|
||||
body: SuppressRequest,
|
||||
tid: str = Depends(get_tenant_id),
|
||||
db: Session = Depends(get_db),
|
||||
) -> dict[str, Any]:
|
||||
with translate_domain_errors():
|
||||
return svc.suppress(db, tid, body.control_uuid, body.reason, body.actor)
|
||||
|
||||
|
||||
@router.post("/{control_uuid}/revert")
|
||||
async def revert_suppression(
|
||||
control_uuid: str,
|
||||
body: RevertRequest = RevertRequest(),
|
||||
tid: str = Depends(get_tenant_id),
|
||||
db: Session = Depends(get_db),
|
||||
) -> dict[str, Any]:
|
||||
with translate_domain_errors():
|
||||
ok = svc.revert(db, tid, control_uuid, body.actor, body.reason)
|
||||
return {"reverted": ok, "control_uuid": control_uuid}
|
||||
@@ -11,7 +11,7 @@ from __future__ import annotations
|
||||
|
||||
from typing import Any, Optional
|
||||
|
||||
from fastapi import APIRouter, Depends, Query
|
||||
from fastapi import APIRouter, Depends, Header, Query
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from classroom_engine.database import get_db
|
||||
@@ -62,14 +62,20 @@ async def controls_for_use_case(
|
||||
description="atom-grain: out-of-scope-Adressaten (Aufsichtsbefugnis/"
|
||||
"Mitgliedstaat/Dritter/meta) einblenden (Default: advisory ausgeblendet)",
|
||||
),
|
||||
include_suppressed: bool = Query(
|
||||
False,
|
||||
description="atom-grain: vom Mandanten als unanwendbar markierte Controls "
|
||||
"einblenden (Default: ausgeblendet)",
|
||||
),
|
||||
x_tenant_id: Optional[str] = Header(None, alias="X-Tenant-ID"),
|
||||
limit: int = Query(50, ge=1, le=200),
|
||||
offset: int = Query(0, ge=0),
|
||||
svc: UseCaseControlsService = Depends(get_use_case_controls_service),
|
||||
) -> dict[str, Any]:
|
||||
"""Controls for a topic. Atom-grain (Haiku: relevant + sub_topic) wenn vorhanden,
|
||||
sonst master-grain Seed."""
|
||||
sonst master-grain Seed. Mandanten-Suppression greift nur mit X-Tenant-ID."""
|
||||
with translate_domain_errors():
|
||||
return svc.controls_for_use_case(
|
||||
use_case, primary_only, limit, offset, sub_topic, tier,
|
||||
include_out_of_scope,
|
||||
include_out_of_scope, x_tenant_id, include_suppressed,
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user