mirror of
https://github.com/hanzoai/dns.git
synced 2026-10-30 18:40:55 +00:00
Yong TangandGitHub
0b3378beca
* core: Reject oversized GET dns query parameter of DoH The DoH POST path limits request size using http.MaxBytesReader(..., 65536), but the GET path passes the dns query value directly to base64ToMsg() with no equivalent bound. This PR adds length check. Signed-off-by: Yong Tang <[email protected]> * Fix Signed-off-by: Yong Tang <[email protected]> --------- Signed-off-by: Yong Tang <[email protected]>
70 lines
1.8 KiB
Go
70 lines
1.8 KiB
Go
package doh
|
|
|
|
import (
|
|
"net/http"
|
|
"testing"
|
|
|
|
"github.com/miekg/dns"
|
|
)
|
|
|
|
func TestDoH(t *testing.T) {
|
|
tests := map[string]struct {
|
|
method string
|
|
url string
|
|
}{
|
|
"POST request over HTTPS": {method: http.MethodPost, url: "https://example.org:443"},
|
|
"POST request over HTTP": {method: http.MethodPost, url: "http://example.org:443"},
|
|
"POST request without protocol": {method: http.MethodPost, url: "example.org:443"},
|
|
"GET request over HTTPS": {method: http.MethodGet, url: "https://example.org:443"},
|
|
"GET request over HTTP": {method: http.MethodGet, url: "http://example.org"},
|
|
"GET request without protocol": {method: http.MethodGet, url: "example.org:443"},
|
|
}
|
|
|
|
for name, test := range tests {
|
|
t.Run(name, func(t *testing.T) {
|
|
m := new(dns.Msg)
|
|
m.SetQuestion("example.org.", dns.TypeDNSKEY)
|
|
|
|
req, err := NewRequest(test.method, test.url, m)
|
|
if err != nil {
|
|
t.Errorf("Failure to make request: %s", err)
|
|
}
|
|
|
|
m, err = RequestToMsg(req)
|
|
if err != nil {
|
|
t.Fatalf("Failure to get message from request: %s", err)
|
|
}
|
|
|
|
if x := m.Question[0].Name; x != "example.org." {
|
|
t.Errorf("Qname expected %s, got %s", "example.org.", x)
|
|
}
|
|
if x := m.Question[0].Qtype; x != dns.TypeDNSKEY {
|
|
t.Errorf("Qname expected %d, got %d", x, dns.TypeDNSKEY)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestDoHGETRejectsOversizedDNSQuery(t *testing.T) {
|
|
// Exceeding max size 65536
|
|
raw := make([]byte, 65536+1)
|
|
b64 := b64Enc.EncodeToString(raw)
|
|
|
|
req, err := http.NewRequest(
|
|
http.MethodGet,
|
|
"https://example.org"+Path+"?dns="+b64,
|
|
nil,
|
|
)
|
|
if err != nil {
|
|
t.Fatalf("failed to build request: %v", err)
|
|
}
|
|
|
|
_, err = RequestToMsg(req)
|
|
if err == nil {
|
|
t.Fatalf("expected oversized GET dns query to be rejected")
|
|
}
|
|
if err.Error() != "dns query too large" {
|
|
t.Fatalf("expected %q, got %v", "dns query too large", err)
|
|
}
|
|
}
|