Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Clean up expired OIDC tokens periodically

Roland Geider5071492cb408
diff --git a/wger/core/tasks.py b/wger/core/tasks.py
index 875627b0d..306fcc7c7 100644
--- a/wger/core/tasks.py
+++ b/wger/core/tasks.py
@@ -52,6 +52,17 @@ def flush_expired_long_lived_sessions_task():
SessionStore.clear_expired()
+def flush_expired_oidc_tokens_task():
+ """
+ Delete expired access and refresh tokens of the OAuth2/OIDC provider.
+
+ Tokens stay in the table after they expire, so without this the table
+ grows for as long as applications keep refreshing.
+ """
+ call_command('oidc_cleartokens')
+
+
@app.on_after_finalize.connect
def setup_periodic_tasks(sender, **kwargs):
sender.add_periodic_task(
@@ -70,3 +81,11 @@ def setup_periodic_tasks(sender, **kwargs):
flush_expired_long_lived_sessions_task.s(),
name='Flush expired long-lived sessions',
)
+ sender.add_periodic_task(
+ crontab(
+ hour=str(random.randint(0, 23)),
+ minute=str(random.randint(0, 59)),
+ ),
+ flush_expired_oidc_tokens_task.s(),
+ name='Flush expired OIDC tokens',
+ )
diff --git a/wger/core/tests/test_oidc_provider.py b/wger/core/tests/test_oidc_provider.py
index 36c8812c8..3b0df69d6 100644
--- a/wger/core/tests/test_oidc_provider.py
+++ b/wger/core/tests/test_oidc_provider.py
@@ -19,6 +19,7 @@
import base64
import hashlib
import secrets
+from datetime import timedelta
from io import StringIO
from urllib.parse import (
parse_qs,
@@ -27,21 +28,27 @@ from urllib.parse import (
# Django
from django.conf import settings
+from django.contrib.auth.models import User
from django.core.management import call_command
from django.test import (
SimpleTestCase,
override_settings,
)
from django.urls import reverse
+from django.utils import timezone
from django.utils.http import urlencode
# Third Party
import jwt
-from allauth.idp.oidc.models import Client
+from allauth.idp.oidc.models import (
+ Client,
+ Token,
+)
from cryptography.hazmat.primitives import serialization
from cryptography.hazmat.primitives.asymmetric import rsa
# wger
+from wger.core.tasks import flush_expired_oidc_tokens_task
from wger.core.tests.base_testcase import WgerTestCase
@@ -246,6 +253,31 @@ class OidcProviderTestCase(WgerTestCase):
self.assertEqual(response.status_code, 400)
self.assertEqual(response.json()['error'], 'invalid_request')
+ def test_flush_expired_oidc_tokens_task(self):
+ """
+ The periodic cleanup task deletes expired tokens and keeps valid ones
+ """
+ user = User.objects.get(username='test')
+ expired = Token.objects.create(
+ type=Token.Type.ACCESS_TOKEN,
+ client=self.oidc_client,
+ user=user,
+ hash='expired',
+ expires_at=timezone.now() - timedelta(days=1),
+ )
+ valid = Token.objects.create(
+ type=Token.Type.ACCESS_TOKEN,
+ client=self.oidc_client,
+ user=user,
+ hash='valid',
+ expires_at=timezone.now() + timedelta(days=1),
+ )
+
+ flush_expired_oidc_tokens_task()
+
+ self.assertFalse(Token.objects.filter(pk=expired.pk).exists())
+ self.assertTrue(Token.objects.filter(pk=valid.pk).exists())
+
def test_cancelled_authorization_issues_no_code(self):
self.user_login('test')
_, challenge = generate_pkce_pair()