Restrict domain name to 255 characters

humaton · jessfraz · commit b2f05c220721 · 2015-03-09T10:14:56.000-07:00
Signed-off-by: Tomáš Hrčka &lt;thrcka@redhat.com&gt;

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle &lt;princess@docker.com&gt; (github: jfrazelle)
diff --git a/opts/opts.go b/opts/opts.go
@@ -211,7 +211,7 @@ func validateDomain(val string) (string, error) {
 		return "", fmt.Errorf("%s is not a valid domain", val)
 	}
 	ns := domainRegexp.FindSubmatch([]byte(val))
-	if len(ns) > 0 {
+	if len(ns) > 0 && len(ns[1]) < 255 {
 		return string(ns[1]), nil
 	}
 	return "", fmt.Errorf("%s is not a valid domain", val)
diff --git a/opts/opts_test.go b/opts/opts_test.go
@@ -105,6 +105,7 @@ func TestValidateDnsSearch(t *testing.T) {
 		`foo.bar-.baz`,
 		`foo.-bar`,
 		`foo.-bar.baz`,
+		`foo.bar.baz.this.should.fail.on.long.name.beause.it.is.longer.thanisshouldbethis.should.fail.on.long.name.beause.it.is.longer.thanisshouldbethis.should.fail.on.long.name.beause.it.is.longer.thanisshouldbethis.should.fail.on.long.name.beause.it.is.longer.thanisshouldbe`,
 	}
 
 	for _, domain := range valid {

Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ func validateDomain(val string) (string, error) {`
`211`	`211`	`return "", fmt.Errorf("%s is not a valid domain", val)`
`212`	`212`	`}`
`213`	`213`	`ns := domainRegexp.FindSubmatch([]byte(val))`
`214`		`- if len(ns) > 0 {`
	`214`	`+ if len(ns) > 0 && len(ns[1]) < 255 {`
`215`	`215`	`return string(ns[1]), nil`
`216`	`216`	`}`
`217`	`217`	`return "", fmt.Errorf("%s is not a valid domain", val)`
Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,7 @@ func TestValidateDnsSearch(t *testing.T) {`
`105`	`105`	`foo.bar-.baz`,
`106`	`106`	`foo.-bar`,
`107`	`107`	`foo.-bar.baz`,
	`108`	+ `foo.bar.baz.this.should.fail.on.long.name.beause.it.is.longer.thanisshouldbethis.should.fail.on.long.name.beause.it.is.longer.thanisshouldbethis.should.fail.on.long.name.beause.it.is.longer.thanisshouldbethis.should.fail.on.long.name.beause.it.is.longer.thanisshouldbe`,
`108`	`109`	`}`
`109`	`110`
`110`	`111`	`for _, domain := range valid {`