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

sharing: add forgotten backmap for delete

Browse Source
This commit is contained in:
Peter Bieringer
2026-07-19 10:19:50 +02:00
parent 6468f9d6f8
commit fe5fd55723
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
radicale/app/delete.py
View File

@@ -20,7 +20,9 @@
import xml.etree.ElementTree as ET import xml.etree.ElementTree as ET
from http import client from http import client
from typing import Optional from typing import Optional, Union
from urllib.parse import quote
from radicale import httputils, storage, types, xmlutils from radicale import httputils, storage, types, xmlutils
from radicale.app.base import Access, ApplicationBase from radicale.app.base import Access, ApplicationBase
@@ -29,7 +31,7 @@ from radicale.log import logger
def xml_delete(base_prefix: str, path: str, collection: storage.BaseCollection, def xml_delete(base_prefix: str, path: str, collection: storage.BaseCollection,
item_href: Optional[str] = None) -> ET.Element: item_href: Optional[str] = None, share: Union[dict, None] = None) -> ET.Element:
"""Read and answer DELETE requests. """Read and answer DELETE requests.
Read rfc4918-9.6 for info. Read rfc4918-9.6 for info.
@@ -43,6 +45,13 @@ def xml_delete(base_prefix: str, path: str, collection: storage.BaseCollection,
href_element = ET.Element(xmlutils.make_clark("D:href")) href_element = ET.Element(xmlutils.make_clark("D:href"))
href_element.text = xmlutils.make_href(base_prefix, path) href_element.text = xmlutils.make_href(base_prefix, path)
if share:
# backmap; quote so the encoded href and raw share path compare
mapped = quote(share['PathMapped'])
token = quote(str(share['PathOrToken']))
if href_element.text.startswith(base_prefix + mapped):
href_element.text = base_prefix + token + href_element.text.removeprefix(base_prefix + mapped)
logger.trace("DELETE/xml_delete: href=%r (backmapped)", href_element.text)
response.append(href_element) response.append(href_element)
status = ET.Element(xmlutils.make_clark("D:status")) status = ET.Element(xmlutils.make_clark("D:status"))
@@ -122,7 +131,7 @@ class ApplicationPartDelete(ApplicationBase):
) )
) )
xml_answer = xml_delete( xml_answer = xml_delete(
base_prefix, path, item.collection, item.href) base_prefix, path, item.collection, item.href, share)
for notification_item in hook_notification_item_list: # Will be empty if hook not enabled for notification_item in hook_notification_item_list: # Will be empty if hook not enabled
self._hook.notify(notification_item) self._hook.notify(notification_item)
headers = {"Content-Type": "text/xml; charset=%s" % self._encoding} headers = {"Content-Type": "text/xml; charset=%s" % self._encoding}