mirror of
https://github.com/minio/minio.git
synced 2025-11-07 12:52:58 -05:00
fix: some races when accessing ldap/openid config globally (#14978)
This commit is contained in:
@@ -62,6 +62,31 @@ type Config struct {
|
||||
rootCAs *x509.CertPool
|
||||
}
|
||||
|
||||
// Clone returns a cloned copy of LDAP config.
|
||||
func (l *Config) Clone() Config {
|
||||
if l == nil {
|
||||
return Config{}
|
||||
}
|
||||
cfg := Config{
|
||||
Enabled: l.Enabled,
|
||||
ServerAddr: l.ServerAddr,
|
||||
UserDNSearchBaseDistName: l.UserDNSearchBaseDistName,
|
||||
UserDNSearchBaseDistNames: l.UserDNSearchBaseDistNames,
|
||||
UserDNSearchFilter: l.UserDNSearchFilter,
|
||||
GroupSearchBaseDistName: l.GroupSearchBaseDistName,
|
||||
GroupSearchBaseDistNames: l.GroupSearchBaseDistNames,
|
||||
GroupSearchFilter: l.GroupSearchFilter,
|
||||
LookupBindDN: l.LookupBindDN,
|
||||
LookupBindPassword: l.LookupBindPassword,
|
||||
stsExpiryDuration: l.stsExpiryDuration,
|
||||
tlsSkipVerify: l.tlsSkipVerify,
|
||||
serverInsecure: l.serverInsecure,
|
||||
serverStartTLS: l.serverStartTLS,
|
||||
rootCAs: l.rootCAs,
|
||||
}
|
||||
return cfg
|
||||
}
|
||||
|
||||
// LDAP keys and envs.
|
||||
const (
|
||||
ServerAddr = "server_addr"
|
||||
|
||||
@@ -164,6 +164,32 @@ type Config struct {
|
||||
closeRespFn func(io.ReadCloser)
|
||||
}
|
||||
|
||||
// Clone returns a cloned copy of OpenID config.
|
||||
func (r *Config) Clone() Config {
|
||||
if r == nil {
|
||||
return Config{}
|
||||
}
|
||||
cfg := Config{
|
||||
Enabled: r.Enabled,
|
||||
arnProviderCfgsMap: make(map[arn.ARN]*providerCfg, len(r.arnProviderCfgsMap)),
|
||||
ProviderCfgs: make(map[string]*providerCfg, len(r.ProviderCfgs)),
|
||||
pubKeys: r.pubKeys,
|
||||
roleArnPolicyMap: make(map[arn.ARN]string, len(r.roleArnPolicyMap)),
|
||||
transport: r.transport,
|
||||
closeRespFn: r.closeRespFn,
|
||||
}
|
||||
for k, v := range r.arnProviderCfgsMap {
|
||||
cfg.arnProviderCfgsMap[k] = v
|
||||
}
|
||||
for k, v := range r.ProviderCfgs {
|
||||
cfg.ProviderCfgs[k] = v
|
||||
}
|
||||
for k, v := range r.roleArnPolicyMap {
|
||||
cfg.roleArnPolicyMap[k] = v
|
||||
}
|
||||
return cfg
|
||||
}
|
||||
|
||||
// LookupConfig lookup jwks from config, override with any ENVs.
|
||||
func LookupConfig(kvsMap map[string]config.KVS, transport http.RoundTripper, closeRespFn func(io.ReadCloser), serverRegion string) (c Config, err error) {
|
||||
openIDClientTransport := http.DefaultTransport
|
||||
|
||||
Reference in New Issue
Block a user