-
-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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
Validate confidential clients and determine if the client handles the grant type #1420
Merged
Sephster
merged 14 commits into
thephpleague:master
from
hafezdivandari:always-validate-client
Feb 6, 2025
Merged
Validate confidential clients and determine if the client handles the grant type #1420
Sephster
merged 14 commits into
thephpleague:master
from
hafezdivandari:always-validate-client
Feb 6, 2025
+189
−125
Conversation
This file contains 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 was referenced Jun 30, 2024
Merged
eugene-borovov
approved these changes
Dec 5, 2024
Sephster
reviewed
Feb 5, 2025
Sephster
reviewed
Feb 5, 2025
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.
This looks good @hafezdivandari - I like the way you've supported the unauthorized_grant without introducing breaking changes. A nice solution.
Only concern I have is around the validation of the redirect URI. I've left a comment. Thanks for your hard work on this
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.
Fixes #1174
Fixes #1369
Fixes #1073
Closes #1036
This PR can be considered as a security enhancement and does 2 main changes:
AbstractGrant::validateClient()
only if the client is confidential (RFC6749 section 4.1.3). But "device authorization", "refresh token" and "password" grants always validate the client secret. This PR allows public "device authorization" (RFC8628 section 3.4), "refresh token" (RFC6749 section 6) and "password" (RFC6749 section 4.3.2) clients by calling theClientRepositoryInterface::validateClient()
method only if the client is confidential.AbstractGrant::getClientEntityOrFail()
twice instead of just using theAbstractGrant::validateClient()
return value, this PR fixes that.ClientTarit::supportsGrantType()
function:ClientTrait
that returnstrue
by default to avoid BC breaking changes.