mirrors/Radicale
1
0
Fork 0
mirror of https://github.com/Kozea/Radicale.git synced 2025-04-04 05:37:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix: auth/htpasswd related to detection and use of bcrypt

Browse source
This commit is contained in:
Peter Bieringer 2025-03-19 06:17:34 +01:00
parent 26eab43f40
commit 2ef99e5e85
4 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
radicale/auth/htpasswd.py
View file

@ -113,6 +113,7 @@ 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:
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 bycrypt module found, but currently not required", self._encryption)
@ -122,8 +123,8 @@ class Auth(auth.BaseAuth):
self._verify = functools.partial(self._bcrypt, bcrypt)
else:
self._verify = self._autodetect
self._verify_bcrypt = functools.partial(self._bcrypt, bcrypt)
self._has_bcrypt = True
if self._htpasswd_bcrypt_use:
self._verify_bcrypt = functools.partial(self._bcrypt, bcrypt)
else:
raise RuntimeError("The htpasswd encryption method %r is not "
"supported." % self._encryption)