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

Merge pull request #2127 from pbiering/sharing-fix-propfind-owner

Browse Source 
Sharing fix propfind owner
This commit is contained in:
Peter Bieringer
2026-05-15 08:43:27 +02:00
committed by GitHub
parent 4fa6ffe82e fda97fedfa
commit a48f35db03
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -1,6 +1,7 @@
# Changelog # Changelog
## 3.7.4.dev ## 3.7.4.dev
* Fix: sharing: PROPFIND returns now empty owner element in case of a mapped share as clients try PROPFIND on this not accessable href
## 3.7.3 ## 3.7.3
* Extension: expose RADICALE:version for authenticated users via PROPFIND * Extension: expose RADICALE:version for authenticated users via PROPFIND

3
radicale/app/propfind.py
View File

@@ -395,7 +395,8 @@ def xml_propfind_response(
is404 = True is404 = True
elif tag == xmlutils.make_clark("D:owner"): elif tag == xmlutils.make_clark("D:owner"):
# return empty elment, if no owner available (rfc3744-5.1) # return empty elment, if no owner available (rfc3744-5.1)
if collection.owner: # return empty element in case of a mapped share / clients try PROPFIND on this not accessable href
if collection.owner and not share:
child_element = ET.Element(xmlutils.make_clark("D:href")) child_element = ET.Element(xmlutils.make_clark("D:href"))
child_element.text = xmlutils.make_href( child_element.text = xmlutils.make_href(
base_prefix, "/%s/" % collection.owner) base_prefix, "/%s/" % collection.owner)

5
radicale/tests/test_sharing.py
View File

@@ -2236,15 +2236,18 @@ class TestSharingApiSanity(BaseTest):
<propfind xmlns="DAV:"> <propfind xmlns="DAV:">
<prop> <prop>
<current-user-principal /> <current-user-principal />
<owner />
</prop> </prop>
</propfind>""", login="user:userpw", check=207) </propfind>""", login="user:userpw", check=207)
logging.info("response: %r", responses) logging.info("response: %r", responses)
response = responses[path_shared] response = responses[path_shared]
assert not isinstance(response, int) and len(response) == 1 assert not isinstance(response, int) and len(response) == 2
status, prop = response["D:current-user-principal"] status, prop = response["D:current-user-principal"]
assert status == 200 and len(prop) == 1 assert status == 200 and len(prop) == 1
element = prop.find(xmlutils.make_clark("D:href")) element = prop.find(xmlutils.make_clark("D:href"))
assert element is not None and element.text == "/user/" assert element is not None and element.text == "/user/"
status, prop = response["D:owner"]
assert status == 200 and len(prop) == 0
def test_sharing_api_map_proppatch_acl(self) -> None: def test_sharing_api_map_proppatch_acl(self) -> None:
"""share-by-map API usage tests related to report.""" """share-by-map API usage tests related to report."""