Ticket #2770: pythonauthenhandler.patch

third-party/django/contrib/auth/handlers/modpython.py

@@ -1 +1 @@
 from mod_python import apache
+from django.dispatch import dispatcher
+from django.core import signals
 import os
 
 def authenhandler(req, **kwargs):
@@ -21 +23 @@
     if settings_module:
         os.environ['DJANGO_SETTINGS_MODULE'] = settings_module
 
-    from django.contrib.auth.models import User
-
-    # check that the username is valid
-    kwargs = {'username': req.user, 'is_active': True}
-    if staff_only:
-        kwargs['is_staff'] = True
-    if superuser_only:
-        kwargs['is_superuser'] = True
+    dispatcher.send(signal=signals.request_started)
     try:
-        user = User.objects.get(**kwargs)
-    except User.DoesNotExist:
-        return apache.HTTP_UNAUTHORIZED
+        from django.contrib.auth.models import User
 
-    # check the password and any permission given
-    if user.check_password(req.get_basic_auth_pw()):
-        if permission_name:
-            if user.has_perm(permission_name):
+        # check that the username is valid
+        kwargs = {'username': req.user, 'is_active': True}
+        if staff_only:
+            kwargs['is_staff'] = True
+        if superuser_only:
+            kwargs['is_superuser'] = True
+        try:
+            user = User.objects.get(**kwargs)
+        except User.DoesNotExist:
+            return apache.HTTP_UNAUTHORIZED
+
+        # check the password and any permission given
+        if user.check_password(req.get_basic_auth_pw()):
+            if permission_name:
+                if user.has_perm(permission_name):
+                    return apache.OK
+                else:
+                    return apache.HTTP_UNAUTHORIZED
+            else:
                 return apache.OK
-            else:
-                return apache.HTTP_UNAUTHORIZED
         else:
-            return apache.OK
-    else:
-        return apache.HTTP_UNAUTHORIZED
+            return apache.HTTP_UNAUTHORIZED
+
+    finally:
+        dispatcher.send(signal=signals.request_finished)
+ No newline at end of file