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>
312 lines
11 KiB
Python
312 lines
11 KiB
Python
"""Tests for #11 — user management (active flag, safeguards, endpoints)."""
|
|
|
|
import os
|
|
import tempfile
|
|
import pytest
|
|
|
|
import duckdb
|
|
|
|
from src.db import _ensure_schema, get_schema_version
|
|
|
|
|
|
@pytest.fixture
|
|
def fresh_db(monkeypatch):
|
|
with tempfile.TemporaryDirectory() as tmp:
|
|
monkeypatch.setenv("DATA_DIR", tmp)
|
|
# Reset cached system DB so we open a brand-new instance in tmp
|
|
from src.db import close_system_db
|
|
close_system_db()
|
|
yield tmp
|
|
close_system_db()
|
|
|
|
|
|
def test_schema_v5_adds_active_column(fresh_db):
|
|
from src.db import get_system_db, close_system_db
|
|
conn = get_system_db()
|
|
try:
|
|
cols = conn.execute("PRAGMA table_info(users)").fetchall()
|
|
col_names = [c[1] for c in cols]
|
|
assert "active" in col_names
|
|
assert "deactivated_at" in col_names
|
|
assert "deactivated_by" in col_names
|
|
assert get_schema_version(conn) >= 5
|
|
finally:
|
|
conn.close()
|
|
close_system_db()
|
|
|
|
|
|
def test_schema_v5_backfill_keeps_existing_users_active(fresh_db):
|
|
"""Simulate upgrading from v4: insert a user pre-migration, verify active=TRUE afterwards."""
|
|
import uuid
|
|
import duckdb as _duckdb
|
|
from pathlib import Path
|
|
|
|
# 1. Create a v4-era DB by hand.
|
|
db_dir = Path(fresh_db) / "state"
|
|
db_dir.mkdir(parents=True, exist_ok=True)
|
|
db_path = db_dir / "system.duckdb"
|
|
conn = _duckdb.connect(str(db_path))
|
|
try:
|
|
conn.execute("CREATE TABLE schema_version (version INTEGER NOT NULL, applied_at TIMESTAMP DEFAULT current_timestamp)")
|
|
conn.execute("INSERT INTO schema_version (version) VALUES (4)")
|
|
conn.execute("""CREATE TABLE users (
|
|
id VARCHAR PRIMARY KEY, email VARCHAR UNIQUE NOT NULL,
|
|
name VARCHAR, role VARCHAR DEFAULT 'analyst',
|
|
password_hash VARCHAR, setup_token VARCHAR,
|
|
setup_token_created TIMESTAMP, reset_token VARCHAR,
|
|
reset_token_created TIMESTAMP,
|
|
created_at TIMESTAMP DEFAULT current_timestamp, updated_at TIMESTAMP)""")
|
|
uid = str(uuid.uuid4())
|
|
conn.execute("INSERT INTO users (id, email, name, role) VALUES (?, 'pre@v4', 'Pre', 'admin')", [uid])
|
|
finally:
|
|
conn.close()
|
|
|
|
# 2. Now let the app open it — schema should migrate to v5 and backfill active=TRUE.
|
|
from src.db import get_system_db, close_system_db, get_schema_version
|
|
close_system_db()
|
|
conn = get_system_db()
|
|
try:
|
|
assert get_schema_version(conn) >= 5
|
|
row = conn.execute("SELECT email, active FROM users WHERE email = 'pre@v4'").fetchone()
|
|
assert row is not None
|
|
assert row[1] is True
|
|
finally:
|
|
conn.close()
|
|
close_system_db()
|
|
|
|
|
|
def test_repository_update_accepts_active(fresh_db):
|
|
import uuid
|
|
from src.db import get_system_db, close_system_db
|
|
from src.repositories.users import UserRepository
|
|
conn = get_system_db()
|
|
try:
|
|
repo = UserRepository(conn)
|
|
uid = str(uuid.uuid4())
|
|
repo.create(id=uid, email="a@b.c", name="A", role="analyst")
|
|
repo.update(id=uid, active=False, deactivated_by="admin-uuid")
|
|
row = repo.get_by_id(uid)
|
|
assert row["active"] is False
|
|
assert row["deactivated_by"] == "admin-uuid"
|
|
finally:
|
|
conn.close()
|
|
close_system_db()
|
|
|
|
|
|
def test_repository_count_admins(fresh_db):
|
|
"""v12: count_admins counts users in the Admin system group, not users.role."""
|
|
import uuid
|
|
from src.db import SYSTEM_ADMIN_GROUP, get_system_db, close_system_db
|
|
from src.repositories.user_group_members import UserGroupMembersRepository
|
|
from src.repositories.users import UserRepository
|
|
conn = get_system_db()
|
|
try:
|
|
repo = UserRepository(conn)
|
|
assert repo.count_admins() == 0
|
|
admin_gid = conn.execute(
|
|
"SELECT id FROM user_groups WHERE name = ?", [SYSTEM_ADMIN_GROUP]
|
|
).fetchone()[0]
|
|
admin_id = str(uuid.uuid4())
|
|
repo.create(id=admin_id, email="a@b.c", name="A", role="admin")
|
|
UserGroupMembersRepository(conn).add_member(admin_id, admin_gid, source="system_seed")
|
|
repo.create(id=str(uuid.uuid4()), email="b@b.c", name="B", role="analyst")
|
|
assert repo.count_admins() == 1
|
|
finally:
|
|
conn.close()
|
|
close_system_db()
|
|
|
|
|
|
from fastapi.testclient import TestClient
|
|
|
|
|
|
@pytest.fixture
|
|
def app_client(fresh_db, monkeypatch):
|
|
monkeypatch.setenv("TESTING", "1")
|
|
monkeypatch.setenv("JWT_SECRET_KEY", "test-jwt-secret-key-minimum-32-chars!!")
|
|
from app.main import app
|
|
return TestClient(app)
|
|
|
|
|
|
def _seed_admin(fresh_db):
|
|
"""Create an admin user (in Admin user_group) and return (id, bearer_token)."""
|
|
import uuid
|
|
from src.db import SYSTEM_ADMIN_GROUP, get_system_db
|
|
from src.repositories.user_group_members import UserGroupMembersRepository
|
|
from src.repositories.users import UserRepository
|
|
from app.auth.jwt import create_access_token
|
|
conn = get_system_db()
|
|
try:
|
|
uid = str(uuid.uuid4())
|
|
UserRepository(conn).create(id=uid, email="admin@test", name="Admin", role="admin")
|
|
admin_gid = conn.execute(
|
|
"SELECT id FROM user_groups WHERE name = ?", [SYSTEM_ADMIN_GROUP]
|
|
).fetchone()[0]
|
|
UserGroupMembersRepository(conn).add_member(uid, admin_gid, source="system_seed")
|
|
token = create_access_token(user_id=uid, email="admin@test", role="admin")
|
|
return uid, token
|
|
finally:
|
|
conn.close()
|
|
|
|
|
|
def test_patch_user_updates_role(app_client, fresh_db):
|
|
import uuid
|
|
from src.db import get_system_db
|
|
from src.repositories.users import UserRepository
|
|
admin_id, token = _seed_admin(fresh_db)
|
|
target_id = str(uuid.uuid4())
|
|
conn = get_system_db()
|
|
try:
|
|
UserRepository(conn).create(id=target_id, email="x@test", name="X", role="viewer")
|
|
finally:
|
|
conn.close()
|
|
|
|
resp = app_client.patch(
|
|
f"/api/users/{target_id}",
|
|
headers={"Authorization": f"Bearer {token}"},
|
|
json={"role": "analyst", "name": "X2"},
|
|
)
|
|
assert resp.status_code == 200
|
|
data = resp.json()
|
|
# v12: role response is admin/user based on Admin group membership.
|
|
# Patching role="analyst" is a no-op for the admin group → still "user".
|
|
assert data["role"] == "user"
|
|
assert data["name"] == "X2"
|
|
|
|
|
|
def test_cannot_self_deactivate(app_client, fresh_db):
|
|
admin_id, token = _seed_admin(fresh_db)
|
|
resp = app_client.patch(
|
|
f"/api/users/{admin_id}",
|
|
headers={"Authorization": f"Bearer {token}"},
|
|
json={"active": False},
|
|
)
|
|
assert resp.status_code == 409
|
|
assert "yourself" in resp.json()["detail"].lower()
|
|
|
|
|
|
def test_cannot_delete_last_admin(app_client, fresh_db):
|
|
"""Deleting the sole active admin must 409.
|
|
Note: the endpoint checks self-delete first, which also triggers 409 here,
|
|
so we accept either "yourself" or "last" wording — the point is the
|
|
safeguard blocks deletion of the only admin."""
|
|
admin_id, token = _seed_admin(fresh_db)
|
|
# Create a non-admin so we have ≥2 users, but admin is still the only admin.
|
|
resp = app_client.post(
|
|
"/api/users",
|
|
headers={"Authorization": f"Bearer {token}"},
|
|
json={"email": "x@test", "name": "X", "role": "viewer"},
|
|
)
|
|
x_id = resp.json()["id"]
|
|
# Try deleting the admin.
|
|
resp = app_client.delete(
|
|
f"/api/users/{admin_id}",
|
|
headers={"Authorization": f"Bearer {token}"},
|
|
)
|
|
assert resp.status_code == 409
|
|
detail = resp.json()["detail"].lower()
|
|
assert "last" in detail or "yourself" in detail
|
|
|
|
|
|
def test_deactivated_user_cannot_authenticate(app_client, fresh_db):
|
|
"""A deactivated user's old JWT must be rejected."""
|
|
import uuid
|
|
from src.db import get_system_db
|
|
from src.repositories.users import UserRepository
|
|
from app.auth.jwt import create_access_token
|
|
|
|
conn = get_system_db()
|
|
try:
|
|
uid = str(uuid.uuid4())
|
|
UserRepository(conn).create(id=uid, email="u@test", name="U", role="analyst")
|
|
token = create_access_token(user_id=uid, email="u@test", role="analyst")
|
|
UserRepository(conn).update(id=uid, active=False)
|
|
finally:
|
|
conn.close()
|
|
|
|
resp = app_client.get(
|
|
"/api/users", # any authenticated endpoint
|
|
headers={"Authorization": f"Bearer {token}", "Accept": "application/json"},
|
|
)
|
|
# Deactivated — must not succeed.
|
|
assert resp.status_code in (401, 403)
|
|
|
|
|
|
def test_admin_users_page_renders_for_admin(app_client, fresh_db):
|
|
admin_id, token = _seed_admin(fresh_db)
|
|
resp = app_client.get(
|
|
"/admin/users",
|
|
headers={"Accept": "text/html"},
|
|
cookies={"access_token": token},
|
|
)
|
|
assert resp.status_code == 200
|
|
assert 'class="users-title">Users' in resp.text
|
|
|
|
|
|
def test_admin_users_page_denies_non_admin(app_client, fresh_db):
|
|
import uuid
|
|
from src.db import get_system_db
|
|
from src.repositories.users import UserRepository
|
|
from app.auth.jwt import create_access_token
|
|
conn = get_system_db()
|
|
try:
|
|
uid = str(uuid.uuid4())
|
|
UserRepository(conn).create(id=uid, email="a@test", name="A", role="analyst")
|
|
token = create_access_token(user_id=uid, email="a@test", role="analyst")
|
|
finally:
|
|
conn.close()
|
|
resp = app_client.get(
|
|
"/admin/users",
|
|
headers={"Accept": "text/html"},
|
|
cookies={"access_token": token},
|
|
follow_redirects=False,
|
|
)
|
|
# HTML request to admin-only page → 302 (to /login) for non-admin per Phase 0, or 403.
|
|
# Phase 0 is out of scope here so we accept 403 (current behaviour) or 302.
|
|
assert resp.status_code in (302, 403)
|
|
|
|
|
|
def test_deactivated_admin_rejected_by_active_check(app_client, fresh_db):
|
|
"""Deactivating an admin must cause their token to be rejected as 401 (not succeed)."""
|
|
import uuid
|
|
from src.db import get_system_db
|
|
from src.repositories.users import UserRepository
|
|
from app.auth.jwt import create_access_token
|
|
|
|
# Seed two admins so we can deactivate one without tripping the last-admin rule.
|
|
admin_id, admin_token = _seed_admin(fresh_db)
|
|
conn = get_system_db()
|
|
try:
|
|
other_uid = str(uuid.uuid4())
|
|
UserRepository(conn).create(id=other_uid, email="other@test", name="Other", role="admin")
|
|
other_token = create_access_token(user_id=other_uid, email="other@test", role="admin")
|
|
# Directly deactivate the "other" admin via repository (bypass safeguard
|
|
# because we already have 2 admins; this is just a state setup).
|
|
UserRepository(conn).update(id=other_uid, active=False)
|
|
finally:
|
|
conn.close()
|
|
|
|
resp = app_client.get(
|
|
"/api/users",
|
|
headers={"Authorization": f"Bearer {other_token}", "Accept": "application/json"},
|
|
)
|
|
assert resp.status_code == 401
|
|
assert "deactivated" in resp.json().get("detail", "").lower()
|
|
|
|
|
|
def test_cannot_deactivate_last_admin(app_client, fresh_db):
|
|
admin_id, token = _seed_admin(fresh_db)
|
|
# Create a second user and try to demote the current admin via PATCH.
|
|
resp = app_client.post(
|
|
"/api/users",
|
|
headers={"Authorization": f"Bearer {token}"},
|
|
json={"email": "y@test", "name": "Y", "role": "viewer"},
|
|
)
|
|
y_id = resp.json()["id"]
|
|
# Try to demote self (admin → viewer) while only admin — should fail.
|
|
resp = app_client.patch(
|
|
f"/api/users/{admin_id}",
|
|
headers={"Authorization": f"Bearer {token}"},
|
|
json={"role": "viewer"},
|
|
)
|
|
assert resp.status_code == 409
|
|
assert "admin" in resp.json()["detail"].lower()
|