Skip to content

Commit fc5b107

Browse files
authored
[3.1.10 backport] CBG-4145 improve logging for jwts (#7070)
1 parent 5ee53c6 commit fc5b107

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

auth/oidc.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ func getJWTUsername(provider JWTConfigCommon, identity *Identity) (username stri
418418
if provider.UsernameClaim != "" {
419419
value, ok := identity.Claims[provider.UsernameClaim]
420420
if !ok {
421-
return "", fmt.Errorf("jwt: specified claim %q not found in id_token, identity: %v", provider.UsernameClaim, identity)
421+
return "", base.RedactErrorf("jwt: specified claim %q not found in id_token, identity: %+v", provider.UsernameClaim, base.UD(identity))
422422
}
423423
if username, err = formatUsername(value); err != nil {
424424
return "", err
@@ -626,13 +626,13 @@ func (op *OIDCProvider) verifyToken(ctx context.Context, token string, callbackU
626626
// Verify claims and signature on the JWT; ensure that it's been signed by the provider.
627627
idToken, err := client.verifyJWT(ctx, token)
628628
if err != nil {
629-
base.InfofCtx(ctx, base.KeyAuth, "Client %v could not verify JWT. Error: %v", base.UD(client), err)
629+
base.InfofCtx(ctx, base.KeyAuth, "Client %v could not verify JWT. Error: %v", base.UD(op.Name), err)
630630
return nil, err
631631
}
632632

633633
identity, ok, err := getIdentity(idToken)
634634
if err != nil {
635-
base.InfofCtx(ctx, base.KeyAuth, "Error getting identity from token (Identity: %v, Error: %v)", base.UD(identity), err)
635+
base.InfofCtx(ctx, base.KeyAuth, "Error getting identity from token (Identity: %+v, Error: %v)", base.UD(identity), err)
636636
}
637637
if !ok {
638638
return nil, err
@@ -654,7 +654,7 @@ func getIssuerWithAudience(token *jwt.JSONWebToken) (issuer string, audiences []
654654
return issuer, audiences, pkgerrors.Wrapf(err, "failed to parse JWT claims")
655655
}
656656
if claims.Issuer == "" {
657-
return issuer, audiences, fmt.Errorf("malformed JWT %v, issuer claim doesn't exist", token)
657+
return issuer, audiences, fmt.Errorf("malformed JWT, issuer claim doesn't exist")
658658
}
659659
return claims.Issuer, claims.Audience, err
660660
}

0 commit comments

Comments
 (0)