[Security] Add clock dependency to OidcTokenHandler #50477
Merged
Conversation
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
nicolas-grekas
commented
May 30, 2023
| use Psr\Log\LoggerInterface; | ||
| use Symfony\Component\Clock\NativeClock; |
There was a problem hiding this comment.
NativeClock should never be used directly since 6.3
1eb6720 to
2349d1b
Compare
nicolas-grekas
commented
May 30, 2023
| ->setArguments([$config['signature']['algorithm']]); | ||
| $container->register('security.access_token_handler.oidc.jwk', JWK::class) | ||
| ->setFactory([JWK::class, 'createFromJson']) | ||
| ->setArguments([$config['signature']['key']]); |
There was a problem hiding this comment.
This fixes the wiring. Before this change, all firewalls would share a single jwk+algo definition, since varying key/algo were registered under the same id
| ->isRequired() | ||
| ->children() |
There was a problem hiding this comment.
removing one unneeded nesting level in the config /cc @vincentchalamon for the doc
| @@ -49,7 +49,7 @@ public function getUserBadgeFrom(string $accessToken): UserBadge | |||
|
|
|||
| // UserLoader argument can be overridden by a UserProvider on AccessTokenAuthenticator::authenticate | |||
| return new UserBadge($claims[$this->claim], fn () => $this->createUser($claims), $claims); | |||
| } catch (\Throwable $e) { | |||
| } catch (\Exception $e) { | |||
There was a problem hiding this comment.
we should never catch Throwable unless reasons which should be explicit/obvious
2349d1b to
8bee7b2
Compare
From "web-token/jwt-checker": The parameter "$clock" will become mandatory in 4.0.0. Please set a valid PSR Clock implementation instead of "null".
8bee7b2 to
5394130
Compare
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
From "web-token/jwt-checker":
The parameter "$clock" will become mandatory in 4.0.0. Please set a valid PSR Clock implementation instead of "null".
Also fixing some other issues found meanwhile.