diff --git a/go.mod b/go.mod index 899c2607..f59de525 100644 --- a/go.mod +++ b/go.mod @@ -4,13 +4,13 @@ go 1.19 require ( github.com/coreos/pkg v0.0.0-20220810130054-c7d1c02cb6cf + github.com/go-jose/go-jose/v3 v3.0.1 github.com/gravitational/trace v1.1.20 github.com/jonboulle/clockwork v0.3.0 github.com/kylelemons/godebug v1.1.0 github.com/pquerna/cachecontrol v0.1.0 golang.org/x/net v0.17.0 golang.org/x/oauth2 v0.3.0 - gopkg.in/square/go-jose.v2 v2.6.0 ) require ( diff --git a/go.sum b/go.sum index a2bc7a83..916e3d0c 100644 --- a/go.sum +++ b/go.sum @@ -23,6 +23,8 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/go-jose/go-jose/v3 v3.0.1 h1:pWmKFVtt+Jl0vBZTIpz/eAKwsm6LkIxDVVbFHKkchhA= +github.com/go-jose/go-jose/v3 v3.0.1/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -72,6 +74,7 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20220126234351-aa10faf2a1f8/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= @@ -156,8 +159,6 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/square/go-jose.v2 v2.6.0 h1:NGk74WTnPKBNUhNzQX7PYcTLUjoq7mzKk2OKbvwk2iI= -gopkg.in/square/go-jose.v2 v2.6.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= diff --git a/jose/doc.go b/jose/doc.go index b5e13217..4e441023 100644 --- a/jose/doc.go +++ b/jose/doc.go @@ -1,2 +1,2 @@ -// Package jose is DEPRECATED. Use gopkg.in/square/go-jose.v2 instead. +// Package jose is DEPRECATED. Use github.com/go-jose/go-jose/v3 instead. package jose diff --git a/jwks.go b/jwks.go index 9bc6a982..977c59e0 100644 --- a/jwks.go +++ b/jwks.go @@ -9,8 +9,8 @@ import ( "sync" "time" + "github.com/go-jose/go-jose/v3" "github.com/pquerna/cachecontrol" - jose "gopkg.in/square/go-jose.v2" ) // keysExpiryDelta is the allowed clock skew between a client and the OpenID Connect diff --git a/jwks_test.go b/jwks_test.go index 6226117a..bdcd6b82 100644 --- a/jwks_test.go +++ b/jwks_test.go @@ -14,7 +14,7 @@ import ( "testing" "time" - jose "gopkg.in/square/go-jose.v2" + "github.com/go-jose/go-jose/v3" ) type keyServer struct { diff --git a/oidc.go b/oidc.go index 3385b437..8bffe567 100644 --- a/oidc.go +++ b/oidc.go @@ -12,8 +12,8 @@ import ( "strings" "time" + "github.com/go-jose/go-jose/v3" "golang.org/x/oauth2" - jose "gopkg.in/square/go-jose.v2" ) const ( diff --git a/verify.go b/verify.go index 00265d82..f1cb2706 100644 --- a/verify.go +++ b/verify.go @@ -10,8 +10,8 @@ import ( "strings" "time" + "github.com/go-jose/go-jose/v3" "golang.org/x/oauth2" - jose "gopkg.in/square/go-jose.v2" ) const ( diff --git a/verify_test.go b/verify_test.go index f09d9006..baa77ac9 100644 --- a/verify_test.go +++ b/verify_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - jose "gopkg.in/square/go-jose.v2" + "github.com/go-jose/go-jose/v3" ) type testVerifier struct {