mirror of https://github.com/nextcloud/server
fix(session): Avoid race condition for cache::get() vs. cache::hasKey()
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
parent
2c059dd606
commit
bc4a102f52
|
@ -192,11 +192,11 @@ class PublicKeyTokenProvider implements IProvider {
|
|||
*/
|
||||
private function getTokenFromCache(string $tokenHash): ?PublicKeyToken {
|
||||
$serializedToken = $this->cache->get($tokenHash);
|
||||
if ($serializedToken === null) {
|
||||
if ($this->cache->hasKey($tokenHash)) {
|
||||
throw new InvalidTokenException('Token does not exist: ' . $tokenHash);
|
||||
}
|
||||
if ($serializedToken === false) {
|
||||
throw new InvalidTokenException('Token does not exist: ' . $tokenHash);
|
||||
}
|
||||
|
||||
if ($serializedToken === null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
@ -211,9 +211,9 @@ class PublicKeyTokenProvider implements IProvider {
|
|||
$this->cache->set($token->getToken(), serialize($token), self::TOKEN_CACHE_TTL);
|
||||
}
|
||||
|
||||
private function cacheInvalidHash(string $tokenHash) {
|
||||
private function cacheInvalidHash(string $tokenHash): void {
|
||||
// Invalid entries can be kept longer in cache since it’s unlikely to reuse them
|
||||
$this->cache->set($tokenHash, null, self::TOKEN_CACHE_TTL * 2);
|
||||
$this->cache->set($tokenHash, false, self::TOKEN_CACHE_TTL * 2);
|
||||
}
|
||||
|
||||
public function getTokenById(int $tokenId): OCPIToken {
|
||||
|
|
Loading…
Reference in New Issue