diff --git a/changelog/unreleased/update-go-oidc.md b/changelog/unreleased/update-go-oidc.md new file mode 100644 index 000000000..cb413f365 --- /dev/null +++ b/changelog/unreleased/update-go-oidc.md @@ -0,0 +1,5 @@ +Enhancement: Update github.com/coreos/go-oidc to v3.0.0 + +Updated the github.com/coreos/go-oidc library to the version 3.0.0. + +https://github.com/owncloud/ocis/pull/2393 diff --git a/go.mod b/go.mod index bc4237b75..49e4e1a55 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( github.com/asim/go-micro/plugins/wrapper/trace/opencensus/v3 v3.0.0-20210408173139-0d57213d3f5c github.com/asim/go-micro/v3 v3.5.1-0.20210217182006-0f0ace1a44a9 github.com/blevesearch/bleve/v2 v2.1.0 - github.com/coreos/go-oidc v2.2.1+incompatible + github.com/coreos/go-oidc/v3 v3.0.0 github.com/cs3org/go-cs3apis v0.0.0-20210802070913-970eec344e59 github.com/cs3org/reva v1.11.1-0.20210812105259-756bdced1d22 github.com/disintegration/imaging v1.6.2 diff --git a/go.sum b/go.sum index 4aafc8db6..abe680566 100644 --- a/go.sum +++ b/go.sum @@ -264,6 +264,8 @@ github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-oidc v2.2.1+incompatible h1:mh48q/BqXqgjVHpy2ZY7WnWAbenxRjsz9N1i1YxjHAk= github.com/coreos/go-oidc v2.2.1+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= +github.com/coreos/go-oidc/v3 v3.0.0 h1:/mAA0XMgYJw2Uqm7WKGCsKnjitE/+A0FFbOmiRJm7LQ= +github.com/coreos/go-oidc/v3 v3.0.0/go.mod h1:rEJ/idjfUyfkBit1eI1fvyr+64/g9dcKpAm8MJMesvo= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= @@ -1306,6 +1308,7 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200505041828-1ed23360d12c/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= diff --git a/ocis-pkg/middleware/openidconnect.go b/ocis-pkg/middleware/openidconnect.go index 868eeb621..d9610b41a 100644 --- a/ocis-pkg/middleware/openidconnect.go +++ b/ocis-pkg/middleware/openidconnect.go @@ -8,7 +8,7 @@ import ( "strings" "time" - oidc "github.com/coreos/go-oidc" + oidc "github.com/coreos/go-oidc/v3/oidc" ocisoidc "github.com/owncloud/ocis/ocis-pkg/oidc" "golang.org/x/oauth2" ) diff --git a/proxy/pkg/command/server.go b/proxy/pkg/command/server.go index addd0a187..b066c7d55 100644 --- a/proxy/pkg/command/server.go +++ b/proxy/pkg/command/server.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/coreos/go-oidc" + "github.com/coreos/go-oidc/v3/oidc" chimiddleware "github.com/go-chi/chi/middleware" "github.com/justinas/alice" "github.com/micro/cli/v2" diff --git a/proxy/pkg/middleware/oidc_auth.go b/proxy/pkg/middleware/oidc_auth.go index 81f05acfd..ed882f04a 100644 --- a/proxy/pkg/middleware/oidc_auth.go +++ b/proxy/pkg/middleware/oidc_auth.go @@ -8,7 +8,7 @@ import ( "github.com/golang-jwt/jwt/v4" - gOidc "github.com/coreos/go-oidc" + gOidc "github.com/coreos/go-oidc/v3/oidc" "github.com/owncloud/ocis/ocis-pkg/log" "github.com/owncloud/ocis/ocis-pkg/oidc" "github.com/owncloud/ocis/ocis-pkg/sync" diff --git a/proxy/pkg/middleware/oidc_auth_test.go b/proxy/pkg/middleware/oidc_auth_test.go index e9fb3f05d..3ffb4581f 100644 --- a/proxy/pkg/middleware/oidc_auth_test.go +++ b/proxy/pkg/middleware/oidc_auth_test.go @@ -7,7 +7,7 @@ import ( "net/http/httptest" "testing" - "github.com/coreos/go-oidc" + "github.com/coreos/go-oidc/v3/oidc" "github.com/owncloud/ocis/ocis-pkg/log" "golang.org/x/oauth2" )