Skip to content

Commit 8d843ad

Browse files
AndyScherzingerAndyScherzinger
authored
Merge pull request #54675 from nextcloud/backport/54533/stable30
[stable30] fix(caldav): show confidential event if writable
2 parents d0db7d6 + 196895b commit 8d843ad

File tree

5 files changed

+281
-17
lines changed

5 files changed

+281
-17
lines changed

‎apps/dav/lib/CalDAV/CalendarObject.php‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ public function get() {
5555
}
5656

5757
// shows as busy if event is declared confidential
58-
if ($this->objectData['classification'] === CalDavBackend::CLASSIFICATION_CONFIDENTIAL) {
58+
if ($this->objectData['classification'] === CalDavBackend::CLASSIFICATION_CONFIDENTIAL
59+
&& ($this->isPublic() || !$this->canWrite())) {
5960
$this->createConfidentialObject($vObject);
6061
}
6162

@@ -137,6 +138,10 @@ private function canWrite() {
137138
return true;
138139
}
139140

141+
private function isPublic(): bool {
142+
return $this->calendarInfo['{http://owncloud.org/ns}public'] ?? false;
143+
}
144+
140145
public function getCalendarId(): int {
141146
return (int) $this->objectData['calendarid'];
142147
}

‎apps/dav/tests/unit/CalDAV/CalendarObjectTest.php‎

Lines changed: 139 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,139 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
/**
6+
* SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
7+
* SPDX-License-Identifier: AGPL-3.0-or-later
8+
*/
9+
10+
namespace OCA\DAV\Tests\unit\CalDAV;
11+
12+
use OCA\DAV\CalDAV\CalDavBackend;
13+
use OCA\DAV\CalDAV\CalendarObject;
14+
use OCP\IL10N;
15+
use PHPUnit\Framework\MockObject\MockObject;
16+
use Sabre\VObject\Component\VCalendar;
17+
use Sabre\VObject\Component\VEvent;
18+
use Sabre\VObject\Reader as VObjectReader;
19+
use Test\TestCase;
20+
21+
class CalendarObjectTest extends TestCase {
22+
private readonly CalDavBackend&MockObject $calDavBackend;
23+
private readonly IL10N&MockObject $l10n;
24+
25+
protected function setUp(): void {
26+
parent::setUp();
27+
28+
$this->calDavBackend = $this->createMock(CalDavBackend::class);
29+
$this->l10n = $this->createMock(IL10N::class);
30+
31+
$this->l10n->method('t')
32+
->willReturnArgument(0);
33+
}
34+
35+
public static function provideConfidentialObjectData(): array {
36+
return [
37+
// Shared writable
38+
[
39+
false,
40+
[
41+
'principaluri' => 'user1',
42+
'{http://owncloud.org/ns}owner-principal' => 'user2',
43+
],
44+
],
45+
[
46+
false,
47+
[
48+
'principaluri' => 'user1',
49+
'{http://owncloud.org/ns}owner-principal' => 'user2',
50+
'{http://owncloud.org/ns}read-only' => 0,
51+
],
52+
],
53+
[
54+
false,
55+
[
56+
'principaluri' => 'user1',
57+
'{http://owncloud.org/ns}owner-principal' => 'user2',
58+
'{http://owncloud.org/ns}read-only' => false,
59+
],
60+
],
61+
// Shared read-only
62+
[
63+
true,
64+
[
65+
'principaluri' => 'user1',
66+
'{http://owncloud.org/ns}owner-principal' => 'user2',
67+
'{http://owncloud.org/ns}read-only' => 1,
68+
],
69+
],
70+
[
71+
true,
72+
[
73+
'principaluri' => 'user1',
74+
'{http://owncloud.org/ns}owner-principal' => 'user2',
75+
'{http://owncloud.org/ns}read-only' => true,
76+
],
77+
],
78+
];
79+
}
80+
81+
/**
82+
* @dataProvider provideConfidentialObjectData
83+
*/
84+
public function testGetWithConfidentialObject(
85+
bool $expectConfidential,
86+
array $calendarInfo,
87+
): void {
88+
$ics = <<<EOF
89+
BEGIN:VCALENDAR
90+
CALSCALE:GREGORIAN
91+
VERSION:2.0
92+
PRODID:-//IDN nextcloud.com//Calendar app 5.5.0-dev.1//EN
93+
BEGIN:VEVENT
94+
CREATED:20250820T102647Z
95+
DTSTAMP:20250820T103038Z
96+
LAST-MODIFIED:20250820T103038Z
97+
SEQUENCE:4
98+
UID:a0f55f1f-4f0e-4db8-a54b-1e8b53846591
99+
DTSTART;TZID=Europe/Berlin:20250822T110000
100+
DTEND;TZID=Europe/Berlin:20250822T170000
101+
STATUS:CONFIRMED
102+
SUMMARY:confidential-event
103+
CLASS:CONFIDENTIAL
104+
LOCATION:A location
105+
DESCRIPTION:A description
106+
END:VEVENT
107+
END:VCALENDAR
108+
EOF;
109+
VObjectReader::read($ics);
110+
111+
$calendarObject = new CalendarObject(
112+
$this->calDavBackend,
113+
$this->l10n,
114+
$calendarInfo,
115+
[
116+
'uri' => 'a0f55f1f-4f0e-4db8-a54b-1e8b53846591.ics',
117+
'calendardata' => $ics,
118+
'classification' => 2, // CalDavBackend::CLASSIFICATION_CONFIDENTIAL
119+
],
120+
);
121+
122+
$actualIcs = $calendarObject->get();
123+
$vObject = VObjectReader::read($actualIcs);
124+
125+
$this->assertInstanceOf(VCalendar::class, $vObject);
126+
$vEvent = $vObject->getBaseComponent('VEVENT');
127+
$this->assertInstanceOf(VEvent::class, $vEvent);
128+
129+
if ($expectConfidential) {
130+
$this->assertEquals('Busy', $vEvent->SUMMARY?->getValue());
131+
$this->assertNull($vEvent->DESCRIPTION);
132+
$this->assertNull($vEvent->LOCATION);
133+
} else {
134+
$this->assertEquals('confidential-event', $vEvent->SUMMARY?->getValue());
135+
$this->assertNotNull($vEvent->DESCRIPTION);
136+
$this->assertNotNull($vEvent->LOCATION);
137+
}
138+
}
139+
}

‎apps/dav/tests/unit/CalDAV/CalendarTest.php‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -311,9 +311,9 @@ public function testPrivateClassification($expectedChildren, $isShared): void {
311311
}
312312
$c = new Calendar($backend, $calendarInfo, $this->l10n, $this->config, $this->logger);
313313
$children = $c->getChildren();
314-
$this->assertEquals($expectedChildren, count($children));
314+
$this->assertCount($expectedChildren, $children);
315315
$children = $c->getMultipleChildren(['event-0', 'event-1', 'event-2']);
316-
$this->assertEquals($expectedChildren, count($children));
316+
$this->assertCount($expectedChildren, $children);
317317

318318
$this->assertEquals(!$isShared, $c->childExists('event-2'));
319319
}
@@ -393,9 +393,13 @@ public function testConfidentialClassification($expectedChildren, $isShared): vo
393393
'id' => 666,
394394
'uri' => 'cal',
395395
];
396+
397+
if ($isShared) {
398+
$calendarInfo['{http://owncloud.org/ns}read-only'] = true;
399+
}
396400
$c = new Calendar($backend, $calendarInfo, $this->l10n, $this->config, $this->logger);
397401

