qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-23 14:10:05 -07:00
Code Releases Activity

crypto/x509: treat hostnames with colons as invalid

Browse Source 
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 <filippo@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Katie Hockman <katie@golang.org>
This commit is contained in:
Filippo Valsorda 2020-04-30 22:35:35 -04:00
parent 95c5ec67ea
commit f81aa23cf0
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/crypto/x509/verify.go
View File

@ -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
}

2
src/crypto/x509/verify_test.go
View File

@ -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 {

10
src/crypto/x509/x509_test.go
View File

@ -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) {