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>
443 lines
17 KiB
Python
443 lines
17 KiB
Python
"""Password auth provider for FastAPI."""
|
|
|
|
import logging
|
|
import os
|
|
import secrets
|
|
from datetime import datetime, timedelta, timezone
|
|
from urllib.parse import quote
|
|
|
|
from fastapi import APIRouter, Depends, Form, HTTPException, Request
|
|
from fastapi.responses import HTMLResponse, RedirectResponse
|
|
from pydantic import BaseModel
|
|
import duckdb
|
|
from argon2 import PasswordHasher
|
|
from argon2.exceptions import VerifyMismatchError
|
|
|
|
from app.auth.jwt import create_access_token
|
|
from app.auth.access import is_user_admin
|
|
from app.auth.dependencies import _get_db, is_local_dev_mode
|
|
from src.repositories.users import UserRepository
|
|
|
|
|
|
def _role_label(user: dict, conn: duckdb.DuckDBPyConnection) -> str:
|
|
"""JWT/cookie role-claim label. ``admin`` for Admin group members,
|
|
otherwise the legacy column value (or ``user`` as fallback)."""
|
|
if is_user_admin(user["id"], conn):
|
|
return "admin"
|
|
return user.get("role") or "user"
|
|
|
|
logger = logging.getLogger(__name__)
|
|
router = APIRouter(prefix="/auth/password", tags=["auth"])
|
|
|
|
RESET_TOKEN_TTL = timedelta(hours=24)
|
|
SETUP_TOKEN_TTL = timedelta(days=7)
|
|
MIN_PASSWORD_LEN = 8
|
|
|
|
|
|
class PasswordLoginRequest(BaseModel):
|
|
email: str
|
|
password: str
|
|
|
|
|
|
class PasswordSetupRequest(BaseModel):
|
|
email: str
|
|
token: str
|
|
password: str
|
|
|
|
|
|
def is_available() -> bool:
|
|
return True # Always available
|
|
|
|
|
|
def _has_email_transport() -> bool:
|
|
return bool(os.environ.get("SMTP_HOST") or os.environ.get("SENDGRID_API_KEY"))
|
|
|
|
|
|
def _cookie_secure() -> bool:
|
|
# Secure cookie only over HTTPS (DOMAIN env set = production with TLS)
|
|
return os.environ.get("DOMAIN", "") != ""
|
|
|
|
|
|
def _set_login_cookie(response, user_id: str, email: str, role: str) -> None:
|
|
token = create_access_token(user_id, email, role)
|
|
response.set_cookie(
|
|
key="access_token", value=token,
|
|
httponly=True, max_age=86400, samesite="lax",
|
|
secure=_cookie_secure(),
|
|
)
|
|
|
|
|
|
def _base_url(request: Request) -> str:
|
|
explicit = os.environ.get("SERVER_URL")
|
|
if explicit:
|
|
return explicit.rstrip("/")
|
|
return str(request.base_url).rstrip("/")
|
|
|
|
|
|
def build_reset_url(request: Request, email: str, token: str) -> str:
|
|
return f"{_base_url(request)}/auth/password/reset?email={quote(email, safe='')}&token={token}"
|
|
|
|
|
|
def build_setup_url(request: Request, email: str, token: str) -> str:
|
|
return f"{_base_url(request)}/auth/password/setup?email={quote(email, safe='')}&token={token}"
|
|
|
|
|
|
def _token_is_fresh(created, ttl: timedelta) -> bool:
|
|
if not created:
|
|
return False
|
|
if isinstance(created, str):
|
|
try:
|
|
created = datetime.fromisoformat(created)
|
|
except ValueError:
|
|
return False
|
|
# DuckDB returns TIMESTAMP as offset-naive; we stored it as UTC, so assume UTC.
|
|
if created.tzinfo is None:
|
|
created = created.replace(tzinfo=timezone.utc)
|
|
return (datetime.now(timezone.utc) - created) <= ttl
|
|
|
|
|
|
def _render_message(request: Request, title: str, message: str, status_code: int = 200):
|
|
from app.web.router import templates, _build_context
|
|
ctx = _build_context(request, page_title=title, page_message=message)
|
|
return templates.TemplateResponse(request, "_message.html", ctx, status_code=status_code)
|
|
|
|
|
|
def _render_reset_form(request: Request, email: str, token: str, error: str = ""):
|
|
from app.web.router import templates, _build_context
|
|
ctx = _build_context(request, email=email, token=token, error=error)
|
|
return templates.TemplateResponse(request, "password_reset.html", ctx)
|
|
|
|
|
|
def _render_setup_form(request: Request, email: str, token: str, name: str = "", error: str = ""):
|
|
from app.web.router import templates, _build_context
|
|
ctx = _build_context(request, email=email, token=token, name=name, error=error)
|
|
return templates.TemplateResponse(request, "password_setup.html", ctx)
|
|
|
|
|
|
def _send_mail(to_email: str, subject: str, body_text: str) -> bool:
|
|
"""Send a plaintext email via SendGrid or SMTP. Returns True on success."""
|
|
try:
|
|
sendgrid_key = os.environ.get("SENDGRID_API_KEY")
|
|
if sendgrid_key:
|
|
import sendgrid
|
|
from sendgrid.helpers.mail import Mail
|
|
sg = sendgrid.SendGridAPIClient(api_key=sendgrid_key)
|
|
msg = Mail(
|
|
from_email=os.environ.get("EMAIL_FROM_ADDRESS", "noreply@example.com"),
|
|
to_emails=to_email,
|
|
subject=subject,
|
|
plain_text_content=body_text,
|
|
)
|
|
sg.send(msg)
|
|
return True
|
|
|
|
smtp_host = os.environ.get("SMTP_HOST")
|
|
if smtp_host:
|
|
import smtplib
|
|
from email.mime.text import MIMEText
|
|
msg = MIMEText(body_text)
|
|
msg["Subject"] = subject
|
|
msg["From"] = os.environ.get("SMTP_FROM", "noreply@example.com")
|
|
msg["To"] = to_email
|
|
with smtplib.SMTP(smtp_host, int(os.environ.get("SMTP_PORT", "587"))) as s:
|
|
if os.environ.get("SMTP_USE_TLS", "true").lower() == "true":
|
|
s.starttls()
|
|
smtp_user = os.environ.get("SMTP_USER")
|
|
if smtp_user:
|
|
s.login(smtp_user, os.environ.get("SMTP_PASSWORD", ""))
|
|
s.send_message(msg)
|
|
return True
|
|
except Exception:
|
|
logger.exception("Failed to send mail to %s", to_email)
|
|
return False
|
|
|
|
|
|
def send_reset_email(request: Request, email: str, token: str) -> bool:
|
|
"""Deliver a password-reset link. In LOCAL_DEV_MODE logs the link as well."""
|
|
link = build_reset_url(request, email, token)
|
|
if is_local_dev_mode():
|
|
logger.warning("=" * 60)
|
|
logger.warning("Password reset link for %s (LOCAL_DEV_MODE):", email)
|
|
logger.warning(" %s", link)
|
|
logger.warning("=" * 60)
|
|
if not _has_email_transport():
|
|
return False
|
|
return _send_mail(email, "Reset your password", f"Click to reset your password: {link}")
|
|
|
|
|
|
def send_setup_email(request: Request, email: str, token: str) -> bool:
|
|
link = build_setup_url(request, email, token)
|
|
if is_local_dev_mode():
|
|
logger.warning("=" * 60)
|
|
logger.warning("Account setup link for %s (LOCAL_DEV_MODE):", email)
|
|
logger.warning(" %s", link)
|
|
logger.warning("=" * 60)
|
|
if not _has_email_transport():
|
|
return False
|
|
return _send_mail(email, "Set up your account", f"Click to set up your password: {link}")
|
|
|
|
|
|
# ---- Existing flows ----
|
|
|
|
@router.post("/login")
|
|
async def password_login(
|
|
request: PasswordLoginRequest,
|
|
conn: duckdb.DuckDBPyConnection = Depends(_get_db),
|
|
):
|
|
"""Login with email + password."""
|
|
repo = UserRepository(conn)
|
|
user = repo.get_by_email(request.email)
|
|
if not user or not user.get("password_hash"):
|
|
raise HTTPException(status_code=401, detail="Invalid email or password")
|
|
if not bool(user.get("active", True)):
|
|
raise HTTPException(status_code=401, detail="Account deactivated")
|
|
|
|
try:
|
|
ph = PasswordHasher()
|
|
ph.verify(user["password_hash"], request.password)
|
|
except VerifyMismatchError:
|
|
raise HTTPException(status_code=401, detail="Invalid email or password")
|
|
except Exception:
|
|
logger.exception("Unexpected error during password verification")
|
|
raise HTTPException(status_code=500, detail="Internal server error")
|
|
|
|
role_label = _role_label(user, conn)
|
|
token = create_access_token(user["id"], user["email"], role_label)
|
|
return {"access_token": token, "token_type": "bearer", "email": user["email"], "role": role_label}
|
|
|
|
|
|
@router.post("/login/web")
|
|
async def password_login_web(
|
|
email: str = Form(...),
|
|
password: str = Form(""),
|
|
next: str = Form(""),
|
|
conn: duckdb.DuckDBPyConnection = Depends(_get_db),
|
|
):
|
|
"""Web form login — sets cookie and redirects to `next` (or /dashboard)."""
|
|
repo = UserRepository(conn)
|
|
user = repo.get_by_email(email)
|
|
if not user or not user.get("password_hash"):
|
|
return RedirectResponse(url="/login/password?error=invalid", status_code=302)
|
|
if not bool(user.get("active", True)):
|
|
return RedirectResponse(url="/login/password?error=deactivated", status_code=302)
|
|
|
|
try:
|
|
ph = PasswordHasher()
|
|
ph.verify(user["password_hash"], password)
|
|
except VerifyMismatchError:
|
|
return RedirectResponse(url="/login/password?error=invalid", status_code=302)
|
|
except Exception:
|
|
logger.exception("Unexpected error during web password verification for %s", email)
|
|
return RedirectResponse(url="/login/password?err=auth_internal", status_code=302)
|
|
|
|
target = next if (next.startswith("/") and not next.startswith("//")) else "/dashboard"
|
|
response = RedirectResponse(url=target, status_code=302)
|
|
_set_login_cookie(response, user["id"], user["email"], _role_label(user, conn))
|
|
return response
|
|
|
|
|
|
# ---- JSON programmatic setup (backward compat — used by existing tests) ----
|
|
|
|
@router.post("/setup")
|
|
async def password_setup(
|
|
request_body: PasswordSetupRequest,
|
|
conn: duckdb.DuckDBPyConnection = Depends(_get_db),
|
|
):
|
|
"""Set initial password using setup token (JSON API)."""
|
|
repo = UserRepository(conn)
|
|
user = repo.get_by_email(request_body.email)
|
|
if not user:
|
|
raise HTTPException(status_code=404, detail="User not found")
|
|
|
|
if user.get("setup_token") != request_body.token:
|
|
raise HTTPException(status_code=400, detail="Invalid setup token")
|
|
if not _token_is_fresh(user.get("setup_token_created"), SETUP_TOKEN_TTL):
|
|
raise HTTPException(status_code=400, detail="Setup token has expired")
|
|
if not bool(user.get("active", True)):
|
|
raise HTTPException(status_code=403, detail="Account deactivated")
|
|
|
|
if len(request_body.password) < MIN_PASSWORD_LEN:
|
|
raise HTTPException(status_code=400, detail=f"Password must be at least {MIN_PASSWORD_LEN} characters")
|
|
|
|
ph = PasswordHasher()
|
|
hashed = ph.hash(request_body.password)
|
|
|
|
repo.update(id=user["id"], password_hash=hashed, setup_token=None, setup_token_created=None)
|
|
token = create_access_token(user["id"], user["email"], _role_label(user, conn))
|
|
return {"access_token": token, "token_type": "bearer", "message": "Password set successfully"}
|
|
|
|
|
|
# ---- Web flow: password RESET ----
|
|
|
|
@router.get("/reset", response_class=HTMLResponse)
|
|
async def reset_page(
|
|
request: Request,
|
|
email: str = "",
|
|
token: str = "",
|
|
):
|
|
"""Render the 'set new password' form when arriving via reset link."""
|
|
if not email or not token:
|
|
return RedirectResponse(url="/login/password", status_code=302)
|
|
return _render_reset_form(request, email=email, token=token)
|
|
|
|
|
|
@router.post("/reset")
|
|
async def reset_request(
|
|
request: Request,
|
|
email: str = Form(""),
|
|
conn: duckdb.DuckDBPyConnection = Depends(_get_db),
|
|
):
|
|
"""Request a password-reset link. Anti-enumeration: same response regardless."""
|
|
# Match the rest of the codebase's case-sensitive lookup (password_login,
|
|
# email magic-link, admin create). Lowercasing here would silently fail
|
|
# for mixed-case emails the admin stored as-is.
|
|
email = (email or "").strip()
|
|
if email:
|
|
repo = UserRepository(conn)
|
|
user = repo.get_by_email(email)
|
|
if user and bool(user.get("active", True)):
|
|
token = secrets.token_urlsafe(32)
|
|
repo.update(
|
|
id=user["id"],
|
|
reset_token=token,
|
|
reset_token_created=datetime.now(timezone.utc),
|
|
)
|
|
send_reset_email(request, email, token)
|
|
return _render_message(
|
|
request,
|
|
title="Check your email",
|
|
message="If an account exists for that email, a password-reset link has been sent. "
|
|
"The link is valid for 24 hours.",
|
|
)
|
|
|
|
|
|
@router.post("/reset/confirm")
|
|
async def reset_confirm(
|
|
request: Request,
|
|
email: str = Form(...),
|
|
token: str = Form(...),
|
|
password: str = Form(...),
|
|
confirm_password: str = Form(...),
|
|
conn: duckdb.DuckDBPyConnection = Depends(_get_db),
|
|
):
|
|
"""Submit a new password using a reset token."""
|
|
if password != confirm_password:
|
|
return _render_reset_form(request, email=email, token=token, error="Passwords do not match.")
|
|
if len(password) < MIN_PASSWORD_LEN:
|
|
return _render_reset_form(
|
|
request, email=email, token=token,
|
|
error=f"Password must be at least {MIN_PASSWORD_LEN} characters.",
|
|
)
|
|
|
|
repo = UserRepository(conn)
|
|
user = repo.get_by_email(email)
|
|
if not user or user.get("reset_token") != token:
|
|
return _render_reset_form(request, email=email, token=token, error="Invalid or expired reset link.")
|
|
if not _token_is_fresh(user.get("reset_token_created"), RESET_TOKEN_TTL):
|
|
return _render_reset_form(request, email=email, token=token, error="Reset link has expired. Please request a new one.")
|
|
if not bool(user.get("active", True)):
|
|
return _render_reset_form(request, email=email, token=token, error="This account is deactivated.")
|
|
|
|
ph = PasswordHasher()
|
|
repo.update(
|
|
id=user["id"],
|
|
password_hash=ph.hash(password),
|
|
reset_token=None,
|
|
reset_token_created=None,
|
|
)
|
|
|
|
response = RedirectResponse(url="/login/password?msg=password_reset", status_code=302)
|
|
_set_login_cookie(response, user["id"], user["email"], _role_label(user, conn))
|
|
return response
|
|
|
|
|
|
# ---- Web flow: initial SETUP ----
|
|
|
|
@router.get("/setup", response_class=HTMLResponse)
|
|
async def setup_page(
|
|
request: Request,
|
|
email: str = "",
|
|
token: str = "",
|
|
):
|
|
"""Render the initial 'set password + name' form when arriving via invite link.
|
|
|
|
Note: we render the form based on URL params only, without a DB lookup, so
|
|
the response is identical for valid and invalid email/token combinations
|
|
(anti-enumeration). Token validity is checked at POST /setup/confirm."""
|
|
if not email or not token:
|
|
return RedirectResponse(url="/login/password", status_code=302)
|
|
return _render_setup_form(request, email=email, token=token)
|
|
|
|
|
|
@router.post("/setup/request")
|
|
async def setup_request(
|
|
request: Request,
|
|
email: str = Form(""),
|
|
conn: duckdb.DuckDBPyConnection = Depends(_get_db),
|
|
):
|
|
"""Self-service 'Request Access' — emails a setup link if user is pre-approved and unset."""
|
|
# Match the rest of the codebase's case-sensitive lookup (password_login,
|
|
# email magic-link, admin create). Lowercasing here would silently fail
|
|
# for mixed-case emails the admin stored as-is.
|
|
email = (email or "").strip()
|
|
if email:
|
|
repo = UserRepository(conn)
|
|
user = repo.get_by_email(email)
|
|
# Only issue setup token if user exists, has no password yet, and is active.
|
|
if user and not user.get("password_hash") and bool(user.get("active", True)):
|
|
token = secrets.token_urlsafe(32)
|
|
repo.update(
|
|
id=user["id"],
|
|
setup_token=token,
|
|
setup_token_created=datetime.now(timezone.utc),
|
|
)
|
|
send_setup_email(request, email, token)
|
|
return _render_message(
|
|
request,
|
|
title="Check your email",
|
|
message="If your account is pre-approved, a setup link has been sent to your email. "
|
|
"Ask an administrator if you do not receive it.",
|
|
)
|
|
|
|
|
|
@router.post("/setup/confirm")
|
|
async def setup_confirm(
|
|
request: Request,
|
|
email: str = Form(...),
|
|
token: str = Form(...),
|
|
password: str = Form(...),
|
|
confirm_password: str = Form(...),
|
|
name: str = Form(""),
|
|
conn: duckdb.DuckDBPyConnection = Depends(_get_db),
|
|
):
|
|
"""Web form: complete initial password setup via setup token."""
|
|
if password != confirm_password:
|
|
return _render_setup_form(request, email=email, token=token, name=name, error="Passwords do not match.")
|
|
if len(password) < MIN_PASSWORD_LEN:
|
|
return _render_setup_form(
|
|
request, email=email, token=token, name=name,
|
|
error=f"Password must be at least {MIN_PASSWORD_LEN} characters.",
|
|
)
|
|
|
|
repo = UserRepository(conn)
|
|
user = repo.get_by_email(email)
|
|
if not user or user.get("setup_token") != token:
|
|
return _render_setup_form(request, email=email, token=token, name=name, error="Invalid or expired setup link.")
|
|
if not _token_is_fresh(user.get("setup_token_created"), SETUP_TOKEN_TTL):
|
|
return _render_setup_form(request, email=email, token=token, name=name, error="Setup link has expired. Ask an administrator for a new one.")
|
|
if not bool(user.get("active", True)):
|
|
return _render_setup_form(request, email=email, token=token, name=name, error="This account is deactivated.")
|
|
|
|
ph = PasswordHasher()
|
|
updates: dict = dict(
|
|
password_hash=ph.hash(password),
|
|
setup_token=None,
|
|
setup_token_created=None,
|
|
)
|
|
if name.strip():
|
|
updates["name"] = name.strip()
|
|
repo.update(id=user["id"], **updates)
|
|
|
|
response = RedirectResponse(url="/dashboard", status_code=302)
|
|
_set_login_cookie(response, user["id"], user["email"], _role_label(user, conn))
|
|
return response
|