AD FS namespace OIDC bug fix #19460
Merged
AD FS namespace OIDC bug fix #19460
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
zofskeez
approved these changes
Mar 22, 2023
Comment on lines
+177
to
+188
| /* | ||
| If authenticating to a namespace, most SSO providers return a callback url | ||
| with a 'state' query param that includes a URI encoded namespace, example: | ||
| '?code=BZBDVPMz0By2JTqulEMWX5-6rflW3A20UAusJYHEeFygJ&state=sst_yOarDguU848w5YZuotLs%2Cns%3Dadmin' | ||
|
|
||
| Active Directory Federation Service (AD FS), instead, decodes the namespace portion: | ||
| '?code=BZBDVPMz0By2JTqulEMWX5-6rflW3A20UAusJYHEeFygJ&state=st_yOarDguU848w5YZuotLs,ns=admin' | ||
|
|
||
| 'ns' isn't recognized as a separate param because there is no ampersand, so using this.paramsFor() returns | ||
| a namespace-less state and authentication fails | ||
| { state: 'st_yOarDguU848w5YZuotLs,ns' } | ||
| */ |
There was a problem hiding this comment.
Great comments here thanks!
There was a problem hiding this comment.
Thanks for all these test updates 🎉
This was referenced Mar 23, 2023
hellobontempo
added a commit
that referenced
this pull request
Mar 23, 2023
* the fix * changelog * clair fix * add test * update changelog * clarify comment * remove state from paramsFor completely, update tests * Revert "remove state from paramsFor completely, update tests" This reverts commit bea042f. * add tests with skips until not flaky --------- Co-authored-by: clairebontempo@gmail.com <clairebontempo@gmail.com> Co-authored-by: claire bontempo <68122737+hellobontempo@users.noreply.github.com>
hellobontempo
added a commit
that referenced
this pull request
Mar 23, 2023
* the fix * changelog * clair fix * add test * update changelog * clarify comment * remove state from paramsFor completely, update tests * Revert "remove state from paramsFor completely, update tests" This reverts commit bea042f. * add tests with skips until not flaky --------- Co-authored-by: clairebontempo@gmail.com <clairebontempo@gmail.com> Co-authored-by: claire bontempo <68122737+hellobontempo@users.noreply.github.com>
hellobontempo
added a commit
that referenced
this pull request
Mar 23, 2023
* the fix * changelog * clair fix * add test * update changelog * clarify comment * remove state from paramsFor completely, update tests * Revert "remove state from paramsFor completely, update tests" This reverts commit bea042f. * add tests with skips until not flaky --------- Co-authored-by: clairebontempo@gmail.com <clairebontempo@gmail.com> Co-authored-by: claire bontempo <68122737+hellobontempo@users.noreply.github.com>
hellobontempo
changed the title
This was referenced Mar 23, 2023
hellobontempo
added a commit
that referenced
this pull request
Mar 23, 2023
* the fix * changelog * clair fix * add test * update changelog * clarify comment * remove state from paramsFor completely, update tests * Revert "remove state from paramsFor completely, update tests" This reverts commit bea042f. * add tests with skips until not flaky --------- Co-authored-by: Angel Garbarino <Monkeychip@users.noreply.github.com>
hellobontempo
added a commit
that referenced
this pull request
Mar 23, 2023
* the fix * changelog * claire fix * add test * update changelog * clarify comment * remove state from paramsFor completely, update tests * Revert "remove state from paramsFor completely, update tests" This reverts commit bea042f. * add tests with skips until not flaky --------- Co-authored-by: Angel Garbarino <Monkeychip@users.noreply.github.com>
hellobontempo
added a commit
that referenced
this pull request
Mar 23, 2023
* the fix * changelog * claire fix * add test * update changelog * clarify comment * remove state from paramsFor completely, update tests * Revert "remove state from paramsFor completely, update tests" This reverts commit bea042f. * add tests with skips until not flaky --------- Co-authored-by: Angel Garbarino <Monkeychip@users.noreply.github.com>
There was a problem hiding this comment.
It may seem redundant to first get namespace using paramsFor and then again using window.location.search but if the namespace is from the cluster (i.e. HCP namespace flag) window.location.search is empty and so we have to use paramsFor to initially assign those variables.
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.
This PR #15378 implemented using the URL api because Ember was stripping out the ns param via the
paramsFormethod. While implementing a fix for cluster namespace flags (PR #16886), we discoveredparamsForwas no longer stripping out the namespace.However, this introduced a regression because ADFS decodes the namespace portion of the state query param in the callback uri, but doesn't separate it as a separate query param using
&. ThusparamsForwas unable to recognizensas a separate parameter and authentication failed. (See these lines in the test file for examples and a more in depth explanation.)Thanks to @austingebauer for checking out this branch and testing it with his local AD FS setup to confirm this does in fact fix the issue!