Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-10-27 08:14:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix a crash in rewrite plugin when rule type is missing (#5459)

Browse Source
This commit is contained in:
Yong Tang
2022-06-25 09:17:35 -07:00
committed by GitHub
parent 497c31f098
commit 4a40e9e3a0
2 changed files with 35 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugin/rewrite/rewrite.go
View File

@@ -104,6 +104,9 @@ func newRule(args ...string) (Rule, error) {
expectNumArgs = len(args) - 1
startArg = 2
case Stop:
if len(args) < 2 {
return nil, fmt.Errorf("stop rule must begin with a rule type")
}
ruleType = strings.ToLower(args[1])
expectNumArgs = len(args) - 1
startArg = 2

79
plugin/rewrite/setup_test.go
View File

@@ -8,60 +8,45 @@ import (
)
func TestParse(t *testing.T) {
c := caddy.NewTestController("dns", `rewrite`)
_, err := rewriteParse(c)
if err == nil {
t.Errorf("Expected error but found nil for `rewrite`")
}
c = caddy.NewTestController("dns", `rewrite name`)
_, err = rewriteParse(c)
if err == nil {
t.Errorf("Expected error but found nil for `rewrite name`")
}
c = caddy.NewTestController("dns", `rewrite name a.com b.com`)
_, err = rewriteParse(c)
if err != nil {
t.Errorf("Expected success but found %s for `rewrite name a.com b.com`", err)
}
c = caddy.NewTestController("dns",
`rewrite stop {
tests := []struct {
inputFileRules string
shouldErr bool
errContains string
}{
// parse errors
{`rewrite`, true, ""},
{`rewrite name`, true, ""},
{`rewrite name a.com b.com`, false, ""},
{`rewrite stop {
name regex foo bar
answer name bar foo
}`)
_, err = rewriteParse(c)
if err != nil {
t.Errorf("Expected success but found %s for valid response rewrite", err)
}
c = caddy.NewTestController("dns", `rewrite stop name regex foo bar answer name bar foo`)
_, err = rewriteParse(c)
if err != nil {
t.Errorf("Expected success but found %s for valid response rewrite", err)
}
c = caddy.NewTestController("dns",
`rewrite stop {
}`, false, ""},
{`rewrite stop name regex foo bar answer name bar foo`, false, ""},
{`rewrite stop {
name regex foo bar
answer name bar foo
name baz
}`)
_, err = rewriteParse(c)
if err == nil {
t.Errorf("Expected error but got success for invalid response rewrite")
} else if !strings.Contains(err.Error(), "2 arguments required") {
t.Errorf("Got wrong error for invalid response rewrite: %v", err.Error())
}
c = caddy.NewTestController("dns",
`rewrite stop {
}`, true, "2 arguments required"},
{`rewrite stop {
answer name bar foo
name regex foo bar
}`)
_, err = rewriteParse(c)
if err == nil {
t.Errorf("Expected error but got success for invalid response rewrite")
} else if !strings.Contains(err.Error(), "must begin with a name rule") {
t.Errorf("Got wrong error for invalid response rewrite: %v", err.Error())
}`, true, "must begin with a name rule"},
{`rewrite stop`, true, ""},
}
for i, test := range tests {
c := caddy.NewTestController("dns", test.inputFileRules)
_, err := rewriteParse(c)
if err == nil && test.shouldErr {
t.Fatalf("Test %d expected errors, but got no error\n---\n%s", i, test.inputFileRules)
} else if err != nil && !test.shouldErr {
t.Fatalf("Test %d expected no errors, but got '%v'\n---\n%s", i, err, test.inputFileRules)
}
if err != nil && test.errContains != "" && !strings.Contains(err.Error(), test.errContains) {
t.Errorf("Test %d got wrong error for invalid response rewrite: '%v'\n---\n%s", i, err.Error(), test.inputFileRules)
}
}
}