Use net.SplitHostPort on Consul address (#3268)

hashicorp · Aug 31, 2017 · f4c12b8 · f4c12b8
1 parent d10075e
commit f4c12b8
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/physical/consul/consul.go b/physical/consul/consul.go
@@ -241,7 +241,14 @@ func NewConsulBackend(conf map[string]string, logger log.Logger) (physical.Backe
 }
 
 func setupTLSConfig(conf map[string]string) (*tls.Config, error) {
-	serverName := strings.Split(conf["address"], ":")
+	serverName, _, err := net.SplitHostPort(conf["address"])
+	switch {
+	case err == nil:
+	case strings.Contains(err.Error(), "missing port"):
+		serverName = conf["address"]
+	default:
+		return nil, err
+	}
 
 	insecureSkipVerify := false
 	if _, ok := conf["tls_skip_verify"]; ok {
@@ -262,7 +269,7 @@ func setupTLSConfig(conf map[string]string) (*tls.Config, error) {
 	tlsClientConfig := &tls.Config{
 		MinVersion:         tlsMinVersion,
 		InsecureSkipVerify: insecureSkipVerify,
-		ServerName:         serverName[0],
+		ServerName:         serverName,
 	}
 
 	_, okCert := conf["tls_cert_file"]