Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixes #2397 jwks refreshes would sometimes not update #2398

Merged
merged 2 commits into from
Sep 13, 2024
Merged

fixes #2397 jwks refreshes would sometimes not update #2398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb3cbcc
fixes #2397 jwks refreshes would sometimes not update
andrewpmartinez Sep 12, 2024
1a2d07a
fix ineffectual assignment to err golint
andrewpmartinez Sep 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions controller/model/authenticator_mod_ext_jwt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,15 @@ type signerRecord struct {
jwksResolver jwks.Resolver
}

func (r *signerRecord) PubKeyByKid(kid string) (pubKey, bool) {
r.Mutex.Lock()
defer r.Mutex.Unlock()

key, ok := r.kidToPubKey[kid]

return key, ok
}

func (r *signerRecord) Resolve(force bool) error {
r.Mutex.Lock()
defer r.Mutex.Unlock()
Expand Down Expand Up @@ -161,11 +170,7 @@ func (r *signerRecord) Resolve(force bool) error {
return nil

} else if r.externalJwtSigner.JwksEndpoint != nil {
if len(r.kidToPubKey) != 0 && !force {
return nil
}

if !r.jwksLastRequest.IsZero() && time.Since(r.jwksLastRequest) < JwksQueryTimeout {
if (!r.jwksLastRequest.IsZero() && time.Since(r.jwksLastRequest) < JwksQueryTimeout) && !force {
return nil
}

Expand All @@ -180,7 +185,7 @@ func (r *signerRecord) Resolve(force bool) error {
for _, key := range jwksResponse.Keys {
//if we have an x509chain the first must be the signing key
if len(key.X509Chain) != 0 {
x509Der, err := base64.StdEncoding.DecodeString(key.X509Chain[0])
x509Der, err := base64.RawURLEncoding.DecodeString(key.X509Chain[0])

if err != nil {
return fmt.Errorf("could not parse JWKS keys: %v", err)
Expand Down Expand Up @@ -283,14 +288,14 @@ func (a *AuthModuleExtJwt) pubKeyLookup(token *jwt.Token) (interface{}, error) {
return nil, apierror.NewInvalidAuth()
}

key, ok := signerRecord.kidToPubKey[kid]
key, ok := signerRecord.PubKeyByKid(kid)

if !ok {
if err := signerRecord.Resolve(true); err != nil {
if err := signerRecord.Resolve(false); err != nil {
logger.WithError(err).Error("error attempting to resolve extJwtSigner certificate used for signing")
}

key, ok = signerRecord.kidToPubKey[kid]
key, ok = signerRecord.PubKeyByKid(kid)

if !ok {
return nil, fmt.Errorf("kid [%s] not found for issuer [%s]", kid, issuer)
Expand Down
Loading
Loading