Fix mTLS configuration parsing. (stripe#1040)

clockwisehq · Feb 9, 2023 · 0da19f0 · 0da19f0
1 parent c6ae106
commit 0da19f0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/server.go b/server.go
@@ -809,7 +809,7 @@ func (s *Server) Start() {
 
 	// Initialize a gRPC connection for forwarding
 	var err error
-	if s.Config.Tls != nil {
+	if s.Config.Tls != nil && s.Config.Tls.CaFile != "" && s.Config.Tls.CertFile != "" && s.Config.Tls.KeyFile != "" {
 		var tlsConfig *tls.Config
 		tlsConfig, err = s.Config.Tls.GetTlsConfig()
 		if err != nil {

diff --git a/util/tls/tls_test.go b/util/tls/tls_test.go
@@ -39,6 +39,16 @@ tls:
 	assert.Error(t, err)
 }
 
+func TestGetTlsConfigEmpty(t *testing.T) {
+	yamlFile := []byte(`---
+tls:
+`)
+	data := yamlStruct{}
+	err := yaml.Unmarshal(yamlFile, &data)
+	assert.NoError(t, err)
+	assert.Nil(t, data.Tls)
+}
+
 func TestGetTlsConfigUnset(t *testing.T) {
 	data := yamlStruct{}
 	err := yaml.Unmarshal([]byte{}, &data)