Improve jwk file store to support different #426
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
PR Verification Succeeded: Coverage >= |
TimShi
commented
Jun 27, 2024
| hash = hashForEd25519(key.(ed25519.PublicKey)) | ||
| case []byte: | ||
| hash = hmac.New(sha256.New, key.([]byte)) | ||
| hash.Write([]byte(name)) |
There was a problem hiding this comment.
Hash the key name using the key to get a unique value.
TimShi
commented
Jun 27, 2024
| //best effort to generate a kid that is consistent across restarts | ||
| var hash hash.Hash | ||
| switch key.(type) { | ||
| case *rsa.PrivateKey: |
There was a problem hiding this comment.
I ended up not using encryption to generate a unique value because some of the encryption algorithm is not deterministic.
stonedu1011
reviewed
Jun 28, 2024
| // - CERTIFICATE | ||
| // - * PRIVATE KEY | ||
| // - PUBLIC KEY | ||
| // - CERTIFICATE | ||
| func LoadMultiBlockPem(path string, password string) ([]interface{}, error) { |
There was a problem hiding this comment.
"returns *pem.Block as fallback" when non of above matches
| @@ -128,7 +128,7 @@ func LoadMultiBlockPem(path string, password string) ([]interface{}, error) { | |||
| case block.Type == "CERTIFICATE": | |||
| item, e = parseX509Cert(block) | |||
| default: | |||
| continue | |||
| item = block | |||
There was a problem hiding this comment.
I think maybe we need to try to decrypt it before returning
Comment on lines
204
to
209
| case *rsa.PublicKey: | ||
| pubKey = cert.PublicKey.(*rsa.PublicKey) | ||
| case *ecdsa.PublicKey: | ||
| pubKey = cert.PublicKey.(*ecdsa.PublicKey) | ||
| case ed25519.PublicKey: | ||
| pubKey = cert.PublicKey.(ed25519.PublicKey) |
There was a problem hiding this comment.
Those cases my be unnecessary. crypto.PublicKey is interface{}. There is a (currently unused) interface publicKey in jwk.go. This could be changed to
var ok bool
if pubKey, ok = cert.PublicKey.(publicKey); !ok {
return ...
}
stonedu1011
approved these changes
Jun 28, 2024
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.
Description
This PR is intended to address #420. The jwk file store implementation is extended to support ECDSA, ED25519 and HMAC
Type of Change
Checklist