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

sharing: report+propfind honor base_prefix on backmap

Browse Source
This commit is contained in:
Peter Bieringer
2026-06-08 21:59:24 +02:00
parent 8aec777e16
commit 8e9216cd08
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
radicale/app/propfind.py
View File

@@ -257,8 +257,8 @@ def xml_propfind_response(
child_element.text = xmlutils.make_href(base_prefix, path) child_element.text = xmlutils.make_href(base_prefix, path)
if share: if share:
# backmap # backmap
if child_element.text.startswith(share['PathMapped']): if child_element.text.startswith(base_prefix + share['PathMapped']):
child_element.text = str(share['PathOrToken']) + child_element.text.removeprefix(share['PathMapped']) child_element.text = base_prefix + str(share['PathOrToken']) + child_element.text.removeprefix(base_prefix + share['PathMapped'])
if share_bday_automap and child_element.text.endswith(".vcf"): if share_bday_automap and child_element.text.endswith(".vcf"):
child_element.text = child_element.text.removesuffix(".vcf") + ".ics" child_element.text = child_element.text.removesuffix(".vcf") + ".ics"
element.append(child_element) element.append(child_element)

6
radicale/app/report.py
View File

@@ -739,11 +739,11 @@ def xml_item_response(base_prefix: str, href: str,
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, href) href_element.text = xmlutils.make_href(base_prefix, href)
logger.trace("REPORT/xml_report: href=%r", href_element.text) logger.trace("REPORT/xml_report: href=%r base_prefix=%r", href_element.text, base_prefix)
if share: if share:
# backmap # backmap
if href_element.text.startswith(share['PathMapped']): if href_element.text.startswith(base_prefix + share['PathMapped']):
href_element.text = str(share['PathOrToken']) + href_element.text.removeprefix(share['PathMapped']) href_element.text = base_prefix + str(share['PathOrToken']) + href_element.text.removeprefix(base_prefix + share['PathMapped'])
if share_bday_automap and href_element.text.endswith(".vcf"): if share_bday_automap and href_element.text.endswith(".vcf"):
href_element.text = href_element.text.removesuffix(".vcf") + ".ics" href_element.text = href_element.text.removesuffix(".vcf") + ".ics"
logger.trace("REPORT/xml_report: href=%r (backmapped)", href_element.text) logger.trace("REPORT/xml_report: href=%r (backmapped)", href_element.text)