Add support for two OpenID Connect key-pairs #11626
Open
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
changelog: Internal, OpenID Connect, Support two OIDC key-pairs
Comment on lines
+97
to
+100
| _matching_cert = [ | ||
| AppArtifacts.store.oidc_primary_public_key, | ||
| AppArtifacts.store.oidc_secondary_public_key, | ||
| ].compact.find do |key| |
There was a problem hiding this comment.
having an unused variable here has me 👀
would it make sense to break this into two methods, or to just ditch the variable entirely? Or switch to .each with a return?
There was a problem hiding this comment.
Ah yeah, I don't think the assignment is doing anything. I was originally considering using the matching cert to log which key was used, but I decided against it since logout is deprecated. I removed the assignment.
Co-authored-by: Zach Margolis <[email protected]>
Co-authored-by: Zach Margolis <[email protected]>
| key_from_response = JWT::JWK.import(json[:keys].first).public_key | ||
| public_key = AppArtifacts.store.oidc_public_key | ||
| # Primary key should be first | ||
| primary_key_from_response = JWT::JWK.import(json[:keys].first).public_key |
There was a problem hiding this comment.
The .keys[1] jumped out at me, maybe we could destructuring to avoid hardcoding indexes?
Suggested change
| primary_key_from_response = JWT::JWK.import(json[:keys].first).public_key | |
| primary_key_from_response, secondary_key_from_response = json[:keys].map do |key| | |
| JWT::JWK.import(key).public_key | |
| end |
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 of changes
Following up on #11612, this adds a secondary OpenID Connect key-pair that gives us the ability to do a zero downtime rotation. The two externally facing elements that require changes are:
id_token_hintparameter in OIDC LogoutPreviously, we did not allow "missing" app artifacts, but we may not always have a secondary key-pair, so the class was modified to allow it (though it still defaults to not allowing it).