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

sharing: fix property overlay add/replace/remove

Browse Source
This commit is contained in:
Peter Bieringer
2026-03-08 08:47:41 +01:00
parent 0404e54a99
commit 4f226d5a27
1 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
radicale/sharing/__init__.py
View File

@@ -921,6 +921,29 @@ class BaseSharing:
if share is None: if share is None:
return httputils.NOT_FOUND return httputils.NOT_FOUND
if 'Properties' in request_data:
if Properties is None:
# clear properties
Properties = {}
elif Properties == {}:
# empty, nothing to do
pass
else:
# replace properties
for prop in share['Properties']:
if logger.isEnabledFor(logging.DEBUG):
logger.debug("TRACE/" + api_info + ": check for existing property %r", prop)
if prop not in Properties:
# overtake
if logger.isEnabledFor(logging.DEBUG):
logger.debug("TRACE/" + api_info + ": overtake property %r", prop)
Properties[prop] = share['Properties'][prop]
elif Properties[prop] == '':
# unset, do nothing
if logger.isEnabledFor(logging.DEBUG):
logger.debug("TRACE/" + api_info + ": clear property %r", prop)
del Properties[prop]
if user == share['Owner']: if user == share['Owner']:
if PathMapped is not None: if PathMapped is not None:
# check access Permissions # check access Permissions
@@ -929,10 +952,6 @@ class BaseSharing:
logger.warning(api_info + ": access to %r not allowed for user %r", PathMapped, user) logger.warning(api_info + ": access to %r not allowed for user %r", PathMapped, user)
return httputils.NOT_ALLOWED return httputils.NOT_ALLOWED
if 'Properties' in request_data and Properties is None:
# clear properties
Properties = {}
result = self.database_update_sharing( result = self.database_update_sharing(
ShareType=ShareType, ShareType=ShareType,
PathMapped=PathMapped, PathMapped=PathMapped,
@@ -967,10 +986,6 @@ class BaseSharing:
return httputils.NOT_ALLOWED return httputils.NOT_ALLOWED
return httputils.NOT_ALLOWED return httputils.NOT_ALLOWED
if 'Properties' in request_data and Properties is None:
# clear properties
Properties = {}
# limited update as user # limited update as user
result = self.database_update_sharing( result = self.database_update_sharing(
ShareType=ShareType, ShareType=ShareType,