vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

*: do not whitelist empty hosts 

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
release-3.4
Gyuho Lee 2018-02-28 19:20:10 -08:00
parent 02217cb6df
commit 9f0027dfb2
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
embed/etcd.go
View File

@ -176,7 +176,9 @@ func StartEtcd(inCfg *Config) (e *Etcd, err error) {
srvcfg.HostWhitelist = make(map[string]struct{}, len(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 {

9
etcdmain/config.go
View File

@ -277,9 +277,12 @@ func (cfg *config) configFromCmdLine() error {
cfg.ec.ListenMetricsUrls = []url.URL(u)
}
hosts := strings.Split(cfg.cf.hostWhitelist, ",")
for i := range hosts {
hosts[i] = strings.TrimSpace(hosts[i])
hosts := []string{}
for _, h := range strings.Split(cfg.cf.hostWhitelist, ",") {
h = strings.TrimSpace(h)
if h != "" {
hosts = append(hosts, h)
}
}
cfg.ec.HostWhitelist = hosts