tobias/radicale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix authentication with Python 3 (see #70)

Browse Source
This commit is contained in:
Guillaume Ayoub 2013-10-18 14:06:57 +02:00
parent f253b23a67
commit a617c4db26
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
radicale/__init__.py
View File

@ -271,8 +271,7 @@ class Application(object):
authorization = environ.get("HTTP_AUTHORIZATION", None) authorization = environ.get("HTTP_AUTHORIZATION", None)
if authorization: if authorization:
authorization = \ authorization = authorization.lstrip("Basic").strip()
authorization.decode("ascii").lstrip("Basic").strip()
user, password = self.decode(base64.b64decode( user, password = self.decode(base64.b64decode(
authorization.encode("ascii")), environ).split(":", 1) authorization.encode("ascii")), environ).split(":", 1)
else: else:

2
tests/__init__.py
View File

@ -136,7 +136,7 @@ class HtpasswdAuthSystem(BaseTest):
fd.write(b"tmp:{SHA}" + base64.b64encode( fd.write(b"tmp:{SHA}" + base64.b64encode(
hashlib.sha1(b"bepo").digest())) hashlib.sha1(b"bepo").digest()))
config.set("auth", "type", "htpasswd") config.set("auth", "type", "htpasswd")
self.userpass = base64.b64encode(b"tmp:bepo") self.userpass = "dG1wOmJlcG8="
self.application = radicale.Application() self.application = radicale.Application()
htpasswd.FILENAME = htpasswd_file_path htpasswd.FILENAME = htpasswd_file_path
htpasswd.ENCRYPTION = "sha1" htpasswd.ENCRYPTION = "sha1"