Commit c5eb7d04 authored by Chris O'Haver's avatar Chris O'Haver Committed by GitHub

dont panic when from-zone cannot be normalized (#5171)

Signed-off-by: default avatarChris O'Haver <cohaver@infoblox.com>
parent d6743531
......@@ -56,7 +56,11 @@ func parseStanza(c *caddy.Controller) (*GRPC, error) {
if !c.Args(&g.from) {
return g, c.ArgErr()
}
g.from = plugin.Host(g.from).NormalizeExact()[0] // only the first is used.
normalized := plugin.Host(g.from).NormalizeExact()
if len(normalized) == 0 {
return g, fmt.Errorf("unable to normalize '%s'", g.from)
}
g.from = normalized[0] // only the first is used.
to := c.RemainingArgs()
if len(to) == 0 {
......
......@@ -30,6 +30,7 @@ func TestSetup(t *testing.T) {
{"grpc . 127.0.0.1 {\nblaatl\n}\n", true, "", nil, "unknown property"},
{`grpc . ::1
grpc com ::2`, true, "", nil, "plugin"},
{"grpc xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx 127.0.0.1", true, "", nil, "unable to normalize 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'"},
}
for i, test := range tests {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment