From d1dbd1df549807724bb098cf4551fcc997115832 Mon Sep 17 00:00:00 2001 From: Unrud Date: Wed, 24 Aug 2016 17:45:10 +0200 Subject: [PATCH 1/2] Fix empty filter DAVdroid sends , which causes an exception. --- radicale/xmlutils.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/radicale/xmlutils.py b/radicale/xmlutils.py index fcedf7d..902390c 100644 --- a/radicale/xmlutils.py +++ b/radicale/xmlutils.py @@ -809,7 +809,8 @@ def report(path, xml_request, collection): match = ( _comp_match if collection.get_meta("tag") == "VCALENDAR" else _prop_match) - if not all(match(item, filter_[0]) for filter_ in filters): + if not all(match(item, filter_[0]) for filter_ in filters + if filter_): continue found_props = [] From f9cabfb20b617079e90d0c5ba6dbdb56255ee43f Mon Sep 17 00:00:00 2001 From: Unrud Date: Wed, 24 Aug 2016 17:52:39 +0200 Subject: [PATCH 2/2] Test empty filter Test for d1dbd1df549807724bb098cf4551fcc997115832 --- radicale/tests/test_base.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/radicale/tests/test_base.py b/radicale/tests/test_base.py index 1ea8c1f..048c464 100644 --- a/radicale/tests/test_base.py +++ b/radicale/tests/test_base.py @@ -267,6 +267,9 @@ class BaseRequestsMixIn: """ % filters_text) return answer + def test_calendar_empty_filter(self): + self._test_filter([""]) + def test_calendar_tag_filter(self): """Report request with tag-based filter on calendar.""" assert "href>/calendar.ics/event1.ics