Skip to content

Commit ade7bfe

Browse files
rhtotmemurats
authored andcommitted
Combine the check for API calls as from MagentaCLOUD prod and NC E2E test
1 parent adf9b7d commit ade7bfe

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
@@ -369,13 +369,14 @@ public static function initSession(): void {
369369
// TODO: Temporary disabled again to solve issues with CalDAV/CardDAV clients like DAVx5 that use cookies
370370
// TODO: See https://github.com/nextcloud/server/issues/37277#issuecomment-1476366147 and the other comments
371371
// TODO: for further information.
372-
// $isDavRequest = strpos($request->getRequestUri(), '/remote.php/dav') === 0 || strpos($request->getRequestUri(), '/remote.php/webdav') === 0;
373-
// if ($request->getHeader('Authorization') !== '' && is_null($request->getCookie('cookie_test')) && $isDavRequest && !isset($_COOKIE['nc_session_id'])) {
374-
// setcookie('cookie_test', 'test', time() + 3600);
375-
// // Do not initialize the session if a request is authenticated directly
376-
// // unless there is a session cookie already sent along
377-
// return;
378-
// }
372+
// MagentaCLOUD stays with original version of the solution from production
373+
$isDavRequest = strpos($request->getRequestUri(), '/remote.php/dav') === 0 ||
374+
strpos($request->getRequestUri(), '/remote.php/webdav') === 0;
375+
if ($request->getHeader('Authorization') !== '' && $isDavRequest && !isset($_COOKIE['nc_session_id'])) {
376+
// Do not initialize the session if a request is authenticated directly
377+
// unless there is a session cookie already sent along
378+
return;
379+
}
379380

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

0 commit comments

Comments
 (0)