*: do not whitelist empty hosts
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>release-3.4
parent
02217cb6df
commit
9f0027dfb2
|
@ -176,7 +176,9 @@ func StartEtcd(inCfg *Config) (e *Etcd, err error) {
|
||||||
|
|
||||||
srvcfg.HostWhitelist = make(map[string]struct{}, len(cfg.HostWhitelist))
|
srvcfg.HostWhitelist = make(map[string]struct{}, len(cfg.HostWhitelist))
|
||||||
for _, h := range cfg.HostWhitelist {
|
for _, h := range cfg.HostWhitelist {
|
||||||
srvcfg.HostWhitelist[h] = struct{}{}
|
if h != "" {
|
||||||
|
srvcfg.HostWhitelist[h] = struct{}{}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if e.Server, err = etcdserver.NewServer(srvcfg); err != nil {
|
if e.Server, err = etcdserver.NewServer(srvcfg); err != nil {
|
||||||
|
|
|
@ -277,9 +277,12 @@ func (cfg *config) configFromCmdLine() error {
|
||||||
cfg.ec.ListenMetricsUrls = []url.URL(u)
|
cfg.ec.ListenMetricsUrls = []url.URL(u)
|
||||||
}
|
}
|
||||||
|
|
||||||
hosts := strings.Split(cfg.cf.hostWhitelist, ",")
|
hosts := []string{}
|
||||||
for i := range hosts {
|
for _, h := range strings.Split(cfg.cf.hostWhitelist, ",") {
|
||||||
hosts[i] = strings.TrimSpace(hosts[i])
|
h = strings.TrimSpace(h)
|
||||||
|
if h != "" {
|
||||||
|
hosts = append(hosts, h)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
cfg.ec.HostWhitelist = hosts
|
cfg.ec.HostWhitelist = hosts
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue