Still setup session if a session cookie is present

Signed-off-by: Julius Härtl <jus@bitgrid.net>
nextcloud · Feb 7, 2022 · 01d5aca · 01d5aca
1 parent d349901
commit 01d5aca
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/base.php b/lib/base.php
@@ -407,8 +407,9 @@ private static function printUpgradePage(\OC\SystemConfig $systemConfig) {
 	}
 
 	public static function initSession() {
-		if (self::$server->getRequest()->getHeader('Authorization') !== '') {
+		if (self::$server->getRequest()->getHeader('Authorization') !== '' && !isset($_COOKIE[OC_Util::getInstanceId()])) {
 			// Do not initialize the session if a request is authenticated directly
+			// unless there is a session cookie already sent along
 			return;
 		}
 		if (self::$server->getRequest()->getServerProtocol() === 'https') {