-
Notifications
You must be signed in to change notification settings - Fork 110
attempt to implement support for cached keyset #600
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.
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
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,14 +18,19 @@ | |
|
||
use ArrayObject; | ||
use Authentication\Identifier\IdentifierInterface; | ||
use Cake\Cache\Cache; | ||
use Cake\Http\Client; | ||
use Cake\Utility\Security; | ||
use Exception; | ||
use Firebase\JWT\CachedKeySet; | ||
use Firebase\JWT\JWK; | ||
use Firebase\JWT\JWT; | ||
use Firebase\JWT\Key; | ||
use Laminas\Diactoros\RequestFactory; | ||
use Psr\Http\Message\ServerRequestInterface; | ||
use RuntimeException; | ||
use stdClass; | ||
use Symfony\Component\Cache\Adapter\Psr16Adapter; | ||
|
||
class JwtAuthenticator extends TokenAuthenticator | ||
{ | ||
|
@@ -41,6 +46,7 @@ class JwtAuthenticator extends TokenAuthenticator | |
'secretKey' => null, | ||
'subjectKey' => IdentifierInterface::CREDENTIAL_JWT_SUBJECT, | ||
'jwks' => null, | ||
'jwksCache' => null, | ||
]; | ||
|
||
/** | ||
|
@@ -149,7 +155,18 @@ protected function decodeToken(string $token): ?object | |
{ | ||
$jsonWebKeySet = $this->getConfig('jwks'); | ||
if ($jsonWebKeySet) { | ||
$keySet = JWK::parseKeySet($jsonWebKeySet); | ||
$jsonWebKeySetCache = $this->getConfig('jwksCache'); | ||
if ($jsonWebKeySetCache) { | ||
$keySet = new CachedKeySet( | ||
$jsonWebKeySet, | ||
new Client(), | ||
new RequestFactory(), | ||
new Psr16Adapter(Cache::pool($jsonWebKeySetCache)), | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Given that |
||
3000 | ||
); | ||
} else { | ||
$keySet = JWK::parseKeySet($jsonWebKeySet); | ||
} | ||
|
||
return JWT::decode( | ||
$token, | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why do we need this dependency?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
see the discussion here:
#535 (comment)
this was rebased / reopened as github closed it beeing stale for a while.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK, so its the PSR6 vs PSR16 compatibility shims that we actually need. While I don't love the additional dependency I also don't relish maintaining adapter code for a low-frequency use feature. We'll should include the additional dependencies required in the documentation and raise an error with instructions to install the required dependencies if they don't exist.