This squashes 13 commits from ma/staging plus a small docstring translation
into a single coherent unit. Three workstreams.
== RBAC v13 redesign ==
- Drops core.viewer/analyst/km_admin/admin hierarchy and the
internal_roles / group_mappings / user_role_grants / plugin_access tables.
- Replaced by user_group_members + resource_grants. Atomic v12→v13 backfill
wrapped in BEGIN/COMMIT; ROLLBACK leaves schema_version at 12 for retry.
- Two authorization primitives in app.auth.access:
require_admin — Admin-group god-mode
require_resource_access(rt, "{path}") — entity-scoped grants
Single DB lookup per request; no session cache; no implies BFS.
- /admin/access UI (single page) replaces /admin/role-mapping +
/admin/plugin-access. CLI `da admin group/grant *` replaces
`da admin role/mapping/grant-role/revoke-role/effective-roles`.
- ResourceType.TABLE listing-only — admins can record table grants,
runtime enforcement still flows through legacy dataset_permissions
(migration plan in docs/TODO-rbac-data-enforcement.md).
== Claude Code marketplace ==
- Aggregated /marketplace.zip + /marketplace.git/* (PAT-gated,
RBAC-filtered, content-addressed cache via dulwich).
- Admin god-mode dropped on the marketplace surface — admins curate
their own view via grants like everyone else.
- Bare-repo cache materializes per RBAC-filtered ETag; stale entries
not pruned in this iteration (disclaimed in git_backend.py docstring).
== #81 #83 #44 security/ops hardening ==
- #81 Group A — orchestrator ATTACH allow-listing (extension/url/alias).
- #81 Group B — Keboola extractor 3-state exit codes:
0 success / 1 total fail / 2 PARTIAL fail
Sync API logs PARTIAL FAILURE alert on exit 2. Operators with binary
alerting must teach it the new partial signal.
- #81 Group C — schema v10 view_ownership; rejects silent overwrite
of a prior connector's view name on collision.
- #81 Group D — extractor-side identifier validation.
- #83 — Jira webhook fail-closed when JIRA_WEBHOOK_SECRET unset
+ path-traversal fix.
- #44 — entire /api/scripts/* surface is admin-only (planted-script +
sandbox-bypass risk closed).
== Web UI polish + deploy fix ==
- /admin/access: live grant-count badges (no stale snapshot revert),
shared-header CSS link added to /catalog and /admin/{tables,permissions},
per-resource-type colored stripes.
- docker-compose.host-mount.yml: bind,rbind so dual-disk hosts don't
silently shadow sub-mounts and write state to the wrong disk.
== OSS vendor-neutralization (waves 1+2) ==
- scripts/grpn/ → scripts/ops/. Customer-specific identifiers
(project IDs, internal hostnames, dev/prod VM IPs, brand names)
replaced with placeholders across code, docs, Terraform, Caddyfile,
OAuth probe, and planning docs. Downstream infra repos that copied
scripts/grpn/agnes-tls-rotate.sh or agnes-auto-upgrade.sh must
update the path.
== Translation ==
- src/repositories/user_groups.py::ensure_system docstring translated
from Czech to English for codebase consistency.
Co-authored-by: Mina Rustamyan <mina@keboola.com>
98 lines
3.3 KiB
Python
98 lines
3.3 KiB
Python
"""Access request API — users request access, admins approve/deny."""
|
|
|
|
import logging
|
|
from fastapi import APIRouter, Depends, HTTPException
|
|
from pydantic import BaseModel
|
|
from typing import Optional
|
|
import duckdb
|
|
|
|
from app.auth.access import require_admin
|
|
from app.auth.dependencies import get_current_user, _get_db
|
|
from src.repositories.access_requests import AccessRequestRepository
|
|
|
|
logger = logging.getLogger(__name__)
|
|
router = APIRouter(prefix="/api/access-requests", tags=["access-requests"])
|
|
|
|
|
|
class AccessRequestCreate(BaseModel):
|
|
table_id: str
|
|
reason: Optional[str] = ""
|
|
|
|
|
|
@router.post("", status_code=201)
|
|
async def create_request(
|
|
request: AccessRequestCreate,
|
|
user: dict = Depends(get_current_user),
|
|
conn: duckdb.DuckDBPyConnection = Depends(_get_db),
|
|
):
|
|
"""Submit an access request for a table."""
|
|
repo = AccessRequestRepository(conn)
|
|
|
|
# Check for duplicate pending request
|
|
if repo.has_pending_request(user["id"], request.table_id):
|
|
raise HTTPException(status_code=409, detail="You already have a pending request for this table")
|
|
|
|
req_id = repo.create(
|
|
user_id=user["id"],
|
|
user_email=user.get("email", ""),
|
|
table_id=request.table_id,
|
|
reason=request.reason or "",
|
|
)
|
|
return {"id": req_id, "status": "pending", "table_id": request.table_id}
|
|
|
|
|
|
@router.get("/my")
|
|
async def my_requests(
|
|
user: dict = Depends(get_current_user),
|
|
conn: duckdb.DuckDBPyConnection = Depends(_get_db),
|
|
):
|
|
"""List current user's access requests."""
|
|
repo = AccessRequestRepository(conn)
|
|
requests = repo.list_by_user(user["id"])
|
|
# Serialize timestamps
|
|
for r in requests:
|
|
for k in ("created_at", "reviewed_at"):
|
|
if r.get(k) and hasattr(r[k], "isoformat"):
|
|
r[k] = r[k].isoformat()
|
|
return {"requests": requests}
|
|
|
|
|
|
@router.get("/pending")
|
|
async def pending_requests(
|
|
user: dict = Depends(require_admin),
|
|
conn: duckdb.DuckDBPyConnection = Depends(_get_db),
|
|
):
|
|
"""List all pending access requests (admin only)."""
|
|
repo = AccessRequestRepository(conn)
|
|
requests = repo.list_pending()
|
|
for r in requests:
|
|
for k in ("created_at", "reviewed_at"):
|
|
if r.get(k) and hasattr(r[k], "isoformat"):
|
|
r[k] = r[k].isoformat()
|
|
return {"requests": requests, "count": len(requests)}
|
|
|
|
|
|
@router.post("/{request_id}/approve")
|
|
async def approve_request(
|
|
request_id: str,
|
|
user: dict = Depends(require_admin),
|
|
conn: duckdb.DuckDBPyConnection = Depends(_get_db),
|
|
):
|
|
"""Approve an access request (admin only). Auto-grants permission."""
|
|
repo = AccessRequestRepository(conn)
|
|
if repo.approve(request_id, reviewed_by=user.get("email", "")):
|
|
return {"status": "approved", "id": request_id}
|
|
raise HTTPException(status_code=404, detail="Request not found or already processed")
|
|
|
|
|
|
@router.post("/{request_id}/deny")
|
|
async def deny_request(
|
|
request_id: str,
|
|
user: dict = Depends(require_admin),
|
|
conn: duckdb.DuckDBPyConnection = Depends(_get_db),
|
|
):
|
|
"""Deny an access request (admin only)."""
|
|
repo = AccessRequestRepository(conn)
|
|
if repo.deny(request_id, reviewed_by=user.get("email", "")):
|
|
return {"status": "denied", "id": request_id}
|
|
raise HTTPException(status_code=404, detail="Request not found or already processed")
|