diff options
| author | Anna <anna@nextcloud.com> | 2024-09-17 12:18:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-17 12:18:59 +0200 |
| commit | 1ab34417db5f05115288e3745c49bd39721bde25 (patch) | |
| tree | 7937472fa8db5ded03ea9e0e6d555bab317e7580 | |
| parent | b937093d25aff9db1511733506389d84bb80395c (diff) | |
| parent | 5aa5ac4701f00e82497ddd2123f4e740c1414499 (diff) | |
| download | nextcloud-server-1ab34417db5f05115288e3745c49bd39721bde25.tar.gz nextcloud-server-1ab34417db5f05115288e3745c49bd39721bde25.zip | |
Merge pull request #48096 from nextcloud/backport/47924/stable29
[stable29] 🥅 — Catch MaxInstancesExceededException on calendar events
| -rw-r--r-- | apps/dav/lib/CalDAV/CalDavBackend.php | 47 |
1 files changed, 31 insertions, 16 deletions
diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php index aa15bce01cc..8b0d42e6991 100644 --- a/apps/dav/lib/CalDAV/CalDavBackend.php +++ b/apps/dav/lib/CalDAV/CalDavBackend.php @@ -98,6 +98,7 @@ use Sabre\VObject\ParseException; use Sabre\VObject\Property; use Sabre\VObject\Reader; use Sabre\VObject\Recur\EventIterator; +use Sabre\VObject\Recur\MaxInstancesExceededException; use Sabre\VObject\Recur\NoInstancesException; use function array_column; use function array_map; @@ -1719,6 +1720,12 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription 'exception' => $ex, ]); continue; + } catch (MaxInstancesExceededException $ex) { + $this->logger->warning('Caught max instances exceeded exception for calendar data. This usually indicates too much recurring (more than 3500) event in calendar data. Object uri: '.$row['uri'], [ + 'app' => 'dav', + 'exception' => $ex, + ]); + continue; } if (!$matches) { @@ -2068,24 +2075,32 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription continue; } - $isValid = $this->validateFilterForObject($row, [ - 'name' => 'VCALENDAR', - 'comp-filters' => [ - [ - 'name' => 'VEVENT', - 'comp-filters' => [], - 'prop-filters' => [], - 'is-not-defined' => false, - 'time-range' => [ - 'start' => $start, - 'end' => $end, + try { + $isValid = $this->validateFilterForObject($row, [ + 'name' => 'VCALENDAR', + 'comp-filters' => [ + [ + 'name' => 'VEVENT', + 'comp-filters' => [], + 'prop-filters' => [], + 'is-not-defined' => false, + 'time-range' => [ + 'start' => $start, + 'end' => $end, + ], ], ], - ], - 'prop-filters' => [], - 'is-not-defined' => false, - 'time-range' => null, - ]); + 'prop-filters' => [], + 'is-not-defined' => false, + 'time-range' => null, + ]); + } catch (MaxInstancesExceededException $ex) { + $this->logger->warning('Caught max instances exceeded exception for calendar data. This usually indicates too much recurring (more than 3500) event in calendar data. Object uri: '.$row['uri'], [ + 'app' => 'dav', + 'exception' => $ex, + ]); + continue; + } if (is_resource($row['calendardata'])) { // Put the stream back to the beginning so it can be read another time |