-
Notifications
You must be signed in to change notification settings - Fork 153
Feature token introspection #12
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
Open
wallforfry
wants to merge
3
commits into
stevenmaguire:master
Choose a base branch
from
wallforfry:feature-tokenIntrospection
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
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
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 |
|---|---|---|
|
|
@@ -4,6 +4,8 @@ | |
|
|
||
| use Exception; | ||
| use Firebase\JWT\JWT; | ||
| use GuzzleHttp\Client; | ||
| use GuzzleHttp\RequestOptions; | ||
| use League\OAuth2\Client\Provider\AbstractProvider; | ||
| use League\OAuth2\Client\Provider\Exception\IdentityProviderException; | ||
| use League\OAuth2\Client\Token\AccessToken; | ||
|
|
@@ -130,6 +132,18 @@ public function getResourceOwnerDetailsUrl(AccessToken $token) | |
| return $this->getBaseUrlWithRealm().'/protocol/openid-connect/userinfo'; | ||
| } | ||
|
|
||
| /** | ||
| * Get provider url to fetch introspect token | ||
| * | ||
| * @param AccessToken $token | ||
| * | ||
| * @return string | ||
| */ | ||
| public function getIntrospectTokenUrl(AccessToken $token) | ||
| { | ||
| return $this->getBaseUrlWithRealm() . '/protocol/openid-connect/token/introspect'; | ||
| } | ||
|
|
||
| /** | ||
| * Builds the logout URL. | ||
| * | ||
|
|
@@ -154,6 +168,23 @@ private function getBaseLogoutUrl() | |
| return $this->getBaseUrlWithRealm() . '/protocol/openid-connect/logout'; | ||
| } | ||
|
|
||
| private function fetchIntrospectToken(AccessToken $token) { | ||
|
Collaborator
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. Please fix your code, to same coding style (opening bracet on new line) and fill PHPDoc |
||
| $data = array( | ||
| 'form_params' => array( | ||
| "token" => $token->getToken(), | ||
| "client_id" => $this->clientId, | ||
| "client_secret" => $this->clientSecret ), | ||
| RequestOptions::SYNCHRONOUS => true | ||
| ); | ||
|
|
||
| $url = $this->getIntrospectTokenUrl($token); | ||
|
|
||
| $client = new Client(); | ||
| $response = $client->requestAsync(self::METHOD_POST, $url, $data)->wait(); | ||
| $parsed = $this->parseResponse($response); | ||
| return $parsed; | ||
| } | ||
|
|
||
| /** | ||
| * Creates base url from provider configuration. | ||
| * | ||
|
|
@@ -220,6 +251,21 @@ public function getResourceOwner(AccessToken $token) | |
| return $this->createResourceOwner($response, $token); | ||
| } | ||
|
|
||
| /** | ||
| * Requests and returns the resource owner of given access token introspection. | ||
| * | ||
| * @param AccessToken $token | ||
| * @return KeycloakResourceOwner | ||
| */ | ||
| public function getResourceOwnerFromIntrospectedToken(AccessToken $token) | ||
| { | ||
| $parsed = $this->fetchIntrospectToken($token); | ||
|
|
||
| $response = $this->decryptResponse($parsed); | ||
|
|
||
| return $this->createResourceOwner($response, $token); | ||
| } | ||
|
|
||
| /** | ||
| * Updates expected encryption algorithm of Keycloak instance. | ||
| * | ||
|
|
||
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.
Nice.
With this token introspection would finally work!