Expired PK tokens should not fall back to legacy tokens

Fixes #11919

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2018-10-21 14:34:29 +02:00
parent f544c9fec9
commit b3a92a4e39
No known key found for this signature in database
GPG key ID: F941078878347C0C

View file

@ -138,6 +138,8 @@ class Manager implements IProvider {
public function getTokenById(int $tokenId): IToken {
try {
return $this->publicKeyTokenProvider->getTokenById($tokenId);
} catch (ExpiredTokenException $e) {
throw $e;
} catch (InvalidTokenException $e) {
return $this->defaultTokenProvider->getTokenById($tokenId);
}