Merge pull request #63718 from nextcloud/backport/63705/stable35

[stable35] fix: Check rememberme cookie previous session id matches uid

Author: AndyScherzinger

lib/private/User/Session.php

@@ -903,6 +903,26 @@ public function loginWithCookie($uid, $currentToken, $oldSessionId) {
 			]);
 			return false;
 		}
+
+		try {
+			$oldToken = $this->tokenProvider->getToken($oldSessionId);
+		} catch (InvalidTokenException $ex) {
+			$this->logger->error('Could not find the session token to renew', [
+				'app' => 'core',
+				'user' => $uid,
+				'exception' => $ex,
+			]);
+			return false;
+		}
+
+		if ($oldToken->getUID() !== $user->getUID()) {
+			$this->logger->warning('Tried to renew a session token belonging to a different user', [
+				'app' => 'core',
+				'user' => $uid,
+			]);
+			return false;
+		}
+
 		// replace successfully used token with a new one
 		$this->config->deleteUserValue($uid, 'login_token', $currentToken);
 		$newToken = $this->random->generate(32);

tests/lib/User/SessionTest.php

@@ -794,8 +794,14 @@ public function testRememberLoginValidToken(): void {
 			->with($oldSessionId, $sessionId)
 			->willReturn($tokenObject);
 
-		$this->tokenProvider->expects($this->never())
-			->method('getToken');
+		$oldTokenObject = $this->createMock(IToken::class);
+		$oldTokenObject->expects($this->once())
+			->method('getUID')
+			->willReturn('foo');
+
+		$this->tokenProvider->expects($this->once())
+			->method('getToken')
+			->willReturn($oldTokenObject);
 
 		$user->expects($this->any())
 			->method('getUID')
@@ -872,7 +878,16 @@ public function testRememberLoginInvalidSessionToken(): void {
 			->with($oldSessionId, $sessionId)
 			->willThrowException(new InvalidTokenException());
 
-		$user->expects($this->never())
+		$oldTokenObject = $this->createMock(IToken::class);
+		$oldTokenObject->expects($this->once())
+			->method('getUID')
+			->willReturn('foo');
+
+		$this->tokenProvider->expects($this->once())
+			->method('getToken')
+			->willReturn($oldTokenObject);
+
+		$user->expects($this->once())
 			->method('getUID')
 			->willReturn('foo');
 		$userSession->expects($this->never())