feat: FZA Einzelstunden + Security-Fixes (K-1–K-5, H-2–H-4, M-1/M-3/M-6)
FZA Einzelstunden:
- Absence.fza_hours (Numeric 5,2) — FZA in Stunden statt Tagen
- Migration 0032: fza_hours Spalte in absences
- AbsenceCreate/AbsenceOut Schema um fza_hours erweitert
- absence_service: _deduct/_refund_overtime nutzt fza_hours direkt wenn gesetzt
- Frontend: Tage/Stunden-Toggle im FZA-Antrag-Modal
Security K-1: Privilege Escalation via PATCH /users/{id}.role
- user_service: Whitelist für Rollenänderungen, SUPER_ADMIN nur durch SUPER_ADMIN
- Letzter COMPANY_ADMIN gegen Selbst-Demotion gesichert
Security K-2: Kiosk-IP-Whitelist hinter nginx
- kiosk_security: _get_client_ip() liest X-Real-IP statt request.client.host
Security K-3: Kiosk-PIN Brute-Force-Schutz
- kiosk_auth_service: Redis-Lockout nach 5 Fehlversuchen (15 min)
Security K-4: TOTP-Setup-Hijacking
- auth router: /totp/setup abgelehnt wenn TOTP bereits aktiv
Security K-5: Separater Fernet-Key
- config: SECRET_KEY_DATA Feld (optional, Fallback auf SECRET_KEY)
- crypto: get_fernet_key() mit Warning bei fehlendem SECRET_KEY_DATA
Security H-2: Vacation Balance nur HR/Admin
- absences router: PATCH /balance nur noch HR/COMPANY_ADMIN/SUPER_ADMIN + AuditLog
Security H-3: Rate-Limits auf /auth/refresh + /auth/logout
- auth router: 30/min auf refresh, 60/min auf logout
Security H-4: Login-Failure-Logging + Lockout
- auth_service: Redis-Counter, Lockout nach 10 Versuchen (15 min)
- AuditLog für login_success und login_failed
Security M-1: Nginx Security-Header
- nginx.conf: X-Frame-Options, X-Content-Type-Options, CSP, Referrer-Policy, X-XSS-Protection, Permissions-Policy
Security M-3: AuditLog bei Rollenänderungen
- user_service: action=role_changed mit old/new role
Security M-6: create_all nur in Development
- main.py: Base.metadata.create_all nur wenn not settings.is_production
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -27,9 +27,52 @@ log = logging.getLogger(__name__)
|
||||
QR_TOKEN_PREFIX = "kiosk_qr:"
|
||||
QR_TOKEN_TTL = 5 * 60 # 5 Minuten
|
||||
|
||||
# PIN-Brute-Force-Schutz
|
||||
PIN_MAX_ATTEMPTS = 5
|
||||
PIN_LOCKOUT_SECONDS = 900 # 15 Minuten
|
||||
|
||||
|
||||
class KioskAuthService:
|
||||
|
||||
async def _check_pin_lockout(
|
||||
self, device_id: uuid.UUID, personnel_number: str, redis
|
||||
) -> None:
|
||||
"""Prüft ob PIN-Login für diese Kombination gesperrt ist. Wirft 429 wenn ja."""
|
||||
lockout_key = f"pin_lockout:{device_id}:{personnel_number}"
|
||||
if await redis.exists(lockout_key):
|
||||
ttl = await redis.ttl(lockout_key)
|
||||
wait_min = ttl // 60 + 1
|
||||
raise HTTPException(
|
||||
status_code=429,
|
||||
detail=f"Zu viele Fehlversuche. Bitte {wait_min} Minute(n) warten.",
|
||||
)
|
||||
|
||||
async def _record_pin_failure(
|
||||
self, device_id: uuid.UUID, personnel_number: str, redis
|
||||
) -> None:
|
||||
"""Zählt einen Fehlversuch und sperrt bei Überschreitung von PIN_MAX_ATTEMPTS."""
|
||||
fail_key = f"pin_fails:{device_id}:{personnel_number}"
|
||||
lockout_key = f"pin_lockout:{device_id}:{personnel_number}"
|
||||
|
||||
fails = await redis.incr(fail_key)
|
||||
await redis.expire(fail_key, PIN_LOCKOUT_SECONDS)
|
||||
|
||||
if fails >= PIN_MAX_ATTEMPTS:
|
||||
await redis.set(lockout_key, "1", ex=PIN_LOCKOUT_SECONDS)
|
||||
await redis.delete(fail_key)
|
||||
log.warning(
|
||||
"PIN-Lockout ausgelöst: device=%s personnel_number=%s",
|
||||
device_id,
|
||||
personnel_number,
|
||||
)
|
||||
|
||||
async def _clear_pin_failures(
|
||||
self, device_id: uuid.UUID, personnel_number: str, redis
|
||||
) -> None:
|
||||
"""Löscht Fehlversuche nach erfolgreichem Login."""
|
||||
await redis.delete(f"pin_fails:{device_id}:{personnel_number}")
|
||||
await redis.delete(f"pin_lockout:{device_id}:{personnel_number}")
|
||||
|
||||
async def login_pin(
|
||||
self,
|
||||
personnel_number: str,
|
||||
@@ -39,24 +82,41 @@ class KioskAuthService:
|
||||
db: AsyncSession,
|
||||
) -> tuple[User, str]:
|
||||
"""Authentifizierung per Personalnummer + PIN. Returns (user, session_token)."""
|
||||
user = await db.scalar(
|
||||
select(User).where(
|
||||
User.company_id == company_id,
|
||||
User.personnel_number == personnel_number,
|
||||
User.is_active == True,
|
||||
)
|
||||
)
|
||||
if user is None:
|
||||
raise HTTPException(status_code=401, detail="Personalnummer nicht gefunden.")
|
||||
import redis.asyncio as aioredis
|
||||
from app.core.config import settings
|
||||
|
||||
if not user.kiosk_pin_hash:
|
||||
raise HTTPException(
|
||||
status_code=401,
|
||||
detail="Kein PIN gesetzt. Bitte in den Profileinstellungen einen PIN vergeben.",
|
||||
)
|
||||
# Redis für Brute-Force-Schutz (async)
|
||||
redis_client = aioredis.from_url(settings.redis_url, decode_responses=True)
|
||||
try:
|
||||
# 1. Lockout-Check vor DB-Abfrage (verhindert auch User-Enumeration via Timing)
|
||||
await self._check_pin_lockout(device_id, personnel_number, redis_client)
|
||||
|
||||
if not bcrypt.checkpw(pin.encode(), user.kiosk_pin_hash.encode()):
|
||||
raise HTTPException(status_code=401, detail="Falscher PIN.")
|
||||
user = await db.scalar(
|
||||
select(User).where(
|
||||
User.company_id == company_id,
|
||||
User.personnel_number == personnel_number,
|
||||
User.is_active == True,
|
||||
)
|
||||
)
|
||||
if user is None:
|
||||
# Fehlversuch zählen auch bei unbekannter Personalnummer
|
||||
await self._record_pin_failure(device_id, personnel_number, redis_client)
|
||||
raise HTTPException(status_code=401, detail="Personalnummer nicht gefunden.")
|
||||
|
||||
if not user.kiosk_pin_hash:
|
||||
raise HTTPException(
|
||||
status_code=401,
|
||||
detail="Kein PIN gesetzt. Bitte in den Profileinstellungen einen PIN vergeben.",
|
||||
)
|
||||
|
||||
if not bcrypt.checkpw(pin.encode(), user.kiosk_pin_hash.encode()):
|
||||
await self._record_pin_failure(device_id, personnel_number, redis_client)
|
||||
raise HTTPException(status_code=401, detail="Falscher PIN.")
|
||||
|
||||
# Erfolgreicher Login: Fehlversuche zurücksetzen
|
||||
await self._clear_pin_failures(device_id, personnel_number, redis_client)
|
||||
finally:
|
||||
await redis_client.aclose()
|
||||
|
||||
session_token = await kiosk_session_service.create_session(
|
||||
user_id=user.id,
|
||||
|
||||
Reference in New Issue
Block a user