From d255187be4c547c8f17f21d15cd453bfbe122ff6 Mon Sep 17 00:00:00 2001 From: John Howard Date: Mon, 11 May 2015 15:16:23 -0700 Subject: [PATCH] Windows: Don't pull in all of resolvconf Signed-off-by: John Howard --- resolvconf/dns/resolvconf.go | 16 ++++++++++++++++ resolvconf/resolvconf.go | 12 ++---------- 2 files changed, 18 insertions(+), 10 deletions(-) create mode 100644 resolvconf/dns/resolvconf.go diff --git a/resolvconf/dns/resolvconf.go b/resolvconf/dns/resolvconf.go new file mode 100644 index 0000000..c2f23ef --- /dev/null +++ b/resolvconf/dns/resolvconf.go @@ -0,0 +1,16 @@ +package dns + +import ( + "regexp" +) + +const IpLocalhost = `((127\.([0-9]{1,3}.){2}[0-9]{1,3})|(::1))` + +var localhostIPRegexp = regexp.MustCompile(IpLocalhost) + +// IsLocalhost returns true if ip matches the localhost IP regular expression. +// Used for determining if nameserver settings are being passed which are +// localhost addresses +func IsLocalhost(ip string) bool { + return localhostIPRegexp.MatchString(ip) +} diff --git a/resolvconf/resolvconf.go b/resolvconf/resolvconf.go index 5707b16..907934c 100644 --- a/resolvconf/resolvconf.go +++ b/resolvconf/resolvconf.go @@ -10,6 +10,7 @@ import ( "github.com/Sirupsen/logrus" "github.com/docker/docker/pkg/ioutils" + "github.com/docker/docker/pkg/resolvconf/dns" ) var ( @@ -24,10 +25,8 @@ var ( // For readability and sufficiency for Docker purposes this seemed more reasonable than a // 1000+ character regexp with exact and complete IPv6 validation ipv6Address = `([0-9A-Fa-f]{0,4}:){2,7}([0-9A-Fa-f]{0,4})` - ipLocalhost = `((127\.([0-9]{1,3}.){2}[0-9]{1,3})|(::1))` - localhostIPRegexp = regexp.MustCompile(ipLocalhost) - localhostNSRegexp = regexp.MustCompile(`(?m)^nameserver\s+` + ipLocalhost + `\s*\n*`) + localhostNSRegexp = regexp.MustCompile(`(?m)^nameserver\s+` + dns.IpLocalhost + `\s*\n*`) nsIPv6Regexp = regexp.MustCompile(`(?m)^nameserver\s+` + ipv6Address + `\s*\n*`) nsRegexp = regexp.MustCompile(`^\s*nameserver\s*((` + ipv4Address + `)|(` + ipv6Address + `))\s*$`) searchRegexp = regexp.MustCompile(`^\s*search\s*(([^\s]+\s*)*)$`) @@ -128,13 +127,6 @@ func getLines(input []byte, commentMarker []byte) [][]byte { return output } -// IsLocalhost returns true if ip matches the localhost IP regular expression. -// Used for determining if nameserver settings are being passed which are -// localhost addresses -func IsLocalhost(ip string) bool { - return localhostIPRegexp.MatchString(ip) -} - // GetNameservers returns nameservers (if any) listed in /etc/resolv.conf func GetNameservers(resolvConf []byte) []string { nameservers := []string{}