mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-05 10:19:20 +00:00
Code Issues 32 Releases Wiki Activity

magic-removal: Changed LazyUser implementation in auth middleware so that it doesn't take request.session in its constructor. This way, session data isn't saved over multiple requests

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2591 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2006-03-28 23:59:38 +00:00
parent 02b3f4489d
commit b13ff1762e
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
django/contrib/auth/middleware.py
View File

@ -1,22 +1,20 @@
class LazyUser(object): class LazyUser(object):
def __init__(self, session): def __init__(self):
self.session = session
self._user = None self._user = None
def __get__(self, request, obj_type=None): def __get__(self, request, obj_type=None):
if self._user is None: if self._user is None:
from django.contrib.auth.models import User, AnonymousUser, SESSION_KEY from django.contrib.auth.models import User, AnonymousUser, SESSION_KEY
try: try:
user_id = self.session[SESSION_KEY] user_id = request.session[SESSION_KEY]
self._user = User.objects.get(pk=user_id) self._user = User.objects.get(pk=user_id)
except (KeyError, User.DoesNotExist): except (KeyError, User.DoesNotExist):
self._user = AnonymousUser() self._user = AnonymousUser()
del self.session # We don't need to keep this around anymore.
return self._user return self._user
class AuthenticationMiddleware: class AuthenticationMiddleware:
def process_request(self, request): def process_request(self, request):
from django.contrib.auth.models import SESSION_KEY from django.contrib.auth.models import SESSION_KEY
assert hasattr(request, 'session'), "The Django authentication middleware requires session middleware to be installed. Edit your MIDDLEWARE_CLASSES setting to insert 'django.contrib.sessions.middleware.SessionMiddleware'." assert hasattr(request, 'session'), "The Django authentication middleware requires session middleware to be installed. Edit your MIDDLEWARE_CLASSES setting to insert 'django.contrib.sessions.middleware.SessionMiddleware'."
request.__class__.user = LazyUser(request.session) request.__class__.user = LazyUser()
return None return None