encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-05 04:50:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add error handling for a raised AttributeError inside of a property call for "request.user".

Browse Source
This commit is contained in:
Adam Grant 2014-11-05 10:22:55 -05:00
parent 36fe656b51
commit 75d755a8fc
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rest_framework/request.py
View File

@ -223,7 +223,10 @@ class Request(object):
by the authentication classes provided to the request. by the authentication classes provided to the request.
""" """
if not hasattr(self, '_user'): if not hasattr(self, '_user'):
self._authenticate() try:
self._authenticate()
except AttributeError as error:
raise RuntimeError("AttributeError: " + error.message)
return self._user return self._user
@user.setter @user.setter

19
tests/test_request.py
View File

@ -333,24 +333,27 @@ class TestUserSetter(TestCase):
login(self.request, self.user) login(self.request, self.user)
self.assertEqual(self.request.user, self.user) self.assertEqual(self.request.user, self.user)
def test_calling_user_fails_when_exception_is_raised(self): def test_calling_user_fails_when_attribute_error_is_raised(self):
class AuthRaisesError(object): """
This proves that when an AttributeError is raised inside of the request.user
property, that we can handle this and report the true, underlying error.
"""
class AuthRaisesAttributeError(object):
def authenticate(self, request): def authenticate(self, request):
raise AttributeError('We should see this error!') import rest_framework
# import rest_framework rest_framework.MISSPELLED_NAME_THAT_DOESNT_EXIST
# rest_framework.MISSPELLED_NAME_THAT_DOESNT_EXIST
self.request = Request(factory.get('/'), authenticators=(AuthRaisesError(),)) self.request = Request(factory.get('/'), authenticators=(AuthRaisesAttributeError(),))
SessionMiddleware().process_request(self.request) SessionMiddleware().process_request(self.request)
login(self.request, self.user) login(self.request, self.user)
error_seen = None error_seen = None
try: try:
self.request.user self.request.user
except AttributeError as error: except RuntimeError as error:
error_seen = error error_seen = error
self.assertEqual('We should see this error!', error_seen.message) self.assertEqual("AttributeError: 'module' object has no attribute 'MISSPELLED_NAME_THAT_DOESNT_EXIST'", error_seen.message)
def test_user_can_logout(self): def test_user_can_logout(self):
self.request.user = self.user self.request.user = self.user