Skip to content

chore: Simplify logic choosing legacy or standard server cert validation #910

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 1 commit into from
Jan 10, 2025
Merged

chore: Simplify logic choosing legacy or standard server cert validation #910

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions internal/cloudsql/instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,16 +241,17 @@ func (c ConnectionInfo) TLSConfig() *tls.Config {
for _, caCert := range c.ServerCACert {
pool.AddCert(caCert)
}
if c.ServerCAMode == "GOOGLE_MANAGED_CAS_CA" ||
c.ServerCAMode == "CUSTOMER_MANAGED_CAS_CA" {
// For CAS instances, we can rely on the DNS name to verify the server identity.
if c.ServerCAMode != "" && c.ServerCAMode != "GOOGLE_MANAGED_INTERNAL_CA" {
// By default, use Standard TLS hostname verification name to
// verify the server identity.
return &tls.Config{
ServerName: c.DNSName,
Certificates: []tls.Certificate{c.ClientCertificate},
RootCAs: pool,
MinVersion: tls.VersionTLS13,
}
}
// For legacy instances use the custom TLS validation
return &tls.Config{
ServerName: c.ConnectionName.String(),
Certificates: []tls.Certificate{c.ClientCertificate},
Expand Down
Loading