git.iko.soy/typeable/oauth2-proxy
on master help sign in
Update go-jose dependency as requested in #2350 (#2356)

* update go-jose dependency by switching gopkg.in/square/go-jose.v2 with github.com/go-jose/go-jose/v3 * updated `CHANGELOG.md` with entry for PR #2356 --------- Co-authored-by: Joel Speed <Joel.speed@hotmail.co.uk>

commitbfd667e4a2bd028983b5d2555187753611f8b078 authordarh <dasvh@protonmail.com> dateMon 8 Jan 2024, 14:08 (3 years ago) parent71561f6
6 files changed+9−7
compare with master
unifiedsplit
CHANGELOG.md+2 go.mod+2−2 go.sum+2−2 pkg/providers/oidc/verifier_test.go+1−1 providers/logingov.go+1−1 providers/logingov_test.go+1−1
CHANGELOG.md+2
@@ -7,6 +7,7 @@
77## Breaking Changes
88
99## Changes since v7.5.1
10+
1011- [#2128](https://github.com/oauth2-proxy/oauth2-proxy/pull/2128) Update dependencies (@vllvll)
1112- [#2269](https://github.com/oauth2-proxy/oauth2-proxy/pull/2269) Added Azure China (and other air gaped cloud) support (@mblaschke)
1213- [#2237](https://github.com/oauth2-proxy/oauth2-proxy/pull/2237) adds an option to append CA certificates (@emsixteeen)
@@ -21,6 +22,7 @@
2122- [#2299](https://github.com/oauth2-proxy/oauth2-proxy/pull/2299) bugfix: OIDCConfig based providers are not respecting flags and configs (@tuunit)
2223- [#2248](https://github.com/oauth2-proxy/oauth2-proxy/pull/2248) Added support for semicolons in query strings. (@timwsuqld)
2324- [#2196](https://github.com/oauth2-proxy/oauth2-proxy/pull/2196) Add GitHub groups (orgs/teams) support. Including `X-Forwarded-Groups` header (@tuunit)
25+- [#2356](https://github.com/oauth2-proxy/oauth2-proxy/pull/2356) Update go-jose dependency (@dasvh)
2426- [#2357](https://github.com/oauth2-proxy/oauth2-proxy/pull/2357) Update ojg to latest release (@bitfehler)
2527
2628# V7.5.1
go.mod+2−2
@@ -12,6 +12,7 @@ require (
1212 github.com/coreos/go-oidc/v3 v3.6.0
1313 github.com/fsnotify/fsnotify v1.6.0
1414 github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
15+ github.com/go-jose/go-jose/v3 v3.0.1
1516 github.com/golang-jwt/jwt v3.2.2+incompatible
1617 github.com/google/uuid v1.3.1
1718 github.com/gorilla/mux v1.8.0
@@ -38,7 +39,6 @@ require (
3839 golang.org/x/sync v0.4.0
3940 google.golang.org/api v0.148.0
4041 gopkg.in/natefinch/lumberjack.v2 v2.2.1
41− gopkg.in/square/go-jose.v2 v2.6.0
4242 k8s.io/apimachinery v0.27.2
4343)
4444
@@ -50,7 +50,6 @@ require (
5050 github.com/cespare/xxhash/v2 v2.2.0 // indirect
5151 github.com/davecgh/go-spew v1.1.1 // indirect
5252 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
53− github.com/go-jose/go-jose/v3 v3.0.0 // indirect
5453 github.com/go-logr/logr v1.2.4 // indirect
5554 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5655 github.com/golang/protobuf v1.5.3 // indirect
@@ -80,6 +79,7 @@ require (
8079 google.golang.org/grpc v1.58.3 // indirect
8180 google.golang.org/protobuf v1.31.0 // indirect
8281 gopkg.in/ini.v1 v1.67.0 // indirect
82+ gopkg.in/square/go-jose.v2 v2.6.0 // indirect
8383 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
8484 gopkg.in/yaml.v2 v2.4.0 // indirect
8585 gopkg.in/yaml.v3 v3.0.1 // indirect
go.sum+2−2
@@ -112,8 +112,8 @@ github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32/go.mod h1:GIjDIg/heH
112112github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
113113github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
114114github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
115−github.com/go-jose/go-jose/v3 v3.0.0 h1:s6rrhirfEP/CGIoc6p+PZAeogN2SxKav6Wp7+dyMWVo=
116−github.com/go-jose/go-jose/v3 v3.0.0/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8=
115+github.com/go-jose/go-jose/v3 v3.0.1 h1:pWmKFVtt+Jl0vBZTIpz/eAKwsm6LkIxDVVbFHKkchhA=
116+github.com/go-jose/go-jose/v3 v3.0.1/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8=
117117github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
118118github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
119119github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
pkg/providers/oidc/verifier_test.go+1−1
@@ -8,9 +8,9 @@ import (
88 "fmt"
99
1010 "github.com/coreos/go-oidc/v3/oidc"
11+ "github.com/go-jose/go-jose/v3"
1112 . "github.com/onsi/ginkgo"
1213 . "github.com/onsi/gomega"
13− "gopkg.in/square/go-jose.v2"
1414)
1515
1616var _ = Describe("Verify", func() {
providers/logingov.go+1−1
@@ -12,11 +12,11 @@ import (
1212 "os"
1313 "time"
1414
15+ "github.com/go-jose/go-jose/v3"
1516 "github.com/golang-jwt/jwt"
1617 "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
1718 "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
1819 "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/requests"
19− "gopkg.in/square/go-jose.v2"
2020)
2121
2222// LoginGovProvider represents an OIDC based Identity Provider
providers/logingov_test.go+1−1
@@ -15,11 +15,11 @@ import (
1515 "testing"
1616 "time"
1717
18+ "github.com/go-jose/go-jose/v3"
1819 "github.com/golang-jwt/jwt"
1920 "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
2021 . "github.com/onsi/gomega"
2122 "github.com/stretchr/testify/assert"
22− "gopkg.in/square/go-jose.v2"
2323)
2424
2525type MyKeyData struct {