Merge pull request #46666 from nextcloud/backport/46640/stable26

[stable26] fix(Token): take over scope in token refresh with login by cookie
nextcloud · Jul 29, 2024 · 59e92dd · 59e92dd
2 parents 7826984 + c6d8aff
commit 59e92dd
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 24 deletions.
diff --git a/lib/private/Authentication/Token/IProvider.php b/lib/private/Authentication/Token/IProvider.php
@@ -48,13 +48,16 @@ interface IProvider {
 	 * @return IToken
 	 * @throws \RuntimeException when OpenSSL reports a problem
 	 */
-	public function generateToken(string $token,
-								  string $uid,
-								  string $loginName,
-								  ?string $password,
-								  string $name,
-								  int $type = IToken::TEMPORARY_TOKEN,
-								  int $remember = IToken::DO_NOT_REMEMBER): IToken;
+	public function generateToken(
+		string  $token,
+		string  $uid,
+		string  $loginName,
+		?string $password,
+		string  $name,
+		int     $type = IToken::TEMPORARY_TOKEN,
+		int     $remember = IToken::DO_NOT_REMEMBER,
+		?array  $scope = null,
+	): IToken;
 
 	/**
 	 * Get a token by token id

diff --git a/lib/private/Authentication/Token/Manager.php b/lib/private/Authentication/Token/Manager.php
@@ -54,13 +54,16 @@ public function __construct(PublicKeyTokenProvider $publicKeyTokenProvider) {
 	 * @param int $remember whether the session token should be used for remember-me
 	 * @return IToken
 	 */
-	public function generateToken(string $token,
-								  string $uid,
-								  string $loginName,
-								  $password,
-								  string $name,
-								  int $type = IToken::TEMPORARY_TOKEN,
-								  int $remember = IToken::DO_NOT_REMEMBER): IToken {
+	public function generateToken(
+		string $token,
+		string $uid,
+		string $loginName,
+			   $password,
+		string $name,
+		int    $type = IToken::TEMPORARY_TOKEN,
+		int    $remember = IToken::DO_NOT_REMEMBER,
+		?array $scope = null,
+	): IToken {
 		if (mb_strlen($name) > 128) {
 			$name = mb_substr($name, 0, 120) . '…';
 		}
@@ -73,7 +76,8 @@ public function generateToken(string $token,
 				$password,
 				$name,
 				$type,
-				$remember
+				$remember,
+				$scope,
 			);
 		} catch (UniqueConstraintViolationException $e) {
 			// It's rare, but if two requests of the same session (e.g. env-based SAML)

diff --git a/lib/private/Authentication/Token/PublicKeyTokenProvider.php b/lib/private/Authentication/Token/PublicKeyTokenProvider.php
@@ -93,13 +93,16 @@ public function __construct(PublicKeyTokenMapper $mapper,
 	/**
 	 * {@inheritDoc}
 	 */
-	public function generateToken(string $token,
-								  string $uid,
-								  string $loginName,
-								  ?string $password,
-								  string $name,
-								  int $type = IToken::TEMPORARY_TOKEN,
-								  int $remember = IToken::DO_NOT_REMEMBER): IToken {
+	public function generateToken(
+		string  $token,
+		string  $uid,
+		string  $loginName,
+		?string $password,
+		string  $name,
+		int     $type = IToken::TEMPORARY_TOKEN,
+		int     $remember = IToken::DO_NOT_REMEMBER,
+		?array  $scope = null,
+	): IToken {
 		if (strlen($token) < self::TOKEN_MIN_LENGTH) {
 			$exception = new InvalidTokenException('Token is too short, minimum of ' . self::TOKEN_MIN_LENGTH . ' characters is required, ' . strlen($token) . ' characters given');
 			$this->logger->error('Invalid token provided when generating new token', ['exception' => $exception]);
@@ -121,6 +124,10 @@ public function generateToken(string $token,
 			$dbToken->setPasswordHash($randomOldToken->getPasswordHash());
 		}
 
+		if ($scope !== null) {
+			$dbToken->setScope($scope);
+		}
+
 		$this->mapper->insert($dbToken);
 
 		if (!$oldTokenMatches && $password !== null) {
@@ -233,16 +240,18 @@ public function renewSessionToken(string $oldSessionId, string $sessionId): ITok
 				$privateKey = $this->decrypt($token->getPrivateKey(), $oldSessionId);
 				$password = $this->decryptPassword($token->getPassword(), $privateKey);
 			}
+
+			$scope = $token->getScope() === '' ? null : $token->getScopeAsArray();
 			$newToken = $this->generateToken(
 				$sessionId,
 				$token->getUID(),
 				$token->getLoginName(),
 				$password,
 				$token->getName(),
 				IToken::TEMPORARY_TOKEN,
-				$token->getRemember()
+				$token->getRemember(),
+				$scope,
 			);
-			$newToken->setScope($token->getScopeAsArray());
 
 			$this->mapper->delete($token);