github/distribution
1
0
Fork 0
mirror of https://github.com/distribution/distribution.git synced 2025-08-10 11:11:59 +00:00
Code Issues Projects Releases Wiki Activity

auth: fix token verification chain (#4415)

Browse Source
This commit is contained in:
Milos Gajdos 2024-07-29 18:56:44 +01:00 committed by GitHub
commit f0bd0f6899
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
registry/auth/token/token.go
View File

@ -162,7 +162,7 @@ func (t *Token) Verify(verifyOpts VerifyOptions) (*ClaimSet, error) {
} }
// VerifySigningKey attempts to verify and return the signing key which was used to sign the token. // VerifySigningKey attempts to verify and return the signing key which was used to sign the token.
func (t *Token) VerifySigningKey(verifyOpts VerifyOptions) (signingKey crypto.PublicKey, err error) { func (t *Token) VerifySigningKey(verifyOpts VerifyOptions) (crypto.PublicKey, error) {
if len(t.JWT.Headers) == 0 { if len(t.JWT.Headers) == 0 {
return nil, ErrInvalidToken return nil, ErrInvalidToken
} }
@ -172,26 +172,27 @@ func (t *Token) VerifySigningKey(verifyOpts VerifyOptions) (signingKey crypto.Pu
// verifying the first one in the list only at the moment. // verifying the first one in the list only at the moment.
header := t.JWT.Headers[0] header := t.JWT.Headers[0]
signingKey, err = verifyCertChain(header, verifyOpts.Roots) signingKey, err := verifyCertChain(header, verifyOpts.Roots)
if err != nil {
// NOTE(milosgajdos): if the x5c header is missing // NOTE(milosgajdos): if the x5c header is missing
// the token may have been signed by a JWKS. // the token may have been signed by a JWKS.
if err != nil && err != jose.ErrMissingX5cHeader { if errors.Is(err, jose.ErrMissingX5cHeader) {
return
}
switch { switch {
case header.JSONWebKey != nil: case header.JSONWebKey != nil:
signingKey, err = verifyJWK(header, verifyOpts) return verifyJWK(header, verifyOpts)
case len(header.KeyID) > 0: case header.KeyID != "":
signingKey = verifyOpts.TrustedKeys[header.KeyID] if signingKey, ok := verifyOpts.TrustedKeys[header.KeyID]; ok {
if signingKey == nil { return signingKey, nil
err = fmt.Errorf("token signed by untrusted key with ID: %q", header.KeyID)
} }
return nil, fmt.Errorf("token signed by untrusted key with ID: %q", header.KeyID)
default: default:
err = ErrInvalidToken return nil, ErrInvalidToken
}
}
return nil, err
} }
return return signingKey, nil
} }
func verifyCertChain(header jose.Header, roots *x509.CertPool) (signingKey crypto.PublicKey, err error) { func verifyCertChain(header jose.Header, roots *x509.CertPool) (signingKey crypto.PublicKey, err error) {