Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(CalDAV): disable both iTip and iMip messages #49503

Merged
merged 1 commit into from
Dec 10, 2024
Merged

fix(CalDAV): disable both iTip and iMip messages #49503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions apps/dav/lib/CalDAV/Schedule/IMipPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,14 +97,6 @@ public function beforeWriteContent($uri, INode $node, $data, $modified): void {
*/
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) {
Expand Down
8 changes: 7 additions & 1 deletion apps/dav/lib/CalDAV/Schedule/Plugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
Expand Down Expand Up @@ -162,10 +163,15 @@ public function calendarObjectChange(RequestInterface $request, ResponseInterfac

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

/** @var Calendar $calendarNode */
$calendarNode = $this->server->tree->getNodeForPath($calendarPath);
// extract addresses for owner
Expand Down
19 changes: 0 additions & 19 deletions apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -997,23 +997,4 @@ 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: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 changes: 39 additions & 0 deletions apps/dav/tests/unit/CalDAV/Schedule/PluginTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
Expand Down Expand Up @@ -738,4 +739,42 @@ function (string $eventName, array $arguments = [], ?callable $continueCallBack

}

/**
* 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
);
}
}
Loading