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

add option for global permit of delete of collection (default: True to avoid breaking change)

Browse source
This commit is contained in:
Peter Bieringer 2024-03-09 06:43:39 +01:00
parent f407915227
commit 0f355114ae
4 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
config
View file

@ -79,6 +79,9 @@
# File for rights management from_file # File for rights management from_file
#file = /etc/radicale/rights #file = /etc/radicale/rights
# Permit delete of a collection (global)
#permit_delete_collection = True
[storage] [storage]

3
radicale/app/__init__.py
View file

@ -68,6 +68,7 @@ class Application(ApplicationPartDelete, ApplicationPartHead,
_max_content_length: int _max_content_length: int
_auth_realm: str _auth_realm: str
_extra_headers: Mapping[str, str] _extra_headers: Mapping[str, str]
_permit_delete_collection: bool
def __init__(self, configuration: config.Configuration) -> None: def __init__(self, configuration: config.Configuration) -> None:
"""Initialize Application. """Initialize Application.
@ -84,6 +85,8 @@ class Application(ApplicationPartDelete, ApplicationPartHead,
self._max_content_length = configuration.get( self._max_content_length = configuration.get(
"server", "max_content_length") "server", "max_content_length")
self._auth_realm = configuration.get("auth", "realm") self._auth_realm = configuration.get("auth", "realm")
self._permit_delete_collection = configuration.get("rights", "permit_delete_collection")
logger.info("permit delete of collection: %s", self._permit_delete_collection)
self._extra_headers = dict() self._extra_headers = dict()
for key in self.configuration.options("headers"): for key in self.configuration.options("headers"):
self._extra_headers[key] = configuration.get("headers", key) self._extra_headers[key] = configuration.get("headers", key)

5
radicale/app/delete.py
View file

@ -68,7 +68,10 @@ class ApplicationPartDelete(ApplicationBase):
# ETag precondition not verified, do not delete item # ETag precondition not verified, do not delete item
return httputils.PRECONDITION_FAILED return httputils.PRECONDITION_FAILED
if isinstance(item, storage.BaseCollection): if isinstance(item, storage.BaseCollection):
xml_answer = xml_delete(base_prefix, path, item) if self._permit_delete_collection:
xml_answer = xml_delete(base_prefix, path, item)
else:
return httputils.NOT_ALLOWED
else: else:
assert item.collection is not None assert item.collection is not None
assert item.href is not None assert item.href is not None

4
radicale/config.py
View file

@ -184,6 +184,10 @@ DEFAULT_CONFIG_SCHEMA: types.CONFIG_SCHEMA = OrderedDict([
"help": "rights backend", "help": "rights backend",
"type": str_or_callable, "type": str_or_callable,
"internal": rights.INTERNAL_TYPES}), "internal": rights.INTERNAL_TYPES}),
("permit_delete_collection", {
"value": "True",
"help": "permit delete of a collection",
"type": bool}),
("file", { ("file", {
"value": "/etc/radicale/rights", "value": "/etc/radicale/rights",
"help": "file for rights management from_file", "help": "file for rights management from_file",