fix(imip): dont propagate attendee changes in reply message

apps/dav/lib/CalDAV/CalDavBackend.php

@@ -3591,4 +3591,21 @@ protected function purgeObjectInvitations(string $eventId): void {
 			->where($cmd->expr()->eq('uid', $cmd->createNamedParameter($eventId, IQueryBuilder::PARAM_STR), IQueryBuilder::PARAM_STR));
 		$cmd->executeStatement();
 	}
+
+	public function findEventDataByUri(string $uid, string $organizerUri): ?array {
+		$principalUri = $this->principalBackend->findByUri($organizerUri, 'principals/users');
+		$query = $this->db->getQueryBuilder();
+		$query->select('co.*')
+			->from('calendarobjects', 'co')
+			->join('co', 'calendars', 'c', $query->expr()->eq('co.calendarid', 'c.id'))
+			->where($query->expr()->eq('co.uid', $query->createNamedParameter($uid)))
+			->andWhere($query->expr()->eq('c.principaluri', $query->createNamedParameter($principalUri)));
+		$stmt = $query->executeQuery();
+		$row = $stmt->fetch();
+		$stmt->closeCursor();
+		if (!$row) {
+			return null;
+		}
+		return $this->rowToCalendarObject($row);
+	}
 }

apps/dav/lib/CalDAV/Schedule/IMipPlugin.php

@@ -185,7 +185,8 @@
 		switch (strtolower($iTipMessage->method)) {
 			case self::METHOD_REPLY:
 				$method = self::METHOD_REPLY;
-				$data = $this->imipService->buildBodyData($vEvent, $oldVevent);
+				$organizerEvent = $this->imipService->getOrganizerVEvent($vEvent->uid, $iTipMessage->recipient);
+				$data = $this->imipService->buildReplyBodyData($organizerEvent);
 				$replyingAttendee = $this->imipService->getReplyingAttendee($iTipMessage);
 				break;
 			case self::METHOD_CANCEL:

apps/dav/lib/CalDAV/Schedule/IMipService.php

@@ -9,6 +9,7 @@
 namespace OCA\DAV\CalDAV\Schedule;
 
 use OC\URLGenerator;
+use OCA\DAV\CalDAV\CaldavBackend;
 use OCA\DAV\CalDAV\EventReader;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\IConfig;
@@ -23,6 +24,7 @@
 use Sabre\VObject\ITip\Message;
 use Sabre\VObject\Parameter;
 use Sabre\VObject\Property;
+use Sabre\VObject\Reader;
 use Sabre\VObject\Recur\EventIterator;
 
 class IMipService {
@@ -44,6 +46,7 @@
 		private ISecureRandom $random,
 		private L10NFactory $l10nFactory,
 		private ITimeFactory $timeFactory,
+		private CaldavBackend $caldavBackend,
 	) {
 		$language = $this->l10nFactory->findGenericLanguage();
 		$locale = $this->l10nFactory->findLocale($language);
@@ -159,7 +162,35 @@
 		if ($eventReaderCurrent->recurs()) {
 			$data['meeting_occurring'] = $this->generateOccurringString($eventReaderCurrent);
 		}
-
+		return $data;
+	}
+
+	/**
+	 * @param VEvent $vEvent
+	 * @return array
+	 */
+	public function buildReplyBodyData(VEvent $vEvent): array {
+		// construct event reader
+		$eventReader = new EventReader($vEvent);
+		$defaultVal = '';
+		$data = [];
+		$data['meeting_when'] = $this->generateWhenString($eventReader);
+
+		foreach (self::STRING_DIFF as $key => $property) {
+			$data[$key] = self::readPropertyWithDefault($vEvent, $property, $defaultVal);
+		}
+
+		if (($locationHtml = $this->linkify($data['meeting_location'])) !== null) {
+			$data['meeting_location_html'] = $locationHtml;
+		}
+
+		$data['meeting_url_html'] = $data['meeting_url'] ? sprintf('<a href="%1$s">%1$s</a>', $data['meeting_url']) : '';
+
+		// generate occurring next string
+		if ($eventReader->recurs()) {
+			$data['meeting_occurring'] = $this->generateOccurringString($eventReader);
+		}
+
 		return $data;
 	}
 
@@ -1142,6 +1173,11 @@
 		return null;
 	}
 
+	public function getOrganizerVEvent(string $uid, string $organizerUri): VEvent {
+		$organizerEvent = $this->caldavBackend->findEventDataByUri($uid, $organizerUri);
+		return Reader::read($organizerEvent['calendardata'])->VEVENT ;
+	}
+
 	public function isRoomOrResource(Property $attendee): bool {
 		$cuType = $attendee->offsetGet('CUTYPE');
 		if (!$cuType instanceof Parameter) {