fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Messaging.
[wolnelektury.git]
/
src
/
basicauth.py
diff --git
a/src/basicauth.py
b/src/basicauth.py
index
3635727
..
b4acb46
100644
(file)
--- a/
src/basicauth.py
+++ b/
src/basicauth.py
@@
-1,4
+1,3
@@
-# -*- coding: utf-8 -*-
#############################################################################
# from http://djangosnippets.org/snippets/243/
#############################################################################
# from http://djangosnippets.org/snippets/243/
@@
-29,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":
# 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:
user = authenticate(username=uname, password=passwd)
if user is not None:
if user.is_active:
@@
-45,7
+44,7
@@
def view_or_basicauth(view, request, test_func, realm="", *args, **kwargs):
response.status_code = 401
response['WWW-Authenticate'] = 'Basic realm="%s"' % realm
return response
response.status_code = 401
response['WWW-Authenticate'] = 'Basic realm="%s"' % realm
return response
-
+
#
def logged_in_or_basicauth(realm=""):
#
def logged_in_or_basicauth(realm=""):
@@
-80,7
+79,7
@@
def logged_in_or_basicauth(realm=""):
def view_decorator(func):
def wrapper(request, *args, **kwargs):
return view_or_basicauth(func, request,
def view_decorator(func):
def wrapper(request, *args, **kwargs):
return view_or_basicauth(func, request,
- lambda u: u.is_authenticated
()
,
+ lambda u: u.is_authenticated,
realm, *args, **kwargs)
return wrapper
return view_decorator
realm, *args, **kwargs)
return wrapper
return view_decorator