Skip to content

[stable31] fix: check if properties exist before using them #52807

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 15, 2025
Merged

[stable31] fix: check if properties exist before using them #52807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
137 changes: 95 additions & 42 deletions lib/private/Calendar/Manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
use Sabre\VObject\Component\VCalendar;
use Sabre\VObject\Component\VEvent;
use Sabre\VObject\Component\VFreeBusy;
use Sabre\VObject\ParseException;
use Sabre\VObject\Property\VCard\DateTime;
use Sabre\VObject\Reader;
use Throwable;
Expand Down Expand Up @@ -235,9 +236,14 @@ public function handleIMipRequest(
$this->logger->warning('iMip message could not be processed because user has no calendars');
return false;
}

/** @var VCalendar $vObject|null */
$calendarObject = Reader::read($calendarData);

Copy link
Member

@nickvergessen nickvergessen May 14, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change

Tabs on empty line 🙈
Why did CS not complain 🤔

try {
/** @var VCalendar $vObject|null */
$calendarObject = Reader::read($calendarData);
} catch (ParseException $e) {
$this->logger->error('iMip message could not be processed because an error occurred while parsing the iMip message', ['exception' => $e]);
return false;
}

if (!isset($calendarObject->METHOD) || $calendarObject->METHOD->getValue() !== 'REQUEST') {
$this->logger->warning('iMip message contains an incorrect or invalid method');
Expand All @@ -249,13 +255,19 @@ public function handleIMipRequest(
return false;
}

/** @var VEvent|null $vEvent */
$eventObject = $calendarObject->VEVENT;

if (!isset($eventObject->UID)) {
$this->logger->warning('iMip message event dose not contains a UID');
return false;
}

if (!isset($eventObject->ORGANIZER)) {
$this->logger->warning('iMip message event dose not contains an organizer');
return false;
}

if (!isset($eventObject->ATTENDEE)) {
$this->logger->warning('iMip message event dose not contains any attendees');
return false;
Expand Down Expand Up @@ -296,7 +308,7 @@ public function handleIMipRequest(
}
}

$this->logger->warning('iMip message event could not be processed because the no corresponding event was found in any calendar');
$this->logger->warning('iMip message event could not be processed because no corresponding event was found in any calendar');
return false;
}

