Skip to content
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

fix: don't assume the login challenge to be a UUID #3317

Merged
merged 4 commits into from Jun 19, 2023

Conversation

hperl
Copy link
Contributor

@hperl hperl commented Jun 14, 2023

Related issue(s)

Checklist

  • I have read the contributing 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 the security 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 changed the documentation.

Further Comments

@hperl hperl self-assigned this Jun 14, 2023
@hperl hperl added the bug Something is not working. label Jun 14, 2023
@hperl hperl force-pushed the hperl/fix-login-challenge-format branch 2 times, most recently from 97cb7f2 to 84d14ed Compare June 14, 2023 18:50
@codecov
Copy link

codecov bot commented Jun 14, 2023

Codecov Report

Merging #3317 (7d1e3d4) into master (3485204) will decrease coverage by 0.08%.
The diff coverage is 91.11%.

❗ Current head 7d1e3d4 differs from pull request most recent head 5871f81. Consider uploading reports for the commit 5871f81 to get more accurate results

@@            Coverage Diff             @@
##           master    #3317      +/-   ##
==========================================
- Coverage   78.20%   78.12%   -0.08%     
==========================================
  Files         325      325              
  Lines       21079    21080       +1     
==========================================
- Hits        16484    16469      -15     
- Misses       3370     3383      +13     
- Partials     1225     1228       +3     
Impacted Files Coverage Δ
selfservice/flow/registration/flow.go 97.36% <ø> (ø)
hydra/fake.go 70.00% <66.66%> (ø)
hydra/hydra.go 67.10% <92.30%> (-0.43%) ⬇️
selfservice/flow/login/handler.go 79.38% <93.75%> (+0.18%) ⬆️
selfservice/flow/login/flow.go 95.00% <100.00%> (ø)
selfservice/flow/login/hook.go 86.23% <100.00%> (ø)
selfservice/flow/registration/handler.go 78.78% <100.00%> (ø)
selfservice/flow/registration/hook.go 70.92% <100.00%> (ø)

... and 2 files with indirect coverage changes

@hperl hperl force-pushed the hperl/fix-login-challenge-format branch 3 times, most recently from d716e20 to 028f64e Compare June 15, 2023 08:36
For compatibility with ory/hydra#3515, which
now encodes the whole flow in the login challenge, we cannot further
assume that the challenge is a UUID.
@hperl hperl force-pushed the hperl/fix-login-challenge-format branch 3 times, most recently from a7eb0f9 to ac1bbde Compare June 16, 2023 06:52
For compatibility with ory/hydra#3515, which
now encodes the whole flow in the login challenge, we cannot further
assume that the challenge is a UUID.
@hperl hperl force-pushed the hperl/fix-login-challenge-format branch from ac1bbde to 794ac6a Compare June 16, 2023 07:52
zepatrik
zepatrik previously approved these changes Jun 16, 2023
hydra/hydra_test.go Show resolved Hide resolved
hydra/hydra_test.go Outdated Show resolved Hide resolved
Co-authored-by: Patrik <zepatrik@users.noreply.github.com>
aeneasr
aeneasr previously approved these changes Jun 19, 2023
Copy link
Member

@aeneasr aeneasr left a comment

Choose a reason for hiding this comment

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

Looking very good. You could improve the SQL migration, right now it will probably cause some 500s when migrating.

@aeneasr aeneasr merged commit 3172862 into master Jun 19, 2023
28 checks passed
@aeneasr aeneasr deleted the hperl/fix-login-challenge-format branch June 19, 2023 11:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something is not working.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants