Skip to content

Add fallback routines for empty secret cases #31499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CarlSchwan merged 5 commits into from
Oct 17, 2022
Merged

Add fallback routines for empty secret cases #31499

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
81f8719
Add fallback routines for empty secret cases
juliusknorr Mar 9, 2022
553cb49
Rotate token after fallback
juliusknorr Mar 10, 2022
a6796b4
Fix decryption fallback after adding a secret
juliusknorr Mar 10, 2022
01e2a26
Fix unit tests
CarlSchwan Mar 10, 2022
ef31396
Mark method as deprecated
CarlSchwan Sep 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Rotate token after fallback 
Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr
juliusknorr committed Mar 10, 2022
commit 553cb499b2abf51b1edd9b2deb309cec6cff35b6
10 changes: 8 additions & 2 deletions lib/private/Authentication/Token/PublicKeyTokenProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,14 @@ public function getToken(string $tokenId): IToken {
$token = $this->mapper->getToken($this->hashToken($tokenId));
$this->cache[$token->getToken()] = $token;
} catch (DoesNotExistException $ex) {
$this->cache[$tokenHash] = $ex;
throw new InvalidTokenException("Token does not exist: " . $ex->getMessage(), 0, $ex);
try {
$token = $this->mapper->getToken($this->hashTokenWithEmptySecret($tokenId));
$this->cache[$token->getToken()] = $token;
$this->rotate($token, $tokenId, $tokenId);
} catch (DoesNotExistException $ex2) {
$this->cache[$tokenHash] = $ex2;
throw new InvalidTokenException("Token does not exist: " . $ex->getMessage(), 0, $ex);
}
}
}

Expand Down