398-
$this->assertEquals(count($c->getChildren()), $expectedChildren);
402+
$this->assertCount($expectedChildren, $c->getChildren());
399403

400404
// test private event
401405
$privateEvent = $c->getChild('event-1');
@@ -600,24 +604,24 @@ public function testRemoveVAlarms() {
600604
$this->assertCount(2, $roCalendar->getChildren());
601605

602606
// calendar data shall not be altered for the owner
603-
$this->assertEquals($ownerCalendar->getChild('event-0')->get(), $publicObjectData);
604-
$this->assertEquals($ownerCalendar->getChild('event-1')->get(), $confidentialObjectData);
607+
$this->assertEquals($publicObjectData, $ownerCalendar->getChild('event-0')->get());
608+
$this->assertEquals($confidentialObjectData, $ownerCalendar->getChild('event-1')->get());
605609

606610
// valarms shall not be removed for read-write shares
607611
$this->assertEquals(
608-
$this->fixLinebreak($rwCalendar->getChild('event-0')->get()),
609-
$this->fixLinebreak($publicObjectData));
612+
$this->fixLinebreak($publicObjectData),
613+
$this->fixLinebreak($rwCalendar->getChild('event-0')->get()));
610614
$this->assertEquals(
611-
$this->fixLinebreak($rwCalendar->getChild('event-1')->get()),
612-
$this->fixLinebreak($confidentialObjectCleaned));
615+
$this->fixLinebreak($confidentialObjectData),
616+
$this->fixLinebreak($rwCalendar->getChild('event-1')->get()));
613617

