Add support for multiple Apple public keys #321
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
|
@mca312 In case you've been pulling your hair out over this like me... |
dstapleton92
commented
Mar 5, 2020
| @@ -100,12 +101,18 @@ func (s *Session) Authorize(provider goth.Provider, params goth.Params) (string, | |||
| } | |||
|
|
|||
| // get the public key for verifying the identity token signature | |||
| // todo: respect Cache-Control header and retrieve this less frequently | |||
| set, err := jwk.FetchHTTP(idTokenVerificationKeyEndpoint, jwk.WithHTTPClient(p.httpClient)) | |||
| set, err := jwk.FetchHTTP(idTokenVerificationKeyEndpoint, jwk.WithHTTPClient(p.Client())) | |||
There was a problem hiding this comment.
Switching this to use p.Client() so that the fallback client will be retrieved if one was not set during Apple controller initialization. This wasn't contributing to the problem but I do think it's a good change to make.
bentranter
approved these changes
Mar 5, 2020
There was a problem hiding this comment.
Looks great to me – thanks for your hard work @dstapleton92!
|
This is out in https://github.com/markbates/goth/releases/tag/v1.61.3. |
|
@dstapleton92 Thanks. I did something similar when verifying the JWT. But I'm doing this right before the session.Authorize |
|
Dang. Didn't know about |
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 Sign In With Apple (SIWA) implementation has been failing intermittently. After some investigation, I have determined the cause of the intermittent failure. Before, Apple only provided a single public key in the array hosted at this url: https://appleid.apple.com/auth/keys.
The original author of this apple provider assumed (wish Apple had better docs!) there would only ever be one key, so always used
keys[0]. Now, Apple has added 2 more keys (making 3 total). The correct procedure is to retrieve the key id (kid) from the header of the Apple JWT and then use the corresponding key from thekeysarray to verify the JWT.I also removed a comment mentioning the need to fetch the keys from Apple less frequently by respecting the cache headers. The headers Apple sets on that response indicate that it should not be cached.