mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-05 03:29:12 +00:00
Code Issues 32 Releases Wiki Activity

magic-removal: fixed #1410. The UserSource class will eventually be replaced with the muti-auth stuff.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2431 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Joseph Kocherhans 2006-02-28 00:46:07 +00:00
parent 64330d7355
commit 36bfffccc4
3 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
class RequestUserMiddleware: # TODO: this will be replaced by the muti-auth stuff
def process_request(self, request): class UserSource:
def get_user(self, request):
from django.contrib.auth.models import User, SESSION_KEY from django.contrib.auth.models import User, SESSION_KEY
try: try:
user_id = request.session[SESSION_KEY] user_id = request.session[SESSION_KEY]
@ -9,5 +10,9 @@ class RequestUserMiddleware:
except (AttributeError, KeyError, ValueError, User.DoesNotExist): except (AttributeError, KeyError, ValueError, User.DoesNotExist):
from django.parts.auth import anonymoususers from django.parts.auth import anonymoususers
user = anonymoususers.AnonymousUser() user = anonymoususers.AnonymousUser()
request.user = user return user
class RequestUserMiddleware:
def process_request(self, request):
request._user_source = UserSource()
return None return None

9
django/core/handlers/modpython.py
View File

@ -98,6 +98,14 @@ class ModPythonRequest(http.HttpRequest):
self._raw_post_data = self._req.read() self._raw_post_data = self._req.read()
return self._raw_post_data return self._raw_post_data
def _get_user(self):
if not hasattr(self, '_user'):
self._user = self._user_source.get_user(self)
return self._user
def _set_user(self, value):
self._user = value
GET = property(_get_get, _set_get) GET = property(_get_get, _set_get)
POST = property(_get_post, _set_post) POST = property(_get_post, _set_post)
COOKIES = property(_get_cookies, _set_cookies) COOKIES = property(_get_cookies, _set_cookies)
@ -105,6 +113,7 @@ class ModPythonRequest(http.HttpRequest):
META = property(_get_meta) META = property(_get_meta)
REQUEST = property(_get_request) REQUEST = property(_get_request)
raw_post_data = property(_get_raw_post_data) raw_post_data = property(_get_raw_post_data)
user = property(_get_user, _set_user)
class ModPythonHandler(BaseHandler): class ModPythonHandler(BaseHandler):
def __call__(self, req): def __call__(self, req):

9
django/core/handlers/wsgi.py
View File

@ -119,12 +119,21 @@ class WSGIRequest(http.HttpRequest):
self._raw_post_data = self.environ['wsgi.input'].read(int(self.environ["CONTENT_LENGTH"])) self._raw_post_data = self.environ['wsgi.input'].read(int(self.environ["CONTENT_LENGTH"]))
return self._raw_post_data return self._raw_post_data
def _get_user(self):
if not hasattr(self, '_user'):
self._user = self._user_source.get_user(self)
return self._user
def _set_user(self, value):
self._user = value
GET = property(_get_get, _set_get) GET = property(_get_get, _set_get)
POST = property(_get_post, _set_post) POST = property(_get_post, _set_post)
COOKIES = property(_get_cookies, _set_cookies) COOKIES = property(_get_cookies, _set_cookies)
FILES = property(_get_files) FILES = property(_get_files)
REQUEST = property(_get_request) REQUEST = property(_get_request)
raw_post_data = property(_get_raw_post_data) raw_post_data = property(_get_raw_post_data)
user = property(_get_user, _set_user)
class WSGIHandler(BaseHandler): class WSGIHandler(BaseHandler):
def __call__(self, environ, start_response): def __call__(self, environ, start_response):