Merge pull request #55623 from nextcloud/fix/caldav/principal-encoding-inconsistencies

provokateurin · web-flow · commit 6c362cb38d57 · 2025-10-08T12:56:12.000+02:00
diff --git a/apps/dav/lib/Search/EventsSearchProvider.php b/apps/dav/lib/Search/EventsSearchProvider.php
@@ -199,7 +199,7 @@ protected function getDavUrlForCalendarObject(
 		[,, $principalId] = explode('/', $principalUri, 3);
 
 		return $this->urlGenerator->linkTo('', 'remote.php') . '/dav/calendars/'
-			. rawurlencode($principalId) . '/'
+			. str_replace(' ', '%20', $principalId) . '/'
 			. $calendarUri . '/'
 			. $calendarObjectUri;
 	}
diff --git a/apps/dav/tests/unit/Search/EventsSearchProviderTest.php b/apps/dav/tests/unit/Search/EventsSearchProviderTest.php
@@ -404,6 +404,7 @@ public static function provideDeepLinkData(): array {
 		return [
 			['principals/users/john.doe', 'bGluay10by1yZW1vdGUucGhwL2Rhdi9jYWxlbmRhcnMvam9obi5kb2UvZm9vL2Jhci5pY3M='],
 			['principals/users/John Doe', 'bGluay10by1yZW1vdGUucGhwL2Rhdi9jYWxlbmRhcnMvSm9obiUyMERvZS9mb28vYmFyLmljcw=='],
+			['principals/users/john@doe', 'bGluay10by1yZW1vdGUucGhwL2Rhdi9jYWxlbmRhcnMvam9obkBkb2UvZm9vL2Jhci5pY3M='],
 		];
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ protected function getDavUrlForCalendarObject(`
`199`	`199`	`[,, $principalId] = explode('/', $principalUri, 3);`
`200`	`200`
`201`	`201`	`return $this->urlGenerator->linkTo('', 'remote.php') . '/dav/calendars/'`
`202`		`- . rawurlencode($principalId) . '/'`
	`202`	`+ . str_replace(' ', '%20', $principalId) . '/'`
`203`	`203`	`. $calendarUri . '/'`
`204`	`204`	`. $calendarObjectUri;`
`205`	`205`	`}`
Original file line number	Diff line number	Diff line change
`@@ -404,6 +404,7 @@ public static function provideDeepLinkData(): array {`
`404`	`404`	`return [`
`405`	`405`	`['principals/users/john.doe', 'bGluay10by1yZW1vdGUucGhwL2Rhdi9jYWxlbmRhcnMvam9obi5kb2UvZm9vL2Jhci5pY3M='],`
`406`	`406`	`['principals/users/John Doe', 'bGluay10by1yZW1vdGUucGhwL2Rhdi9jYWxlbmRhcnMvSm9obiUyMERvZS9mb28vYmFyLmljcw=='],`
	`407`	`+ ['principals/users/john@doe', 'bGluay10by1yZW1vdGUucGhwL2Rhdi9jYWxlbmRhcnMvam9obkBkb2UvZm9vL2Jhci5pY3M='],`
`407`	`408`	`];`
`408`	`409`	`}`
`409`	`410`