core/dnsserver: add Config.UDPDecorateWriterFunc for external plugins (#8257)

* core/dnsserver: add Config.UDPDecorateWriterFunc for external plugins

Allow external plugins to install a dns.DecorateWriter (an existing
miekg/dns Server field CoreDNS never sets) on plain-UDP servers, e.g.
for per-socket write disciplines or overload protection; UDP is the
only transport without a Max*-style concurrency setting.

The field is a factory called once per Server in ServePacket, so each
socket gets its own decorator under multisocket; the *Server argument
is the same value handlers see via ctx.Value(dnsserver.Key{}). Follows
the Config.HTTPRequestValidateFunc precedent, including server-block
propagation and the ServePacket-time lookup over s.zones. Nil (the
default) changes nothing.

Signed-off-by: Ryan Brewster <rpb@anthropic.com>

* core/dnsserver: select UDP writer decorator deterministically in NewServer

Review feedback: s.zones is a map, so choosing the decorator in
ServePacket was non-deterministic when several server blocks share a
listener. Select it in NewServer from the group slice instead (stable
config order, last one set wins) and document the resolution order.

Signed-off-by: Ryan Brewster <rpb@anthropic.com>

* core/dnsserver: group decorator selection with the other last-writer-wins fields

Pure move: place it next to ProxyProtoConnPolicy, the existing field
resolved the same way at the same point.

Signed-off-by: Ryan Brewster <rpb@anthropic.com>

---------

Signed-off-by: Ryan Brewster <rpb@anthropic.com>
This commit is contained in:
rpb-ant
2026-07-09 13:15:13 -04:00
committed by GitHub
parent 7df9238255
commit 2d106be341
4 changed files with 87 additions and 1 deletions

View File

@@ -5,6 +5,7 @@ import (
"errors"
"net"
"sync"
"sync/atomic"
"testing"
"time"
@@ -180,3 +181,61 @@ func BenchmarkCoreServeDNS(b *testing.B) {
s.ServeDNS(ctx, w, m)
}
}
// recordingWriter counts the packed frames the decorated writer receives
// before forwarding them to the real writer. The decorator mints a fresh
// wrapper per packet; the frames counter is shared across them.
type recordingWriter struct {
dns.Writer
frames *atomic.Int64
}
func (rw *recordingWriter) Write(b []byte) (int, error) {
rw.frames.Add(1)
return rw.Writer.Write(b)
}
func TestUDPDecorateWriterFunc(t *testing.T) {
cfg := testConfig("dns", test.ErrorHandler())
frames := new(atomic.Int64)
var gotServer atomic.Pointer[Server]
var calls atomic.Int64
cfg.UDPDecorateWriterFunc = func(srv *Server) dns.DecorateWriter {
calls.Add(1)
gotServer.Store(srv)
return func(w dns.Writer) dns.Writer {
return &recordingWriter{Writer: w, frames: frames}
}
}
s, err := NewServer("127.0.0.1:0", []*Config{cfg})
if err != nil {
t.Fatalf("NewServer failed: %v", err)
}
pc, err := net.ListenPacket("udp", "127.0.0.1:0")
if err != nil {
t.Fatalf("ListenPacket failed: %v", err)
}
defer pc.Close()
go s.ServePacket(pc)
defer s.Stop()
m := new(dns.Msg)
m.SetQuestion("example.com.", dns.TypeA)
if _, err := dns.Exchange(m, pc.LocalAddr().String()); err != nil {
t.Fatalf("dns.Exchange failed: %v", err)
}
if n := calls.Load(); n != 1 {
t.Errorf("expected UDPDecorateWriterFunc to be called once per socket, got %d", n)
}
if gotServer.Load() != s {
t.Errorf("expected UDPDecorateWriterFunc to receive the serving *Server")
}
if frames.Load() == 0 {
t.Errorf("expected the decorated writer to observe the response write")
}
}