oss/Radicale
oss/Radicale
1
0
Fork 0
mirror of https://github.com/Kozea/Radicale.git synced 2025-08-10 18:40:53 +00:00
Code Wiki Activity

Merge pull request #1805 from pbiering/fix-1803

Browse source 
Fix 1803
This commit is contained in:
Peter Bieringer 2025-06-13 07:41:32 +02:00 • committed by GitHub
commit 82c9d1b5ac
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 22 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -2,6 +2,7 @@
## 3.5.5.dev ## 3.5.5.dev
* Improve: [auth] ldap: do not read server info by bind to avoid needless network traffic * Improve: [auth] ldap: do not read server info by bind to avoid needless network traffic
* Fix: [storage] broken support of 'folder_umask'
## 3.5.4 ## 3.5.4
* Improve: item filter enhanced for 3rd level supporting VALARM and honoring TRIGGER (offset or absolute) * Improve: item filter enhanced for 3rd level supporting VALARM and honoring TRIGGER (offset or absolute)

30
radicale/storage/multifilesystem/__init__.py
View file

@ -146,6 +146,21 @@ class Storage(
def __init__(self, configuration: config.Configuration) -> None: def __init__(self, configuration: config.Configuration) -> None:
super().__init__(configuration) super().__init__(configuration)
if sys.platform != "win32":
if not self._folder_umask:
# retrieve current umask by setting a dummy umask
current_umask = os.umask(0o0022)
logger.info("Storage folder umask (from system): '%04o'", current_umask)
# reset to original
os.umask(current_umask)
else:
try:
config_umask = int(self._folder_umask, 8)
except Exception:
logger.critical("storage folder umask defined but invalid: '%s'", self._folder_umask)
raise
logger.info("storage folder umask defined: '%04o'", config_umask)
self._config_umask = config_umask
logger.info("Storage location: %r", self._filesystem_folder) logger.info("Storage location: %r", self._filesystem_folder)
if not os.path.exists(self._filesystem_folder): if not os.path.exists(self._filesystem_folder):
logger.warning("Storage location: %r does not exist, creating now", self._filesystem_folder) logger.warning("Storage location: %r does not exist, creating now", self._filesystem_folder)
@ -178,18 +193,3 @@ class Storage(
if not os.path.exists(self._get_collection_cache_folder()): if not os.path.exists(self._get_collection_cache_folder()):
logger.warning("Storage cache subfolder: %r does not exist, creating now", self._get_collection_cache_folder()) logger.warning("Storage cache subfolder: %r does not exist, creating now", self._get_collection_cache_folder())
self._makedirs_synced(self._get_collection_cache_folder()) self._makedirs_synced(self._get_collection_cache_folder())
if sys.platform != "win32":
if not self._folder_umask:
# retrieve current umask by setting a dummy umask
current_umask = os.umask(0o0022)
logger.info("Storage folder umask (from system): '%04o'", current_umask)
# reset to original
os.umask(current_umask)
else:
try:
config_umask = int(self._folder_umask, 8)
except Exception:
logger.critical("storage folder umask defined but invalid: '%s'", self._folder_umask)
raise
logger.info("storage folder umask defined: '%04o'", config_umask)
self._config_umask = config_umask

6
radicale/tests/test_storage.py
View file

@ -46,6 +46,12 @@ class TestMultiFileSystem(BaseTest):
self.configure({"storage": {"filesystem_folder": folder}}) self.configure({"storage": {"filesystem_folder": folder}})
assert os.path.isdir(folder) assert os.path.isdir(folder)
def test_folder_creation_with_umask(self) -> None:
"""Verify that the folder is created with umask."""
folder = os.path.join(self.colpath, "subfolder")
self.configure({"storage": {"filesystem_folder": folder, "folder_umask": "0077"}})
assert os.path.isdir(folder)
def test_fsync(self) -> None: def test_fsync(self) -> None:
"""Create a directory and file with syncing enabled.""" """Create a directory and file with syncing enabled."""
self.configure({"storage": {"_filesystem_fsync": "True"}}) self.configure({"storage": {"_filesystem_fsync": "True"}})