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

tiproxy: fix http tls when only tls cluster is enabled #5555

Merged
merged 1 commit into from
Feb 26, 2024
Merged

tiproxy: fix http tls when only tls cluster is enabled #5555

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 12 additions & 7 deletions pkg/manager/member/tiproxy_member_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,24 +125,21 @@ func (m *tiproxyMemberManager) syncConfigMap(tc *v1alpha1.TidbCluster, set *apps
cfgWrapper.Set("proxy.require-backend-tls", false)
}

if tc.IsTLSClusterEnabled() {
tlsCluster := tc.IsTLSClusterEnabled()
tlsTiDB := tc.Spec.TiDB != nil && tc.Spec.TiDB.IsTLSClientEnabled()
if tlsCluster {
cfgWrapper.Set("security.cluster-tls.ca", path.Join(util.ClusterClientTLSPath, "ca.crt"))
cfgWrapper.Set("security.cluster-tls.key", path.Join(util.ClusterClientTLSPath, "tls.key"))
cfgWrapper.Set("security.cluster-tls.cert", path.Join(util.ClusterClientTLSPath, "tls.crt"))
}
if tc.Spec.TiDB != nil && tc.Spec.TiDB.IsTLSClientEnabled() {
if tlsTiDB {
cfgWrapper.Set("security.server-tls.ca", path.Join(tiproxyServerPath, "ca.crt"))
cfgWrapper.Set("security.server-tls.key", path.Join(tiproxyServerPath, "tls.key"))
cfgWrapper.Set("security.server-tls.cert", path.Join(tiproxyServerPath, "tls.crt"))
if cfgWrapper.Get("security.server-tls.skip-ca") == nil {
cfgWrapper.Set("security.server-tls.skip-ca", true)
}

cfgWrapper.Set("security.server-http-tls.ca", path.Join(tiproxyServerPath, "ca.crt"))
cfgWrapper.Set("security.server-http-tls.key", path.Join(tiproxyServerPath, "tls.key"))
cfgWrapper.Set("security.server-http-tls.cert", path.Join(tiproxyServerPath, "tls.crt"))
cfgWrapper.Set("security.server-http-tls.skip-ca", true)

if tc.Spec.TiProxy.SSLEnableTiDB || !tc.SkipTLSWhenConnectTiDB() {
if cfgWrapper.Get("security.sql-tls.skip-ca") == nil && tc.Spec.TiDB.TLSClient.SkipInternalClientCA {
cfgWrapper.Set("security.sql-tls.skip-ca", true)
Expand All @@ -155,6 +152,14 @@ func (m *tiproxyMemberManager) syncConfigMap(tc *v1alpha1.TidbCluster, set *apps
}
}
}
// TODO: this should only be set on `tlsCluster`. `tlsTiDB` check is for backward compatibility.
// and it should be removed in the future.
if tlsCluster || tlsTiDB {
cfgWrapper.Set("security.server-http-tls.ca", path.Join(tiproxyServerPath, "ca.crt"))
cfgWrapper.Set("security.server-http-tls.key", path.Join(tiproxyServerPath, "tls.key"))
cfgWrapper.Set("security.server-http-tls.cert", path.Join(tiproxyServerPath, "tls.crt"))
cfgWrapper.Set("security.server-http-tls.skip-ca", true)
}

cfgBytes, err := cfgWrapper.MarshalTOML()
if err != nil {
Expand Down