TrueCloudLab/coredns
16
0
Fork 2
Code Issues Pull requests 4 Projects Releases Packages Wiki Activity Actions

plugin/autopath: Don't panic on empty token (#5169)

Browse source 
* dont panic on empty token

Signed-off-by: Chris O'Haver <cohaver@infoblox.com>
This commit is contained in:
Chris O'Haver 2022-02-10 09:00:27 -05:00 • committed by GitHub
parent c5eb7d0460
commit fe9ba42590
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
plugin/autopath/setup.go
View file

@ -2,6 +2,7 @@ package autopath
import ( import (
"fmt" "fmt"
"strings"
"github.com/coredns/caddy" "github.com/coredns/caddy"
"github.com/coredns/coredns/core/dnsserver" "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") return ap, "", fmt.Errorf("no resolv-conf specified")
} }
resolv := zoneAndresolv[len(zoneAndresolv)-1] resolv := zoneAndresolv[len(zoneAndresolv)-1]
if resolv[0] == '@' { if strings.HasPrefix(resolv, "@") {
mw = resolv[1:] mw = resolv[1:]
} else { } else {
// assume file on disk // assume file on disk

1
plugin/autopath/setup_test.go
View file

@ -33,6 +33,7 @@ func TestSetupAutoPath(t *testing.T) {
// negative // negative
{`autopath kubernetes`, true, "", "", nil, "open kubernetes: no such file or directory"}, {`autopath kubernetes`, true, "", "", nil, "open kubernetes: no such file or directory"},
{`autopath`, true, "", "", nil, "no resolv-conf"}, {`autopath`, true, "", "", nil, "no resolv-conf"},
{`autopath ""`, true, "", "", nil, "no such file"},
} }
for i, test := range tests { for i, test := range tests {