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

Improve sanitization of collection properties

Browse Source
This commit is contained in:
Unrud 2020-10-11 18:42:09 +02:00
parent 9909454761
commit 4d4b040b81
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
radicale/item/__init__.py
View File

@ -171,9 +171,22 @@ def check_and_sanitize_items(vobject_items, is_collection=False, tag=None):
def check_and_sanitize_props(props): def check_and_sanitize_props(props):
"""Check collection properties for common errors.""" """Check collection properties for common errors."""
tag = props.get("tag") for k, v in props.copy().items(): # Make copy to be able to delete items
if tag and tag not in ("VCALENDAR", "VADDRESSBOOK"): if not isinstance(k, str):
raise ValueError("Unsupported collection tag: %r" % tag) raise ValueError("Key must be %r not %r: %r" % (
str.__name__, type(k).__name__, k))
if not isinstance(v, str):
if v is None:
del props[k]
continue
raise ValueError("Value of %r must be %r not %r: %r" % (
k, str.__name__, type(v).__name__, v))
if k == "tag":
if not v:
del props[k]
continue
if v not in ("VCALENDAR", "VADDRESSBOOK"):
raise ValueError("Unsupported collection tag: %r" % v)
def find_available_uid(exists_fn, suffix=""): def find_available_uid(exists_fn, suffix=""):