git.iko.soy/typeable/oauth2-proxy
on master help sign in
Update go-jose dependency as requested in #2350 (#2356)
bfd667edarh
CHANGELOG.md+2
@@ -7,6 +7,7 @@
7## Breaking Changes
7## Breaking Changes
8
8
9## Changes since v7.5.1
9## Changes since v7.5.1
10+
10- [#2128](https://github.com/oauth2-proxy/oauth2-proxy/pull/2128) Update dependencies (@vllvll)
11- [#2128](https://github.com/oauth2-proxy/oauth2-proxy/pull/2128) Update dependencies (@vllvll)
11- [#2269](https://github.com/oauth2-proxy/oauth2-proxy/pull/2269) Added Azure China (and other air gaped cloud) support (@mblaschke)
12- [#2269](https://github.com/oauth2-proxy/oauth2-proxy/pull/2269) Added Azure China (and other air gaped cloud) support (@mblaschke)
12- [#2237](https://github.com/oauth2-proxy/oauth2-proxy/pull/2237) adds an option to append CA certificates (@emsixteeen)
13- [#2237](https://github.com/oauth2-proxy/oauth2-proxy/pull/2237) adds an option to append CA certificates (@emsixteeen)
@@ -21,6 +22,7 @@
21- [#2299](https://github.com/oauth2-proxy/oauth2-proxy/pull/2299) bugfix: OIDCConfig based providers are not respecting flags and configs (@tuunit)
22- [#2299](https://github.com/oauth2-proxy/oauth2-proxy/pull/2299) bugfix: OIDCConfig based providers are not respecting flags and configs (@tuunit)
22- [#2248](https://github.com/oauth2-proxy/oauth2-proxy/pull/2248) Added support for semicolons in query strings. (@timwsuqld)
23- [#2248](https://github.com/oauth2-proxy/oauth2-proxy/pull/2248) Added support for semicolons in query strings. (@timwsuqld)
23- [#2196](https://github.com/oauth2-proxy/oauth2-proxy/pull/2196) Add GitHub groups (orgs/teams) support. Including `X-Forwarded-Groups` header (@tuunit)
24- [#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)
24- [#2357](https://github.com/oauth2-proxy/oauth2-proxy/pull/2357) Update ojg to latest release (@bitfehler)
26- [#2357](https://github.com/oauth2-proxy/oauth2-proxy/pull/2357) Update ojg to latest release (@bitfehler)
25
27
26# V7.5.1
28# V7.5.1
go.mod+2−2
@@ -12,6 +12,7 @@ require (
12 github.com/coreos/go-oidc/v3 v3.6.0
12 github.com/coreos/go-oidc/v3 v3.6.0
13 github.com/fsnotify/fsnotify v1.6.0
13 github.com/fsnotify/fsnotify v1.6.0
14 github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
14 github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
15+ github.com/go-jose/go-jose/v3 v3.0.1
15 github.com/golang-jwt/jwt v3.2.2+incompatible
16 github.com/golang-jwt/jwt v3.2.2+incompatible
16 github.com/google/uuid v1.3.1
17 github.com/google/uuid v1.3.1
17 github.com/gorilla/mux v1.8.0
18 github.com/gorilla/mux v1.8.0
@@ -38,7 +39,6 @@ require (
38 golang.org/x/sync v0.4.0
39 golang.org/x/sync v0.4.0
39 google.golang.org/api v0.148.0
40 google.golang.org/api v0.148.0
40 gopkg.in/natefinch/lumberjack.v2 v2.2.1
41 gopkg.in/natefinch/lumberjack.v2 v2.2.1
41− gopkg.in/square/go-jose.v2 v2.6.0
42 k8s.io/apimachinery v0.27.2
42 k8s.io/apimachinery v0.27.2
43)
43)
44
44
@@ -50,7 +50,6 @@ require (
50 github.com/cespare/xxhash/v2 v2.2.0 // indirect
50 github.com/cespare/xxhash/v2 v2.2.0 // indirect
51 github.com/davecgh/go-spew v1.1.1 // indirect
51 github.com/davecgh/go-spew v1.1.1 // indirect
52 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
52 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
53− github.com/go-jose/go-jose/v3 v3.0.0 // indirect
54 github.com/go-logr/logr v1.2.4 // indirect
53 github.com/go-logr/logr v1.2.4 // indirect
55 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
54 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
56 github.com/golang/protobuf v1.5.3 // indirect
55 github.com/golang/protobuf v1.5.3 // indirect
@@ -80,6 +79,7 @@ require (
80 google.golang.org/grpc v1.58.3 // indirect
79 google.golang.org/grpc v1.58.3 // indirect
81 google.golang.org/protobuf v1.31.0 // indirect
80 google.golang.org/protobuf v1.31.0 // indirect
82 gopkg.in/ini.v1 v1.67.0 // indirect
81 gopkg.in/ini.v1 v1.67.0 // indirect
82+ gopkg.in/square/go-jose.v2 v2.6.0 // indirect
83 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
83 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
84 gopkg.in/yaml.v2 v2.4.0 // indirect
84 gopkg.in/yaml.v2 v2.4.0 // indirect
85 gopkg.in/yaml.v3 v3.0.1 // indirect
85 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
112github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
112github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
113github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
113github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
114github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
114github.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=
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.0/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8=
116+github.com/go-jose/go-jose/v3 v3.0.1/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8=
117github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
117github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
118github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
118github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
119github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
119github.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 (
8 "fmt"
8 "fmt"
9
9
10 "github.com/coreos/go-oidc/v3/oidc"
10 "github.com/coreos/go-oidc/v3/oidc"
11+ "github.com/go-jose/go-jose/v3"
11 . "github.com/onsi/ginkgo"
12 . "github.com/onsi/ginkgo"
12 . "github.com/onsi/gomega"
13 . "github.com/onsi/gomega"
13− "gopkg.in/square/go-jose.v2"
14)
14)
15
15
16var _ = Describe("Verify", func() {
16var _ = Describe("Verify", func() {
providers/logingov.go+1−1
@@ -12,11 +12,11 @@ import (
12 "os"
12 "os"
13 "time"
13 "time"
14
14
15+ "github.com/go-jose/go-jose/v3"
15 "github.com/golang-jwt/jwt"
16 "github.com/golang-jwt/jwt"
16 "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
17 "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
17 "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
18 "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
18 "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/requests"
19 "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/requests"
19− "gopkg.in/square/go-jose.v2"
20)
20)
21
21
22// LoginGovProvider represents an OIDC based Identity Provider
22// LoginGovProvider represents an OIDC based Identity Provider
providers/logingov_test.go+1−1
@@ -15,11 +15,11 @@ import (
15 "testing"
15 "testing"
16 "time"
16 "time"
17
17
18+ "github.com/go-jose/go-jose/v3"
18 "github.com/golang-jwt/jwt"
19 "github.com/golang-jwt/jwt"
19 "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
20 "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
20 . "github.com/onsi/gomega"
21 . "github.com/onsi/gomega"
21 "github.com/stretchr/testify/assert"
22 "github.com/stretchr/testify/assert"
22− "gopkg.in/square/go-jose.v2"
23)
23)
24
24
25type MyKeyData struct {
25type MyKeyData struct {