Merge pull request #45349 from nextcloud/backport/45026/stable28

[stable28] Avoid updating the same oc_authtoken row twice
nextcloud · Jun 2, 2024 · aac7365 · aac7365
2 parents 7b087ee + 9880800
commit aac7365
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/config/config.sample.php b/config/config.sample.php
@@ -355,7 +355,7 @@
  * Tokens are still checked every 5 minutes for validity
  * max value: 300
  *
- * Defaults to ``300``
+ * Defaults to ``60``
  */
 'token_auth_activity_update' => 60,
 

diff --git a/lib/private/User/Session.php b/lib/private/User/Session.php
@@ -43,6 +43,7 @@
 use OC\Authentication\Exceptions\PasswordLoginForbiddenException;
 use OC\Authentication\Token\IProvider;
 use OC\Authentication\Token\IToken;
+use OC\Authentication\Token\PublicKeyToken;
 use OC\Hooks\Emitter;
 use OC\Hooks\PublicEmitter;
 use OC_User;
@@ -774,6 +775,9 @@ private function checkTokenCredentials(IToken $dbToken, $token) {
 		}
 
 		$dbToken->setLastCheck($now);
+		if ($dbToken instanceof PublicKeyToken) {
+			$dbToken->setLastActivity($now);
+		}
 		$this->tokenProvider->updateToken($dbToken);
 		return true;
 	}