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

add support for max_vevent_rrule_entries

Browse Source
This commit is contained in:
Peter Bieringer
2026-08-01 18:55:29 +02:00
parent b044addc53
commit bcb5061416
1 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
radicale/item/__init__.py
View File

@@ -233,11 +233,40 @@ def check_and_sanitize_items(
if ref_value_param is not None: if ref_value_param is not None:
dates.params["VALUE"] = ref_value_param dates.params["VALUE"] = ref_value_param
# vobject interprets recurrence rules on demand # vobject interprets recurrence rules on demand
try: if hasattr(component, "rrule"):
component.rruleset logger.trace("Recurrence rule found in %s in object %r: %r", component.name, component_uid, component.rrule.value)
except Exception as e: # early check of maximum of COUNT to avoid DoS
raise ValueError("Invalid recurrence rules in %s in object %r" pattern = re.compile('.*;COUNT=(\\d+).*')
% (component.name, component_uid)) from e match = pattern.match(component.rrule.value)
if match:
rrule_count = int(match[1])
if max_vevent_rrule_entries > 0 and rrule_count > max_vevent_rrule_entries:
logger.error("Recurrence rule count in %s in object %r: %d (REJECTED/limit: %d)" % (component.name, component_uid, rrule_count, max_vevent_rrule_entries))
raise ValueError("Too many recurrence rule entries in %s in object %r: %d (limit: %d)"
% (component.name, component_uid, rrule_count, max_vevent_rrule_entries))
else:
logger.trace("Recurrence rule count in %s in object %r: %d (PASSED/limit: %d)" % (component.name, component_uid, rrule_count, max_vevent_rrule_entries))
# generic check by vobject
try:
rruleset = component.rruleset
except Exception as e:
raise ValueError("Invalid recurrence rules in %s in object %r"
% (component.name, component_uid)) from e
# check limit after generation (e.g. UNTIL)
# TODO: find possibility to add also early check of UNTIL
infinite = False
if (";UNTIL=" not in component.rrule.value and
";COUNT=" not in component.rrule.value):
infinite = True
if infinite is False:
rrule_entries = len(list(rruleset))
if max_vevent_rrule_entries > 0 and rrule_entries > max_vevent_rrule_entries:
logger.warning("Recurrence rule entries in %s in object %r: %d (limit: %d)" % (component.name, component_uid, rrule_entries, max_vevent_rrule_entries))
raise ValueError("Too many recurrence rule entries in %s in object %r: %d (limit: %d)"
% (component.name, component_uid, rrule_entries, max_vevent_rrule_entries))
else:
logger.trace("Recurrence rule entries in %s in object %r: %d" % (component.name, component_uid, rrule_entries))
elif tag == "VADDRESSBOOK": elif tag == "VADDRESSBOOK":
# https://tools.ietf.org/html/rfc6352#section-5.1 # https://tools.ietf.org/html/rfc6352#section-5.1
object_uids = set() object_uids = set()