Skip to content

conf: use server-http-tls to specify http security | tidb-test=pr/2248 #403

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

Merged
merged 3 commits into from
Nov 18, 2023
Merged

conf: use server-http-tls to specify http security | tidb-test=pr/2248 #403

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d61c9cb
conf: rename peer-tls to server-http-tls
xhebox Nov 17, 2023
a27303b
fix lint
xhebox Nov 17, 2023
a12f400
fix test
xhebox Nov 17, 2023
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
Prev Previous commit
fix test 
Signed-off-by: xhe <[email protected]>
  • Loading branch information
@xhebox
xhebox committed Nov 17, 2023
commit a12f40057a96802c8452680179851a542f56faed
2 changes: 1 addition & 1 deletion pkg/manager/cert/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ func NewCertManager() *CertManager {
func (cm *CertManager) Init(cfg *config.Config, logger *zap.Logger, cfgch <-chan *config.Config) error {
cm.logger = logger
cm.serverSQLTLS = security.NewCert(true)
cm.serverHTTPTLS = security.NewCert(false)
cm.serverHTTPTLS = security.NewCert(true)
cm.clusterTLS = security.NewCert(false)
cm.sqlTLS = security.NewCert(false)
cm.setConfig(cfg)
Expand Down
14 changes: 10 additions & 4 deletions pkg/manager/cert/manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,25 +83,31 @@ func TestInit(t *testing.T) {
name: "server config",
cfg: config.Config{
Security: config.Security{
ServerSQLTLS: config.TLSConfig{AutoCerts: true},
ServerSQLTLS: config.TLSConfig{AutoCerts: true},
ServerHTTPTLS: config.TLSConfig{AutoCerts: true},
ClusterTLS: config.TLSConfig{AutoCerts: true},
SQLTLS: config.TLSConfig{AutoCerts: true},
},
},
check: func(t *testing.T, cm *CertManager) {
require.Nil(t, cm.ClusterTLS())
require.Nil(t, cm.SQLTLS())
require.Nil(t, cm.ServerHTTPTLS())
require.NotNil(t, cm.ServerHTTPTLS())
require.NotNil(t, cm.ServerSQLTLS())
},
},
{
name: "client config",
cfg: config.Config{
Security: config.Security{
SQLTLS: config.TLSConfig{SkipCA: true},
ServerSQLTLS: config.TLSConfig{SkipCA: true},
ServerHTTPTLS: config.TLSConfig{SkipCA: true},
ClusterTLS: config.TLSConfig{SkipCA: true},
SQLTLS: config.TLSConfig{SkipCA: true},
},
},
check: func(t *testing.T, cm *CertManager) {
require.Nil(t, cm.ClusterTLS())
require.NotNil(t, cm.ClusterTLS())
require.NotNil(t, cm.SQLTLS())
require.Nil(t, cm.ServerHTTPTLS())
require.Nil(t, cm.ServerSQLTLS())
Expand Down