Repair auth tests, add tests for all methods and cross check

The auth tests were not doing anything because "Basic" was missing in the AUTHORIZATION header.

radicale/tests/test_auth.py

@@ -21,15 +21,15 @@ Radicale tests with simple requests and authentication.
 """
 
 import base64
-import hashlib
 import logging
 import os
 import shutil
 import tempfile
 
+import pytest
 from radicale import Application, config
 
-from . import BaseTest
+from .test_base import BaseTest
 
 
 class TestBaseAuthRequests(BaseTest):
@@ -39,38 +39,78 @@ class TestBaseAuthRequests(BaseTest):
 
     """
     def setup(self):
+        self.configuration = config.load()
+        self.logger = logging.getLogger("radicale_test")
         self.colpath = tempfile.mkdtemp()
+        self.configuration.set("storage", "filesystem_folder", self.colpath)
+        # Disable syncing to disk for better performance
+        self.configuration.set("storage", "filesystem_fsync", "False")
+        # Required on Windows, doesn't matter on Unix
+        self.configuration.set("storage", "close_lock_file", "True")
 
     def teardown(self):
         shutil.rmtree(self.colpath)
 
-    def test_root(self):
+    def _test_htpasswd(self, htpasswd_encryption, htpasswd_content):
-        """Htpasswd authentication."""
+        """Test htpasswd authentication with user "tmp" and password "bepo"."""
         htpasswd_file_path = os.path.join(self.colpath, ".htpasswd")
-        with open(htpasswd_file_path, "wb") as fd:
+        with open(htpasswd_file_path, "w") as f:
-            fd.write(b"tmp:{SHA}" + base64.b64encode(
+            f.write(htpasswd_content)
-                hashlib.sha1(b"bepo").digest()))
+        self.configuration.set("auth", "type", "htpasswd")
-
+        self.configuration.set("auth", "htpasswd_filename", htpasswd_file_path)
-        configuration = config.load()
+        self.configuration.set("auth", "htpasswd_encryption",
-        configuration.set("auth", "type", "htpasswd")
+                               htpasswd_encryption)
-        configuration.set("auth", "htpasswd_filename", htpasswd_file_path)
+        self.application = Application(self.configuration, self.logger)
-        configuration.set("auth", "htpasswd_encryption", "sha1")
+        for user, password, expeced_status in (
-
+                ("tmp", "bepo", 207), ("tmp", "tmp", 401), ("tmp", "", 401),
-        self.application = Application(
+                ("unk", "unk", 401), ("unk", "", 401), ("", "", 401)):
-            configuration, logging.getLogger("radicale_test"))
-
             status, headers, answer = self.request(
-            "GET", "/", HTTP_AUTHORIZATION="dG1wOmJlcG8=")
+                "PROPFIND", "/",
-        assert status == 200
+                HTTP_AUTHORIZATION="Basic %s" % base64.b64encode(
-        assert "Radicale works!" in answer
+                    ("%s:%s" % (user, password)).encode()).decode())
+            assert status == expeced_status
+
+    def test_htpasswd_plain(self):
+        self._test_htpasswd("plain", "tmp:bepo")
+
+    def test_htpasswd_sha1(self):
+        self._test_htpasswd("sha1", "tmp:{SHA}UWRS3uSJJq2itZQEUyIH8rRajCM=")
+
+    def test_htpasswd_ssha(self):
+        self._test_htpasswd("ssha", "tmp:{SSHA}qbD1diw9RJKi0DnW4qO8WX9SE18W")
+
+    def test_htpasswd_md5(self):
+        try:
+            import passlib  # noqa: F401
+        except ImportError:
+            pytest.skip("passlib is not installed")
+        self._test_htpasswd("md5", "tmp:$apr1$BI7VKCZh$GKW4vq2hqDINMr8uv7lDY/")
+
+    def test_htpasswd_crypt(self):
+        try:
+            import crypt  # noqa: F401
+        except ImportError:
+            pytest.skip("crypt is not installed")
+        self._test_htpasswd("crypt", "tmp:dxUqxoThMs04k")
+
+    def test_htpasswd_bcrypt(self):
+        try:
+            from passlib.hash import bcrypt
+            from passlib.exc import MissingBackendError
+        except ImportError:
+            pytest.skip("passlib is not installed")
+        try:
+            bcrypt.encrypt("test-bcrypt-backend")
+        except MissingBackendError:
+            pytest.skip("bcrypt backend for passlib is not installed")
+        self._test_htpasswd(
+            "bcrypt",
+            "tmp:$2y$05$oD7hbiQFQlvCM7zoalo/T.MssV3VNTRI3w5KDnj8NTUKJNWfVpvRq")
 
     def test_custom(self):
         """Custom authentication."""
-        configuration = config.load()
+        self.configuration.set("auth", "type", "tests.custom.auth")
-        configuration.set("auth", "type", "tests.custom.auth")
+        self.application = Application(self.configuration, self.logger)
-        self.application = Application(
-            configuration, logging.getLogger("radicale_test"))
-
         status, headers, answer = self.request(
             "GET", "/", HTTP_AUTHORIZATION="dG1wOmJlcG8=")
         assert status == 200