radicale/utils: drop bcrypt compat check
We now support passlib and bcrypt5 so the test can be dropped. Related-to: #1980 Signed-off-by: Henning Schild <henning@hennsch.de>
This commit is contained in:
@@ -43,7 +43,7 @@ out-of-the-box:
|
||||
- SHA256 (htpasswd -2 ...)
|
||||
- SHA512 (htpasswd -5 ...)
|
||||
|
||||
When bcrypt is installed (bcrypt >= 5.0.0 requires passlib(libpass) >= 1.9.3):
|
||||
When bcrypt is installed:
|
||||
- BCRYPT (htpasswd -B ...) -- Requires htpasswd 2.4.x
|
||||
|
||||
When argon2 is installed:
|
||||
@@ -61,7 +61,7 @@ from typing import Any, Tuple
|
||||
|
||||
from passlib.hash import apr_md5_crypt, sha256_crypt, sha512_crypt
|
||||
|
||||
from radicale import auth, config, logger, utils
|
||||
from radicale import auth, config, logger
|
||||
|
||||
|
||||
class Auth(auth.BaseAuth):
|
||||
@@ -122,22 +122,12 @@ class Auth(auth.BaseAuth):
|
||||
"The htpasswd encryption method 'bcrypt' or 'autodetect' requires "
|
||||
"the bcrypt module (entries found: %d)." % self._htpasswd_bcrypt_use) from e
|
||||
else:
|
||||
[bcrypt_usable, info] = utils.passlib_libpass_supports_bcrypt()
|
||||
if bcrypt_usable:
|
||||
self._has_bcrypt = True
|
||||
logger.info(info)
|
||||
else:
|
||||
logger.warning(info)
|
||||
self._has_bcrypt = True
|
||||
if self._encryption == "autodetect":
|
||||
if self._htpasswd_bcrypt_use == 0:
|
||||
logger.info("auth htpasswd encryption is 'radicale.auth.htpasswd_encryption.%s' and bcrypt module found, but currently not required", self._encryption)
|
||||
else:
|
||||
logger.info("auth htpasswd encryption is 'radicale.auth.htpasswd_encryption.%s' and bcrypt module found (bcrypt entries found: %d)", self._encryption, self._htpasswd_bcrypt_use)
|
||||
if not bcrypt_usable:
|
||||
raise RuntimeError("The htpasswd encryption 'autodetect' requires the bcrypt module but not usuable")
|
||||
else:
|
||||
if not bcrypt_usable:
|
||||
raise RuntimeError("The htpasswd encryption method 'bcrypt' requires the bcrypt module but not usuable")
|
||||
if self._encryption == "bcrypt":
|
||||
self._verify = functools.partial(self._bcrypt, bcrypt)
|
||||
else:
|
||||
|
||||
Reference in New Issue
Block a user