Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7236 from heyitsanthony/no-dns-bind

Browse Source 
embed: reject domain names before binding (again)
This commit is contained in:
Anthony Romano 2017-01-26 13:52:30 -08:00 committed by GitHub
commit 9dbde1cc52
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
embed/config.go
View File

@ -405,8 +405,7 @@ func checkBindURLs(urls []url.URL) error {
continue continue
} }
if net.ParseIP(host) == nil { if net.ParseIP(host) == nil {
err := fmt.Errorf("expected IP in URL for binding (%s)", url.String()) return fmt.Errorf("expected IP in URL for binding (%s)", url.String())
plog.Warning(err)
} }
} }
return nil return nil

6
integration/embed_test.go
View File

@ -40,6 +40,8 @@ func TestEmbedEtcd(t *testing.T) {
{wpeers: 1, wclients: 1}, {wpeers: 1, wclients: 1},
{wpeers: 2, wclients: 1}, {wpeers: 2, wclients: 1},
{wpeers: 1, wclients: 2}, {wpeers: 1, wclients: 2},
{werr: "expected IP"},
{werr: "expected IP"},
} }
urls := newEmbedURLs(10) urls := newEmbedURLs(10)
@ -58,6 +60,10 @@ func TestEmbedEtcd(t *testing.T) {
setupEmbedCfg(&tests[5].cfg, []url.URL{urls[4]}, []url.URL{urls[5], urls[6]}) setupEmbedCfg(&tests[5].cfg, []url.URL{urls[4]}, []url.URL{urls[5], urls[6]})
setupEmbedCfg(&tests[6].cfg, []url.URL{urls[7], urls[8]}, []url.URL{urls[9]}) setupEmbedCfg(&tests[6].cfg, []url.URL{urls[7], urls[8]}, []url.URL{urls[9]})
dnsURL, _ := url.Parse("http://whatever.test:12345")
tests[7].cfg.LCUrls = []url.URL{*dnsURL}
tests[8].cfg.LPUrls = []url.URL{*dnsURL}
dir := path.Join(os.TempDir(), fmt.Sprintf("embed-etcd")) dir := path.Join(os.TempDir(), fmt.Sprintf("embed-etcd"))
os.RemoveAll(dir) os.RemoveAll(dir)
defer os.RemoveAll(dir) defer os.RemoveAll(dir)