Ensure that the native redirect_uri parameter matches with redirect_uri of the client. #1060
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
houndci-bot
reviewed
Mar 20, 2018
| def validate_redirect_uri | ||
| return false if redirect_uri.blank? | ||
|
|
||
| Helpers::URIChecker.native_uri?(redirect_uri) || | ||
| Helpers::URIChecker.valid_for_authorization?(redirect_uri, client.redirect_uri) | ||
| Helpers::URIChecker.valid_for_authorization?(redirect_uri, client.redirect_uri) |
Even though doorkeeper-gem#1045 fixes the issue with broken native redirect URLs, it bypasses `Doorkeeper::OAuth::Helpers::URIChecker::valid_for_authorization?` check for authorization_code grants. This enables `Doorkeeper:: OAuth::AuthorizationCodeRequest#validate_redirect_uri` to return `true` if the `redirect_uri` parameter is a native URI. This fix tries to fix this anomaly by changing the behaviour of `Doorkeeper::OAuth::Helpers::URIChecker::valid?` to return `true` whenever the `redirect_uri` parameter is a native URI. I think this makes more sense because this is a logic that is common to all grant types. When `Doorkeeper::OAuth::Helpers::URIChecker::valid?` returns `true` for native URLs, `Doorkeeper::OAuth::Helpers::URIChecker::valid_for_authorization?` makes sure that the given two urls match before returning `true` to the respective `validate_redirect_uri` methods of different grant types. Also gets rid of a #TODO from `Doorkeeper::OAuth::PreAuthorization`. Update News.md with the change Address review
hallucinations
force-pushed
the
feature/ensure-native-redirect_uri-matches-with-grant-redirect_uri
branch
from
f249d66 to
bb90fe1
Compare
hallucinations
deleted the
feature/ensure-native-redirect_uri-matches-with-grant-redirect_uri
branch
Gargron
pushed a commit
to mastodon/mastodon
that referenced
this pull request
May 12, 2018
ryansch
added a commit
to outstand/doorkeeper
that referenced
this pull request
Aug 13, 2018
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.
Summary
Even though #1045 fixes the issue with broken native redirect URLs, it bypasses
Doorkeeper::OAuth::Helpers::URIChecker::valid_for_authorization?check forauthorization_code grants. This enables
Doorkeeper:: OAuth::AuthorizationCodeRequest#validate_redirect_urito returntrueif theredirect_uriparameter is a native URI.This fix tries to fix this anomaly by changing the behaviour of
Doorkeeper::OAuth::Helpers::URIChecker::valid?to returntruewhenever theredirect_uriparameter is a native URI. I think this makes more sense becausethis is a logic that is common to all grant types.
Other Information
When
Doorkeeper::OAuth::Helpers::URIChecker::valid?returnstruefor nativeURLs,
Doorkeeper::OAuth::Helpers::URIChecker::valid_for_authorization?makessure that the given two urls match before returning
trueto the respectivevalidate_redirect_urimethods of different grant types.Also gets rid of a #TODO from
Doorkeeper::OAuth::PreAuthorization.