X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/357027375ff8867f42ca34bcbfb5a78b5b185fc3..05b7014d1d710937c6a4b5cdccdb4890f377818d:/src/basicauth.py diff --git a/src/basicauth.py b/src/basicauth.py index befcc6fe7..dc7aceb16 100644 --- a/src/basicauth.py +++ b/src/basicauth.py @@ -7,8 +7,8 @@ import base64 from django.http import HttpResponse from django.contrib.auth import authenticate, login -# -def view_or_basicauth(view, request, test_func, realm = "", *args, **kwargs): + +def view_or_basicauth(view, request, test_func, realm="", *args, **kwargs): """ This is a helper function used by 'logged_in_or_basicauth' and 'has_perm_or_basicauth' (deleted) that does the nitty of determining if they @@ -28,7 +28,7 @@ def view_or_basicauth(view, request, test_func, realm = "", *args, **kwargs): # NOTE: We are only support basic authentication for now. # if auth[0].lower() == "basic": - uname, passwd = base64.b64decode(auth[1]).split(':') + uname, passwd = base64.b64decode(auth[1].encode('utf-8')).decode('utf-8').split(':') user = authenticate(username=uname, password=passwd) if user is not None: if user.is_active: @@ -47,7 +47,7 @@ def view_or_basicauth(view, request, test_func, realm = "", *args, **kwargs): # -def logged_in_or_basicauth(realm = ""): +def logged_in_or_basicauth(realm=""): """ A simple decorator that requires a user to be logged in. If they are not logged in the request is examined for a 'authorization' header.