CBG-1518 - Added ServerTLSSkipVerify to legacy config (#5126)

couchbase · Jul 28, 2021 · 2b52c57 · 2b52c57
1 parent 8f84469
commit 2b52c57
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/rest/config_legacy.go b/rest/config_legacy.go
@@ -17,6 +17,7 @@ import (
 type LegacyServerConfig struct {
 	TLSMinVersion              *string                        `json:"tls_minimum_version,omitempty"`    // Set TLS Version
 	Interface                  *string                        `json:",omitempty"`                       // Interface to bind REST API to, default ":4984"
+	ServerTLSSkipVerify        *bool                          `json:"server_tls_skip_verify,omitempty"` // Allow empty server CA Cert Path without attempting to use system root pool
 	SSLCert                    *string                        `json:",omitempty"`                       // Path to SSL cert file, or nil
 	SSLKey                     *string                        `json:",omitempty"`                       // Path to SSL private key file, or nil
 	ServerReadTimeout          *int                           `json:",omitempty"`                       // maximum duration.Second before timing out read of the HTTP(S) request
@@ -96,12 +97,13 @@ func (lc *LegacyServerConfig) ToStartupConfig() (*StartupConfig, DbConfigMap, er
 			continue
 		}
 		bsc = &BootstrapConfig{
-			Server:       *dbConfig.Server,
-			Username:     dbConfig.Username,
-			Password:     dbConfig.Password,
-			CACertPath:   dbConfig.CACertPath,
-			X509CertPath: dbConfig.CertPath,
-			X509KeyPath:  dbConfig.KeyPath,
+			Server:              *dbConfig.Server,
+			Username:            dbConfig.Username,
+			Password:            dbConfig.Password,
+			CACertPath:          dbConfig.CACertPath,
+			X509CertPath:        dbConfig.CertPath,
+			X509KeyPath:         dbConfig.KeyPath,
+			ServerTLSSkipVerify: lc.ServerTLSSkipVerify,
 		}
 		break
 	}
@@ -289,7 +291,6 @@ func (config *LegacyServerConfig) validate() (errorMessages error) {
 				"unsupported.stats_log_freq_secs", 10))
 		}
 	}
-
 	return errorMessages
 }