diff options
| author | SebastianKrupinski <krupinskis05@gmail.com> | 2024-07-17 15:26:05 -0400 |
|---|---|---|
| committer | SebastianKrupinski <krupinskis05@gmail.com> | 2024-07-17 17:42:35 -0400 |
| commit | 0f3d05afea9224d38ef90eba55371372f9ce9b4d (patch) | |
| tree | 37ae44daef2a02ed694133a824cec93e041fc5ed /apps/dav/lib | |
| parent | 718ef5dea5288a13e9536fd9a611ff777ee7168d (diff) | |
| download | nextcloud-server-0f3d05afea9224d38ef90eba55371372f9ce9b4d.tar.gz nextcloud-server-0f3d05afea9224d38ef90eba55371372f9ce9b4d.zip | |
fix(caldav): Throw 403 Forbidden Error instead of 500 Internal Server Error
Signed-off-by: SebastianKrupinski <krupinskis05@gmail.com>
Diffstat (limited to 'apps/dav/lib')
| -rw-r--r-- | apps/dav/lib/CalDAV/CalDavBackend.php | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php index cc6c4344c3c..d25276fe16d 100644 --- a/apps/dav/lib/CalDAV/CalDavBackend.php +++ b/apps/dav/lib/CalDAV/CalDavBackend.php @@ -65,6 +65,7 @@ use Sabre\VObject\ParseException; use Sabre\VObject\Property; use Sabre\VObject\Reader; use Sabre\VObject\Recur\EventIterator; +use Sabre\VObject\Recur\NoInstancesException; use function array_column; use function array_map; use function array_merge; @@ -2987,7 +2988,15 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription $lastOccurrence = $firstOccurrence; } } else { - $it = new EventIterator($vEvents); + try { + $it = new EventIterator($vEvents); + } catch (NoInstancesException $e) { + $this->logger->debug('Caught no instance exception for calendar data. This usually indicates invalid calendar data.', [ + 'app' => 'dav', + 'exception' => $e, + ]); + throw new Forbidden($e->getMessage()); + } $maxDate = new DateTime(self::MAX_DATE); $firstOccurrence = $it->getDtStart()->getTimestamp(); if ($it->isInfinite()) { |