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

Verify number of components in items

Browse Source
This commit is contained in:
Unrud 2017-07-15 09:42:01 +02:00
parent d3a90d16c3
commit 4f831de006
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
radicale/__init__.py
View File

@ -814,7 +814,10 @@ class Application:
return PRECONDITION_FAILED return PRECONDITION_FAILED
try: try:
items = list(vobject.readComponents(content or "")) items = tuple(vobject.readComponents(content or ""))
if not write_whole_collection and len(items) != 1:
raise RuntimeError(
"Content contains %d components" % len(items))
for i in items: for i in items:
storage.check_and_sanitize_item( storage.check_and_sanitize_item(
i, is_collection=write_whole_collection, uid=item.uid i, is_collection=write_whole_collection, uid=item.uid

6
radicale/storage.py
View File

@ -362,7 +362,11 @@ class Item:
def item(self): def item(self):
if self._item is None: if self._item is None:
try: try:
self._item = vobject.readOne(self._text) items = tuple(vobject.readComponents(self._text))
if len(items) != 1:
raise RuntimeError(
"Content contains %d components" % len(items))
self._item = items[0]
except Exception as e: except Exception as e:
raise RuntimeError("Failed to parse item %r from %r: %s" % raise RuntimeError("Failed to parse item %r from %r: %s" %
(self.href, self.collection.path, e)) from e (self.href, self.collection.path, e)) from e