git.iko.soy/typeable/oauth2-proxy
on master help sign in
Upgrade go-oidc to v3 (#1264)
commit0b4bc36554b218eb34a0b47b18791695323b2004 authorNick Meves <nicholas.meves@gmail.com> dateSat 17 Jul 2021, 09:55 (5 years ago) parentef697af
13 files changed+19−22
compare with master
unifiedsplit
CHANGELOG.md+2 go.mod+2−3 go.sum+5−9 oauthproxy_test.go+1−1 pkg/apis/middleware/session.go+1−1 pkg/apis/options/options.go+1−1 pkg/middleware/jwt_session_test.go+1−1 pkg/validation/options.go+1−1 providers/adfs_test.go+1−1 providers/azure_test.go+1−1 providers/oidc_test.go+1−1 providers/provider_data.go+1−1 providers/provider_data_test.go+1−1
CHANGELOG.md+2
@@ -12,6 +12,8 @@
1212## Breaking Changes
1313
1414## Changes since v7.1.3
15+
16+- [#1264](https://github.com/oauth2-proxy/oauth2-proxy/pull/1264) Update go-oidc to v3 (@NickMeves)
1517- [#1233](https://github.com/oauth2-proxy/oauth2-proxy/pull/1233) Extend email-domain validation with sub-domain capability (@morarucostel)
1618- [#1060](https://github.com/oauth2-proxy/oauth2-proxy/pull/1060) Implement RewriteTarget to allow requests to be rewritten before proxying to upstream servers (@JoelSpeed)
1719- [#1086](https://github.com/oauth2-proxy/oauth2-proxy/pull/1086) Refresh sessions before token expiration if configured (@NickMeves)
go.mod+2−3
@@ -9,7 +9,7 @@ require (
99 github.com/bitly/go-simplejson v0.5.0
1010 github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
1111 github.com/bsm/redislock v0.7.0
12− github.com/coreos/go-oidc v2.2.1+incompatible
12+ github.com/coreos/go-oidc/v3 v3.0.0
1313 github.com/dgrijalva/jwt-go v3.2.0+incompatible
1414 github.com/frankban/quicktest v1.10.0 // indirect
1515 github.com/fsnotify/fsnotify v1.4.9
@@ -24,7 +24,6 @@ require (
2424 github.com/onsi/ginkgo v1.14.1
2525 github.com/onsi/gomega v1.10.2
2626 github.com/pierrec/lz4 v2.5.2+incompatible
27− github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 // indirect
2827 github.com/prometheus/client_golang v1.9.0
2928 github.com/spf13/pflag v1.0.5
3029 github.com/spf13/viper v1.6.3
@@ -37,6 +36,6 @@ require (
3736 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a
3837 google.golang.org/api v0.20.0
3938 gopkg.in/natefinch/lumberjack.v2 v2.0.0
40− gopkg.in/square/go-jose.v2 v2.4.1
39+ gopkg.in/square/go-jose.v2 v2.5.1
4140 k8s.io/apimachinery v0.19.3
4241)
go.sum+5−9
@@ -69,8 +69,8 @@ github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:z
6969github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
7070github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
7171github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
72−github.com/coreos/go-oidc v2.2.1+incompatible h1:mh48q/BqXqgjVHpy2ZY7WnWAbenxRjsz9N1i1YxjHAk=
73−github.com/coreos/go-oidc v2.2.1+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc=
72+github.com/coreos/go-oidc/v3 v3.0.0 h1:/mAA0XMgYJw2Uqm7WKGCsKnjitE/+A0FFbOmiRJm7LQ=
73+github.com/coreos/go-oidc/v3 v3.0.0/go.mod h1:rEJ/idjfUyfkBit1eI1fvyr+64/g9dcKpAm8MJMesvo=
7474github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
7575github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
7676github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
@@ -333,14 +333,11 @@ github.com/pierrec/lz4 v2.5.2+incompatible h1:WCjObylUIOlKy/+7Abdn34TLIkXiA4UWUM
333333github.com/pierrec/lz4 v2.5.2+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
334334github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
335335github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
336−github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
337336github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
338337github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA=
339338github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
340339github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
341340github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
342−github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 h1:J9b7z+QKAmPf4YLrFg6oQUotqHQeUNWwkvo7jZp1GLU=
343−github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA=
344341github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
345342github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
346343github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
@@ -409,7 +406,6 @@ github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3
409406github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
410407github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI=
411408github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
412−github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
413409github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
414410github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
415411github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
@@ -477,7 +473,6 @@ golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHl
477473golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
478474golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
479475golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
480−golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ=
481476golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
482477golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449 h1:xUIPaMhvROX9dhPvRCenIJtU78+lbEenGbgqB5hfHCQ=
483478golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
@@ -502,6 +497,7 @@ golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLL
502497golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
503498golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
504499golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
500+golang.org/x/net v0.0.0-20200505041828-1ed23360d12c/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
505501golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
506502golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
507503golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
@@ -636,8 +632,8 @@ gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
636632gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8=
637633gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
638634gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
639−gopkg.in/square/go-jose.v2 v2.4.1 h1:H0TmLt7/KmzlrDOpa1F+zr0Tk90PbJYBfsVUmRLrf9Y=
640−gopkg.in/square/go-jose.v2 v2.4.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
635+gopkg.in/square/go-jose.v2 v2.5.1 h1:7odma5RETjNHWJnR32wx8t+Io4djHE1PqxCFx3iiZ2w=
636+gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
641637gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
642638gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
643639gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
oauthproxy_test.go+1−1
@@ -15,7 +15,7 @@ import (
1515 "testing"
1616 "time"
1717
18− "github.com/coreos/go-oidc"
18+ "github.com/coreos/go-oidc/v3/oidc"
1919 "github.com/mbland/hmacauth"
2020 "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
2121 "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
pkg/apis/middleware/session.go+1−1
@@ -4,7 +4,7 @@ import (
44 "context"
55 "fmt"
66
7− "github.com/coreos/go-oidc"
7+ "github.com/coreos/go-oidc/v3/oidc"
88 sessionsapi "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
99)
1010
pkg/apis/options/options.go+1−1
@@ -4,7 +4,7 @@ import (
44 "crypto"
55 "net/url"
66
7− oidc "github.com/coreos/go-oidc"
7+ "github.com/coreos/go-oidc/v3/oidc"
88 ipapi "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/ip"
99 "github.com/oauth2-proxy/oauth2-proxy/v7/providers"
1010 "github.com/spf13/pflag"
pkg/middleware/jwt_session_test.go+1−1
@@ -13,7 +13,7 @@ import (
1313 "strings"
1414 "time"
1515
16− "github.com/coreos/go-oidc"
16+ "github.com/coreos/go-oidc/v3/oidc"
1717 "github.com/dgrijalva/jwt-go"
1818 middlewareapi "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/middleware"
1919 sessionsapi "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
pkg/validation/options.go+1−1
@@ -10,7 +10,7 @@ import (
1010 "os"
1111 "strings"
1212
13− "github.com/coreos/go-oidc"
13+ "github.com/coreos/go-oidc/v3/oidc"
1414 "github.com/dgrijalva/jwt-go"
1515 "github.com/mbland/hmacauth"
1616 "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
providers/adfs_test.go+1−1
@@ -8,7 +8,7 @@ import (
88 "net/url"
99 "strings"
1010
11− "github.com/coreos/go-oidc"
11+ "github.com/coreos/go-oidc/v3/oidc"
1212 "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
1313 . "github.com/onsi/ginkgo"
1414 . "github.com/onsi/ginkgo/extensions/table"
providers/azure_test.go+1−1
@@ -13,7 +13,7 @@ import (
1313 "testing"
1414 "time"
1515
16− oidc "github.com/coreos/go-oidc"
16+ "github.com/coreos/go-oidc/v3/oidc"
1717 "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
1818
1919 . "github.com/onsi/gomega"
providers/oidc_test.go+1−1
@@ -11,7 +11,7 @@ import (
1111 "net/url"
1212 "testing"
1313
14− "github.com/coreos/go-oidc"
14+ "github.com/coreos/go-oidc/v3/oidc"
1515 "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
1616 "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/encryption"
1717 "github.com/stretchr/testify/assert"
providers/provider_data.go+1−1
@@ -9,7 +9,7 @@ import (
99 "reflect"
1010 "strings"
1111
12− "github.com/coreos/go-oidc"
12+ "github.com/coreos/go-oidc/v3/oidc"
1313 "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
1414 "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
1515 "golang.org/x/oauth2"
providers/provider_data_test.go+1−1
@@ -12,7 +12,7 @@ import (
1212 "testing"
1313 "time"
1414
15− "github.com/coreos/go-oidc"
15+ "github.com/coreos/go-oidc/v3/oidc"
1616 "github.com/dgrijalva/jwt-go"
1717 "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
1818 "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/encryption"