diff options
| -rw-r--r-- | apps/dav/lib/CalDAV/Schedule/IMipPlugin.php | 8 | ||||
| -rw-r--r-- | apps/dav/lib/CalDAV/Schedule/Plugin.php | 6 | ||||
| -rw-r--r-- | apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php | 19 | ||||
| -rw-r--r-- | apps/dav/tests/unit/CalDAV/Schedule/PluginTest.php | 39 |
4 files changed, 45 insertions, 27 deletions
diff --git a/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php b/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php index 8ed3cf4d56f..79b625d25b7 100644 --- a/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php +++ b/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php @@ -111,14 +111,6 @@ class IMipPlugin extends SabreIMipPlugin { */ public function schedule(Message $iTipMessage) { - // 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) { diff --git a/apps/dav/lib/CalDAV/Schedule/Plugin.php b/apps/dav/lib/CalDAV/Schedule/Plugin.php index 8e5ba282f72..d7c2a735dae 100644 --- a/apps/dav/lib/CalDAV/Schedule/Plugin.php +++ b/apps/dav/lib/CalDAV/Schedule/Plugin.php @@ -1,4 +1,5 @@ <?php + /** * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors * SPDX-License-Identifier: AGPL-3.0-or-later @@ -167,6 +168,11 @@ class Plugin extends \Sabre\CalDAV\Schedule\Plugin { try { + // Do not generate iTip and iMip messages if scheduling is disabled for this message + if ($request->getHeader('x-nc-scheduling') === 'false') { + return; + } + if (!$this->scheduleReply($this->server->httpRequest)) { return; } diff --git a/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php b/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php index b459b9da7c8..9ac6177fc8b 100644 --- a/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php +++ b/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php @@ -997,23 +997,4 @@ class IMipPluginTest extends TestCase { $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:gandalf@wiz.ard'); - $event->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']); - $event->add('X-NC-DISABLE-SCHEDULING', 'true'); - $message = new Message(); - $message->method = 'REQUEST'; - $message->message = $calendar; - $message->sender = 'mailto:gandalf@wiz.ard'; - $message->senderName = 'Mr. Wizard'; - $message->recipient = 'mailto:' . 'frodo@hobb.it'; - - $this->plugin->schedule($message); - $this->assertEquals('1.0;We got the message, but iMip messages are disabled for this event', $message->scheduleStatus); - } } diff --git a/apps/dav/tests/unit/CalDAV/Schedule/PluginTest.php b/apps/dav/tests/unit/CalDAV/Schedule/PluginTest.php index 853094e4de2..15e598389c1 100644 --- a/apps/dav/tests/unit/CalDAV/Schedule/PluginTest.php +++ b/apps/dav/tests/unit/CalDAV/Schedule/PluginTest.php @@ -1,4 +1,5 @@ <?php + /** * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors * SPDX-License-Identifier: AGPL-3.0-or-later @@ -738,4 +739,42 @@ class PluginTest extends TestCase { } + /** + * Test Calendar Event Creation with iTip and iMip disabled + * + * Should generate 2 messages for attendees User 2 and User External + */ + public function testCalendarObjectChangeWithSchedulingDisabled(): void { + // construct server request + $request = new Request( + 'PUT', + '/remote.php/dav/calendars/user1/personal/B0DC78AE-6DD7-47E3-80BE-89F23E6D5383.ics', + ['x-nc-scheduling' => 'false'] + ); + $request->setBaseUrl('/remote.php/dav/'); + // construct server response + $response = new Response(); + // construct server tree + $tree = $this->createMock(Tree::class); + $tree->expects($this->never()) + ->method('getNodeForPath'); + // construct server properties and returns + $this->server->httpRequest = $request; + $this->server->tree = $tree; + // construct empty calendar event + $vCalendar = new VCalendar(); + $vEvent = $vCalendar->add('VEVENT', []); + // define flags + $newFlag = true; + $modifiedFlag = false; + // execute method + $this->plugin->calendarObjectChange( + $request, + $response, + $vCalendar, + 'calendars/user1/personal', + $modifiedFlag, + $newFlag + ); + } } |