Skip to content

fix(caldav): url-encode owner/user in activity event links #61973

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

Open
Otto-Deviant1904 wants to merge 1 commit into
base: master
Choose a base branch
from
+22 −4
Open

fix(caldav): url-encode owner/user in activity event links #61973

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
4 changes: 2 additions & 2 deletions apps/dav/lib/CalDAV/Activity/Provider/Event.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,13 @@ protected function generateObjectParameter(array $eventData, string $affectedUse
$linkData = $eventData['link'];
$calendarUri = $this->urlencodeLowerHex($linkData['calendar_uri']);
if ($affectedUser === $linkData['owner']) {
$objectId = base64_encode($this->url->getWebroot() . '/remote.php/dav/calendars/' . $linkData['owner'] . '/' . $calendarUri . '/' . $linkData['object_uri']);
$objectId = base64_encode($this->url->getWebroot() . '/remote.php/dav/calendars/' . rawurlencode($linkData['owner']) . '/' . $calendarUri . '/' . $linkData['object_uri']);
} else {
// Can't use the "real" owner and calendar names here because we create a custom
// calendar for incoming shares with the name "<calendar>_shared_by_<sharer>".
// Hack: Fix the link by generating it for the incoming shared calendar instead,
// as seen from the affected user.
$objectId = base64_encode($this->url->getWebroot() . '/remote.php/dav/calendars/' . $affectedUser . '/' . $calendarUri . '_shared_by_' . $linkData['owner'] . '/' . $linkData['object_uri']);
$objectId = base64_encode($this->url->getWebroot() . '/remote.php/dav/calendars/' . rawurlencode($affectedUser) . '/' . $calendarUri . '_shared_by_' . rawurlencode($linkData['owner']) . '/' . $linkData['object_uri']);
}
$params['link'] = $this->url->linkToRouteAbsolute('calendar.view.indexdirect.edit', [
'objectId' => $objectId,
Expand Down
22 changes: 20 additions & 2 deletions apps/dav/tests/unit/CalDAV/Activity/Provider/EventTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,11 +146,29 @@ public static function generateObjectParameterLinkEncodingDataProvider(): array
],
base64_encode('/remote.php/dav/calendars/sharee/Umlaut_%c3%a4%c3%bc%c3%b6%c3%9f/someuuid.ics'),
],
[ // Owned calendar, uid contains a space
[
'object_uri' => 'someuuid.ics',
'calendar_uri' => 'personal',
'owner' => 'Elisa Ciria'
],
base64_encode('/remote.php/dav/calendars/Elisa%20Ciria/personal/someuuid.ics'),
'Elisa Ciria',
],
[ // Shared calendar, owner and affected user uids both contain a space
[
'object_uri' => 'someuuid.ics',
'calendar_uri' => 'personal',
'owner' => 'Elisa Ciria'
],
base64_encode('/remote.php/dav/calendars/John%20Doe/personal_shared_by_Elisa%20Ciria/someuuid.ics'),
'John Doe',
],
];
}

#[\PHPUnit\Framework\Attributes\DataProvider(methodName: 'generateObjectParameterLinkEncodingDataProvider')]
public function testGenerateObjectParameterLinkEncoding(array $link, string $objectId): void {
public function testGenerateObjectParameterLinkEncoding(array $link, string $objectId, string $affectedUser = 'sharee'): void {
$generatedLink = [
'objectId' => $objectId,
];
Expand All @@ -171,7 +189,7 @@ public function testGenerateObjectParameterLinkEncoding(array $link, string $obj
'name' => 'calendar',
'link' => 'fullLink',
];
$this->assertEquals($result, $this->invokePrivate($this->provider, 'generateObjectParameter', [$objectParameter, 'sharee']));
$this->assertEquals($result, $this->invokePrivate($this->provider, 'generateObjectParameter', [$objectParameter, $affectedUser]));
}

public static function dataGenerateObjectParameterThrows(): array {
Expand Down