Self hosted FLOSS fitness/workout, nutrition and weight tracker
Add task to flush expired long-lived sessions
Roland Geider61223427a70c
diff --git a/wger/core/tasks.py b/wger/core/tasks.pyindex c0b263c19..4c852955e 100644--- a/wger/core/tasks.py+++ b/wger/core/tasks.py@@ -17,6 +17,7 @@ import loggingimport random# Django+from django.contrib.sessions.backends.db import SessionStorefrom django.core.management import call_command# Third Party@@ -43,6 +44,14 @@ def flush_expired_jwt_tokens_task():call_command('flushexpiredtokens')+def flush_expired_long_lived_sessions_task():+ """+ Delete expired DB-backed sessions, i.e. the headless long-lived refresh tokens+ """+ SessionStore.clear_expired()++@app.on_after_finalize.connectdef setup_periodic_tasks(sender, **kwargs):sender.add_periodic_task(@@ -53,3 +62,11 @@ def setup_periodic_tasks(sender, **kwargs):flush_expired_jwt_tokens_task.s(),name='Flush expired JWT tokens',)+ sender.add_periodic_task(+ crontab(+ hour=str(random.randint(0, 23)),+ minute=str(random.randint(0, 59)),+ ),+ flush_expired_long_lived_sessions_task.s(),+ name='Flush expired long-lived sessions',+ )diff --git a/wger/core/tests/test_apikey.py b/wger/core/tests/test_apikey.pyindex b93cd1c33..3d9520579 100644--- a/wger/core/tests/test_apikey.py+++ b/wger/core/tests/test_apikey.py@@ -15,22 +15,25 @@# Standard Libraryimport jsonimport logging+from datetime import timedelta# Djangofrom django.contrib.auth.models import Userfrom django.contrib.sessions.models import Sessionfrom django.urls import reverse+from django.utils import timezone# Third Partyfrom rest_framework.authtoken.models import Tokenfrom rest_framework.test import APIClient-from rest_framework_simplejwt.tokens import RefreshTokenfrom rest_framework_simplejwt.token_blacklist.models import (BlacklistedToken,OutstandingToken,)+from rest_framework_simplejwt.tokens import RefreshToken# wger+from wger.core.tasks import flush_expired_long_lived_sessions_taskfrom wger.core.tests.base_testcase import WgerTestCasefrom wger.utils.headless_long_lived import (LONG_LIVED_FLAG,@@ -370,3 +373,25 @@ class LongLivedRefreshTokenTestCase(WgerTestCase):self.assertTrue(browser_sessions)for s in browser_sessions:self.assertFalse(s.get_decoded().get(LONG_LIVED_FLAG))++ def test_flush_expired_long_lived_sessions_task(self):+ """+ The periodic cleanup task deletes expired DB-backed long-lived sessions+ while leaving still-valid ones untouched.+ """+ user = User.objects.get(username='test')++ before = set(Session.objects.values_list('session_key', flat=True))+ mint_long_lived_refresh_token(user, 3600)+ mint_long_lived_refresh_token(user, 3600)+ expired_key, live_key = set(Session.objects.values_list('session_key', flat=True)) - before++ # Force one of the two sessions past its expiry.+ Session.objects.filter(session_key=expired_key).update(+ expire_date=timezone.now() - timedelta(days=1),+ )++ flush_expired_long_lived_sessions_task()++ self.assertFalse(Session.objects.filter(session_key=expired_key).exists())+ self.assertTrue(Session.objects.filter(session_key=live_key).exists())