Expand All @@ -309,45 +321,67 @@ public function handleIMipReply(
string $recipient,
string $calendarData,
): bool {
/** @var VCalendar $vObject|null */
$vObject = Reader::read($calendarData);

$calendars = $this->getCalendarsForPrincipal($principalUri);
if (empty($calendars)) {
$this->logger->warning('iMip message could not be processed because user has no calendars');
return false;
}

try {
/** @var VCalendar $vObject|null */
$vObject = Reader::read($calendarData);
} catch (ParseException $e) {
$this->logger->error('iMip message could not be processed because an error occurred while parsing the iMip message', ['exception' => $e]);
return false;
}

if ($vObject === null) {
$this->logger->warning('iMip message contains an invalid calendar object');
return false;
}

if (!isset($vObject->METHOD) || $vObject->METHOD->getValue() !== 'REPLY') {
$this->logger->warning('iMip message contains an incorrect or invalid method');
return false;
}

if (!isset($vObject->VEVENT)) {
$this->logger->warning('iMip message contains no event');
return false;
}

/** @var VEvent|null $vEvent */
$vEvent = $vObject->{'VEVENT'};
$vEvent = $vObject->VEVENT;

if (!isset($vEvent->UID)) {
$this->logger->warning('iMip message event dose not contains a UID');
return false;
}

if ($vEvent === null) {
if (!isset($vEvent->ORGANIZER)) {
$this->logger->warning('iMip message event dose not contains an organizer');
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');
if (!isset($vEvent->ATTENDEE)) {
$this->logger->warning('iMip message event dose not contains any attendees');
return false;
}

// check if mail recipient and organizer are one and the same
$organizer = substr($vEvent->{'ORGANIZER'}->getValue(), 7);

if (strcasecmp($recipient, $organizer) !== 0) {
$this->logger->warning('Recipient and ORGANIZER must be identical');
$this->logger->warning('iMip message event could not be processed because recipient and ORGANIZER must be identical');
return false;
}

//check if the event is in the future
/** @var DateTime $eventTime */
$eventTime = $vEvent->{'DTSTART'};
if ($eventTime->getDateTime()->getTimeStamp() < $this->timeFactory->getTime()) { // this might cause issues with recurrences
$this->logger->warning('Only events in the future are processed');
return false;
}

$calendars = $this->getCalendarsForPrincipal($principalUri);
if (empty($calendars)) {
$this->logger->warning('Could not find any calendars for principal ' . $principalUri);
$this->logger->warning('iMip message event could not be processed because the event is in the past');
return false;
}

Expand All @@ -369,14 +403,14 @@ public function handleIMipReply(
}

if (empty($found)) {
$this->logger->info('Event not found in any calendar for principal ' . $principalUri . 'and UID' . $vEvent->{'UID'}->getValue());
$this->logger->warning('iMip message event could not be processed because no corresponding event was found in any calendar ' . $principalUri . 'and UID' . $vEvent->{'UID'}->getValue());
return false;
}

try {
$found->handleIMipMessage($name, $calendarData); // sabre will handle the scheduling behind the scenes
} catch (CalendarException $e) {
$this->logger->error('Could not update calendar for iMIP processing', ['exception' => $e]);
$this->logger->error('An error occurred while processing the iMip message event', ['exception' => $e]);
return false;
}
return true;
Expand All @@ -393,29 +427,57 @@ public function handleIMipCancel(
string $recipient,
string $calendarData,
): bool {
/** @var VCalendar $vObject|null */
$vObject = Reader::read($calendarData);

$calendars = $this->getCalendarsForPrincipal($principalUri);
if (empty($calendars)) {
$this->logger->warning('iMip message could not be processed because user has no calendars');
return false;
}

try {
/** @var VCalendar $vObject|null */
$vObject = Reader::read($calendarData);
} catch (ParseException $e) {
$this->logger->error('iMip message could not be processed because an error occurred while parsing the iMip message', ['exception' => $e]);
return false;
}

if ($vObject === null) {
$this->logger->warning('iMip message contains an invalid calendar object');
return false;
}

if (!isset($vObject->METHOD) || $vObject->METHOD->getValue() !== 'CANCEL') {
$this->logger->warning('iMip message contains an incorrect or invalid method');
return false;
}

if (!isset($vObject->VEVENT)) {
$this->logger->warning('iMip message contains no event');
return false;
}

/** @var VEvent|null $vEvent */
$vEvent = $vObject->{'VEVENT'};

if ($vEvent === null) {
if (!isset($vEvent->UID)) {
$this->logger->warning('iMip message event dose not contains a UID');
return false;
}

if (!isset($vEvent->ORGANIZER)) {
$this->logger->warning('iMip message event dose not contains an organizer');
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');
if (!isset($vEvent->ATTENDEE)) {
$this->logger->warning('iMip message event dose not contains any attendees');
return false;
}

$attendee = substr($vEvent->{'ATTENDEE'}->getValue(), 7);
if (strcasecmp($recipient, $attendee) !== 0) {
$this->logger->warning('Recipient must be an ATTENDEE of this event');
$this->logger->warning('iMip message event could not be processed because recipient must be an ATTENDEE of this event');
return false;
}

Expand All @@ -426,22 +488,15 @@ public function handleIMipCancel(
$organizer = substr($vEvent->{'ORGANIZER'}->getValue(), 7);
$isNotOrganizer = ($replyTo !== null) ? (strcasecmp($sender, $organizer) !== 0 && strcasecmp($replyTo, $organizer) !== 0) : (strcasecmp($sender, $organizer) !== 0);
if ($isNotOrganizer) {
$this->logger->warning('Sender must be the ORGANIZER of this event');
$this->logger->warning('iMip message event could not be processed because sender must be the ORGANIZER of this event');
return false;
}

//check if the event is in the future
/** @var DateTime $eventTime */
$eventTime = $vEvent->{'DTSTART'};
if ($eventTime->getDateTime()->getTimeStamp() < $this->timeFactory->getTime()) { // this might cause issues with recurrences
$this->logger->warning('Only events in the future are processed');
return false;
}

// Check if we have a calendar to work with
$calendars = $this->getCalendarsForPrincipal($principalUri);
if (empty($calendars)) {
$this->logger->warning('Could not find any calendars for principal ' . $principalUri);
$this->logger->warning('iMip message event could not be processed because the event is in the past');
return false;
}

Expand All @@ -463,17 +518,15 @@ public function handleIMipCancel(
}

if (empty($found)) {
$this->logger->info('Event not found in any calendar for principal ' . $principalUri . 'and UID' . $vEvent->{'UID'}->getValue());
// this is a safe operation
// we can ignore events that have been cancelled but were not in the calendar anyway
return true;
$this->logger->warning('iMip message event could not be processed because no corresponding event was found in any calendar ' . $principalUri . 'and UID' . $vEvent->{'UID'}->getValue());
return false;
}

try {
$found->handleIMipMessage($name, $calendarData); // sabre will handle the scheduling behind the scenes
return true;
} catch (CalendarException $e) {
$this->logger->error('Could not update calendar for iMIP processing', ['exception' => $e]);
$this->logger->error('An error occurred while processing the iMip message event', ['exception' => $e]);
return false;
}
}
Expand Down
Loading
Loading