Avii/Radicale
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

user/path test: fixes

Browse Source
This commit is contained in:
Peter Bieringer
2026-04-22 21:57:11 +02:00
parent 4b15e4b432
commit 8babd65ae8
3 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
radicale/app/__init__.py
View File

@@ -168,18 +168,6 @@ class Application(ApplicationPartDelete, ApplicationPartHead,
self._validate_user_value = "no-unicode"
if self._validate_path_value not in ["strict", "no-unicode"]:
self._validate_path_value = "no-unicode"
if not self._storage._supports_problematic_chars or not self._storage._supports_trailing_whitespace:
if self._validate_user_value not in ["strict"]:
self._validate_user_value = "strict"
if self._validate_path_value not in ["strict"]:
self._validate_path_value = "strict"
logger.notice("validate user value: %r (enforced by limited support of collection storage)", self._validate_user_value)
logger.notice("validate path value: %r (enforced by limited support of collection storage)", self._validate_path_value)
elif not self._storage._supports_problematic_chars or not self._storage._supports_trailing_whitespace:
if self._validate_user_value not in ["strict"]:
self._validate_user_value = "strict"
if self._validate_path_value not in ["strict"]:
self._validate_path_value = "strict"
logger.notice("validate user value: %r (enforced by limited support of collection storage)", self._validate_user_value)
logger.notice("validate path value: %r (enforced by limited support of collection storage)", self._validate_path_value)
else:

8
radicale/app/base.py
View File

@@ -127,6 +127,8 @@ class ApplicationBase:
check_unicode_letter = (validation_type == "unicode-letter")
check_no_unicode = (validation_type == "no-unicode")
logger.trace("_check_format investigate %r (validation_type=%r check_minimal=%s check_unicode_letter=%s check_no_unicode=%s)", string, validation_type, check_minimal, check_unicode_letter, check_no_unicode)
if not self._storage._supports_trailing_whitespace and string.endswith(' '):
return False
for c in string:
if c <= chr(31) or (c >= chr(127) and c <= chr(159)):
# ASCII: control char
@@ -135,15 +137,15 @@ class ApplicationBase:
# https://unicodeplus.com/category
# Unicode: control
return False
if check_minimal:
if check_minimal or not self._storage._supports_problematic_chars:
if c in blacklist_minimal:
logger.trace("_check_format found %r", c)
return False
elif check_unicode_letter:
if check_unicode_letter:
if c not in whitelist_unicode:
if unicodedata.category(c)[0] != "L":
return False
elif check_no_unicode:
if check_no_unicode:
if ord(c) > 255:
return False
return True

2
radicale/tests/test_auth.py
View File

@@ -335,7 +335,7 @@ class TestBaseAuthRequests(BaseTest):
def test_htpasswd_whitespace_user(self) -> None:
for user in (" tmp", "tmp ", " tmp "):
if not pathutils.path_supports_trailing_whitespace(self.colpath) and (user.endswith(' ') or user.startswith(' ')):
if not pathutils.path_supports_trailing_whitespace(self.colpath) and user.endswith(' '):
check = 401
else:
check = 207