aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorescoand <escoand@users.noreply.github.com>2024-09-25 12:29:12 +0200
committerbackportbot[bot] <backportbot[bot]@users.noreply.github.com>2024-10-02 13:13:42 +0000
commita3c81d201608cfda1c2c1870e0ee6f307909fb43 (patch)
tree1a452c28d604c44735de1864c255fdaa03f2545b
parentf23fc4d6fda0076133b8f14214952e203036d7eb (diff)
downloadnextcloud-server-backport/48519/stable29.tar.gz
nextcloud-server-backport/48519/stable29.zip
fix(dav): don't crash subscription on invalid calendar objectbackport/48519/stable29
Signed-off-by: escoand <escoand@users.noreply.github.com> [skip ci]
-rw-r--r--apps/dav/lib/CalDAV/WebcalCaching/RefreshWebcalService.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/dav/lib/CalDAV/WebcalCaching/RefreshWebcalService.php b/apps/dav/lib/CalDAV/WebcalCaching/RefreshWebcalService.php
index 1a369714ba7..1aeb4a87630 100644
--- a/apps/dav/lib/CalDAV/WebcalCaching/RefreshWebcalService.php
+++ b/apps/dav/lib/CalDAV/WebcalCaching/RefreshWebcalService.php
@@ -38,6 +38,7 @@ use OCP\Http\Client\LocalServerException;
use OCP\IAppConfig;
use Psr\Log\LoggerInterface;
use Sabre\DAV\Exception\BadRequest;
+use Sabre\DAV\Exception\Forbidden;
use Sabre\DAV\PropPatch;
use Sabre\VObject\Component;
use Sabre\VObject\DateTimeParser;
@@ -124,7 +125,7 @@ class RefreshWebcalService {
try {
$this->calDavBackend->createCalendarObject($subscription['id'], $objectUri, $calendarData, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
} catch (NoInstancesException|BadRequest $ex) {
- $this->logger->error('Unable to create calendar object from subscription {subscriptionId}', ['exception' => $ex, 'subscriptionId' => $subscription['id'], 'source' => $subscription['source']]);
+ $this->logger->warning('Unable to create calendar object from subscription {subscriptionId}', ['exception' => $ex, 'subscriptionId' => $subscription['id'], 'source' => $subscription['source']]);
}
}