Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Reject a refresh whose session was deleted meanwhile

Roland Geider1e9212cd7162
diff --git a/wger/core/tests/test_headless.py b/wger/core/tests/test_headless.py
index 03a7183de..ce6f77b3d 100644
--- a/wger/core/tests/test_headless.py
+++ b/wger/core/tests/test_headless.py
@@ -17,13 +17,19 @@
# Standard Library
import json
+from unittest import mock
# Django
from django.contrib.auth.models import User
-from django.test import Client
+from django.contrib.sessions.models import Session
+from django.test import (
+ Client,
+ override_settings,
+)
from django.urls import reverse
# Third Party
+from allauth.headless.tokens.strategies.jwt import internal
from rest_framework_simplejwt.tokens import RefreshToken
# wger
@@ -231,6 +237,31 @@ class HeadlessSmokeTestCase(WgerTestCase):
self.assertEqual(self._refresh(first).status_code, 400)
+ def test_refresh_is_rejected_when_the_session_is_deleted_meanwhile(self):
+ """
+ A session deleted while the refresh is running, e.g. by a logout in a
+ concurrent request, rejects the refresh token with a 400.
+ """
+ create_access_token = internal.create_access_token
+
+ def delete_session_then_create(user, session, claims):
+ Session.objects.filter(session_key=session.session_key).delete()
+ return create_access_token(user, session, claims)
+
+ for rotate in (True, False):
+ with (
+ self.subTest(rotate=rotate),
+ override_settings(HEADLESS_JWT_ROTATE_REFRESH_TOKEN=rotate),
+ ):
+ refresh_token = self._login_refresh_token()
+ with mock.patch.object(
+ internal,
+ 'create_access_token',
+ side_effect=delete_session_then_create,
+ ):
+ response = self._refresh(refresh_token)
+ self.assertEqual(response.status_code, 400)
+
def test_invalid_jwt_does_not_break_auth_chain(self):
"""
A malformed Bearer token must not raise AuthenticationFailed in our
diff --git a/wger/utils/headless_auth.py b/wger/utils/headless_auth.py
index 1ef5b85fa..5cdb07638 100644
--- a/wger/utils/headless_auth.py
+++ b/wger/utils/headless_auth.py
@@ -17,6 +17,7 @@
# Django
from django.contrib.auth import get_user_model
+from django.contrib.sessions.backends.base import UpdateError
# Third Party
from allauth.headless import app_settings
@@ -114,6 +115,13 @@ class WgerJWTTokenStrategy(JWTTokenStrategy):
"""
def refresh_token(self, refresh_token: str) -> tuple[str, str] | None:
+ try:
+ return self._refresh_token(refresh_token)
+ except UpdateError:
+ # Session deleted while the refresh was running, e.g. a concurrent logout
+ return None
+
+ def _refresh_token(self, refresh_token: str) -> tuple[str, str] | None:
validated = internal.validate_refresh_token(refresh_token)
if validated is None or validated[0] is None:
return None