upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-11 01:30:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 79

Merge pull request #39083 from nextcloud/fix/check-vobject-existence

Browse source 
fix(CalDAV): Check if the vObject exists before attempting any operations
This commit is contained in:
Andy Scherzinger 2023-08-28 16:33:31 +02:00 committed by GitHub
commit fc3eef9d2f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
lib/private/Calendar/Manager.php
View file

@ -231,11 +231,20 @@ class Manager implements IManager {
string $recipient,
string $calendarData,
): bool {
/** @var VCalendar $vObject */
/** @var VCalendar $vObject|null */
$vObject = Reader::read($calendarData);
/** @var VEvent $vEvent */
if ($vObject === null) {
return false;
}
/** @var VEvent|null $vEvent */
$vEvent = $vObject->{'VEVENT'};
if ($vEvent === null) {
return false;
}
// First, we check if the correct method is passed to us
if (strcasecmp('REPLY', $vObject->{'METHOD'}->getValue()) !== 0) {
$this->logger->warning('Wrong method provided for processing');
@ -306,10 +315,20 @@ class Manager implements IManager {
string $recipient,
string $calendarData,
): bool {
/** @var VCalendar $vObject|null */
$vObject = Reader::read($calendarData);
/** @var VEvent $vEvent */
if ($vObject === null) {
return false;
}
/** @var VEvent|null $vEvent */
$vEvent = $vObject->{'VEVENT'};
if ($vEvent === null) {
return false;
}
// First, we check if the correct method is passed to us
if (strcasecmp('CANCEL', $vObject->{'METHOD'}->getValue()) !== 0) {
$this->logger->warning('Wrong method provided for processing');