encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-09-16 17:22:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge 035bd25dcf into b1fca03089

Browse Source
This commit is contained in:
GitHub Merge Button 2012-07-12 23:48:55 -07:00
commit e3f063f7fd
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
djangorestframework/authentication.py
View File

@ -56,6 +56,18 @@ class BasicAuthentication(BaseAuthentication):
Returns a :obj:`User` if a correct username and password have been supplied Returns a :obj:`User` if a correct username and password have been supplied
using HTTP Basic authentication. Otherwise returns :const:`None`. using HTTP Basic authentication. Otherwise returns :const:`None`.
""" """
uname, passwd = self.extract_credentials(request)
if uname:
user = authenticate(username=uname, password=passwd)
if user is not None and user.is_active:
return user
return None
def extract_credentials(self, request):
"""
Extracts username, password from HTTP Auth Basic header if they have
been set. Otherwise returns :const:`None`, :const:`None`.
"""
from django.utils.encoding import smart_unicode, DjangoUnicodeDecodeError from django.utils.encoding import smart_unicode, DjangoUnicodeDecodeError
if 'HTTP_AUTHORIZATION' in request.META: if 'HTTP_AUTHORIZATION' in request.META:
@ -71,10 +83,9 @@ class BasicAuthentication(BaseAuthentication):
except DjangoUnicodeDecodeError: except DjangoUnicodeDecodeError:
return None return None
user = authenticate(username=uname, password=passwd) return uname, passwd
if user is not None and user.is_active:
return user return None, None
return None
class UserLoggedInAuthentication(BaseAuthentication): class UserLoggedInAuthentication(BaseAuthentication):