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

Merge pull request #2002 from flesueur/master

Browse Source 
Improve performance of `path_to_filesystem()`
This commit is contained in:
Peter Bieringer
2026-03-01 09:37:34 +01:00
committed by GitHub
parent 7e3d4b3b6c 0be7b620c9
commit 8c0f716eaa
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
radicale/pathutils.py
View File

@@ -282,14 +282,11 @@ def path_to_filesystem(root: str, sane_path: str) -> str:
for part in parts: for part in parts:
if not is_safe_filesystem_path_component(part): if not is_safe_filesystem_path_component(part):
raise UnsafePathError(part) raise UnsafePathError(part)
safe_path_parent = safe_path
safe_path = os.path.join(safe_path, part) safe_path = os.path.join(safe_path, part)
# Check for conflicting files (e.g. case-insensitive file systems # Check for conflicting files (e.g. case-insensitive file systems
# or short names on Windows file systems) # or short names on Windows file systems)
if os.path.lexists(safe_path): if (os.path.lexists(safe_path) and not os.path.realpath(safe_path).endswith(part)):
with os.scandir(safe_path_parent) as entries: raise CollidingPathError(part)
if part not in (e.name for e in entries):
raise CollidingPathError(part)
return safe_path return safe_path