Skip to content
Closed
Changes from all commits
Commits
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
14 changes: 10 additions & 4 deletions lib/base.php
Original file line number Diff line number Diff line change
Expand Up @@ -548,10 +548,11 @@ private static function performSameSiteCookieProtection(IConfig $config): void {
return;
}

$requestUri = $request->getScriptName();
$processingScript = explode('/', $requestUri);
$processingScript = $processingScript[count($processingScript) - 1];

if (count($_COOKIE) > 0) {
$requestUri = $request->getScriptName();
$processingScript = explode('/', $requestUri);
$processingScript = $processingScript[count($processingScript) - 1];

if ($processingScript === 'index.php' // index.php routes are handled in the middleware
|| $processingScript === 'cron.php' // and cron.php does not need any authentication at all
Expand All @@ -573,7 +574,12 @@ private static function performSameSiteCookieProtection(IConfig $config): void {
exit();
}
}
} elseif (!isset($_COOKIE['nc_sameSiteCookielax']) || !isset($_COOKIE['nc_sameSiteCookiestrict'])) {
} else {
// Session not started for status.php, skip setting SS cookies
if ($processingScript === 'status.php') {
return;
}
// set nc_sameSiteCookielax and nc_sameSiteCookiestrict
self::sendSameSiteCookies();
}
}
Expand Down