Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2026-10-08 19:45:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

request: stop echoing unhandled EDNS options (#8514)

Browse Source 
Signed-off-by: houyuwushang <liuluoqianqiu@outlook.com>
This commit is contained in:
houyuwushang
2026-09-05 09:14:53 +08:00
committed by GitHub
parent 895eab37e8
commit b6987aeb4a
6 changed files with 77 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
request/edns0.go
View File

@@ -7,24 +7,10 @@ import (
)
func supportedOptions(o []dns.EDNS0) []dns.EDNS0 {
var supported = make([]dns.EDNS0, 0, 3)
// For as long as possible try avoid looking up in the map, because that need an Rlock.
supported := make([]dns.EDNS0, 0, 3)
for _, opt := range o {
switch code := opt.Option(); code {
case dns.EDNS0NSID:
fallthrough
case dns.EDNS0EXPIRE:
fallthrough
case dns.EDNS0COOKIE:
fallthrough
case dns.EDNS0TCPKEEPALIVE:
fallthrough
case dns.EDNS0PADDING:
if edns.SupportedOption(opt.Option()) {
supported = append(supported, opt)
default:
if edns.SupportedOption(code) {
supported = append(supported, opt)
}
}
}
return supported

57
request/edns0_test.go
View File

@@ -3,48 +3,31 @@ package request
import (
"testing"
"github.com/coredns/coredns/plugin/pkg/edns"
"github.com/miekg/dns"
)
func TestSupportedOptions(t *testing.T) {
tests := []struct {
name string
options []dns.EDNS0
expected int
}{
{
name: "empty options",
options: []dns.EDNS0{},
expected: 0,
},
{
name: "all supported options",
options: []dns.EDNS0{
&dns.EDNS0_NSID{},
&dns.EDNS0_EXPIRE{},
&dns.EDNS0_COOKIE{},
&dns.EDNS0_TCP_KEEPALIVE{},
&dns.EDNS0_PADDING{},
},
expected: 5,
},
{
name: "mixed supported and unsupported options",
options: []dns.EDNS0{
&dns.EDNS0_NSID{},
&dns.EDNS0_LOCAL{Code: 65001}, // unsupported code
&dns.EDNS0_PADDING{},
},
expected: 2,
},
const supportedCode = 65001
edns.SetSupportedOption(supportedCode)
want := &dns.EDNS0_LOCAL{Code: supportedCode}
options := []dns.EDNS0{
&dns.EDNS0_NSID{},
&dns.EDNS0_EXPIRE{},
&dns.EDNS0_COOKIE{},
&dns.EDNS0_TCP_KEEPALIVE{},
&dns.EDNS0_PADDING{},
&dns.EDNS0_LOCAL{Code: supportedCode + 1},
want,
}
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
result := supportedOptions(tc.options)
if len(result) != tc.expected {
t.Errorf("Expected %d supported options, got %d", tc.expected, len(result))
}
})
got := supportedOptions(options)
if len(got) != 1 {
t.Fatalf("Expected one explicitly supported option, got %d: %v", len(got), got)
}
if got[0] != want {
t.Errorf("Expected explicitly supported option %v, got %v", want, got[0])
}
}

24
request/request_test.go
View File

@@ -107,6 +107,30 @@ func TestRequestSizeAndDo(t *testing.T) {
}
}
func TestRequestSizeAndDoDoesNotEchoEDNSOptions(t *testing.T) {
st := testRequest()
requestOPT := st.Req.IsEdns0()
requestOPT.Option = []dns.EDNS0{
&dns.EDNS0_NSID{Code: dns.EDNS0NSID, Nsid: "request-nsid"},
&dns.EDNS0_EXPIRE{Code: dns.EDNS0EXPIRE, Expire: 60},
&dns.EDNS0_COOKIE{Code: dns.EDNS0COOKIE, Cookie: "abcdef0123456789"},
&dns.EDNS0_TCP_KEEPALIVE{Code: dns.EDNS0TCPKEEPALIVE, Timeout: 10},
&dns.EDNS0_PADDING{Padding: []byte{0, 0, 0, 0}},
}
response := new(dns.Msg)
if !st.SizeAndDo(response) {
t.Fatal("Expected SizeAndDo to add an OPT record")
}
responseOPT := response.IsEdns0()
if responseOPT == nil {
t.Fatal("Expected response to contain an OPT record")
}
if len(responseOPT.Option) != 0 {
t.Errorf("Expected request EDNS options to be ignored, got %v", responseOPT.Option)
}
}
// TestRequestNewWithQuestion tests the NewWithQuestion method
func TestRequestNewWithQuestion(t *testing.T) {
st := testRequest()