Skip to content

Commit

Permalink
crypto/x509: treat hostnames with colons as invalid
Browse files Browse the repository at this point in the history
Colons are port separators, so it's risky to allow them in hostnames.
Per the CL 231377 rule, if we at least consider them invalid we will not
apply wildcard processing to them, making behavior a little more
predictable.

We were considering hostnames with colons valid (against spec) because
that meant we'd not ignore them in Common Name. (There was at least
one deployment that was putting colons in Common Name and expecting it
to verify.)

Now that Common Name is ignored by default, those clients will break
again, so it's a good time to drop the exception. Hopefully they moved
to SANs, where invalid hostnames are checked 1:1 (ignoring wildcards)
but still work. (If they didn't, this change means they can't use
GODEBUG=x509ignoreCN=0 to opt back in, but again you don't get to use a
legacy deprecated field AND invalid hostnames.)

Updates #24151

Change-Id: Id44b4fecb2d620480acdfc65fea1473f7abbca7f
Reviewed-on: https://go-review.googlesource.com/c/go/+/231381
Run-TryBot: Filippo Valsorda <[email protected]>
TryBot-Result: Gobot Gobot <[email protected]>
Reviewed-by: Katie Hockman <[email protected]>
  • Loading branch information
FiloSottile committed May 8, 2020
1 parent 95c5ec6 commit f81aa23
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/crypto/x509/verify.go
Original file line number Diff line number Diff line change
Expand Up @@ -940,8 +940,8 @@ func validHostname(host string, isPattern bool) bool {
if c == '-' && j != 0 {
continue
}
if c == '_' || c == ':' {
// Not valid characters in hostnames, but commonly
if c == '_' {
// Not a valid character in hostnames, but commonly
// found in deployments outside the WebPKI.
continue
}
Expand Down
2 changes: 1 addition & 1 deletion src/crypto/x509/verify_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2004,7 +2004,7 @@ func TestValidHostname(t *testing.T) {
{host: "foo.*.example.com"},
{host: "exa_mple.com", validInput: true, validPattern: true},
{host: "foo,bar"},
{host: "project-dev:us-central1:main", validInput: true, validPattern: true},
{host: "project-dev:us-central1:main"},
}
for _, tt := range tests {
if got := validHostnamePattern(tt.host); got != tt.validPattern {
Expand Down
10 changes: 9 additions & 1 deletion src/crypto/x509/x509_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,15 @@ var matchHostnamesTests = []matchHostnamesTest{
{"*.com", "example.com", true},
{"*.com", "example.com.", true},
{"foo:bar", "foo:bar", true},
{"*.foo:bar", "xxx.foo:bar", true},
{"*.foo:bar", "xxx.foo:bar", false},
{"*.2.3.4", "1.2.3.4", false},
{"*.2.3.4", "[1.2.3.4]", false},
{"*:4860:4860::8888", "2001:4860:4860::8888", false},
{"*:4860:4860::8888", "[2001:4860:4860::8888]", false},
{"2001:4860:4860::8888", "2001:4860:4860::8888", false},
{"2001:4860:4860::8888", "[2001:4860:4860::8888]", false},
{"[2001:4860:4860::8888]", "2001:4860:4860::8888", false},
{"[2001:4860:4860::8888]", "[2001:4860:4860::8888]", false},
}

func TestMatchHostnames(t *testing.T) {
Expand Down

0 comments on commit f81aa23

Please sign in to comment.