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

client: clean up the tls config for client #8347

Merged
merged 2 commits into from
Jul 3, 2024
Merged

client: clean up the tls config for client #8347

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ef0aac
clean up the tls config for client
rleungx Jul 1, 2024
0d3ff4b
Merge branch 'master' into clean-config
ti-chi-bot[bot] Jul 3, 2024
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
12 changes: 0 additions & 12 deletions client/tlsutil/tlsconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,21 +47,12 @@ import (
type TLSInfo struct {
CertFile string
KeyFile string
CAFile string // TODO: deprecate this in v4
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does it work if there is no CAfile? like pdctl no specified the --cacert.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/tikv/pd/pull/8347/files#diff-91dc9b32b58d11d334b55b1e6fdc4495c5d28d42f125320b8611d43238799bbcR160 still works. It will be assigned to TrustedCAFile.

TrustedCAFile string
ClientCertAuth bool
CRLFile string
InsecureSkipVerify bool

SkipClientSANVerify bool

// ServerName ensures the cert matches the given host in case of discovery / virtual hosting
ServerName string

// HandshakeFailure is optionally called when a connection fails to handshake. The
// connection will be closed immediately afterwards.
HandshakeFailure func(*tls.Conn, error)

// CipherSuites is a list of supported cipher suites.
// If empty, Go auto-populates it by default.
// Note that cipher suites are prioritized in the given order.
Expand Down Expand Up @@ -157,9 +148,6 @@ func (info TLSInfo) baseConfig() (*tls.Config, error) {
// cafiles returns a list of CA file paths.
func (info TLSInfo) cafiles() []string {
cs := make([]string, 0)
if info.CAFile != "" {
cs = append(cs, info.CAFile)
}
if info.TrustedCAFile != "" {
cs = append(cs, info.TrustedCAFile)
}
Expand Down