sjs/vdirsyncer
1
0
Fork 0
mirror of https://github.com/samsonjs/vdirsyncer.git synced 2026-04-27 14:57:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refine race-check in dav._put

Browse source
This commit is contained in:
Markus Unterwaditzer 2015-07-25 03:59:32 +02:00
parent f0e842ac41
commit edc0eb2f84
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
vdirsyncer/storage/dav.py
View file

@ -445,13 +445,23 @@ class DavStorage(Storage):
etag = response.headers.get('etag', None) etag = response.headers.get('etag', None)
href = self._normalize_href(response.url) href = self._normalize_href(response.url)
if not etag: if not etag:
# The server violated the RFC and didn't send an etag. # The server violated the RFC and didn't send an etag. This is
# technically a race-condition, but too many popular servers do it.
#
# ownCloud: https://github.com/owncloud/contacts/issues/920 # ownCloud: https://github.com/owncloud/contacts/issues/920
dav_logger.debug('Server did not send etag, fetching {!r}' dav_logger.debug('Server did not send etag, fetching {!r}'
.format(href)) .format(href))
item2, etag = self.get(href) item2, etag = self.get(href)
if item2.raw != item.raw:
raise exceptions.WrongEtagError(href) # We don't have the old etag, but we can sloppily compare item
# contents to see if the values changed.
if item2.hash != item.hash:
dav_logger.debug('Old content: {!r}'.format(item.raw))
dav_logger.debug('New content: {!r}'.format(item2.raw))
raise exceptions.WrongEtagError(
'While requesting the etag for {!r}, '
'the item content changed.'
)
return href, etag return href, etag
def update(self, href, item, etag): def update(self, href, item, etag):