Skip to content

Commit

Permalink
Be more permissive in what URLs to allow; added test for unix socket. (
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Gritter authored and jefferai committed Jun 20, 2019
1 parent 9bc820f commit e31435b
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 3 deletions.
4 changes: 1 addition & 3 deletions physical/consul/consul.go
Expand Up @@ -238,9 +238,7 @@ func NewConsulBackend(conf map[string]string, logger log.Logger) (physical.Backe
logger.Debug("config address parsed", "scheme", parts[0])
logger.Debug("config scheme parsed", "address", parts[1])
}
} else {
return nil, errors.New("address should be host[:port], not URL")
}
} // allow "unix:" or whatever else consul supports in the future
}
}
if scheme, ok := conf["scheme"]; ok {
Expand Down
18 changes: 18 additions & 0 deletions physical/consul/consul_test.go
Expand Up @@ -237,6 +237,24 @@ func TestConsul_newConsulBackend(t *testing.T) {
max_parallel: 4,
consistencyMode: "strong",
},
{
name: "Unix socket",
consulConfig: map[string]string{
"address": "unix:///tmp/.consul.http.sock",
},
address: "/tmp/.consul.http.sock",
scheme: "http", // Default, not overridden?

// Defaults
checkTimeout: 5 * time.Second,
redirectAddr: "http://127.0.0.1:8200",
path: "vault/",
service: "vault",
token: "",
max_parallel: 4,
disableReg: false,
consistencyMode: "default",
},
{
name: "Scheme in address",
consulConfig: map[string]string{
Expand Down

0 comments on commit e31435b

Please sign in to comment.