Merge branch 'develop/v2' into v2

.github/workflows/lint.yml

@@ -10,7 +10,7 @@ jobs:
         with:
           go-version: 1.18
           check-latest: true
-      - uses: golangci/golangci-lint-action@v2
+      - uses: golangci/golangci-lint-action@v3
         with:
           version: v1.45.2
       - name: Run go vet

Changes

@@ -4,6 +4,12 @@ Changes
 v2 has many incompatibilities with v1. To see the full list of differences between
 v1 and v2, please read the Changes-v2.md file (https://github.com/lestrrat-go/jwx/blob/develop/v2/Changes-v2.md)
 
+v2.0.5 - 11 Aug 2022
+[Bug fixes]
+  * [jwt] Remove stray debug log
+  * [jwk] Fix x5u field name, caused by a typo
+  * [misc] Update golangci-lint action to v3; v2 was causing weird problems
+
 v2.0.4 - 19 Jul 2022
 [Bug Fixes]
   * [jwk] github.com/lestrrat-go/httprc, which jwk.Cache depends on,

jwk/interface_gen.go

@@ -16,7 +16,7 @@ const (
 	KeyOpsKey                 = "key_ops"
 	AlgorithmKey              = "alg"
 	KeyIDKey                  = "kid"
-	X509URLKey                = "x58"
+	X509URLKey                = "x5u"
 	X509CertChainKey          = "x5c"
 	X509CertThumbprintKey     = "x5t"
 	X509CertThumbprintS256Key = "x5t#S256"
@@ -103,7 +103,7 @@ type Key interface {
 	Algorithm() jwa.KeyAlgorithm
 	// KeyID returns `kid` of a JWK
 	KeyID() string
-	// X509URL returns `x58` of a JWK
+	// X509URL returns `x5u` of a JWK
 	X509URL() string
 	// X509CertChain returns `x5c` of a JWK
 	X509CertChain() *cert.Chain

jwt/validate.go

@@ -3,7 +3,6 @@ package jwt
 import (
 	"context"
 	"fmt"
-	"log"
 	"strconv"
 	"time"
 )
@@ -392,7 +391,6 @@ func isIssuedAtValid(ctx context.Context, t Token) ValidationError {
 	now := clock.Now().Truncate(trunc)
 	ttv := tv.Truncate(trunc)
 
-	log.Printf("now = %s, ttv = %s, skew = %s, trunc = %s", now.UTC(), ttv, skew, trunc)
 	if now.Before(ttv.Add(-1 * skew)) {
 		return ErrInvalidIssuedAt()
 	}

tools/cmd/genjwk/objects.yml

@@ -22,7 +22,7 @@ std_fields:
     getter: X509URL
     unexported_name: x509URL
     exported_name: X509URL
-    json: x58
+    json: x5u
     is_std: true
     comment: https://tools.ietf.org/html/rfc7515#section-4.1.5
   - name: x509CertChain