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>
88 lines
5.2 KiB
HTML
88 lines
5.2 KiB
HTML
{# Shared modern header — used by base.html and dashboard.html.
|
|
Styles live in app/web/static/style-custom.css under the .app-* prefix. #}
|
|
{% if session.user %}
|
|
<header class="app-header">
|
|
<div class="app-header-left">
|
|
<a class="app-header-logo" href="/" aria-label="Home">
|
|
{% if config.LOGO_SVG %}{{ config.LOGO_SVG | safe }}{% else %}{{ config.INSTANCE_NAME or 'Data Analyst Portal' }}{% endif %}
|
|
</a>
|
|
<span class="app-header-subtitle">{{ config.INSTANCE_SUBTITLE or 'Data Analyst Portal' }}</span>
|
|
</div>
|
|
<div class="app-header-right">
|
|
{% set _path = request.url.path %}
|
|
<a class="app-nav-link {% if _path == '/dashboard' or _path == '/' %}is-active{% endif %}" href="/dashboard">Dashboard</a>
|
|
<a class="app-nav-link {% if _path.startswith('/install') %}is-active{% endif %}" href="/install">Install CLI</a>
|
|
{% if session.user.role == 'admin' %}
|
|
<a class="app-nav-link {% if _path.startswith('/admin/tokens') %}is-active{% endif %}" href="/admin/tokens">All tokens</a>
|
|
<a class="app-nav-link {% if _path.startswith('/admin/marketplaces') %}is-active{% endif %}" href="/admin/marketplaces">Marketplaces</a>
|
|
{% set _admin_active = _path.startswith('/admin/users') or _path.startswith('/admin/groups') or _path.startswith('/admin/access') %}
|
|
<div class="app-nav-menu" id="adminNavMenu">
|
|
<button type="button"
|
|
class="app-nav-link app-nav-menu-trigger {% if _admin_active %}is-active{% endif %}"
|
|
id="adminNavTrigger"
|
|
aria-haspopup="menu" aria-expanded="false" aria-controls="adminNavPanel">
|
|
Admin
|
|
<svg class="app-nav-menu-chevron" width="10" height="10" viewBox="0 0 12 12" aria-hidden="true">
|
|
<path d="M2 4l4 4 4-4" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
|
|
</svg>
|
|
</button>
|
|
<div class="app-nav-menu-panel" id="adminNavPanel" role="menu" hidden>
|
|
<a class="app-nav-menu-item {% if _path.startswith('/admin/users') %}is-active{% endif %}" role="menuitem" href="/admin/users">Users</a>
|
|
<a class="app-nav-menu-item {% if _path.startswith('/admin/groups') %}is-active{% endif %}" role="menuitem" href="/admin/groups">Groups</a>
|
|
<a class="app-nav-menu-item {% if _path.startswith('/admin/access') %}is-active{% endif %}" role="menuitem" href="/admin/access">Resource access</a>
|
|
</div>
|
|
</div>
|
|
{% endif %}
|
|
|
|
<div class="app-user-menu" id="userMenu">
|
|
<button type="button" class="app-user-menu-trigger" id="userMenuTrigger"
|
|
aria-haspopup="menu" aria-expanded="false" aria-controls="userMenuPanel">
|
|
{% if session.user.picture %}
|
|
<img src="{{ session.user.picture }}" alt="" class="app-avatar-img">
|
|
{% else %}
|
|
<span class="app-avatar">{{ (session.user.name or session.user.email)[:2] | upper }}</span>
|
|
{% endif %}
|
|
<svg class="app-user-menu-chevron" width="12" height="12" viewBox="0 0 12 12" aria-hidden="true">
|
|
<path d="M2 4l4 4 4-4" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
|
|
</svg>
|
|
</button>
|
|
<div class="app-user-menu-panel" id="userMenuPanel" role="menu" hidden>
|
|
<div class="app-user-menu-header">
|
|
<div class="app-user-menu-email">{{ session.user.email }}</div>
|
|
{% if session.user.role %}
|
|
<div class="app-user-menu-role">{{ session.user.role | capitalize }}</div>
|
|
{% endif %}
|
|
</div>
|
|
<a class="app-user-menu-item {% if _path.startswith('/profile') %}is-active{% endif %}" role="menuitem" href="/profile">Profile</a>
|
|
<a class="app-user-menu-item {% if _path == '/tokens' %}is-active{% endif %}" role="menuitem" href="/tokens">My tokens</a>
|
|
<a class="app-user-menu-item" role="menuitem" href="{{ url_for('auth.logout') }}">Logout</a>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</header>
|
|
<script>
|
|
// Generic toggle pattern — used by both the user menu and the Admin nav dropdown.
|
|
function _wireDropdown(triggerId, panelId) {
|
|
var trigger = document.getElementById(triggerId);
|
|
var panel = document.getElementById(panelId);
|
|
if (!trigger || !panel) return;
|
|
function setOpen(open) {
|
|
trigger.setAttribute('aria-expanded', open ? 'true' : 'false');
|
|
if (open) { panel.removeAttribute('hidden'); }
|
|
else { panel.setAttribute('hidden', ''); }
|
|
}
|
|
trigger.addEventListener('click', function(e) {
|
|
e.stopPropagation();
|
|
setOpen(trigger.getAttribute('aria-expanded') !== 'true');
|
|
});
|
|
document.addEventListener('click', function(e) {
|
|
if (!panel.contains(e.target) && e.target !== trigger) setOpen(false);
|
|
});
|
|
document.addEventListener('keydown', function(e) {
|
|
if (e.key === 'Escape') { setOpen(false); trigger.focus(); }
|
|
});
|
|
}
|
|
_wireDropdown('userMenuTrigger', 'userMenuPanel');
|
|
_wireDropdown('adminNavTrigger', 'adminNavPanel');
|
|
</script>
|
|
{% endif %}
|