tobias/radicale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

XML error message for invalid sync-token

Browse Source
This commit is contained in:
Unrud 2017-06-07 14:16:18 +02:00
parent 13381fb829
commit 3753364fc8
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
radicale/__init__.py
View File

@ -842,6 +842,4 @@ class Application:
headers = {"Content-Type": "text/xml; charset=%s" % self.encoding} headers = {"Content-Type": "text/xml; charset=%s" % self.encoding}
status, xml_answer = xmlutils.report( status, xml_answer = xmlutils.report(
base_prefix, path, xml_content, collection) base_prefix, path, xml_content, collection)
if status == client.PRECONDITION_FAILED:
return PRECONDITION_FAILED
return (status, headers, self._write_xml_content(xml_answer)) return (status, headers, self._write_xml_content(xml_answer))

10
radicale/xmlutils.py
View File

@ -127,6 +127,13 @@ def _href(base_prefix, href):
return quote("%s%s" % (base_prefix, href)) return quote("%s%s" % (base_prefix, href))
def _webdav_error(namespace, name):
"""Generate XML error message."""
root = ET.Element(_tag("D", "error"))
root.append(ET.Element(_tag(namespace, name)))
return root
def _date_to_datetime(date_): def _date_to_datetime(date_):
"""Transform a date to a UTC datetime. """Transform a date to a UTC datetime.
@ -1041,7 +1048,8 @@ def report(base_prefix, path, xml_request, collection):
# Invalid sync token # Invalid sync token
collection.logger.warning("Client provided invalid sync token %r: " collection.logger.warning("Client provided invalid sync token %r: "
"%s", old_sync_token, e, exc_info=True) "%s", old_sync_token, e, exc_info=True)
return client.PRECONDITION_FAILED, None return (client.PRECONDITION_FAILED,
_webdav_error("D", "valid-sync-token"))
hreferences = ("/" + posixpath.join(collection.path, n) for n in names) hreferences = ("/" + posixpath.join(collection.path, n) for n in names)
# Append current sync token to response # Append current sync token to response
sync_token_element = ET.Element(_tag("D", "sync-token")) sync_token_element = ET.Element(_tag("D", "sync-token"))