Avii/Radicale
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #2181 from TowyTowy/fix/text-match-structured-property

Browse Source 
Fix: text-match filter crashes on structured property (vCard N/ADR)
This commit is contained in:
Peter Bieringer
2026-07-15 20:25:36 +03:00
committed by GitHub
parent 35567e53ba f48dc47177
commit 0d1c802973
3 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -3,6 +3,7 @@
## 3.7.7.dev ## 3.7.7.dev
* Fix: time-range filter treated a VEVENT with a whole-day DURATION (e.g. P1D, P2D) as zero-length (timedelta.seconds instead of total_seconds), so such events were missing from calendar-query REPORT results * Fix: time-range filter treated a VEVENT with a whole-day DURATION (e.g. P1D, P2D) as zero-length (timedelta.seconds instead of total_seconds), so such events were missing from calendar-query REPORT results
* Fix: calendar-data expand (REPORT) left recurrence properties (e.g. RDATE) on the expanded single-occurrence VEVENTs; a single try/except around the sequential delattr() calls stopped at the first absent property (e.g. missing EXDATE), so later ones were never removed * Fix: calendar-data expand (REPORT) left recurrence properties (e.g. RDATE) on the expanded single-occurrence VEVENTs; a single try/except around the sequential delattr() calls stopped at the first absent property (e.g. missing EXDATE), so later ones were never removed
* Fix: text-match filter on a structured property (e.g. vCard N or ADR) crashed with HTTP 500 (AttributeError: 'Name'/'Address' object has no attribute 'lower') because vobject parses these into non-string objects; their text representation is now used
## 3.7.6 ## 3.7.6
* Extension: item verification on commandline * Extension: item verification on commandline

5
radicale/item/filter.py
View File

@@ -578,6 +578,11 @@ def text_match(vobject_item: vobject.base.Component,
match_type = filter_.get("match-type", match_type) match_type = filter_.get("match-type", match_type)
def match(value: str) -> bool: def match(value: str) -> bool:
if not isinstance(value, str):
# Some properties (e.g. N and ADR in vCard) are parsed by vobject
# into structured objects instead of plain strings. Use their text
# representation so text-match doesn't crash with AttributeError.
value = str(value)
value = value.lower() value = value.lower()
if match_type == "equals": if match_type == "equals":
return value == text return value == text

12
radicale/tests/test_base.py
View File

@@ -1458,6 +1458,18 @@ permissions: RrWw""")
<C:text-match collation="i;unicode-casemap">test</C:text-match> <C:text-match collation="i;unicode-casemap">test</C:text-match>
</C:prop-filter>"""], "contact", test="allof") </C:prop-filter>"""], "contact", test="allof")
def test_addressbook_prop_filter_structured(self) -> None:
"""text-match on a structured property (N) that vobject parses into a
non-string value must not crash the REPORT."""
assert "/contacts.vcf/contact1.vcf" in self._test_filter(["""\
<C:prop-filter name="N">
<C:text-match collation="i;unicode-casemap">contact</C:text-match>
</C:prop-filter>"""], "contact")
assert "/contacts.vcf/contact1.vcf" not in self._test_filter(["""\
<C:prop-filter name="N">
<C:text-match collation="i;unicode-casemap">nonexistent</C:text-match>
</C:prop-filter>"""], "contact")
def test_calendar_empty_filter(self) -> None: def test_calendar_empty_filter(self) -> None:
self._test_filter([""]) self._test_filter([""])