Various cherry picks from v2 onto v3 #286
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
Using mime.ParseMediaType
… instead of a bool
this fix one word typo of the IDTokenVerifier.Verify function's comment Fixes coreos#265
mikedanese
approved these changes
Jan 7, 2021
oidc/oidc.go
Outdated
Comment on lines
399
to
417
| func (sb *stringAsBool) UnmarshalJSON(b []byte) error { | ||
| var result bool | ||
| err := json.Unmarshal(b, &result) | ||
| if err == nil { | ||
| *sb = stringAsBool(result) | ||
| return nil | ||
| } | ||
| var s string | ||
| err = json.Unmarshal(b, &s) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| result, err = strconv.ParseBool(s) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| *sb = stringAsBool(result) | ||
| return nil | ||
| } |
There was a problem hiding this comment.
This might be simpler:
func (sb *stringAsBool) UnmarshalJSON(b []byte) error {
switch string(b) {
case "true", `"true"`:
*sb = stringAsBool(true)
case "false", `"false"`:
*sb = stringAsBool(false)
default:
return errors.New("wat")
}
return nil
}There was a problem hiding this comment.
Good idea. Added as a separate commit to preserve commit history.
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.
Includes #266, #261, #255, #254