summaryrefslogtreecommitdiffstats
path: root/lib/base.php
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2022-12-22 11:33:23 +0100
committerJulius Härtl <jus@bitgrid.net>2022-12-22 11:33:23 +0100
commit842f4d530fab291e8e6157689e53f405f044cad3 (patch)
tree04abbbdc3cdd3d7e99ab264948d8ddf60c9ad53b /lib/base.php
parent5c4b4bde1b2da872c3e03846954214a8aa8c598e (diff)
downloadnextcloud-server-842f4d530fab291e8e6157689e53f405f044cad3.tar.gz
nextcloud-server-842f4d530fab291e8e6157689e53f405f044cad3.zip
fix(session): Always setup the session if a session cookie is passed
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'lib/base.php')
-rw-r--r--lib/base.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/base.php b/lib/base.php
index a7c36bcd3fe..6186e29bd6d 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -411,7 +411,7 @@ class OC {
public static function initSession(): void {
$request = Server::get(IRequest::class);
$isDavRequest = strpos($request->getRequestUri(), '/remote.php/dav') === 0 || strpos($request->getRequestUri(), '/remote.php/webdav') === 0;
- if ($request->getHeader('Authorization') !== '' && is_null($request->getCookie('cookie_test')) && $isDavRequest) {
+ if ($request->getHeader('Authorization') !== '' && is_null($request->getCookie('cookie_test')) && $isDavRequest && !isset($_COOKIE['nc_session_id'])) {
setcookie('cookie_test', 'test', time() + 3600);
// Do not initialize the session if a request is authenticated directly
// unless there is a session cookie already sent along