Browse Source

Merge pull request #11260 from jfrazelle/carry-domain-255

Restrict domain name to 255 characters
Tibor Vass 10 years ago
parent
commit
6ffc57ad5c
2 changed files with 2 additions and 1 deletions
  1. 1 1
      opts/opts.go
  2. 1 0
      opts/opts_test.go

+ 1 - 1
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)

+ 1 - 0
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 {