upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

fix: disable both iTip and iMip messages

Browse source 
Signed-off-by: SebastianKrupinski <krupinskis05@gmail.com>
This commit is contained in:
SebastianKrupinski 2024-11-26 19:52:01 -05:00
parent 394527e24e
commit 85fbce23aa
4 changed files with 45 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/dav/lib/CalDAV/Schedule/IMipPlugin.php
View file

@ -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) {

6
apps/dav/lib/CalDAV/Schedule/Plugin.php
View file

@ -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;
}

19
apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php
View file

@ -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);
}
}

39
apps/dav/tests/unit/CalDAV/Schedule/PluginTest.php
View file

@ -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
);
}
}