habsi/authentik
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix db connection middleware

Browse Source 
Signed-off-by: Marc 'risson' Schmitt <marc.schmitt@risson.space>
This commit is contained in:
Marc 'risson' Schmitt
2025-06-12 12:29:13 +02:00
parent c2f7883a5c
commit 217063ef7b
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
authentik/providers/scim/tests/test_user.py
View File

@ -3,6 +3,7 @@
from json import loads from json import loads
from django.test import TestCase from django.test import TestCase
from django.utils.text import slugify
from jsonschema import validate from jsonschema import validate
from requests_mock import Mocker from requests_mock import Mocker
@ -11,7 +12,8 @@ from authentik.core.models import Application, Group, User
from authentik.lib.generators import generate_id from authentik.lib.generators import generate_id
from authentik.lib.sync.outgoing.base import SAFE_METHODS from authentik.lib.sync.outgoing.base import SAFE_METHODS
from authentik.providers.scim.models import SCIMMapping, SCIMProvider from authentik.providers.scim.models import SCIMMapping, SCIMProvider
from authentik.providers.scim.tasks import scim_sync, sync_tasks from authentik.providers.scim.tasks import scim_sync, scim_sync_objects
from authentik.tasks.models import Task
from authentik.tenants.models import Tenant from authentik.tenants.models import Tenant
@ -354,7 +356,7 @@ class SCIMUserTests(TestCase):
email=f"{uid}@goauthentik.io", email=f"{uid}@goauthentik.io",
) )
sync_tasks.trigger_single_task(self.provider, scim_sync).get() scim_sync.send(self.provider.pk)
self.assertEqual(mock.call_count, 5) self.assertEqual(mock.call_count, 5)
self.assertEqual(mock.request_history[0].method, "GET") self.assertEqual(mock.request_history[0].method, "GET")
@ -426,15 +428,14 @@ class SCIMUserTests(TestCase):
email=f"{uid}@goauthentik.io", email=f"{uid}@goauthentik.io",
) )
sync_tasks.trigger_single_task(self.provider, scim_sync).get() scim_sync.send(self.provider.pk)
self.assertEqual(mock.call_count, 3) self.assertEqual(mock.call_count, 3)
for request in mock.request_history: for request in mock.request_history:
self.assertIn(request.method, SAFE_METHODS) self.assertIn(request.method, SAFE_METHODS)
drop_msg = {} task = Task.objects.filter(actor_name=scim_sync_objects.actor_name).first()
# task = Task.objects.filter(uid=slugify(self.provider.name)).first() self.assertIsNotNone(task)
# self.assertIsNotNone(task) drop_msg = task._messages[2]
# drop_msg = task.messages[3]
self.assertEqual(drop_msg["event"], "Dropping mutating request due to dry run") self.assertEqual(drop_msg["event"], "Dropping mutating request due to dry run")
self.assertIsNotNone(drop_msg["attributes"]["url"]) self.assertIsNotNone(drop_msg["attributes"]["url"])
self.assertIsNotNone(drop_msg["attributes"]["body"]) self.assertIsNotNone(drop_msg["attributes"]["body"])

7
authentik/tasks/broker.py
View File

@ -6,6 +6,7 @@ from queue import Empty, Queue
from random import randint from random import randint
import tenacity import tenacity
from django.conf import settings
from django.db import ( from django.db import (
DEFAULT_DB_ALIAS, DEFAULT_DB_ALIAS,
DatabaseError, DatabaseError,
@ -61,13 +62,15 @@ def raise_connection_error(func):
class DbConnectionMiddleware(Middleware): class DbConnectionMiddleware(Middleware):
def _close_old_connections(self, *args, **kwargs): def _close_old_connections(self, *args, **kwargs):
if settings.TEST:
return
close_old_connections() close_old_connections()
# TODO: figure out if we really need this, it seems a bit excessive to close connections after # TODO: figure out if we really need this, it seems a bit excessive to close connections after
# each message and if fails in tests # each message and if fails in tests
# before_process_message = _close_old_connections before_process_message = _close_old_connections
# after_process_message = _close_old_connections after_process_message = _close_old_connections
def _close_connections(self, *args, **kwargs): def _close_connections(self, *args, **kwargs):
connections.close_all() connections.close_all()