luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

agent: Disallow 0.0.0.0 as advertise or advertise-wan address 

Fixes #2961
This commit is contained in:
Frank Schroeder 2017-05-08 18:39:53 +02:00
parent 5b48fec0dd
commit 66e7b414b0
No known key found for this signature in database
GPG Key ID: 4D65C6EAEC87DECD
2 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
command/agent/command.go
View File

@ -361,6 +361,16 @@ func (c *Command) readConfig() *Config {
return nil
}
if config.AdvertiseAddr == "0.0.0.0" {
c.UI.Error("Advertise address cannot be 0.0.0.0")
return nil
}
if config.AdvertiseAddrWan == "0.0.0.0" {
c.UI.Error("Advertise WAN address cannot be 0.0.0.0")
return nil
}
// Compile all the watches
for _, params := range config.Watches {
// Parse the watches, excluding the handler

31
command/agent/command_test.go
View File

@ -5,6 +5,7 @@ import (
"io/ioutil"
"log"
"os"
"os/exec"
"path/filepath"
"reflect"
"strings"
@ -50,6 +51,36 @@ func TestValidDatacenter(t *testing.T) {
}
}
// TestConfigFail should test command line flags that lead to an immediate error.
func TestConfigFail(t *testing.T) {
tests := []struct {
args []string
out string
}{
{
args: []string{"agent", "-server", "-data-dir", "foo", "-advertise", "0.0.0.0"},
out: "==> Advertise address cannot be 0.0.0.0\n",
},
{
args: []string{"agent", "-server", "-data-dir", "foo", "-advertise-wan", "0.0.0.0"},
out: "==> Advertise WAN address cannot be 0.0.0.0\n",
},
}
for _, tt := range tests {
t.Run(strings.Join(tt.args, " "), func(t *testing.T) {
cmd := exec.Command("consul", tt.args...)
b, err := cmd.CombinedOutput()
if got, want := err, "exit status 1"; got == nil || got.Error() != want {
t.Fatalf("got err %q want %q", got, want)
}
if got, want := string(b), tt.out; got != want {
t.Fatalf("got %q want %q", got, want)
}
})
}
}
func TestRetryJoin(t *testing.T) {
dir, agent := makeAgent(t, nextConfig())
defer os.RemoveAll(dir)