From fdfa2057863e4fd32d477855f8c8f289c0898293 Mon Sep 17 00:00:00 2001
From: Phil Estes <estesp@linux.vnet.ibm.com>
Date: Wed, 4 Feb 2015 10:20:28 -0500
Subject: [PATCH] Allow IPv6 addresses in ExtraHosts option settings

Since the separator for extra host settings (for /etc/hosts in a
container) is a ":", the code that handles extra hosts needed to only
split on the first ":" to preserve IPv6 addresses which are passed via
the command line settings as well as stored in the JSON container
config.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
---
 daemon/container.go |  3 ++-
 opts/opts.go        |  3 ++-
 opts/opts_test.go   | 28 ++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/daemon/container.go b/daemon/container.go
index 7d3505a0f7..7397573e07 100644
--- a/daemon/container.go
+++ b/daemon/container.go
@@ -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]})
 	}
 
diff --git a/opts/opts.go b/opts/opts.go
index 7f40193412..1b57b77536 100644
--- a/opts/opts.go
+++ b/opts/opts.go
@@ -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)
 	}
diff --git a/opts/opts_test.go b/opts/opts_test.go
index e813c44326..68a715567c 100644
--- a/opts/opts_test.go
+++ b/opts/opts_test.go
@@ -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")
+		}
+	}
+}