* feat(rbac): drop dataset_permissions + access_requests + users.role + is_public; v19 migration
BREAKING. Sjednocení datové RBAC vrstvy do per-group resource_grants modelu.
Před PR byla legacy data RBAC vrstva (dataset_permissions + is_public bypass)
de-facto neaktivní — is_public neměl API/UI/CLI surface, default true znamenal
že can_access_table vždycky bypassl. Dnes každý non-admin přístup vyžaduje
explicitní resource_grants(group, "table", id) řádek.
Schema v18 → v19 (src/db.py:_v18_to_v19_finalize):
- DROP TABLE dataset_permissions, access_requests
- DROP COLUMN users.role (NULL artifact since v13)
- DROP COLUMN table_registry.is_public
- Drops přes table-rebuild idiom (rename → create new → INSERT … SELECT
→ drop old) kvůli DuckDB ALTER DROP COLUMN limitacím na tabulkách
s historic FK constraints. INSERT picks intersection sloupců, takže
test fixtures s minimal pre-v19 schemou migrate cleanly.
Runtime:
- src/rbac.py:can_access_table → deleguje na app.auth.access.can_access
- DatasetPermissionRepository, AccessRequestRepository smazány
- AGNES_ENABLE_TABLE_GRANTS env-gate v app/resource_types.py odstraněn
(TABLE je unconditionally enabled)
API drop:
- app/api/permissions.py, app/api/access_requests.py celé soubory
- /admin/permissions web route + admin_permissions.html
- "Request Access" modal v catalog.html + locked-row UI
- ~10 if user.get("role") != "admin" checků nahrazeno (admin shortcut
je uvnitř can_access_table)
- /api/settings: drop permissions field z GET; PUT /api/settings/dataset
gate přepnut na can_access(user_id, "table", dataset, conn)
Auth:
- app/auth/jwt.py:create_access_token: drop role parametr (claim zmizí
z nově vydávaných JWT; staré tokeny zůstávají valid, claim ignored)
- app/api/users.py: drop role z CreateUserRequest / UpdateUserRequest
(admin promotion = explicit add to Admin group via memberships API)
- src/repositories/users.py: drop role z create() / update()
CLI:
- da admin set-role smazán → hard-fail s replacement command
- da admin add-user --role flag pryč
- da auth import-token --role flag pryč
- da auth whoami: drop "Role:" výpis
- cli/config.py:save_token: role parametr now optional, no longer written
(back-compat se starými token.json soubory zachována — pole se ignoruje)
Tests:
- DELETE: test_permissions.py, test_permissions_api.py, test_access_requests_api.py
- REWRITE: test_access_control.py (resource_grants flow), test_rbac.py
(can_access_table over resource_grants), test_journey_rbac.py
(drop access-request flow), test_resource_types.py (drop env-gate
tests, drop is_public from helpers), test_v2_*.py (drop role-based
user dicts in favor of id-based + Admin group membership),
test_settings_api.py (no permissions field, can_access gate)
- TRIVIAL: ~30 souborů — drop role="admin" arg z UserRepository.create
a 3rd positional role z create_access_token
- NEW: test_v18_to_v19 migration test (test_db.py),
test_can_access_table_no_implicit_public (test_rbac.py),
test_admin_set_role_returns_hardfail (test_cli_admin.py)
- OpenAPI snapshot regenerated
Docs:
- CHANGELOG: BREAKING entry pod [Unreleased]
- CLAUDE.md: schema v18 → v19
- docs/architecture.md: schema table + RBAC sekce přepsána
- docs/auth-google-oauth.md: admin promotion přes da admin break-glass
- cli/skills/security.md: kompletně přepsáno na group-based model
- docs/TODO-rbac-data-enforcement.md: smazáno (TODO splněn)
Test results: 2363 passed, 19 failed. Zbývající failures jsou pre-existing
Windows-specific issues (fcntl, charset) nesouvisející s tímto PR —
ověřeno git stash pop.
Plan: ~/.claude/plans/floofy-coalescing-parnas.md
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* chore(release): cut 0.27.0
---------
Co-authored-by: Minas Arustamyan <arustamyan.minas@gmail.com>
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Co-authored-by: ZdenekSrotyr <zdenek.srotyr@keboola.com>
275 lines
10 KiB
Python
275 lines
10 KiB
Python
"""Resource types that can be granted to user groups.
|
|
|
|
A *resource type* identifies a class of entity admins can hand out access to
|
|
(e.g. marketplace plugins, datasets). Concrete instances live in their own
|
|
domain tables (`marketplace_plugins`, `table_registry`, …); access to a
|
|
specific instance is recorded as a row in `resource_grants` with this enum
|
|
value as ``resource_type`` and a module-defined path string as ``resource_id``.
|
|
|
|
Adding a new type — single place, no separate wiring step:
|
|
|
|
1. Add a member to :class:`ResourceType`.
|
|
2. Write a ``list_blocks(conn) -> list[Block]`` delegate that projects the
|
|
domain tables into the (block → items) tree the admin /access page
|
|
consumes. Each item must include ``resource_id`` matching the path
|
|
string used in ``resource_grants.resource_id``.
|
|
3. Register a :class:`ResourceTypeSpec` in :data:`RESOURCE_TYPES`. The
|
|
dataclass requires ``list_blocks`` — the type checker forces step 2.
|
|
4. Wire endpoints with
|
|
``Depends(require_resource_access(ResourceType.X, "<path>"))``.
|
|
|
|
No DB migration needed — this is application-level configuration. Membership
|
|
in the enum + registry is the source of truth; the DB just stores the string
|
|
value verbatim.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from dataclasses import dataclass
|
|
from enum import StrEnum
|
|
from typing import TYPE_CHECKING, Any, Callable, List
|
|
|
|
if TYPE_CHECKING:
|
|
import duckdb
|
|
|
|
|
|
class ResourceType(StrEnum):
|
|
"""Resource categories that the access-control layer understands.
|
|
|
|
Values are persisted verbatim in ``resource_grants.resource_type``.
|
|
Renaming a member is a breaking change — existing grants reference the
|
|
string. Add a new member and migrate via SQL UPDATE if needed.
|
|
"""
|
|
|
|
MARKETPLACE_PLUGIN = "marketplace_plugin"
|
|
TABLE = "table"
|
|
MEMORY_DOMAIN = "memory_domain"
|
|
|
|
|
|
# Shape returned by ``list_blocks`` delegates. Kept as plain ``dict`` to keep
|
|
# the registry decoupled from any specific ORM/repo type — UI consumes JSON.
|
|
Block = dict[str, Any]
|
|
ListBlocksFn = Callable[["duckdb.DuckDBPyConnection"], List[Block]]
|
|
|
|
|
|
@dataclass(frozen=True)
|
|
class ResourceTypeSpec:
|
|
"""Self-contained definition of a resource type.
|
|
|
|
Bundles UI copy with the projection delegate so that adding a new type
|
|
in :data:`RESOURCE_TYPES` is the single place that needs editing — no
|
|
forgotten branch in ``access-overview`` or the admin UI.
|
|
|
|
Attributes:
|
|
key: The enum member; ``key.value`` is what gets persisted.
|
|
display_name: Plural label rendered as a section header on the
|
|
admin /access page.
|
|
description: One-liner shown in the create-grant form's helper text.
|
|
id_format: Human-readable hint for ``resource_id`` shape — e.g.
|
|
``"<marketplace_slug>/<plugin_name>"``. Surfaced as input
|
|
placeholder.
|
|
list_blocks: Delegate that takes a system DB connection and returns
|
|
``[{id, name, items: [{resource_id, name, ...}]}]`` — one block
|
|
per parent entity (e.g. marketplace), one item per grantable
|
|
resource (e.g. plugin). Items must carry ``resource_id`` that
|
|
matches the path string written into ``resource_grants``.
|
|
"""
|
|
|
|
key: ResourceType
|
|
display_name: str
|
|
description: str
|
|
id_format: str
|
|
list_blocks: ListBlocksFn
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Marketplace plugin projection
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def _marketplace_plugin_blocks(conn: "duckdb.DuckDBPyConnection") -> List[Block]:
|
|
"""Project marketplace_registry + marketplace_plugins into the
|
|
hierarchical (block → items) shape the admin UI renders.
|
|
|
|
One block per marketplace_registry row, ordered by registered_at.
|
|
Items inside are plugins; ``resource_id`` encodes the canonical path
|
|
``<marketplace_slug>/<plugin_name>`` that ``resource_grants.resource_id``
|
|
matches against.
|
|
"""
|
|
rows = conn.execute(
|
|
"""SELECT mr.id, mr.name, mr.registered_at,
|
|
mp.name AS plugin_name, mp.version, mp.category,
|
|
mp.description, mp.source_type
|
|
FROM marketplace_registry mr
|
|
LEFT JOIN marketplace_plugins mp ON mp.marketplace_id = mr.id
|
|
ORDER BY mr.registered_at, mr.id, mp.name"""
|
|
).fetchall()
|
|
blocks: dict[str, Block] = {}
|
|
for mr_id, mr_name, _, p_name, p_ver, p_cat, p_desc, p_src in rows:
|
|
block = blocks.setdefault(mr_id, {
|
|
"id": mr_id,
|
|
"name": mr_name,
|
|
"items": [],
|
|
})
|
|
if p_name:
|
|
block["items"].append({
|
|
"resource_id": f"{mr_id}/{p_name}",
|
|
"name": p_name,
|
|
"version": p_ver,
|
|
"category": p_cat,
|
|
"description": p_desc,
|
|
"source_type": p_src,
|
|
})
|
|
return list(blocks.values())
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Table projection
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def _table_blocks(conn: "duckdb.DuckDBPyConnection") -> List[Block]:
|
|
"""Project table_registry into the (block → items) shape the admin UI
|
|
renders.
|
|
|
|
One block per ``bucket`` value, ordered by bucket then table name.
|
|
Items inside are tables; ``resource_id`` is the ``table_registry.id``
|
|
primary key — that is the path string that ``resource_grants.resource_id``
|
|
matches against. Bucket is purely a UI grouping and does not enter the
|
|
resource_id (mirrors the marketplace/plugin pattern).
|
|
|
|
Tables with NULL/empty bucket fall into a synthetic ``"(no bucket)"``
|
|
block so they are still grantable.
|
|
"""
|
|
rows = conn.execute(
|
|
"""SELECT id, name, bucket, source_type, query_mode, description
|
|
FROM table_registry
|
|
ORDER BY COALESCE(bucket, ''), name"""
|
|
).fetchall()
|
|
blocks: dict[str, Block] = {}
|
|
for tbl_id, name, bucket, source_type, query_mode, description in rows:
|
|
block_key = bucket if bucket else "(no bucket)"
|
|
block = blocks.setdefault(block_key, {
|
|
"id": block_key,
|
|
"name": block_key,
|
|
"items": [],
|
|
})
|
|
block["items"].append({
|
|
"resource_id": tbl_id,
|
|
"name": name,
|
|
"category": query_mode,
|
|
"source_type": source_type,
|
|
"description": description,
|
|
})
|
|
return list(blocks.values())
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Memory domain projection
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
# Mirrors VALID_DOMAINS in app/api/memory.py. Kept inline here to avoid
|
|
# importing the FastAPI module at registry-load time (circular import risk).
|
|
# If this list drifts from VALID_DOMAINS, add a runtime cross-check or merge
|
|
# the two sources — for now they're tiny and reviewed together.
|
|
_MEMORY_DOMAINS = (
|
|
"finance",
|
|
"engineering",
|
|
"product",
|
|
"data",
|
|
"operations",
|
|
"infrastructure",
|
|
)
|
|
|
|
|
|
def _memory_domain_blocks(conn: "duckdb.DuckDBPyConnection") -> List[Block]:
|
|
"""Project the (fixed) set of corporate-memory domains into the
|
|
(block → items) shape the admin UI renders.
|
|
|
|
Unlike marketplace plugins / tables, the grantable items are a fixed
|
|
enum, not a DB lookup — every deployment has the same 6 domains. One
|
|
synthetic block ``"Memory domains"`` holds them; ``resource_id`` is
|
|
the domain string (matches ``knowledge_items.domain``).
|
|
"""
|
|
return [{
|
|
"id": "memory_domains",
|
|
"name": "Memory domains",
|
|
"items": [
|
|
{
|
|
"resource_id": domain,
|
|
"name": domain,
|
|
"category": "domain",
|
|
"description": (
|
|
f"Members of granted groups see all knowledge_items "
|
|
f"with domain={domain!r}, in addition to the existing "
|
|
f"audience filter."
|
|
),
|
|
}
|
|
for domain in _MEMORY_DOMAINS
|
|
],
|
|
}]
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Registry — the one place that gets edited when adding a new resource type
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
RESOURCE_TYPES: dict[ResourceType, ResourceTypeSpec] = {
|
|
ResourceType.MARKETPLACE_PLUGIN: ResourceTypeSpec(
|
|
key=ResourceType.MARKETPLACE_PLUGIN,
|
|
display_name="Marketplace plugins",
|
|
description="A plugin from a registered marketplace.",
|
|
id_format="<marketplace_slug>/<plugin_name>",
|
|
list_blocks=_marketplace_plugin_blocks,
|
|
),
|
|
ResourceType.TABLE: ResourceTypeSpec(
|
|
key=ResourceType.TABLE,
|
|
display_name="Tables",
|
|
description="A registered data table.",
|
|
id_format="<table_id>",
|
|
list_blocks=_table_blocks,
|
|
),
|
|
ResourceType.MEMORY_DOMAIN: ResourceTypeSpec(
|
|
key=ResourceType.MEMORY_DOMAIN,
|
|
display_name="Memory domains",
|
|
description="A corporate-memory domain (knowledge_items.domain).",
|
|
id_format="<domain>",
|
|
list_blocks=_memory_domain_blocks,
|
|
),
|
|
}
|
|
|
|
|
|
def is_resource_type_enabled(rt: ResourceType) -> bool:
|
|
"""Whether a resource type is exposed to the admin UI + grant API.
|
|
|
|
All resource types are unconditionally enabled in v19. The
|
|
``AGNES_ENABLE_TABLE_GRANTS`` env-gate that previously held back
|
|
``ResourceType.TABLE`` was removed when ``can_access_table`` was
|
|
rewired onto ``app.auth.access.can_access``.
|
|
"""
|
|
return True
|
|
|
|
|
|
def enabled_resource_types() -> list[ResourceTypeSpec]:
|
|
"""The subset of RESOURCE_TYPES currently surfaced to admins."""
|
|
return [spec for rt, spec in RESOURCE_TYPES.items() if is_resource_type_enabled(rt)]
|
|
|
|
|
|
def list_resource_types() -> list[dict[str, str]]:
|
|
"""Flat projection for /api/admin/resource-types.
|
|
|
|
Shape: ``[{key, display_name, description, id_format}]``. The
|
|
``list_blocks`` delegate is intentionally omitted — the UI consumes
|
|
blocks via ``/api/admin/access-overview`` instead.
|
|
"""
|
|
return [
|
|
{
|
|
"key": spec.key.value,
|
|
"display_name": spec.display_name,
|
|
"description": spec.description,
|
|
"id_format": spec.id_format,
|
|
}
|
|
for spec in enabled_resource_types()
|
|
]
|