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

Raise error if regexp and template are not specified together (#2884)

Browse source 
Signed-off-by: Xiao An <hac@zju.edu.cn>
This commit is contained in:
An Xiao 2019-06-13 19:07:41 +08:00 • committed by Miek Gieben
parent 481dea50ad
commit c1d7c2e69b
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
plugin/auto/setup.go
View file

@ -120,7 +120,7 @@ func autoParse(c *caddy.Controller) (Auto, error) {
} }
} }
// regexp // regexp template
if c.NextArg() { if c.NextArg() {
a.loader.re, err = regexp.Compile(c.Val()) a.loader.re, err = regexp.Compile(c.Val())
if err != nil { if err != nil {
@ -129,10 +129,10 @@ func autoParse(c *caddy.Controller) (Auto, error) {
if a.loader.re.NumSubexp() == 0 { if a.loader.re.NumSubexp() == 0 {
return a, c.Errf("Need at least one sub expression") return a, c.Errf("Need at least one sub expression")
} }
}
// template if !c.NextArg() {
if c.NextArg() { return a, c.ArgErr()
}
a.loader.template = rewriteToExpand(c.Val()) a.loader.template = rewriteToExpand(c.Val())
} }

7
plugin/auto/setup_test.go
View file

@ -75,6 +75,13 @@ func TestAutoParse(t *testing.T) {
}`, }`,
true, "/tmp", "bliep", `(.*)`, 10 * time.Second, nil, true, "/tmp", "bliep", `(.*)`, 10 * time.Second, nil,
}, },
// no template specified.
{
`auto {
directory /tmp (.*)
}`,
true, "/tmp", "", `(.*)`, 60 * time.Second, nil,
},
// no directory specified. // no directory specified.
{ {
`auto example.org { `auto example.org {