From 1fc5b5cf157961e37d333ccfd1f5fcfd08ada36e Mon Sep 17 00:00:00 2001 From: Leandro Lafin Date: Fri, 12 Jul 2024 15:07:29 -0300 Subject: [PATCH] Update go-jose dependency as requested in #2350 --- CHANGELOG.md | 1 + go.mod | 4 ++-- go.sum | 4 ++-- pkg/providers/oidc/verifier_test.go | 2 +- providers/logingov.go | 2 +- providers/logingov_test.go | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd8512b5..e6e87eba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ - [#2299](https://github.com/oauth2-proxy/oauth2-proxy/pull/2299) bugfix: OIDCConfig based providers are not respecting flags and configs (@tuunit) - [#2248](https://github.com/oauth2-proxy/oauth2-proxy/pull/2248) Added support for semicolons in query strings. (@timwsuqld) - [#2196](https://github.com/oauth2-proxy/oauth2-proxy/pull/2196) Add GitHub groups (orgs/teams) support. Including `X-Forwarded-Groups` header (@tuunit) +- [#2356](https://github.com/oauth2-proxy/oauth2-proxy/pull/2356) Update go-jose dependency (@dasvh) - [#2357](https://github.com/oauth2-proxy/oauth2-proxy/pull/2357) Update ojg to latest release (@bitfehler) ## Release Highlights diff --git a/go.mod b/go.mod index 71bce690..19f543e7 100644 --- a/go.mod +++ b/go.mod @@ -12,6 +12,7 @@ require ( github.com/coreos/go-oidc/v3 v3.6.0 github.com/fsnotify/fsnotify v1.6.0 github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 + github.com/go-jose/go-jose/v3 v3.0.1 github.com/go-resty/resty/v2 v2.13.1 github.com/golang-jwt/jwt v3.2.2+incompatible github.com/google/uuid v1.3.1 @@ -39,7 +40,6 @@ require ( golang.org/x/sync v0.4.0 google.golang.org/api v0.148.0 gopkg.in/natefinch/lumberjack.v2 v2.2.1 - gopkg.in/square/go-jose.v2 v2.6.0 k8s.io/apimachinery v0.27.2 ) @@ -51,7 +51,6 @@ require ( github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect - github.com/go-jose/go-jose/v3 v3.0.0 // indirect github.com/go-logr/logr v1.2.4 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.3 // indirect @@ -81,6 +80,7 @@ require ( google.golang.org/grpc v1.60.1 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/ini.v1 v1.51.0 // indirect + gopkg.in/square/go-jose.v2 v2.6.0 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index bcf7c28a..893ef940 100644 --- a/go.sum +++ b/go.sum @@ -68,8 +68,8 @@ github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbS github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 h1:Mn26/9ZMNWSw9C9ERFA1PUxfmGpolnw2v0bKOREu5ew= github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32/go.mod h1:GIjDIg/heH5DOkXY3YJ/wNhfHsQHoXGjl8G8amsYQ1I= -github.com/go-jose/go-jose/v3 v3.0.0 h1:s6rrhirfEP/CGIoc6p+PZAeogN2SxKav6Wp7+dyMWVo= -github.com/go-jose/go-jose/v3 v3.0.0/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8= +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/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= diff --git a/pkg/providers/oidc/verifier_test.go b/pkg/providers/oidc/verifier_test.go index dd125e77..5496d9fd 100644 --- a/pkg/providers/oidc/verifier_test.go +++ b/pkg/providers/oidc/verifier_test.go @@ -8,9 +8,9 @@ import ( "fmt" "github.com/coreos/go-oidc/v3/oidc" + "github.com/go-jose/go-jose/v3" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "gopkg.in/square/go-jose.v2" ) var _ = Describe("Verify", func() { diff --git a/providers/logingov.go b/providers/logingov.go index 2660b015..b7af2024 100644 --- a/providers/logingov.go +++ b/providers/logingov.go @@ -12,11 +12,11 @@ import ( "os" "time" + "github.com/go-jose/go-jose/v3" "github.com/golang-jwt/jwt" "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options" "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions" "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/requests" - "gopkg.in/square/go-jose.v2" ) // LoginGovProvider represents an OIDC based Identity Provider diff --git a/providers/logingov_test.go b/providers/logingov_test.go index 00fe8dcc..a8853490 100644 --- a/providers/logingov_test.go +++ b/providers/logingov_test.go @@ -15,11 +15,11 @@ import ( "testing" "time" + "github.com/go-jose/go-jose/v3" "github.com/golang-jwt/jwt" "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options" . "github.com/onsi/gomega" "github.com/stretchr/testify/assert" - "gopkg.in/square/go-jose.v2" ) type MyKeyData struct {