plugin/rewrite: handle continue in response rewrite (#1740)

* handle continue in response rewrite

* add test
This commit is contained in:
Chris O'Haver
2018-04-27 02:05:44 -04:00
committed by Miek Gieben
parent 3236464223
commit 47b2b10209
2 changed files with 33 additions and 19 deletions

View File

@@ -11,12 +11,7 @@ import (
"github.com/miekg/dns"
)
func TestResponseReverter(t *testing.T) {
rules := []Rule{}
r, _ := newNameRule("stop", "regex", `(core)\.(dns)\.(rocks)`, "{2}.{1}.{3}", "answer", "name", `(dns)\.(core)\.(rocks)`, "{2}.{1}.{3}")
rules = append(rules, r)
tests := []struct {
var tests = []struct {
from string
fromType uint16
answer []dns.RR
@@ -35,6 +30,22 @@ func TestResponseReverter(t *testing.T) {
}, "core.dns.rocks", dns.TypeA, false},
}
func TestResponseReverter(t *testing.T) {
rules := []Rule{}
r, _ := newNameRule("stop", "regex", `(core)\.(dns)\.(rocks)`, "{2}.{1}.{3}", "answer", "name", `(dns)\.(core)\.(rocks)`, "{2}.{1}.{3}")
rules = append(rules, r)
doReverterTests(rules, t)
rules = []Rule{}
r, _ = newNameRule("continue", "regex", `(core)\.(dns)\.(rocks)`, "{2}.{1}.{3}", "answer", "name", `(dns)\.(core)\.(rocks)`, "{2}.{1}.{3}")
rules = append(rules, r)
doReverterTests(rules, t)
}
func doReverterTests(rules []Rule, t *testing.T) {
ctx := context.TODO()
for i, tc := range tests {
m := new(dns.Msg)

View File

@@ -64,8 +64,11 @@ func (rw Rewrite) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg
// }
}
}
if rw.noRevert || len(wr.ResponseRules) == 0 {
return plugin.NextOrFailure(rw.Name(), rw.Next, ctx, w, r)
}
return plugin.NextOrFailure(rw.Name(), rw.Next, ctx, wr, r)
}
// Name implements the Handler interface.
func (rw Rewrite) Name() string { return "rewrite" }