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

Use TrimPrefix instead of TrimLeft in rewrite prefix plugin (#2364) (#2370)

Browse source
This commit is contained in:
Daniel Garcia 2018-12-06 15:02:07 -06:00 • committed by Miek Gieben
parent 9a393ac5c8
commit f51c110511
2 changed files with 29 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugin/rewrite/name.go
View file

@ -71,7 +71,7 @@ func (rule *exactNameRule) Rewrite(ctx context.Context, state request.Request) R
// Rewrite rewrites the current request when the name begins with the matching string.
func (rule *prefixNameRule) Rewrite(ctx context.Context, state request.Request) Result {
if strings.HasPrefix(state.Name(), rule.Prefix) {
state.Req.Question[0].Name = rule.Replacement + strings.TrimLeft(state.Name(), rule.Prefix)
state.Req.Question[0].Name = rule.Replacement + strings.TrimPrefix(state.Name(), rule.Prefix)
return RewriteDone
}
return RewriteIgnored

28
plugin/rewrite/name_test.go
View file

@ -32,6 +32,34 @@ func TestRewriteIllegalName(t *testing.T) {
}
}
func TestRewriteNamePrefix(t *testing.T) {
r, err := newNameRule("stop", "prefix", "test", "not-a-test")
if err != nil {
t.Fatalf("Expected no error, got %s", err)
}
rw := Rewrite{
Next: plugin.HandlerFunc(msgPrinter),
Rules: []Rule{r},
noRevert: true,
}
ctx := context.TODO()
m := new(dns.Msg)
m.SetQuestion("test.example.org.", dns.TypeA)
rec := dnstest.NewRecorder(&test.ResponseWriter{})
_, err = rw.ServeDNS(ctx, rec, m)
if err != nil {
t.Fatalf("Expected no error, got %s", err)
}
expected := "not-a-test.example.org."
actual := rec.Msg.Question[0].Name
if actual != expected {
t.Fatalf("Expected rewrite to %v, got %v", expected, actual)
}
}
func TestNewNameRule(t *testing.T) {
tests := []struct {
next string