01a513a496
This diff refactors the DNSTransport model to receive in input a DNSQuery and return in output a DNSResponse. The design of DNSQuery and DNSResponse takes into account the use case of a transport using getaddrinfo, meaning that we don't need to serialize and deserialize messages when using getaddrinfo. The current codebase does not use a getaddrinfo transport, but I wrote one such a transport in the Websteps Winter 2021 prototype (https://github.com/bassosimone/websteps-illustrated/). The design conversation that lead to producing this diff is https://github.com/ooni/probe/issues/2099
120 lines
3.1 KiB
Go
120 lines
3.1 KiB
Go
package resolver_test
|
|
|
|
import (
|
|
"context"
|
|
"crypto/tls"
|
|
"net"
|
|
"net/http"
|
|
"testing"
|
|
|
|
"github.com/apex/log"
|
|
"github.com/ooni/probe-cli/v3/internal/model"
|
|
"github.com/ooni/probe-cli/v3/internal/netxlite"
|
|
)
|
|
|
|
func init() {
|
|
log.SetLevel(log.DebugLevel)
|
|
}
|
|
|
|
func testresolverquick(t *testing.T, reso model.Resolver) {
|
|
if testing.Short() {
|
|
t.Skip("skip test in short mode")
|
|
}
|
|
reso = &netxlite.ResolverLogger{
|
|
Logger: log.Log,
|
|
Resolver: reso,
|
|
}
|
|
addrs, err := reso.LookupHost(context.Background(), "dns.google.com")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if addrs == nil {
|
|
t.Fatal("expected non-nil addrs here")
|
|
}
|
|
var foundquad8 bool
|
|
for _, addr := range addrs {
|
|
// See https://github.com/ooni/probe-engine/pull/954/checks?check_run_id=1182269025
|
|
if addr == "8.8.8.8" || addr == "2001:4860:4860::8888" {
|
|
foundquad8 = true
|
|
}
|
|
}
|
|
if !foundquad8 {
|
|
t.Fatalf("did not find 8.8.8.8 in output; output=%+v", addrs)
|
|
}
|
|
}
|
|
|
|
// Ensuring we can handle Internationalized Domain Names (IDNs) without issues
|
|
func testresolverquickidna(t *testing.T, reso model.Resolver) {
|
|
if testing.Short() {
|
|
t.Skip("skip test in short mode")
|
|
}
|
|
reso = &netxlite.ResolverIDNA{
|
|
Resolver: &netxlite.ResolverLogger{
|
|
Logger: log.Log,
|
|
Resolver: reso,
|
|
},
|
|
}
|
|
addrs, err := reso.LookupHost(context.Background(), "яндекс.рф")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if addrs == nil {
|
|
t.Fatal("expected non-nil addrs here")
|
|
}
|
|
}
|
|
|
|
func TestNewResolverSystem(t *testing.T) {
|
|
reso := &netxlite.ResolverSystem{}
|
|
testresolverquick(t, reso)
|
|
testresolverquickidna(t, reso)
|
|
}
|
|
|
|
func TestNewResolverUDPAddress(t *testing.T) {
|
|
reso := netxlite.NewSerialResolver(
|
|
netxlite.NewDNSOverUDPTransport(netxlite.DefaultDialer, "8.8.8.8:53"))
|
|
testresolverquick(t, reso)
|
|
testresolverquickidna(t, reso)
|
|
}
|
|
|
|
func TestNewResolverUDPDomain(t *testing.T) {
|
|
reso := netxlite.NewSerialResolver(
|
|
netxlite.NewDNSOverUDPTransport(netxlite.DefaultDialer, "dns.google.com:53"))
|
|
testresolverquick(t, reso)
|
|
testresolverquickidna(t, reso)
|
|
}
|
|
|
|
func TestNewResolverTCPAddress(t *testing.T) {
|
|
reso := netxlite.NewSerialResolver(
|
|
netxlite.NewDNSOverTCPTransport(new(net.Dialer).DialContext, "8.8.8.8:53"))
|
|
testresolverquick(t, reso)
|
|
testresolverquickidna(t, reso)
|
|
}
|
|
|
|
func TestNewResolverTCPDomain(t *testing.T) {
|
|
reso := netxlite.NewSerialResolver(
|
|
netxlite.NewDNSOverTCPTransport(new(net.Dialer).DialContext, "dns.google.com:53"))
|
|
testresolverquick(t, reso)
|
|
testresolverquickidna(t, reso)
|
|
}
|
|
|
|
func TestNewResolverDoTAddress(t *testing.T) {
|
|
reso := netxlite.NewSerialResolver(
|
|
netxlite.NewDNSOverTLSTransport(new(tls.Dialer).DialContext, "8.8.8.8:853"))
|
|
testresolverquick(t, reso)
|
|
testresolverquickidna(t, reso)
|
|
}
|
|
|
|
func TestNewResolverDoTDomain(t *testing.T) {
|
|
reso := netxlite.NewSerialResolver(
|
|
netxlite.NewDNSOverTLSTransport(new(tls.Dialer).DialContext, "dns.google.com:853"))
|
|
testresolverquick(t, reso)
|
|
testresolverquickidna(t, reso)
|
|
}
|
|
|
|
func TestNewResolverDoH(t *testing.T) {
|
|
reso := netxlite.NewSerialResolver(
|
|
netxlite.NewDNSOverHTTPSTransport(http.DefaultClient, "https://cloudflare-dns.com/dns-query"))
|
|
testresolverquick(t, reso)
|
|
testresolverquickidna(t, reso)
|
|
}
|