Kaynağa Gözat

Fix authentication with Python 3 (see #70)

Guillaume Ayoub 12 yıl önce
ebeveyn
işleme
a617c4db26
2 değiştirilmiş dosya ile 2 ekleme ve 3 silme
  1. 1 2
      radicale/__init__.py
  2. 1 1
      tests/__init__.py

+ 1 - 2
radicale/__init__.py

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

+ 1 - 1
tests/__init__.py

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