|
@@ -51,15 +51,17 @@ def health():
|
|
|
return {"status": "ok"}
|
|
return {"status": "ok"}
|
|
|
|
|
|
|
|
|
|
|
|
|
-@router.get("/login", response_class=HTMLResponse)
|
|
|
|
|
-def login_get(request: Request, next: str | None = None):
|
|
|
|
|
- if getattr(request.state, "principal", None):
|
|
|
|
|
- return RedirectResponse(safe_next_url(next), status_code=303)
|
|
|
|
|
- csrf = secrets.token_urlsafe(32)
|
|
|
|
|
|
|
+def _login_response(request: Request, next: str | None, error: str | None = None, status_code: int = 200):
|
|
|
|
|
+ # Keep open login forms valid when another tab loads the login page.
|
|
|
|
|
+ csrf = request.cookies.get(settings.LOGIN_CSRF_COOKIE_NAME, "")
|
|
|
|
|
+ if not re.fullmatch(r"[A-Za-z0-9_-]{43}", csrf):
|
|
|
|
|
+ csrf = secrets.token_urlsafe(32)
|
|
|
response = templates.TemplateResponse(
|
|
response = templates.TemplateResponse(
|
|
|
request,
|
|
request,
|
|
|
"base/login.html",
|
|
"base/login.html",
|
|
|
- {"request": request, "csrf": csrf, "next": safe_next_url(next), "error": None},
|
|
|
|
|
|
|
+ {"request": request, "csrf": csrf, "next": safe_next_url(next), "error": error},
|
|
|
|
|
+ status_code=status_code,
|
|
|
|
|
+ headers={"Cache-Control": "no-store"},
|
|
|
)
|
|
)
|
|
|
response.set_cookie(
|
|
response.set_cookie(
|
|
|
settings.LOGIN_CSRF_COOKIE_NAME,
|
|
settings.LOGIN_CSRF_COOKIE_NAME,
|
|
@@ -72,12 +74,19 @@ def login_get(request: Request, next: str | None = None):
|
|
|
return response
|
|
return response
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
+@router.get("/login", response_class=HTMLResponse)
|
|
|
|
|
+def login_get(request: Request, next: str | None = None):
|
|
|
|
|
+ if getattr(request.state, "principal", None):
|
|
|
|
|
+ return RedirectResponse(safe_next_url(next), status_code=303)
|
|
|
|
|
+ return _login_response(request, next)
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
@router.post("/login")
|
|
@router.post("/login")
|
|
|
def login_post(
|
|
def login_post(
|
|
|
request: Request,
|
|
request: Request,
|
|
|
username: Annotated[str, Form()],
|
|
username: Annotated[str, Form()],
|
|
|
password: Annotated[str, Form()],
|
|
password: Annotated[str, Form()],
|
|
|
- csrf: Annotated[str, Form(alias="_csrf")],
|
|
|
|
|
|
|
+ csrf: Annotated[str, Form(alias="_csrf")] = "",
|
|
|
next: Annotated[str | None, Form()] = None,
|
|
next: Annotated[str | None, Form()] = None,
|
|
|
db: Session = Depends(get_session),
|
|
db: Session = Depends(get_session),
|
|
|
):
|
|
):
|
|
@@ -85,7 +94,13 @@ def login_post(
|
|
|
return RedirectResponse(safe_next_url(next), status_code=303)
|
|
return RedirectResponse(safe_next_url(next), status_code=303)
|
|
|
expected_csrf = request.cookies.get(settings.LOGIN_CSRF_COOKIE_NAME, "")
|
|
expected_csrf = request.cookies.get(settings.LOGIN_CSRF_COOKIE_NAME, "")
|
|
|
if not expected_csrf or not secrets.compare_digest(expected_csrf, csrf):
|
|
if not expected_csrf or not secrets.compare_digest(expected_csrf, csrf):
|
|
|
- raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Ungültiger CSRF-Token")
|
|
|
|
|
|
|
+ return _login_response(
|
|
|
|
|
+ request,
|
|
|
|
|
+ next,
|
|
|
|
|
+ error="Das Anmeldeformular ist nicht mehr gültig. Bitte melden Sie sich erneut an. "
|
|
|
|
|
+ "Falls der Fehler erneut auftritt, prüfen Sie, ob Cookies für diese Website erlaubt sind.",
|
|
|
|
|
+ status_code=status.HTTP_403_FORBIDDEN,
|
|
|
|
|
+ )
|
|
|
|
|
|
|
|
try:
|
|
try:
|
|
|
if settings.debug_auth_enabled:
|
|
if settings.debug_auth_enabled:
|
|
@@ -102,32 +117,11 @@ def login_post(
|
|
|
user = ldap_authenticate(username, password)
|
|
user = ldap_authenticate(username, password)
|
|
|
except DirectoryUnavailable:
|
|
except DirectoryUnavailable:
|
|
|
logger.exception("LDAP-Anmeldedienst nicht verfügbar")
|
|
logger.exception("LDAP-Anmeldedienst nicht verfügbar")
|
|
|
- return templates.TemplateResponse(
|
|
|
|
|
- request,
|
|
|
|
|
- "base/login.html",
|
|
|
|
|
- {
|
|
|
|
|
- "request": request,
|
|
|
|
|
- "csrf": csrf,
|
|
|
|
|
- "next": safe_next_url(next),
|
|
|
|
|
- "error": "Anmeldedienst ist derzeit nicht verfügbar",
|
|
|
|
|
- },
|
|
|
|
|
- status_code=503,
|
|
|
|
|
- )
|
|
|
|
|
|
|
+ return _login_response(request, next, error="Anmeldedienst ist derzeit nicht verfügbar", status_code=503)
|
|
|
except ValueError:
|
|
except ValueError:
|
|
|
user = None
|
|
user = None
|
|
|
if not user:
|
|
if not user:
|
|
|
- response = templates.TemplateResponse(
|
|
|
|
|
- request,
|
|
|
|
|
- "base/login.html",
|
|
|
|
|
- {
|
|
|
|
|
- "request": request,
|
|
|
|
|
- "csrf": csrf,
|
|
|
|
|
- "next": safe_next_url(next),
|
|
|
|
|
- "error": "Anmeldung fehlgeschlagen",
|
|
|
|
|
- },
|
|
|
|
|
- status_code=401,
|
|
|
|
|
- )
|
|
|
|
|
- return response
|
|
|
|
|
|
|
+ return _login_response(request, next, error="Anmeldung fehlgeschlagen", status_code=401)
|
|
|
|
|
|
|
|
entitlements = load_entitlements(db, user.username)
|
|
entitlements = load_entitlements(db, user.username)
|
|
|
role = highest_role(entitlements)
|
|
role = highest_role(entitlements)
|