Просмотр исходного кода

Verbessere CSRF-Token-Verwaltung und teste, dass Anmeldeformulare bei mehreren Tabs gültig bleiben

gc-server3 2 недель назад
Родитель
Сommit
82191be5c0
2 измененных файлов с 85 добавлено и 31 удалено
  1. 25 31
      app/routes.py
  2. 60 0
      tests/test_debug_auth.py

+ 25 - 31
app/routes.py

@@ -51,15 +51,17 @@ def health():
     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(
         request,
         "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(
         settings.LOGIN_CSRF_COOKIE_NAME,
@@ -72,12 +74,19 @@ def login_get(request: Request, next: str | None = None):
     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")
 def login_post(
     request: Request,
     username: 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,
     db: Session = Depends(get_session),
 ):
@@ -85,7 +94,13 @@ def login_post(
         return RedirectResponse(safe_next_url(next), status_code=303)
     expected_csrf = request.cookies.get(settings.LOGIN_CSRF_COOKIE_NAME, "")
     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:
         if settings.debug_auth_enabled:
@@ -102,32 +117,11 @@ def login_post(
             user = ldap_authenticate(username, password)
     except DirectoryUnavailable:
         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:
         user = None
     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)
     role = highest_role(entitlements)

+ 60 - 0
tests/test_debug_auth.py

@@ -1,4 +1,5 @@
 import unittest
+from html.parser import HTMLParser
 from unittest.mock import patch
 
 from fastapi.testclient import TestClient
@@ -9,6 +10,19 @@ from app.oauth_token import InvalidSessionToken, create_access_token, decode_acc
 from app.permissions import Entitlement
 
 
+class LoginFormParser(HTMLParser):
+    def handle_starttag(self, tag, attrs):
+        attributes = dict(attrs)
+        if tag == "input" and attributes.get("name") == "_csrf":
+            self.csrf = attributes["value"]
+
+
+def form_csrf(response):
+    parser = LoginFormParser()
+    parser.feed(response.text)
+    return parser.csrf
+
+
 class DebugLoginTests(unittest.TestCase):
     def setUp(self):
         self.config = patch.multiple(settings, ENVIRONMENT="development", DEBUG_AUTH=True, COOKIE_SECURE=False)
@@ -70,6 +84,52 @@ class DebugLoginTests(unittest.TestCase):
     def test_csrf_remains_required(self):
         self.assertEqual(self.login(csrf=False).status_code, 403)
 
+    @patch("app.routes.load_entitlements")
+    def test_opening_another_login_page_keeps_first_form_valid(self, login_rights):
+        login_rights.return_value = self.entitlements
+        first_page = self.client.get("/login")
+        second_page = self.client.get("/login?next=/select")
+        self.assertEqual(form_csrf(first_page), form_csrf(second_page))
+        self.assertEqual(second_page.headers["cache-control"], "no-store")
+        response = self.client.post(
+            "/login",
+            data={"username": "winter", "password": "winter", "_csrf": form_csrf(first_page)},
+            follow_redirects=False,
+        )
+        self.assertEqual(response.status_code, 303)
+
+    @patch("app.routes.load_entitlements")
+    def test_missing_cookie_returns_fresh_form_and_allows_retry(self, login_rights):
+        login_rights.return_value = self.entitlements
+        page = self.client.get("/login")
+        self.client.cookies.clear()
+        rejected = self.client.post(
+            "/login",
+            data={"username": "winter", "password": "winter", "_csrf": form_csrf(page), "next": "/select"},
+        )
+        self.assertEqual(rejected.status_code, 403)
+        self.assertIn("text/html", rejected.headers["content-type"])
+        self.assertEqual(rejected.headers["cache-control"], "no-store")
+        self.assertNotEqual(form_csrf(rejected), form_csrf(page))
+        login_rights.assert_not_called()
+        self.ldap_mock.assert_not_called()
+        accepted = self.client.post(
+            "/login",
+            data={"username": "winter", "password": "winter", "_csrf": form_csrf(rejected), "next": "/select"},
+            follow_redirects=False,
+        )
+        self.assertEqual(accepted.status_code, 303)
+        self.assertEqual(accepted.headers["location"], "/select")
+
+    @patch("app.routes.load_entitlements")
+    def test_missing_form_token_is_rejected_before_authentication(self, login_rights):
+        self.client.get("/login")
+        response = self.client.post("/login", data={"username": "winter", "password": "winter"})
+        self.assertEqual(response.status_code, 403)
+        self.assertEqual(form_csrf(response), self.client.cookies[settings.LOGIN_CSRF_COOKIE_NAME])
+        login_rights.assert_not_called()
+        self.ldap_mock.assert_not_called()
+
     @patch("app.auth.lookup_directory_user")
     def test_proxy_header_does_not_bypass_debug_form(self, lookup):
         with patch.object(settings, "TRUSTED_PROXY_IPS", ["testclient"]):