-
Notifications
You must be signed in to change notification settings - Fork 66
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
Support multiple IDPs and identity transformations on Supervisor FederationDomains #1419
Merged
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
Codecov Report
@@ Coverage Diff @@
## main #1419 +/- ##
==========================================
+ Coverage 75.55% 79.21% +3.65%
==========================================
Files 166 163 -3
Lines 15159 15757 +598
==========================================
+ Hits 11454 12482 +1028
+ Misses 3403 2959 -444
- Partials 302 316 +14
|
cfryanr
force-pushed
the
multiple_idps_and_transformations
branch
from
February 15, 2023 20:08
a9d1475
to
2967fb0
Compare
cfryanr
force-pushed
the
multiple_idps_and_transformations
branch
from
April 26, 2023 20:59
2967fb0
to
4134cf3
Compare
internal/controller/supervisorconfig/federation_domain_watcher.go
Outdated
Show resolved
Hide resolved
internal/controller/supervisorconfig/federation_domain_watcher.go
Outdated
Show resolved
Hide resolved
cfryanr
force-pushed
the
multiple_idps_and_transformations
branch
from
May 8, 2023 21:07
4134cf3
to
786197e
Compare
cfryanr
force-pushed
the
multiple_idps_and_transformations
branch
5 times, most recently
from
June 5, 2023 22:22
2777f8b
to
497b86a
Compare
Forgot to remove this in the previous commit which removed writing that condition from the controller code.
Also try to avoid flakes by using RetryOnConflict when calling Update on the FederationDomain.
To make the subject of the downstream ID token more unique when there are multiple IDPs. It is possible to define two IDPs in a FederationDomain using the same identity provider CR, in which case the only thing that would make the subject claim different is adding the IDP display name into the values of the subject claim.
cfryanr
force-pushed
the
multiple_idps_and_transformations
branch
2 times, most recently
from
September 11, 2023 19:52
908f2a0
to
29eee1f
Compare
cfryanr
force-pushed
the
multiple_idps_and_transformations
branch
from
September 11, 2023 20:08
29eee1f
to
8faf3b0
Compare
cfryanr
force-pushed
the
multiple_idps_and_transformations
branch
from
September 12, 2023 16:34
4c2e9b2
to
84498d5
Compare
cfryanr
force-pushed
the
multiple_idps_and_transformations
branch
from
September 13, 2023 19:31
7df9702
to
2cecc17
Compare
These extra timeout contexts were only in the new multiple IDPs e2e test. Remove this possible cause of test cleanup flakes where the test runs slow enough in CI that this timeout context has already expired and then the cleanup function fails with context deadline exceeded errors.
joshuatcasey
approved these changes
Sep 13, 2023
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 implements the proposal to support multiple identity providers and identity transformations from #1407.
Notes
The changes look larger than they really are because I also moved some pre-existing interfaces to new packages to help avoid circular package dependencies, and improved the organization of some exiting packages.
The easiest way to play with this code is to checkout this branch and then:
Remaining work to get this branch ready
Stabilize pre-existing integration tests
Remaining production code changes needed
sub
claim of the Supervisor-issued ID tokens. Thesub
claim is supposed to be a unique identifier, but is not necessarily unique without this update.Add new unit tests
federation_domain_issuer_test.go
could test the new gettersdownstream_session.go
should be unit tested indirectly via tests for the callers, but maybe the newApplyIdentityTransformations
method could have its own unit testAdd new integration tests
supervisor_login_tests.go
for multiple IDPs and transformations/policies, including testing refresh flowse2e_test.go
to exercise the whole auth experience with multiple IDPs configuredAdd docs (see "docs story" sections in proposal doc from #1407 for more details). These were added in a separate PR so it can be merged later. See #1660.
Release note: