Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings
/hydraPublic

fix: add scopes to token hook on authorization_code#3970

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Draft
sousandrei wants to merge1 commit intoory:master
base:master
Choose a base branch
Loading
fromsousandrei:fix/scopes-authorization-code

Conversation

@sousandrei
Copy link

@sousandreisousandrei commentedMar 27, 2025
edited
Loading

Related issue(s)

#3969#3891#3969
Addingauthorization_code to conditional of adding scopes to the requests for the token hook

Checklist

  • I have read thecontributing guidelines.
  • I have referenced an issue containing the design document if my change
    introduces a new feature.
  • I am following the
    contributing code guidelines.
  • I have read thesecurity policy.
  • I confirm that this pull request does not address a security
    vulnerability. If this pull request addresses a security vulnerability, I
    confirm that I got the approval (please contact
    security@ory.sh) from the maintainers to push
    the changes.
  • I have added tests that prove my fix is effective or that my feature
    works.
  • I have added or changedthe documentation.

Further Comments

@CLAassistant
Copy link

CLAassistant commentedMar 27, 2025
edited
Loading

CLA assistant check
All committers have signed the CLA.

accessRequest.GetGrantTypes().ExactOne(string(fosite.GrantTypeJWTBearer))||
accessRequest.GetGrantTypes().ExactOne(string(fosite.GrantTypePassword)) {
accessRequest.GetGrantTypes().ExactOne(string(fosite.GrantTypePassword))||
accessRequest.GetGrantTypes().ExactOne(string(fosite.GrantTypeAuthorizationCode)) {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

I think the reason that authorization code is left out of here is that a lot of this information is already determined when handling the authorization endpoint. I think the token endpoint should not be receiving the scope and audience parameters in the authorization code flow.

Line 1306 callsHandler.updateSessionWithRequest which should grant the scopes. If the scopes aren't available in the token hook, I think something else must be going on.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

And I hope the drive-by is welcome! I'm not a maintainer here or anything, just someone who saw your note about this PR on Slack and was curious and has spent some time recently staring at some of this code.

Copy link

@tilgovitilgoviApr 9, 2025
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

I think what may be happening here is that fosite is supposed to handle this but it's called in two phases. First it's called to process the token request, then it's called to issue the token response. I think the token hook might be getting called in between these two phases. Moving some code between the two phases in fosite fixes the issue, I think.

I put up adraft fosite PR that seems to fix this for me, but haven't checked yet whether tests need to be updated or looked into whether there are other consequences to be aware of.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Just to explain that a little more clearly, maybe. The token endpoint handler does these things:

  1. Callsfosite.OAuth2Provider.NewAccessRequest(), which calls the fosite code to handle the token request. This is just above your patch.
  2. Runs the code around where you've patched here, to handle some things that fosite does not.
  3. Calls all the hooks returned fromRegistry.AccessTokenHooks(), just below the code in your patch. That's where the token hook gets called.
  4. Callsfosite.OAuth2Provider.NewAccessResponse(), which calls the fosite code to generate a response.

So, I think my patch in fosite is moving the code that reads the granted scope and audience, already set and persisted by the consent flow, and updates the token request. It moves this from step 4 to step 1 so that it's visible in the token hook in step 3.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

I think you are on to something!
I'll keep this PR in draft until we have a resolution from your's as well if you don't mind

tilgovi reacted with thumbs up emoji

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

That sounds like the right move!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Hello, this definitely is not correct. This code part is only for machine interaction. User interaction has to be done differently.

accessRequest.GetGrantTypes().ExactOne(string(fosite.GrantTypeJWTBearer))||
accessRequest.GetGrantTypes().ExactOne(string(fosite.GrantTypePassword)) {
accessRequest.GetGrantTypes().ExactOne(string(fosite.GrantTypePassword))||
accessRequest.GetGrantTypes().ExactOne(string(fosite.GrantTypeAuthorizationCode)) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Hello, this definitely is not correct. This code part is only for machine interaction. User interaction has to be done differently.

Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment

Reviewers

@aeneasraeneasraeneasr requested changes

+1 more reviewer

@tilgovitilgovitilgovi left review comments

Reviewers whose approvals may not affect merge requirements

Requested changes must be addressed to merge this pull request.

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@sousandrei@CLAassistant@tilgovi@aeneasr

[8]ページ先頭

©2009-2025 Movatter.jp