diff --git a/internal/configfile/external_dolt_config.go b/internal/configfile/external_dolt_config.go index 283419859..27d29d1ba 100644 --- a/internal/configfile/external_dolt_config.go +++ b/internal/configfile/external_dolt_config.go @@ -77,6 +77,19 @@ func (c ExternalDoltConfig) Validate() error { return fmt.Errorf("ExternalDoltConfig: TLSCACert %q is not absolute", c.TLSCACert) } + if !c.TLSRequired { + switch { + case c.TLSCACert != "": + return errors.New("ExternalDoltConfig: TLSCACert set without TLSRequired") + case c.TLSCert != "" || c.TLSKey != "": + return errors.New("ExternalDoltConfig: TLSCert/TLSKey set without TLSRequired") + case c.TLSServerName != "": + return errors.New("ExternalDoltConfig: TLSServerName set without TLSRequired") + case c.TLSSkipVerify: + return errors.New("ExternalDoltConfig: TLSSkipVerify set without TLSRequired") + } + } + if c.TLSRequired && hasSocket && c.TLSServerName == "" && !c.TLSSkipVerify { return errors.New("ExternalDoltConfig: TLSRequired over Socket needs TLSServerName or TLSSkipVerify") } @@ -96,7 +109,7 @@ func (c ExternalDoltConfig) TLSClientConfig() (*tls.Config, error) { cfg := &tls.Config{MinVersion: tls.VersionTLS12} if c.TLSSkipVerify { - cfg.InsecureSkipVerify = true + cfg.InsecureSkipVerify = true //nolint:gosec // G402: opt-in insecure transport via the TLSSkipVerify testing flag } else { name := c.TLSServerName if name == "" { diff --git a/internal/configfile/external_dolt_config_test.go b/internal/configfile/external_dolt_config_test.go index 9a27db82c..1a430814d 100644 --- a/internal/configfile/external_dolt_config_test.go +++ b/internal/configfile/external_dolt_config_test.go @@ -63,7 +63,19 @@ func TestExternalDoltConfig_Validate_TLS(t *testing.T) { } }) - _ = keyPath + t.Run("tls material without tls required is rejected", func(t *testing.T) { + cases := []ExternalDoltConfig{ + {Host: "db", Port: 3306, TLSCACert: certPath}, + {Host: "db", Port: 3306, TLSCert: certPath, TLSKey: keyPath}, + {Host: "db", Port: 3306, TLSServerName: "db"}, + {Host: "db", Port: 3306, TLSSkipVerify: true}, + } + for _, c := range cases { + if err := c.Validate(); err == nil { + t.Fatalf("expected error for TLS material without TLSRequired: %+v", c) + } + } + }) } func TestExternalDoltConfig_TLSClientConfig(t *testing.T) {