Skip to content

Commit 5599ce0

Browse files
committed
Merge #251 No session on DAV API call
2 parents 1406eec + 70f1b3b commit 5599ce0

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

lib/base.php

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -420,13 +420,14 @@ public static function initSession(): void {
420420
// TODO: Temporary disabled again to solve issues with CalDAV/CardDAV clients like DAVx5 that use cookies
421421
// TODO: See https://github.com/nextcloud/server/issues/37277#issuecomment-1476366147 and the other comments
422422
// TODO: for further information.
423-
// $isDavRequest = strpos($request->getRequestUri(), '/remote.php/dav') === 0 || strpos($request->getRequestUri(), '/remote.php/webdav') === 0;
424-
// if ($request->getHeader('Authorization') !== '' && is_null($request->getCookie('cookie_test')) && $isDavRequest && !isset($_COOKIE['nc_session_id'])) {
425-
// setcookie('cookie_test', 'test', time() + 3600);
426-
// // Do not initialize the session if a request is authenticated directly
427-
// // unless there is a session cookie already sent along
428-
// return;
429-
// }
423+
// MagentaCLOUD stays with original version of the solution from production
424+
$isDavRequest = strpos($request->getRequestUri(), '/remote.php/dav') === 0 ||
425+
strpos($request->getRequestUri(), '/remote.php/webdav') === 0;
426+
if ($request->getHeader('Authorization') !== '' && $isDavRequest && !isset($_COOKIE['nc_session_id'])) {
427+
// Do not initialize the session if a request is authenticated directly
428+
// unless there is a session cookie already sent along
429+
return;
430+
}
430431

431432
if ($request->getServerProtocol() === 'https') {
432433
ini_set('session.cookie_secure', 'true');

0 commit comments

Comments
 (0)