Skip to content

Commit d5b46b1

Browse files
author
Amin Jamali
committed
Run tests with a newer version of Go
This is setting a max version for TLS 1.2 since TLS 1.3 ciphers is not configurable (golang/go#29349)
1 parent 144511d commit d5b46b1

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

db/mysql_connection_string_builder_test.go

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package db_test
22

33
import (
4-
"crypto/tls"
54
"crypto/x509"
65
"encoding/pem"
76
"errors"
@@ -15,8 +14,7 @@ import (
1514
)
1615

1716
const (
18-
19-
DATABASE_CLIENT_CERT = `-----BEGIN CERTIFICATE-----
17+
DATABASE_CLIENT_CERT = `-----BEGIN CERTIFICATE-----
2018
MIIEOTCCAiECFFQB88eMvRFzig5vh+MJyi0LpnODMA0GCSqGSIb3DQEBCwUAMFcx
2119
CzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRl
2220
cm5ldCBXaWRnaXRzIFB0eSBMdGQxEDAOBgNVBAMMB215c3FsQ0EwHhcNMjAwNzIx
@@ -42,7 +40,6 @@ Gim3GXnxjUDAUZOd88665Y2iirAmG1TcMDek0lBu7/ysuxjBK+Ef3BQ0YONQvzmn
4240
mSvPMfv+Qs4rTUvQi9ISXSWS9WDxye35Y/H5Zas=
4341
-----END CERTIFICATE-----`
4442

45-
4643
DATABASE_CLIENT_KEY = `-----BEGIN RSA PRIVATE KEY-----
4744
MIIEpAIBAAKCAQEAoCDk9QQsut5x0te6zRc9UmJ5lT4qMk26SrQ+hGUyVYj4dP4h
4845
tzsgwqoPRdDGNeunU+lDCdGWe0IpbnU5Lh2kEQaNF4E0+vNKF+AvUBw5Bcm1+FDX
@@ -169,10 +166,8 @@ var _ = Describe("MySQLConnectionStringBuilder", func() {
169166
Expect(mySQLAdapter.RegisterTLSConfigCallCount()).To(Equal(1))
170167
passedTLSConfigName, passedTLSConfig := mySQLAdapter.RegisterTLSConfigArgsForCall(0)
171168
Expect(passedTLSConfigName).To(Equal("some-database-tls"))
172-
Expect(passedTLSConfig).To(Equal(&tls.Config{
173-
InsecureSkipVerify: false,
174-
RootCAs: caCertPool,
175-
}))
169+
Expect(passedTLSConfig.InsecureSkipVerify).To(Equal(false))
170+
Expect(passedTLSConfig.RootCAs.Subjects()).To(Equal(caCertPool.Subjects()))
176171
})
177172

178173
Context("when SkipHostnameValidation is true", func() {
@@ -189,7 +184,7 @@ var _ = Describe("MySQLConnectionStringBuilder", func() {
189184
passedTLSConfigName, passedTLSConfig := mySQLAdapter.RegisterTLSConfigArgsForCall(0)
190185
Expect(passedTLSConfigName).To(Equal("some-database-tls"))
191186
Expect(passedTLSConfig.InsecureSkipVerify).To(BeTrue())
192-
Expect(passedTLSConfig.RootCAs).To(Equal(caCertPool))
187+
Expect(passedTLSConfig.RootCAs.Subjects()).To(Equal(caCertPool.Subjects()))
193188
Expect(passedTLSConfig.Certificates).To(BeNil())
194189
// impossible to assert VerifyPeerCertificate is set to a specfic function
195190
Expect(passedTLSConfig.VerifyPeerCertificate).NotTo(BeNil())

mutualtls/mutualtls.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ func newTLSConfig(certFile, keyFile string) (*tls.Config, error) {
4343
tlsConfig := &tls.Config{
4444
Certificates: []tls.Certificate{keyPair},
4545
MinVersion: tls.VersionTLS12,
46+
MaxVersion: tls.VersionTLS12,
4647
}
4748
return tlsConfig, nil
4849
}

mutualtls/mutualtls_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ var _ = Describe("TLS config for internal API server", func() {
176176

177177
It("refuses the connection from the client", func() {
178178
_, err := makeRequest(serverListenAddr, clientTLSConfig)
179+
179180
Expect(err).To(MatchError(ContainSubstring("remote error")))
180181
})
181182
})

0 commit comments

Comments
 (0)