aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Chris O'Haver <cohaver@infoblox.com> 2022-02-10 09:00:27 -0500
committerGravatar GitHub <noreply@github.com> 2022-02-10 09:00:27 -0500
commitfe9ba42590199b5d46e6acda2584195338f5497d (patch)
tree98f35b0fa27238c410db320bae61bd89f3db792f
parentc5eb7d04601ebbd9400274cb77eaabf431fd7d49 (diff)
downloadcoredns-fe9ba42590199b5d46e6acda2584195338f5497d.tar.gz
coredns-fe9ba42590199b5d46e6acda2584195338f5497d.tar.zst
coredns-fe9ba42590199b5d46e6acda2584195338f5497d.zip
plugin/autopath: Don't panic on empty token (#5169)
* dont panic on empty token Signed-off-by: Chris O'Haver <cohaver@infoblox.com>
-rw-r--r--plugin/autopath/setup.go3
-rw-r--r--plugin/autopath/setup_test.go1
2 files changed, 3 insertions, 1 deletions
diff --git a/plugin/autopath/setup.go b/plugin/autopath/setup.go
index ed536933a..a041e364c 100644
--- a/plugin/autopath/setup.go
+++ b/plugin/autopath/setup.go
@@ -2,6 +2,7 @@ package autopath
import (
"fmt"
+ "strings"
"github.com/coredns/caddy"
"github.com/coredns/coredns/core/dnsserver"
@@ -50,7 +51,7 @@ func autoPathParse(c *caddy.Controller) (*AutoPath, string, error) {
return ap, "", fmt.Errorf("no resolv-conf specified")
}
resolv := zoneAndresolv[len(zoneAndresolv)-1]
- if resolv[0] == '@' {
+ if strings.HasPrefix(resolv, "@") {
mw = resolv[1:]
} else {
// assume file on disk
diff --git a/plugin/autopath/setup_test.go b/plugin/autopath/setup_test.go
index 5847e0de5..4644c7d59 100644
--- a/plugin/autopath/setup_test.go
+++ b/plugin/autopath/setup_test.go
@@ -33,6 +33,7 @@ func TestSetupAutoPath(t *testing.T) {
// negative
{`autopath kubernetes`, true, "", "", nil, "open kubernetes: no such file or directory"},
{`autopath`, true, "", "", nil, "no resolv-conf"},
+ {`autopath ""`, true, "", "", nil, "no such file"},
}
for i, test := range tests {