kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #10556 from estesp/ipv6-extra-hosts

Browse source 
Allow IPv6 addresses in ExtraHosts option settings
This commit is contained in:
Jessie Frazelle 2015-02-06 14:53:54 -08:00
commit 76bf543fea
3 changed files with 32 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
daemon/container.go
View file

@ -461,7 +461,8 @@ func (container *Container) buildHostsFiles(IP string) error {
}
for _, extraHost := range container.hostConfig.ExtraHosts {
parts := strings.Split(extraHost, ":")
// allow IPv6 addresses in extra hosts; only split on first ":"
parts := strings.SplitN(extraHost, ":", 2)
extraContent = append(extraContent, etchosts.Record{Hosts: parts[0], IP: parts[1]})
}

3
opts/opts.go
View file

@ -204,7 +204,8 @@ func validateDomain(val string) (string, error) {
}
func ValidateExtraHost(val string) (string, error) {
arr := strings.Split(val, ":")
// allow for IPv6 addresses in extra hosts by only splitting on first ":"
arr := strings.SplitN(val, ":", 2)
if len(arr) != 2 || len(arr[0]) == 0 {
return "", fmt.Errorf("bad format for add-host: %s", val)
}

28
opts/opts_test.go
View file

@ -104,3 +104,31 @@ func TestValidateDnsSearch(t *testing.T) {
}
}
}
func TestValidateExtraHosts(t *testing.T) {
valid := []string{
`myhost:192.168.0.1`,
`thathost:10.0.2.1`,
`anipv6host:2003:ab34:e::1`,
`ipv6local:::1`,
}
invalid := []string{
`myhost:192.notanipaddress.1`,
`thathost-nosemicolon10.0.0.1`,
`anipv6host:::::1`,
`ipv6local:::0::`,
}
for _, extrahost := range valid {
if _, err := ValidateExtraHost(extrahost); err != nil {
t.Fatalf("ValidateExtraHost(`"+extrahost+"`) should succeed: error %v", err)
}
}
for _, extrahost := range invalid {
if _, err := ValidateExtraHost(extrahost); err == nil {
t.Fatalf("ValidateExtraHost(`" + extrahost + "`) should have failed validation")
}
}
}