Adriano Dal Pastro
6ff78b2150
Until now the out-of-tolerance authorization ("Autorizzazione capoturno")
required is_admin, conflating shift-leader authority with full system
administration. Introduce a combinable Supervisor role so a capoturno can
authorize overrides without admin privileges (roadmap D-0.8 / Phase 2).
Backend:
- users router: add "Supervisor" to the allowed roles (centralized as
VALID_ROLES, deduplicating the create/update validation).
- middleware: add require_supervisor dependency (admins still bypass).
Frontend:
- measure.validate_supervisor: authorize users with the Supervisor role OR
is_admin (was is_admin only).
- admin/users: Supervisor checkbox + orange role badge.
- profile: explicit Supervisor badge styling.
- EN translation for the new role label.
roles is a free JSON column, so no migration is required.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
73 lines
2.3 KiB
Python
73 lines
2.3 KiB
Python
"""API Key authentication dependency for FastAPI."""
|
|
from fastapi import Depends, HTTPException, Request, status
|
|
from sqlalchemy import select
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from src.backend.database import get_db
|
|
from src.backend.models.orm.user import User
|
|
|
|
|
|
async def get_current_user(
|
|
request: Request,
|
|
db: AsyncSession = Depends(get_db),
|
|
) -> User:
|
|
"""Extract API key from header and return the authenticated user.
|
|
|
|
The API key is sent in the X-API-Key header on every request.
|
|
Login endpoint is excluded from this check.
|
|
"""
|
|
api_key = request.headers.get("X-API-Key")
|
|
if not api_key:
|
|
raise HTTPException(
|
|
status_code=status.HTTP_401_UNAUTHORIZED,
|
|
detail="Missing API key in X-API-Key header",
|
|
)
|
|
|
|
result = await db.execute(
|
|
select(User).where(User.api_key == api_key, User.active == True)
|
|
)
|
|
user = result.scalar_one_or_none()
|
|
|
|
if user is None:
|
|
raise HTTPException(
|
|
status_code=status.HTTP_401_UNAUTHORIZED,
|
|
detail="Invalid or inactive API key",
|
|
)
|
|
|
|
# Store user_id in request state for access logging middleware
|
|
request.state.user_id = user.id
|
|
|
|
return user
|
|
|
|
|
|
def require_role(role: str):
|
|
"""Dependency factory that checks if user has a specific role."""
|
|
async def check_role(user: User = Depends(get_current_user)) -> User:
|
|
if not user.has_role(role) and not user.is_admin:
|
|
raise HTTPException(
|
|
status_code=status.HTTP_403_FORBIDDEN,
|
|
detail=f"Role '{role}' required",
|
|
)
|
|
return user
|
|
return check_role
|
|
|
|
|
|
def require_admin():
|
|
"""Dependency that checks if user is admin."""
|
|
async def check_admin(user: User = Depends(get_current_user)) -> User:
|
|
if not user.is_admin:
|
|
raise HTTPException(
|
|
status_code=status.HTTP_403_FORBIDDEN,
|
|
detail="Admin access required",
|
|
)
|
|
return user
|
|
return check_admin
|
|
|
|
|
|
# Pre-built role dependencies for convenience
|
|
require_maker = require_role("Maker")
|
|
require_measurement_tec = require_role("MeasurementTec")
|
|
require_metrologist = require_role("Metrologist")
|
|
require_supervisor = require_role("Supervisor")
|
|
require_admin_user = require_admin()
|