From ac276ff136e94ff3b5e34b34b4d36b9dabf82346 Mon Sep 17 00:00:00 2001 From: Rolson Quadras Date: Thu, 23 Dec 2021 11:55:55 -0500 Subject: [PATCH] feat: Support to override OIDC discovered issuer URL Signed-off-by: Rolson Quadras --- cmd/auth-rest/go.sum | 7 ++-- cmd/auth-rest/startcmd/parameters.go | 15 ++++---- cmd/auth-rest/startcmd/start.go | 15 ++++---- cmd/auth-rest/startcmd/start_test.go | 10 ++++++ .../startcmd/test/data/providers.yaml | 15 ++++++++ go.mod | 2 +- go.sum | 7 ++-- pkg/restapi/operation/dependencies.go | 17 ++++----- pkg/restapi/operation/operations.go | 36 +++++++++++-------- test/bdd/go.mod | 3 +- test/bdd/go.sum | 8 ++--- test/bdd/pkg/login/mock_wallet.go | 2 +- 12 files changed, 87 insertions(+), 50 deletions(-) create mode 100644 cmd/auth-rest/startcmd/test/data/providers.yaml diff --git a/cmd/auth-rest/go.sum b/cmd/auth-rest/go.sum index 2d9bee9..020497b 100644 --- a/cmd/auth-rest/go.sum +++ b/cmd/auth-rest/go.sum @@ -193,9 +193,10 @@ github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkE github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-oidc v2.0.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= +github.com/coreos/go-oidc v2.1.0+incompatible h1:sdJrfw8akMnCuUlaZU3tE/uYXFgfqom8DBE9so9EBsM= github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= -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.1.0 h1:6avEvcdvTa1qYsOZ6I5PRkSYHzpTNWgKYmaJfaYbrRw= +github.com/coreos/go-oidc/v3 v3.1.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-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= @@ -878,7 +879,6 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/posener/complete v1.2.1/go.mod h1:6gapUrK/U1TAN7ciCoNRIdVC5sbdBTUh1DKN0g6uH7E= -github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 h1:J9b7z+QKAmPf4YLrFg6oQUotqHQeUNWwkvo7jZp1GLU= github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= github.com/pquerna/otp v1.2.1-0.20191009055518-468c2dd2b58d/go.mod h1:dkJfzwRKNiegxyNb54X/3fLwhCynbMspSyWKnvi1AEg= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= @@ -1148,6 +1148,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-20200519113804-d87ec0cfa476/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= diff --git a/cmd/auth-rest/startcmd/parameters.go b/cmd/auth-rest/startcmd/parameters.go index 475ce9c..92d2357 100644 --- a/cmd/auth-rest/startcmd/parameters.go +++ b/cmd/auth-rest/startcmd/parameters.go @@ -52,13 +52,14 @@ type oidcProvidersConfig struct { } type oidcProviderConfig struct { - URL string `yaml:"url"` - ClientID string `yaml:"clientID"` - ClientSecret string `yaml:"clientSecret"` - Name string `yaml:"name"` - SignUpLogoURL string `yaml:"signUpLogoURL"` - SignInLogoURL string `yaml:"signInLogoURL"` - Order int `yaml:"order"` + URL string `yaml:"url"` + ClientID string `yaml:"clientID"` + ClientSecret string `yaml:"clientSecret"` + Name string `yaml:"name"` + SignUpLogoURL string `yaml:"signUpLogoURL"` + SignInLogoURL string `yaml:"signInLogoURL"` + Order int `yaml:"order"` + SkipIssuerCheck bool `yaml:"skipIssuerCheck"` } type bootstrapParams struct { diff --git a/cmd/auth-rest/startcmd/start.go b/cmd/auth-rest/startcmd/start.go index 90f9b51..51dad74 100644 --- a/cmd/auth-rest/startcmd/start.go +++ b/cmd/auth-rest/startcmd/start.go @@ -547,13 +547,14 @@ func getOIDCParams(cmd *cobra.Command) (*oidcParams, error) { for k, v := range data.Providers { params.providers[k] = operation.OIDCProviderConfig{ - URL: v.URL, - ClientID: v.ClientID, - ClientSecret: v.ClientSecret, - Name: v.Name, - SignUpLogoURL: v.SignUpLogoURL, - SignInLogoURL: v.SignInLogoURL, - Order: v.Order, + URL: v.URL, + ClientID: v.ClientID, + ClientSecret: v.ClientSecret, + Name: v.Name, + SignUpLogoURL: v.SignUpLogoURL, + SignInLogoURL: v.SignInLogoURL, + Order: v.Order, + SkipIssuerCheck: v.SkipIssuerCheck, } } diff --git a/cmd/auth-rest/startcmd/start_test.go b/cmd/auth-rest/startcmd/start_test.go index 0b6fc21..39b9333 100644 --- a/cmd/auth-rest/startcmd/start_test.go +++ b/cmd/auth-rest/startcmd/start_test.go @@ -80,6 +80,16 @@ func TestOIDCParameters(t *testing.T) { require.Error(t, err) require.Contains(t, err.Error(), "failed to parse contents") }) + + t.Run("valid provider config", func(t *testing.T) { + startCmd := GetStartCmd(&mockServer{}) + + args := overrideArg(allArgs(t), oidcProvidersConfigFileFlagName, "./test/data/providers.yaml") + startCmd.SetArgs(args) + + err := startCmd.Execute() + require.NoError(t, err) + }) } func TestStartCmdContents(t *testing.T) { diff --git a/cmd/auth-rest/startcmd/test/data/providers.yaml b/cmd/auth-rest/startcmd/test/data/providers.yaml new file mode 100644 index 0000000..e6ab141 --- /dev/null +++ b/cmd/auth-rest/startcmd/test/data/providers.yaml @@ -0,0 +1,15 @@ +# +# Copyright SecureKey Technologies Inc. All Rights Reserved. +# +# SPDX-License-Identifier: Apache-2.0 +# + +providers: + mockbank: + url: https://third.party.oidc.provider.example.com:5555/ + clientID: hub-auth + clientSecret: hub-auth-secret + name: Demo OIDC + signUpLogoURL: https://localhost:8070/static/images/signup_logo.svg + signInLogoURL: https://localhost:8070/static/images/signin_logo.svg + order: 1 \ No newline at end of file diff --git a/go.mod b/go.mod index 9de5769..8af9915 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ go 1.16 require ( github.com/cenkalti/backoff v2.2.1+incompatible - github.com/coreos/go-oidc v2.2.1+incompatible + github.com/coreos/go-oidc/v3 v3.1.0 github.com/google/uuid v1.1.2 github.com/gorilla/sessions v1.2.1 github.com/hyperledger/aries-framework-go v0.1.7 diff --git a/go.sum b/go.sum index bb839a2..55c2d58 100644 --- a/go.sum +++ b/go.sum @@ -183,9 +183,10 @@ github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkE github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-oidc v2.0.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= +github.com/coreos/go-oidc v2.1.0+incompatible h1:sdJrfw8akMnCuUlaZU3tE/uYXFgfqom8DBE9so9EBsM= github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= -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.1.0 h1:6avEvcdvTa1qYsOZ6I5PRkSYHzpTNWgKYmaJfaYbrRw= +github.com/coreos/go-oidc/v3 v3.1.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-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= @@ -802,7 +803,6 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/posener/complete v1.2.1/go.mod h1:6gapUrK/U1TAN7ciCoNRIdVC5sbdBTUh1DKN0g6uH7E= -github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 h1:J9b7z+QKAmPf4YLrFg6oQUotqHQeUNWwkvo7jZp1GLU= github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= github.com/pquerna/otp v1.2.1-0.20191009055518-468c2dd2b58d/go.mod h1:dkJfzwRKNiegxyNb54X/3fLwhCynbMspSyWKnvi1AEg= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= @@ -1051,6 +1051,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-20200519113804-d87ec0cfa476/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= diff --git a/pkg/restapi/operation/dependencies.go b/pkg/restapi/operation/dependencies.go index 07814b7..183beab 100644 --- a/pkg/restapi/operation/dependencies.go +++ b/pkg/restapi/operation/dependencies.go @@ -10,7 +10,7 @@ import ( "context" "net/http" - "github.com/coreos/go-oidc" + "github.com/coreos/go-oidc/v3/oidc" "github.com/ory/hydra-client-go/client/admin" "golang.org/x/oauth2" ) @@ -23,12 +23,13 @@ type oidcProvider interface { } type oidcProviderImpl struct { - name string - clientID string - clientSecret string - callback string - op *oidc.Provider - httpClient *http.Client + name string + clientID string + clientSecret string + callback string + skipIssuerCheck bool + op *oidc.Provider + httpClient *http.Client } func (o *oidcProviderImpl) Name() string { @@ -53,7 +54,7 @@ func (o *oidcProviderImpl) Endpoint() oauth2.Endpoint { } func (o *oidcProviderImpl) Verify(ctx context.Context, rawToken string) (idToken, error) { - return o.op.Verifier(&oidc.Config{ClientID: o.clientID}).Verify(ctx, rawToken) + return o.op.Verifier(&oidc.Config{ClientID: o.clientID, SkipIssuerCheck: o.skipIssuerCheck}).Verify(ctx, rawToken) } type idToken interface { diff --git a/pkg/restapi/operation/operations.go b/pkg/restapi/operation/operations.go index 2314bb0..02e2a37 100644 --- a/pkg/restapi/operation/operations.go +++ b/pkg/restapi/operation/operations.go @@ -22,7 +22,7 @@ import ( "time" "github.com/cenkalti/backoff" - "github.com/coreos/go-oidc" + "github.com/coreos/go-oidc/v3/oidc" "github.com/google/uuid" "github.com/hyperledger/aries-framework-go/spi/storage" "github.com/ory/hydra-client-go/client/admin" @@ -109,13 +109,14 @@ type OIDCConfig struct { // OIDCProviderConfig holds the configuration for a single OIDC provider. type OIDCProviderConfig struct { - URL string - ClientID string - ClientSecret string - Name string - SignUpLogoURL string - SignInLogoURL string - Order int + URL string + ClientID string + ClientSecret string + Name string + SignUpLogoURL string + SignInLogoURL string + Order int + SkipIssuerCheck bool } // CookieConfig holds cookie configuration. @@ -963,9 +964,15 @@ func (o *Operation) initOIDCProvider(providerID string, config *OIDCProviderConf func() error { var idpErr error + ctx := context.Background() + + if config.SkipIssuerCheck { + ctx = oidc.InsecureIssuerURLContext(context.Background(), config.URL) + } + idp, idpErr = oidc.NewProvider( oidc.ClientContext( - context.Background(), + ctx, &http.Client{ Transport: &http.Transport{TLSClientConfig: o.tlsConfig}, }, @@ -987,11 +994,12 @@ func (o *Operation) initOIDCProvider(providerID string, config *OIDCProviderConf } return &oidcProviderImpl{ - name: providerID, - clientID: config.ClientID, - clientSecret: config.ClientSecret, - callback: o.callbackURL, - op: idp, + name: providerID, + clientID: config.ClientID, + clientSecret: config.ClientSecret, + callback: o.callbackURL, + skipIssuerCheck: config.SkipIssuerCheck, + op: idp, httpClient: &http.Client{Transport: &http.Transport{ TLSClientConfig: o.tlsConfig, }}, diff --git a/test/bdd/go.mod b/test/bdd/go.mod index 0bdd44a..ba50793 100644 --- a/test/bdd/go.mod +++ b/test/bdd/go.mod @@ -7,13 +7,12 @@ module github.com/trustbloc/hub-auth/test/bdd go 1.16 require ( - github.com/coreos/go-oidc v2.2.1+incompatible + github.com/coreos/go-oidc/v3 v3.1.0 github.com/cucumber/godog v0.9.0 github.com/fsouza/go-dockerclient v1.6.5 github.com/google/uuid v1.1.2 github.com/ory/hydra-client-go v1.8.5 github.com/pkg/errors v0.9.1 - github.com/pquerna/cachecontrol v0.0.0-20200921180117-858c6e7e6b7e // indirect github.com/tidwall/gjson v1.6.7 github.com/trustbloc/edge-core v0.1.7 github.com/trustbloc/hub-auth v0.0.0 diff --git a/test/bdd/go.sum b/test/bdd/go.sum index 2e3ca28..35f379c 100644 --- a/test/bdd/go.sum +++ b/test/bdd/go.sum @@ -197,9 +197,10 @@ github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkE github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-oidc v2.0.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= +github.com/coreos/go-oidc v2.1.0+incompatible h1:sdJrfw8akMnCuUlaZU3tE/uYXFgfqom8DBE9so9EBsM= github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= -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.1.0 h1:6avEvcdvTa1qYsOZ6I5PRkSYHzpTNWgKYmaJfaYbrRw= +github.com/coreos/go-oidc/v3 v3.1.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-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= @@ -849,8 +850,6 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/posener/complete v1.2.1/go.mod h1:6gapUrK/U1TAN7ciCoNRIdVC5sbdBTUh1DKN0g6uH7E= github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= -github.com/pquerna/cachecontrol v0.0.0-20200921180117-858c6e7e6b7e h1:BLqxdwZ6j771IpSCRx7s/GJjXHUE00Hmu7/YegCGdzA= -github.com/pquerna/cachecontrol v0.0.0-20200921180117-858c6e7e6b7e/go.mod h1:hoLfEwdY11HjRfKFH6KqnPsfxlo3BP6bJehpDv8t6sQ= github.com/pquerna/otp v1.2.1-0.20191009055518-468c2dd2b58d/go.mod h1:dkJfzwRKNiegxyNb54X/3fLwhCynbMspSyWKnvi1AEg= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM= @@ -1107,6 +1106,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-20200519113804-d87ec0cfa476/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= diff --git a/test/bdd/pkg/login/mock_wallet.go b/test/bdd/pkg/login/mock_wallet.go index d83523b..66ff182 100644 --- a/test/bdd/pkg/login/mock_wallet.go +++ b/test/bdd/pkg/login/mock_wallet.go @@ -19,7 +19,7 @@ import ( "net/url" "strings" - "github.com/coreos/go-oidc" + "github.com/coreos/go-oidc/v3/oidc" "github.com/google/uuid" "github.com/ory/hydra-client-go/client" "github.com/ory/hydra-client-go/client/admin"