Cleanup go1.15.7 (letsencrypt#5374)

andygabby · web-flow · commit 3d9d5e2306ec · 2021-04-01T10:50:18.000-07:00
Remove code that is no longer needed after migrating to go1.16.x. Remove testing with go1.15.7 in the test matrix. Fixes letsencrypt#5321
diff --git a/.github/workflows/boulder-ci.yml b/.github/workflows/boulder-ci.yml
@@ -30,7 +30,6 @@ jobs:
       matrix:
         # Add additional docker image tags here and all tests will be run with the additional image.
         BOULDER_TOOLS_TAG:
-          - go1.15.7_2021-03-29
           - go1.16.2_2021-03-29
         # Tests command definitions. Use the entire docker-compose command you want to run.
         tests:
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   boulder:
-    image: &boulder_image letsencrypt/boulder-tools:${BOULDER_TOOLS_TAG:-go1.15.7_2021-03-29}
+    image: &boulder_image letsencrypt/boulder-tools:${BOULDER_TOOLS_TAG:-go1.16.2_2021-03-29}
     environment:
       FAKE_DNS: 10.77.77.77
       BOULDER_CONFIG_DIR: test/config
diff --git a/va/tlsalpn.go b/va/tlsalpn.go
@@ -48,13 +48,6 @@ func certNames(cert *x509.Certificate) []string {
 	}
 	names = append(names, cert.DNSNames...)
 	names = core.UniqueLowerNames(names)
-	// TODO(#5321): This for loop can be deleted after new builds of boulder use
-	// golang 1.16. In 1.16, code was added to crypto/x509 to not allow
-	// invalid unicode into a DNSName in a SAN. An error will be caught in
-	// the standard library before it gets to this point.
-	for i, n := range names {
-		names[i] = replaceInvalidUTF8([]byte(n))
-	}
 	return names
 }
 
diff --git a/va/tlsalpn_test.go b/va/tlsalpn_test.go
@@ -464,34 +464,11 @@ func TestValidateTLSALPN01UnawareSrv(t *testing.T) {
 
 // TestValidateTLSALPN01BadUTFSrv tests that validating TLS-ALPN-01 against
 // a host that returns a certificate with a SAN/CN that contains invalid UTF-8
-// will result in a problem with the invalid UTF-8 replaced.
+// will result in a problem with the invalid UTF-8.
 func TestValidateTLSALPN01BadUTFSrv(t *testing.T) {
 	chall := tlsalpnChallenge()
-	hs, err := tlsalpn01Srv(t, chall, IdPeAcmeIdentifier, 0, "localhost", "\xf0\x28\x8c\xbc")
-	// TODO(#5321): Remove this comment and the err check below. In go1.16 and
-	// greater tlsalpn01Srv is expected to fail because of invalid unicode
-	// attempted in the certificate creation. If that error occurs, then
-	// the standard library has done it's job and this test is satisfied.
-	// If the error is for any other reason, the unit test will fail. In
-	// 1.15.x this error is not expected and the other test cases will
-	// continue.
-	if err != nil {
-		test.AssertContains(t, err.Error(), "cannot be encoded as an IA5String")
-		return
-	}
-	port := getPort(hs)
-	va, _ := setup(hs, 0, "", nil)
-
-	_, prob := va.validateTLSALPN01(ctx, dnsi("localhost"), chall)
-	if prob == nil {
-		t.Fatalf("TLS ALPN validation should have failed.")
-	}
-	test.AssertEquals(t, prob.Type, probs.UnauthorizedProblem)
-	test.AssertEquals(t, prob.Detail, fmt.Sprintf(
-		"Incorrect validation certificate for tls-alpn-01 challenge. "+
-			"Requested localhost from 127.0.0.1:%d. Received 1 certificate(s), "+
-			`first certificate had names "localhost, %s"`,
-		port, "\ufffd(\ufffd\ufffd"))
+	_, err := tlsalpn01Srv(t, chall, IdPeAcmeIdentifier, 0, "localhost", "\xf0\x28\x8c\xbc")
+	test.AssertContains(t, err.Error(), "cannot be encoded as an IA5String")
 }
 
 // TestValidateTLSALPN01MalformedExtnValue tests that validating TLS-ALPN-01

Original file line number	Diff line number	Diff line change
`@@ -48,13 +48,6 @@ func certNames(cert *x509.Certificate) []string {`
`48`	`48`	`}`
`49`	`49`	`names = append(names, cert.DNSNames...)`
`50`	`50`	`names = core.UniqueLowerNames(names)`
`51`		`- // TODO(#5321): This for loop can be deleted after new builds of boulder use`
`52`		`- // golang 1.16. In 1.16, code was added to crypto/x509 to not allow`
`53`		`- // invalid unicode into a DNSName in a SAN. An error will be caught in`
`54`		`- // the standard library before it gets to this point.`
`55`		`- for i, n := range names {`
`56`		`- names[i] = replaceInvalidUTF8([]byte(n))`
`57`		`- }`
`58`	`51`	`return names`
`59`	`52`	`}`
`60`	`53`