Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

server: Split TestTLS #27108

Merged
merged 3 commits into from
Aug 13, 2021
Merged

server: Split TestTLS #27108

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
effb301
server: Split TestTLS
dveeden Aug 11, 2021
2d5c747
Merge branch 'master' into test_tls
ti-chi-bot Aug 13, 2021
9e70975
Merge branch 'master' into test_tls
ti-chi-bot Aug 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 60 additions & 28 deletions server/tidb_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -871,7 +871,31 @@ func (ts *tidbTestSuite) TestSystemTimeZone(c *C) {
tk.MustQuery("select @@system_time_zone").Check(tz1)
}

func (ts *tidbTestSerialSuite) TestTLS(c *C) {
func (ts *tidbTestSerialSuite) TestTLSAuto(c *C) {
// Start the server without TLS configure, letting the server create these as AutoTLS is enabled
connOverrider := func(config *mysql.Config) {
config.TLSConfig = "skip-verify"
}
cli := newTestServerClient()
cfg := newTestConfig()
cfg.Port = cli.port
cfg.Status.ReportStatus = false
cfg.Security.AutoTLS = true
server, err := NewServer(cfg, ts.tidbdrv)
c.Assert(err, IsNil)
cli.port = getPortFromTCPAddr(server.listener.Addr())
go func() {
err := server.Run()
c.Assert(err, IsNil)
}()
time.Sleep(time.Millisecond * 100)
err = cli.runTestTLSConnection(c, connOverrider) // Relying on automatically created TLS certificates
c.Assert(err, IsNil)

server.Close()
}

func (ts *tidbTestSerialSuite) TestTLSBasic(c *C) {
// Generate valid TLS certificates.
caCert, caKey, err := generateCert(0, "TiDB CA", nil, nil, "/tmp/ca-key.pem", "/tmp/ca-cert.pem")
c.Assert(err, IsNil)
Expand All @@ -897,41 +921,19 @@ func (ts *tidbTestSerialSuite) TestTLS(c *C) {
c.Assert(err, IsNil)
}()

// Start the server without TLS.
// Start the server with TLS but without CA, in this case the server will not verify client's certificate.
connOverrider := func(config *mysql.Config) {
config.TLSConfig = "skip-verify"
}
cli := newTestServerClient()
cfg := newTestConfig()
cfg.Port = cli.port
cfg.Status.ReportStatus = false
cfg.Security.AutoTLS = true
server, err := NewServer(cfg, ts.tidbdrv)
c.Assert(err, IsNil)
cli.port = getPortFromTCPAddr(server.listener.Addr())
go func() {
err := server.Run()
c.Assert(err, IsNil)
}()
time.Sleep(time.Millisecond * 100)
err = cli.runTestTLSConnection(c, connOverrider) // Relying on automatically created TLS certificates
c.Assert(err, IsNil)

server.Close()

// Start the server with TLS but without CA, in this case the server will not verify client's certificate.
connOverrider = func(config *mysql.Config) {
config.TLSConfig = "skip-verify"
}
cli = newTestServerClient()
cfg = newTestConfig()
cfg.Port = cli.port
cfg.Status.ReportStatus = false
cfg.Security = config.Security{
SSLCert: "/tmp/server-cert.pem",
SSLKey: "/tmp/server-key.pem",
}
server, err = NewServer(cfg, ts.tidbdrv)
server, err := NewServer(cfg, ts.tidbdrv)
c.Assert(err, IsNil)
cli.port = getPortFromTCPAddr(server.listener.Addr())
go func() {
Expand Down Expand Up @@ -960,18 +962,45 @@ func (ts *tidbTestSerialSuite) TestTLS(c *C) {
c.Assert(stats["Ssl_server_not_before"], Equals, serverCert.NotBefore.Format("Jan _2 15:04:05 2006 MST"))

server.Close()
}

func (ts *tidbTestSerialSuite) TestTLSVerify(c *C) {
// Generate valid TLS certificates.
caCert, caKey, err := generateCert(0, "TiDB CA", nil, nil, "/tmp/ca-key.pem", "/tmp/ca-cert.pem")
c.Assert(err, IsNil)
_, _, err = generateCert(1, "tidb-server", caCert, caKey, "/tmp/server-key.pem", "/tmp/server-cert.pem")
c.Assert(err, IsNil)
_, _, err = generateCert(2, "SQL Client Certificate", caCert, caKey, "/tmp/client-key.pem", "/tmp/client-cert.pem")
c.Assert(err, IsNil)
err = registerTLSConfig("client-certificate", "/tmp/ca-cert.pem", "/tmp/client-cert.pem", "/tmp/client-key.pem", "tidb-server", true)
c.Assert(err, IsNil)

defer func() {
err := os.Remove("/tmp/ca-key.pem")
c.Assert(err, IsNil)
err = os.Remove("/tmp/ca-cert.pem")
c.Assert(err, IsNil)
err = os.Remove("/tmp/server-key.pem")
c.Assert(err, IsNil)
err = os.Remove("/tmp/server-cert.pem")
c.Assert(err, IsNil)
err = os.Remove("/tmp/client-key.pem")
c.Assert(err, IsNil)
err = os.Remove("/tmp/client-cert.pem")
c.Assert(err, IsNil)
}()

// Start the server with TLS & CA, if the client presents its certificate, the certificate will be verified.
cli = newTestServerClient()
cfg = newTestConfig()
cli := newTestServerClient()
cfg := newTestConfig()
cfg.Port = cli.port
cfg.Status.ReportStatus = false
cfg.Security = config.Security{
SSLCA: "/tmp/ca-cert.pem",
SSLCert: "/tmp/server-cert.pem",
SSLKey: "/tmp/server-key.pem",
}
server, err = NewServer(cfg, ts.tidbdrv)
server, err := NewServer(cfg, ts.tidbdrv)
c.Assert(err, IsNil)
cli.port = getPortFromTCPAddr(server.listener.Addr())
go func() {
Expand All @@ -982,6 +1011,9 @@ func (ts *tidbTestSerialSuite) TestTLS(c *C) {
// The client does not provide a certificate, the connection should succeed.
err = cli.runTestTLSConnection(c, nil)
c.Assert(err, IsNil)
connOverrider := func(config *mysql.Config) {
config.TLSConfig = "client-certificate"
}
cli.runTestRegression(c, connOverrider, "TLSRegression")
// The client provides a valid certificate.
connOverrider = func(config *mysql.Config) {
Expand Down