mirror of
https://github.com/coredns/coredns.git
synced 2026-04-05 03:35:33 -04:00
Core: Propagate TSIG status in DoQ transport (#7947)
This PR nsure DoQ writer preserves and returns TSIG verification status, preventing authentication bypass on DNS-over-QUIC. Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
This commit is contained in:
@@ -14,6 +14,7 @@ type DoQWriter struct {
|
||||
remoteAddr net.Addr
|
||||
stream *quic.Stream
|
||||
Msg *dns.Msg
|
||||
tsigStatus error
|
||||
}
|
||||
|
||||
func (w *DoQWriter) Write(b []byte) (int, error) {
|
||||
@@ -61,7 +62,7 @@ func AddPrefix(b []byte) (m []byte) {
|
||||
|
||||
// These methods implement the dns.ResponseWriter interface from Go DNS.
|
||||
|
||||
func (w *DoQWriter) TsigStatus() error { return nil }
|
||||
func (w *DoQWriter) TsigStatus() error { return w.tsigStatus }
|
||||
func (w *DoQWriter) TsigTimersOnly(b bool) {}
|
||||
func (w *DoQWriter) Hijack() {}
|
||||
func (w *DoQWriter) LocalAddr() net.Addr { return w.localAddr }
|
||||
|
||||
@@ -224,6 +224,14 @@ func (s *ServerQUIC) serveQUICStream(stream *quic.Stream, conn *quic.Conn) {
|
||||
Msg: req,
|
||||
}
|
||||
|
||||
if tsig := req.IsTsig(); tsig != nil {
|
||||
if s.tsigSecret == nil {
|
||||
w.tsigStatus = dns.ErrSecret
|
||||
} else if _, ok := s.tsigSecret[tsig.Hdr.Name]; !ok {
|
||||
w.tsigStatus = dns.ErrSecret
|
||||
}
|
||||
}
|
||||
|
||||
dnsCtx := context.WithValue(stream.Context(), Key{}, s.Server)
|
||||
dnsCtx = context.WithValue(dnsCtx, LoopKey{}, 0)
|
||||
s.ServeDNS(dnsCtx, w, req)
|
||||
|
||||
@@ -439,3 +439,15 @@ func TestAcquireQUICWorkerReturnsFalseOnCancelledContext(t *testing.T) {
|
||||
t.Fatal("expected acquireQUICWorker to return false when context is cancelled")
|
||||
}
|
||||
}
|
||||
|
||||
func TestDoQWriterTsigStatusReturnsStoredStatus(t *testing.T) {
|
||||
want := errors.New("bad tsig")
|
||||
|
||||
w := &DoQWriter{
|
||||
tsigStatus: want,
|
||||
}
|
||||
|
||||
if got := w.TsigStatus(); got != want {
|
||||
t.Fatalf("TsigStatus() = %v, want %v", got, want)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user