Merge pull request #49234 from nextcloud/backport/49139/stable30

[stable30] feat: Add X-NC-Disable-Scheduling property to allow skipping scheduling
nextcloud · Nov 13, 2024 · 339f6ff · 339f6ff
2 parents 0da87f1 + bc77cf9
commit 339f6ff
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 2 deletions.
diff --git a/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php b/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php
@@ -109,8 +109,16 @@ public function beforeWriteContent($uri, INode $node, $data, $modified): void {
 	 * @return void
 	 */
 	public function schedule(Message $iTipMessage) {
-		// Not sending any emails if the system considers the update
-		// insignificant.
+
+		// do not send imip messages if external system already did
+		/** @psalm-suppress UndefinedPropertyFetch */
+		if ($iTipMessage->message?->VEVENT?->{'X-NC-DISABLE-SCHEDULING'}?->getValue() === 'true') {
+			if (!$iTipMessage->scheduleStatus) {
+				$iTipMessage->scheduleStatus = '1.0;We got the message, but iMip messages are disabled for this event';
+			}
+			return;
+		}
+		// Not sending any emails if the system considers the update insignificant
 		if (!$iTipMessage->significantChange) {
 			if (!$iTipMessage->scheduleStatus) {
 				$iTipMessage->scheduleStatus = '1.0;We got the message, but it\'s not significant enough to warrant an email';

diff --git a/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php b/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php
@@ -890,4 +890,23 @@ public function testNoButtons(): void {
 		$this->plugin->schedule($message);
 		$this->assertEquals('1.1', $message->getScheduleStatus());
 	}
+
+	public function testImipDisabledForEvent(): void {
+		// construct iTip message with event and attendees
+		$calendar = new VCalendar();
+		$calendar->add('VEVENT', ['UID' => 'uid-1234']);
+		$event = $calendar->VEVENT;
+		$event->add('ORGANIZER', 'mailto:[email protected]');
+		$event->add('ATTENDEE', 'mailto:' . '[email protected]', ['RSVP' => 'TRUE',  'CN' => 'Frodo']);
+		$event->add('X-NC-DISABLE-SCHEDULING', 'true');
+		$message = new Message();
+		$message->method = 'REQUEST';
+		$message->message = $calendar;
+		$message->sender = 'mailto:[email protected]';
+		$message->senderName = 'Mr. Wizard';
+		$message->recipient = 'mailto:' . '[email protected]';
+
+		$this->plugin->schedule($message);
+		$this->assertEquals('1.0;We got the message, but iMip messages are disabled for this event', $message->scheduleStatus);
+	}
 }