614618
// valarms shall be removed for read-only shares
615619
$this->assertEquals(
616-
$this->fixLinebreak($roCalendar->getChild('event-0')->get()),
617-
$this->fixLinebreak($publicObjectDataWithoutVAlarm));
620+
$this->fixLinebreak($publicObjectDataWithoutVAlarm),
621+
$this->fixLinebreak($roCalendar->getChild('event-0')->get()));
618622
$this->assertEquals(
619-
$this->fixLinebreak($roCalendar->getChild('event-1')->get()),
620-
$this->fixLinebreak($confidentialObjectCleaned));
623+
$this->fixLinebreak($confidentialObjectCleaned),
624+
$this->fixLinebreak($roCalendar->getChild('event-1')->get()));
621625
}
622626

623627
private function fixLinebreak($str) {

‎apps/dav/tests/unit/CalDAV/PublicCalendarObjectTest.php‎

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
/**
6+
* SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
7+
* SPDX-License-Identifier: AGPL-3.0-or-later
8+
*/
9+
10+
namespace OCA\DAV\Tests\unit\CalDAV;
11+
12+
use OCA\DAV\CalDAV\CalDavBackend;
13+
use OCA\DAV\CalDAV\PublicCalendarObject;
14+
use OCP\IL10N;
15+
use PHPUnit\Framework\MockObject\MockObject;
16+
use Sabre\VObject\Component\VCalendar;
17+
use Sabre\VObject\Component\VEvent;
18+
use Sabre\VObject\Reader as VObjectReader;
19+
use Test\TestCase;
20+
21+
class PublicCalendarObjectTest extends TestCase {
22+
private readonly CalDavBackend&MockObject $calDavBackend;
23+
private readonly IL10N&MockObject $l10n;
24+
25+
protected function setUp(): void {
26+
parent::setUp();
27+
28+
$this->calDavBackend = $this->createMock(CalDavBackend::class);
29+
$this->l10n = $this->createMock(IL10N::class);
30+
31+
$this->l10n->method('t')
32+
->willReturnArgument(0);
33+
}
34+
35+
public static function provideConfidentialObjectData(): array {
36+
// For some reason, the CalDavBackend always sets read-only to false. Hence, we test for
37+
// both cases as the property should not matter anyway.
38+
// Ref \OCA\DAV\CalDAV\CalDavBackend::getPublicCalendars (approximately in line 538)
39+
return [
40+
[
41+
[
42+
'{http://owncloud.org/ns}read-only' => true,
43+
'{http://owncloud.org/ns}public' => true,
44+
],
45+
],
46+
[
47+
[
48+
'{http://owncloud.org/ns}read-only' => false,
49+
'{http://owncloud.org/ns}public' => true,
50+
],
51+
],
52+
[
53+
[
54+
'{http://owncloud.org/ns}read-only' => 1,
55+
'{http://owncloud.org/ns}public' => true,
56+
],
57+
],
58+
[
59+
[
60+
'{http://owncloud.org/ns}read-only' => 0,
61+
'{http://owncloud.org/ns}public' => true,
62+
],
63+
],
64+
];
65+
}
66+
67+
/**
68+
* @dataProvider provideConfidentialObjectData
69+
*/
70+
public function testGetWithConfidentialObject(array $calendarInfo): void {
71+
$ics = <<<EOF
72+
BEGIN:VCALENDAR
73+
CALSCALE:GREGORIAN
74+
VERSION:2.0
75+
PRODID:-//IDN nextcloud.com//Calendar app 5.5.0-dev.1//EN
76+
BEGIN:VEVENT
77+
CREATED:20250820T102647Z
78+
DTSTAMP:20250820T103038Z
79+
LAST-MODIFIED:20250820T103038Z
80+
SEQUENCE:4
81+
UID:a0f55f1f-4f0e-4db8-a54b-1e8b53846591
82+
DTSTART;TZID=Europe/Berlin:20250822T110000
83+
DTEND;TZID=Europe/Berlin:20250822T170000
84+
STATUS:CONFIRMED
85+
SUMMARY:confidential-event
86+
CLASS:CONFIDENTIAL
87+
LOCATION:A location
88+
DESCRIPTION:A description
89+
END:VEVENT
90+
END:VCALENDAR
91+
EOF;
92+
93+
$calendarObject = new PublicCalendarObject(
94+
$this->calDavBackend,
95+
$this->l10n,
96+
$calendarInfo,
97+
[
98+
'uri' => 'a0f55f1f-4f0e-4db8-a54b-1e8b53846591.ics',
99+
'calendardata' => $ics,
100+
'classification' => 2, // CalDavBackend::CLASSIFICATION_CONFIDENTIAL
101+
],
102+
);
103+
104+
$actualIcs = $calendarObject->get();
105+
$vObject = VObjectReader::read($actualIcs);
106+
107+
$this->assertInstanceOf(VCalendar::class, $vObject);
108+
$vEvent = $vObject->getBaseComponent('VEVENT');
109+
$this->assertInstanceOf(VEvent::class, $vEvent);
110+
111+
$this->assertEquals('Busy', $vEvent->SUMMARY?->getValue());
112+
$this->assertNull($vEvent->DESCRIPTION);
113+
$this->assertNull($vEvent->LOCATION);
114+
}
115+
}

‎apps/dav/tests/unit/CalDAV/PublicCalendarTest.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ public function testPrivateClassification($expectedChildren, $isShared): void {
5151
$logger = $this->createMock(LoggerInterface::class);
5252
$c = new PublicCalendar($backend, $calendarInfo, $this->l10n, $config, $logger);
5353
$children = $c->getChildren();
54-
$this->assertEquals(2, count($children));
54+
$this->assertCount(2, $children);
5555
$children = $c->getMultipleChildren(['event-0', 'event-1', 'event-2']);
56-
$this->assertEquals(2, count($children));
56+
$this->assertCount(2, $children);
5757

5858
$this->assertFalse($c->childExists('event-2'));
5959
}
@@ -132,14 +132,15 @@ public function testConfidentialClassification($expectedChildren, $isShared): vo
132132
'principaluri' => 'user2',
133133
'id' => 666,
134134
'uri' => 'cal',
135+
'{http://owncloud.org/ns}public' => true,
135136
];
136137
/** @var MockObject | IConfig $config */
137138
$config = $this->createMock(IConfig::class);
138139
/** @var MockObject | LoggerInterface $logger */
139140
$logger = $this->createMock(LoggerInterface::class);
140141
$c = new PublicCalendar($backend, $calendarInfo, $this->l10n, $config, $logger);
141142

142-
$this->assertEquals(count($c->getChildren()), 2);
143+
$this->assertCount(2, $c->getChildren());
143144

144145
// test private event
145146
$privateEvent = $c->getChild('event-1');

0 commit comments

Comments
 (0)