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>
207 lines
7.4 KiB
Python
207 lines
7.4 KiB
Python
"""Unit tests for app.auth.group_sync.fetch_user_groups."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import sys
|
|
from types import SimpleNamespace
|
|
from unittest import mock
|
|
|
|
import pytest
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Mock env flag
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
class TestMockFlag:
|
|
def test_returns_parsed_list(self, monkeypatch):
|
|
monkeypatch.setenv(
|
|
"GOOGLE_ADMIN_SDK_MOCK_GROUPS",
|
|
"grp_a@groupon.com, grp_b@groupon.com , grp_c@groupon.com",
|
|
)
|
|
from app.auth.group_sync import fetch_user_groups
|
|
assert fetch_user_groups("any@x") == [
|
|
"grp_a@groupon.com",
|
|
"grp_b@groupon.com",
|
|
"grp_c@groupon.com",
|
|
]
|
|
|
|
def test_empty_value_returns_empty_list(self, monkeypatch):
|
|
"""Setting the flag to the empty string returns [] — explicit 'no groups'."""
|
|
monkeypatch.setenv("GOOGLE_ADMIN_SDK_MOCK_GROUPS", "")
|
|
from app.auth.group_sync import fetch_user_groups
|
|
assert fetch_user_groups("any@x") == []
|
|
|
|
def test_single_value_no_comma(self, monkeypatch):
|
|
monkeypatch.setenv("GOOGLE_ADMIN_SDK_MOCK_GROUPS", "solo@groupon.com")
|
|
from app.auth.group_sync import fetch_user_groups
|
|
assert fetch_user_groups("any@x") == ["solo@groupon.com"]
|
|
|
|
def test_trailing_commas_are_skipped(self, monkeypatch):
|
|
monkeypatch.setenv("GOOGLE_ADMIN_SDK_MOCK_GROUPS", "a@x, , ,b@x,,")
|
|
from app.auth.group_sync import fetch_user_groups
|
|
assert fetch_user_groups("u@x") == ["a@x", "b@x"]
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Real path (monkeypatched Google client)
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def _make_service_mock(pages: list[dict]) -> mock.Mock:
|
|
"""Build a mock for `service.groups().memberships().searchTransitiveGroups(...).execute()`
|
|
that returns the given pages in order."""
|
|
page_iter = iter(pages)
|
|
|
|
def execute_side_effect(*_a, **_kw):
|
|
return next(page_iter)
|
|
|
|
search = mock.Mock()
|
|
search.return_value.execute.side_effect = execute_side_effect
|
|
memberships = mock.Mock()
|
|
memberships.return_value.searchTransitiveGroups = search
|
|
groups = mock.Mock()
|
|
groups.return_value.memberships = memberships
|
|
service = mock.Mock()
|
|
service.groups = groups
|
|
return service, search
|
|
|
|
|
|
class TestRealPath:
|
|
def test_success_single_page(self, monkeypatch):
|
|
monkeypatch.delenv("GOOGLE_ADMIN_SDK_MOCK_GROUPS", raising=False)
|
|
service, search = _make_service_mock(
|
|
[
|
|
{
|
|
"memberships": [
|
|
{"groupKey": {"id": "grp_a@groupon.com"}},
|
|
{"groupKey": {"id": "grp_b@groupon.com"}},
|
|
]
|
|
# no nextPageToken
|
|
}
|
|
]
|
|
)
|
|
monkeypatch.setattr(
|
|
"google.auth.default",
|
|
lambda scopes=None: (mock.Mock(), "test-project"),
|
|
)
|
|
monkeypatch.setattr(
|
|
"googleapiclient.discovery.build",
|
|
lambda *a, **kw: service,
|
|
)
|
|
|
|
from app.auth.group_sync import fetch_user_groups
|
|
result = fetch_user_groups("user@groupon.com")
|
|
assert result == ["grp_a@groupon.com", "grp_b@groupon.com"]
|
|
|
|
# CEL query contains email + discussion_forum label filter
|
|
call_kwargs = search.call_args.kwargs
|
|
assert call_kwargs["parent"] == "groups/-"
|
|
assert "member_key_id == 'user@groupon.com'" in call_kwargs["query"]
|
|
assert "discussion_forum" in call_kwargs["query"]
|
|
|
|
def test_success_paginated(self, monkeypatch):
|
|
monkeypatch.delenv("GOOGLE_ADMIN_SDK_MOCK_GROUPS", raising=False)
|
|
service, search = _make_service_mock(
|
|
[
|
|
{
|
|
"memberships": [{"groupKey": {"id": "page1@x"}}],
|
|
"nextPageToken": "tok1",
|
|
},
|
|
{
|
|
"memberships": [{"groupKey": {"id": "page2@x"}}],
|
|
# terminal
|
|
},
|
|
]
|
|
)
|
|
monkeypatch.setattr(
|
|
"google.auth.default",
|
|
lambda scopes=None: (mock.Mock(), "test-project"),
|
|
)
|
|
monkeypatch.setattr(
|
|
"googleapiclient.discovery.build",
|
|
lambda *a, **kw: service,
|
|
)
|
|
|
|
from app.auth.group_sync import fetch_user_groups
|
|
result = fetch_user_groups("u@x")
|
|
assert result == ["page1@x", "page2@x"]
|
|
|
|
# Second call should have pageToken=tok1
|
|
assert search.call_args_list[1].kwargs["pageToken"] == "tok1"
|
|
|
|
def test_api_exception_returns_empty(self, monkeypatch):
|
|
monkeypatch.delenv("GOOGLE_ADMIN_SDK_MOCK_GROUPS", raising=False)
|
|
|
|
def raise_boom(*a, **kw):
|
|
raise RuntimeError("boom")
|
|
|
|
service = mock.Mock()
|
|
service.groups.return_value.memberships.return_value.searchTransitiveGroups.return_value.execute.side_effect = raise_boom
|
|
monkeypatch.setattr(
|
|
"google.auth.default",
|
|
lambda scopes=None: (mock.Mock(), "test-project"),
|
|
)
|
|
monkeypatch.setattr(
|
|
"googleapiclient.discovery.build",
|
|
lambda *a, **kw: service,
|
|
)
|
|
|
|
from app.auth.group_sync import fetch_user_groups
|
|
assert fetch_user_groups("user@x") == []
|
|
|
|
def test_client_init_exception_returns_empty(self, monkeypatch):
|
|
"""Errors before the API call (ADC, discovery.build) also fail-soft."""
|
|
monkeypatch.delenv("GOOGLE_ADMIN_SDK_MOCK_GROUPS", raising=False)
|
|
|
|
def boom(*a, **kw):
|
|
raise RuntimeError("no metadata server")
|
|
|
|
monkeypatch.setattr("google.auth.default", boom)
|
|
|
|
from app.auth.group_sync import fetch_user_groups
|
|
assert fetch_user_groups("user@x") == []
|
|
|
|
def test_memberships_without_groupkey_are_skipped(self, monkeypatch):
|
|
"""Defensive: a malformed membership missing groupKey.id must not crash."""
|
|
monkeypatch.delenv("GOOGLE_ADMIN_SDK_MOCK_GROUPS", raising=False)
|
|
service, _ = _make_service_mock(
|
|
[
|
|
{
|
|
"memberships": [
|
|
{"groupKey": {"id": "good@x"}},
|
|
{"groupKey": {}}, # missing id
|
|
{}, # missing groupKey
|
|
]
|
|
}
|
|
]
|
|
)
|
|
monkeypatch.setattr(
|
|
"google.auth.default",
|
|
lambda scopes=None: (mock.Mock(), "test-project"),
|
|
)
|
|
monkeypatch.setattr(
|
|
"googleapiclient.discovery.build",
|
|
lambda *a, **kw: service,
|
|
)
|
|
|
|
from app.auth.group_sync import fetch_user_groups
|
|
assert fetch_user_groups("u@x") == ["good@x"]
|
|
|
|
def test_email_with_quote_is_escaped(self, monkeypatch):
|
|
"""A single quote in the email must not break the CEL query."""
|
|
monkeypatch.delenv("GOOGLE_ADMIN_SDK_MOCK_GROUPS", raising=False)
|
|
service, search = _make_service_mock([{"memberships": []}])
|
|
monkeypatch.setattr(
|
|
"google.auth.default",
|
|
lambda scopes=None: (mock.Mock(), "test-project"),
|
|
)
|
|
monkeypatch.setattr(
|
|
"googleapiclient.discovery.build",
|
|
lambda *a, **kw: service,
|
|
)
|
|
|
|
from app.auth.group_sync import fetch_user_groups
|
|
fetch_user_groups("o'reilly@x")
|
|
assert "\\'" in search.call_args.kwargs["query"]
|