luxolus/open-vault
2
0
Fork 0
Code Issues 1 Pull requests Releases Activity

Use net.SplitHostPort on Consul address (#3268)

Browse source
This commit is contained in:
Jeff Mitchell 2017-08-31 12:31:34 -04:00 committed by GitHub
parent 6f417d39da
commit 7585349e46
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
physical/consul/consul.go
View file

@ -241,7 +241,14 @@ func NewConsulBackend(conf map[string]string, logger log.Logger) (physical.Backe
} }
func setupTLSConfig(conf map[string]string) (*tls.Config, error) { 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 insecureSkipVerify := false
if _, ok := conf["tls_skip_verify"]; ok { if _, ok := conf["tls_skip_verify"]; ok {
@ -262,7 +269,7 @@ func setupTLSConfig(conf map[string]string) (*tls.Config, error) {
tlsClientConfig := &tls.Config{ tlsClientConfig := &tls.Config{
MinVersion: tlsMinVersion, MinVersion: tlsMinVersion,
InsecureSkipVerify: insecureSkipVerify, InsecureSkipVerify: insecureSkipVerify,
ServerName: serverName[0], ServerName: serverName,
} }
_, okCert := conf["tls_cert_file"] _, okCert := conf["tls_cert_file"]