From 2ef99e5e851e27c530fc123fd254017240e38765 Mon Sep 17 00:00:00 2001 From: Peter Bieringer Date: Wed, 19 Mar 2025 06:17:34 +0100 Subject: [PATCH] Fix: auth/htpasswd related to detection and use of bcrypt --- CHANGELOG.md | 4 ++++ pyproject.toml | 2 +- radicale/auth/htpasswd.py | 5 +++-- setup.py.legacy | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dae477f0..04ce27a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 3.5.1.dev + +* Fix: auth/htpasswd related to detection and use of bcrypt + ## 3.5.0 * Add: option [auth] type oauth2 by code migration from https://gitlab.mim-libre.fr/alphabet/radicale_oauth/-/blob/dev/oauth2/ diff --git a/pyproject.toml b/pyproject.toml index 1b7fb5ca..66ded900 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,7 @@ name = "Radicale" # When the version is updated, a new section in the CHANGELOG.md file must be # added too. readme = "README.md" -version = "3.5.0" +version = "3.5.1.dev" authors = [{name = "Guillaume Ayoub", email = "guillaume.ayoub@kozea.fr"}, {name = "Unrud", email = "unrud@outlook.com"}, {name = "Peter Bieringer", email = "pb@bieringer.de"}] license = {text = "GNU GPL v3"} description = "CalDAV and CardDAV Server" diff --git a/radicale/auth/htpasswd.py b/radicale/auth/htpasswd.py index 8ac77372..17dc2c9c 100644 --- a/radicale/auth/htpasswd.py +++ b/radicale/auth/htpasswd.py @@ -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) diff --git a/setup.py.legacy b/setup.py.legacy index 910cf5ed..0256f556 100644 --- a/setup.py.legacy +++ b/setup.py.legacy @@ -20,7 +20,7 @@ from setuptools import find_packages, setup # When the version is updated, a new section in the CHANGELOG.md file must be # added too. -VERSION = "3.5.0" +VERSION = "3.5.1.dev" with open("README.md", encoding="utf-8") as f: long_description = f.read()