MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-04-06 12:50:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix loading config from openid config_url (#8503)

Browse Source
This commit is contained in:
Kanagaraj M 2019-11-11 23:01:46 +05:30 committed by Harshavardhana
parent 822eb5ddc7
commit 4082764d48
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/config/identity/openid/jwt.go
View File

@ -282,6 +282,13 @@ func LookupConfig(kv config.KVS, transport *http.Transport, closeRespFn func(io.
jwksURL = env.Get(EnvIdentityOpenIDJWKSURL, kv.Get(JwksURL)) jwksURL = env.Get(EnvIdentityOpenIDJWKSURL, kv.Get(JwksURL))
} }
c = Config{
ClaimPrefix: env.Get(EnvIdentityOpenIDClaimPrefix, kv.Get(ClaimPrefix)),
publicKeys: make(map[string]crypto.PublicKey),
transport: transport,
closeRespFn: closeRespFn,
}
configURL := env.Get(EnvIdentityOpenIDURL, kv.Get(ConfigURL)) configURL := env.Get(EnvIdentityOpenIDURL, kv.Get(ConfigURL))
if configURL != "" { if configURL != "" {
c.URL, err = xnet.ParseHTTPURL(configURL) c.URL, err = xnet.ParseHTTPURL(configURL)
@ -308,13 +315,6 @@ func LookupConfig(kv config.KVS, transport *http.Transport, closeRespFn func(io.
return c, nil return c, nil
} }
c = Config{
ClaimPrefix: env.Get(EnvIdentityOpenIDClaimPrefix, kv.Get(ClaimPrefix)),
publicKeys: make(map[string]crypto.PublicKey),
transport: transport,
closeRespFn: closeRespFn,
}
c.JWKS.URL, err = xnet.ParseHTTPURL(jwksURL) c.JWKS.URL, err = xnet.ParseHTTPURL(jwksURL)
if err != nil { if err != nil {
return c, err return c, err