Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-11-08 21:16:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

DoH: Allow http as the protocol (#5762)

Browse Source 
This change avoids the hard coding of HTTPS, allowing flexibility in whether HTTP or HTTPS is used.

Signed-off-by: Sebastian Dahlgren <sebdah@fb.com>
This commit is contained in:
Sebastian Dahlgren
2023-03-03 15:44:38 +01:00
committed by GitHub
parent 03fb2fa747
commit 80b40c159e
2 changed files with 52 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
plugin/pkg/doh/doh_test.go
View File

@@ -7,46 +7,40 @@ import (
"github.com/miekg/dns"
)
func TestPostRequest(t *testing.T) {
m := new(dns.Msg)
m.SetQuestion("example.org.", dns.TypeDNSKEY)
req, err := NewRequest(http.MethodPost, "https://example.org:443", m)
if err != nil {
t.Errorf("Failure to make request: %s", err)
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"},
}
m, err = RequestToMsg(req)
if err != nil {
t.Fatalf("Failure to get message from request: %s", err)
}
for name, test := range tests {
t.Run(name, func(t *testing.T) {
m := new(dns.Msg)
m.SetQuestion("example.org.", dns.TypeDNSKEY)
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 TestGetRequest(t *testing.T) {
m := new(dns.Msg)
m.SetQuestion("example.org.", dns.TypeDNSKEY)
req, err := NewRequest(http.MethodGet, "https://example.org:443", 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)
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)
}
})
}
}