fixup! fix: iMip reply from outlook.com does not contain organizer property

Signed-off-by: SebastianKrupinski <krupinskis05@gmail.com>

Author: SebastianKrupinski

apps/dav/lib/CalDAV/CalendarImpl.php

@@ -229,13 +229,6 @@ public function handleIMipMessage(string $name, string $calendarData): void {
 		} catch (ParseException $e) {
 			throw new CalendarException('iMip message could not be processed because an error occurred while parsing the iMip message', 0, $e);
 		}
-		// Determine mode base on message source
-		$mode = null;
-		if (isset($vObject->PRODID)) {
-			if ($vObject->PRODID->getValue() === 'Microsoft Exchange Server 2010') {
-				$mode = 'EX2010';
-			}
-		}
 		// validate the iMip message
 		if (!isset($vObject->METHOD)) {
 			throw new CalendarException('iMip message contains no valid method');
@@ -246,7 +239,7 @@ public function handleIMipMessage(string $name, string $calendarData): void {
 		if (!isset($vObject->VEVENT->UID)) {
 			throw new CalendarException('iMip message event dose not contain a UID');
 		}
-		if ($mode !== 'EX2010' && !isset($vObject->VEVENT->ORGANIZER)) {
+		if (!isset($vObject->VEVENT->ORGANIZER)) {
 			throw new CalendarException('iMip message event dose not contain an organizer');
 		}
 		if (!isset($vObject->VEVENT->ATTENDEE)) {
@@ -273,22 +266,15 @@ public function handleIMipMessage(string $name, string $calendarData): void {
 		if (in_array($imipMethod, ['REPLY', 'REFRESH'], true)) {
 			// extract sender (REPLY and REFRESH method should only have one attendee)
 			$sender = strtolower($vObject->VEVENT->ATTENDEE->getValue());
-			// fix Microsoft Exchange Server 2010 reply quirk
-			if ($mode === 'EX2010' && $imipMethod === 'REPLY') {
-				$recipient = $userAddress;
-			}
 			// extract and verify the recipient
-			if ($mode === null) {
-				$recipient = strtolower($vObject->VEVENT->ORGANIZER->getValue());
-				
-				if (!in_array($recipient, $userAddresses, true)) {
-					throw new CalendarException('iMip message dose not contain an organizer that matches the user');
-				}
-				// if the recipient address is not the same as the user address this means an alias was used
-				// the iTip broker uses the users primary email address during processing
-				if ($userAddress !== $recipient) {
-					$recipient = $userAddress;
-				}
+			$recipient = strtolower($vObject->VEVENT->ORGANIZER->getValue());
+			if (!in_array($recipient, $userAddresses, true)) {
+				throw new CalendarException('iMip message dose not contain an organizer that matches the user');
+			}
+			// if the recipient address is not the same as the user address this means an alias was used
+			// the iTip broker uses the users primary email address during processing
+			if ($userAddress !== $recipient) {
+				$recipient = $userAddress;
 			}
 		} elseif (in_array($imipMethod, ['PUBLISH', 'REQUEST', 'ADD', 'CANCEL'], true)) {
 			// extract sender

lib/private/Calendar/Manager.php

@@ -39,6 +39,7 @@
 use Throwable;
 use function array_map;
 use function array_merge;
+use function PHPUnit\Framework\isEmpty;
 
 class Manager implements IManager {
 	/**
@@ -252,15 +253,6 @@ public function handleIMip(
 			$this->logger->warning('iMip message does not contain any event(s)');
 			return false;
 		}
-
-		$mode = null;
-		if (isset($vObject->PRODID)) {
-			if ($vObject->PRODID->getValue() === 'Microsoft Exchange Server 2010') {
-				$mode = 'EX2010';
-				$this->logger->warning('iMip message source is Microsoft Exchange Server 2010, using quirks mode');
-			}
-		}
-
 		/** @var VEvent $vEvent */
 		$vEvent = $vObject->VEVENT;
 
@@ -269,10 +261,14 @@ public function handleIMip(
 			return false;
 		}
 
-		// skip organizer check for message from Exchange 2010
-		if ($mode !== 'EX2010' && !isset($vEvent->ORGANIZER)) {
-			$this->logger->warning('iMip message event dose not contains an organizer');
-			return false;
+		if (!isset($vEvent->ORGANIZER)) {
+			// quirks mode: for Microsoft Exchange Servers use recipient as organizer if no organizer is set
+			if (isset($options['recipient']) && !isEmpty($options['recipient'])) {
+				$vEvent->add('ORGANIZER', 'mailto:' . $options['recipient']);
+			} else {
+				$this->logger->warning('iMip message event dose not contains an organizer and no recipient was provided');
+				return false;
+			}
 		}
 
 		if (!isset($vEvent->ATTENDEE)) {