Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2026-07-10 17:50:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(rewrite): restore the original question on empty replies (#8212)

Browse Source 
Signed-off-by: immanuwell <pchpr.00@list.ru>
This commit is contained in:
Immanuel Tikhonov
2026-06-30 15:05:12 +04:00
committed by GitHub
parent 4faf983fb6
commit 33266a45c7
2 changed files with 67 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugin/rewrite/reverter.go
View File

@@ -73,8 +73,12 @@ func (r *ResponseReverter) WriteMsg(res1 *dns.Msg) error {
res := res1.Copy()
if r.revertPolicy.DoQuestionRestore() {
if len(res.Question) == 0 {
res.Question = []dns.Question{r.originalQuestion}
} else {
res.Question[0] = r.originalQuestion
}
}
if len(r.ResponseRules) > 0 {
for _, rr := range res.Ns {
r.rewriteResourceRecord(res, rr)

62
plugin/rewrite/reverter_test.go
View File

@@ -292,6 +292,55 @@ func TestEDNS0ResponseReverterNoOPT(t *testing.T) {
}
}
func TestResponseReverterRestoresMissingQuestion(t *testing.T) {
ctx := context.TODO()
r, err := newNameRule("stop", "suffix", ".example.org", ".example.net", "answer", "auto")
if err != nil {
t.Fatalf("cannot parse rule: %s", err)
}
req := new(dns.Msg)
req.SetQuestion("service.example.org.", dns.TypeA)
req.Question[0].Qclass = dns.ClassINET
rw := Rewrite{
Next: plugin.HandlerFunc(noQuestionMsgPrinter),
Rules: []Rule{r},
RevertPolicy: NewRevertPolicy(false, false),
}
rec := dnstest.NewRecorder(&test.ResponseWriter{})
if _, err := rw.ServeDNS(ctx, rec, req); err != nil {
t.Fatalf("ServeDNS returned error: %v", err)
}
resp := rec.Msg
if resp == nil {
t.Fatal("expected response")
}
if len(resp.Question) != 1 {
t.Fatalf("expected 1 question got %d", len(resp.Question))
}
if got := resp.Question[0].Name; got != "service.example.org." {
t.Fatalf("question name = %q, want %q", got, "service.example.org.")
}
if got := resp.Question[0].Qtype; got != dns.TypeA {
t.Fatalf("question type = %d, want %d", got, dns.TypeA)
}
if len(resp.Answer) != 1 {
t.Fatalf("expected 1 answer got %d", len(resp.Answer))
}
if got := resp.Answer[0].Header().Name; got != "service.example.org." {
t.Fatalf("answer name = %q, want %q", got, "service.example.org.")
}
}
func noOPTMsgPrinter(_ context.Context, w dns.ResponseWriter, r *dns.Msg) (int, error) {
m := new(dns.Msg)
m.SetReply(r)
@@ -308,3 +357,16 @@ func noOPTMsgPrinter(_ context.Context, w dns.ResponseWriter, r *dns.Msg) (int,
return dns.RcodeSuccess, nil
}
func noQuestionMsgPrinter(_ context.Context, w dns.ResponseWriter, _ *dns.Msg) (int, error) {
m := new(dns.Msg)
m.Answer = []dns.RR{
test.A("service.example.net. 60 IN A 127.0.0.1"),
}
if err := w.WriteMsg(m); err != nil {
return dns.RcodeServerFailure, err
}
return dns.RcodeSuccess, nil
}