8f7e3803eb
Acknowledge that transports MAY be used in isolation (i.e., outside of a Resolver) and add support for wrapping. Ensure that every factory that creates an unwrapped type is named accordingly to hopefully ensure there are no surprises. Implement DNSTransport wrapping and use a technique similar to the one used by Dialer to customize the DNSTransport while constructing more complex data types (e.g., a specific resolver). Ensure that the stdlib resolver's own "getaddrinfo" transport (1) is wrapped and (2) could be extended during construction. This work is part of my ongoing effort to bring to this repository websteps-illustrated changes relative to netxlite. Ref issue: https://github.com/ooni/probe/issues/2096
120 lines
3.2 KiB
Go
120 lines
3.2 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.NewResolverSystem()
|
|
testresolverquick(t, reso)
|
|
testresolverquickidna(t, reso)
|
|
}
|
|
|
|
func TestNewResolverUDPAddress(t *testing.T) {
|
|
reso := netxlite.NewUnwrappedSerialResolver(
|
|
netxlite.NewUnwrappedDNSOverUDPTransport(netxlite.DefaultDialer, "8.8.8.8:53"))
|
|
testresolverquick(t, reso)
|
|
testresolverquickidna(t, reso)
|
|
}
|
|
|
|
func TestNewResolverUDPDomain(t *testing.T) {
|
|
reso := netxlite.NewUnwrappedSerialResolver(
|
|
netxlite.NewUnwrappedDNSOverUDPTransport(netxlite.DefaultDialer, "dns.google.com:53"))
|
|
testresolverquick(t, reso)
|
|
testresolverquickidna(t, reso)
|
|
}
|
|
|
|
func TestNewResolverTCPAddress(t *testing.T) {
|
|
reso := netxlite.NewUnwrappedSerialResolver(
|
|
netxlite.NewUnwrappedDNSOverTCPTransport(new(net.Dialer).DialContext, "8.8.8.8:53"))
|
|
testresolverquick(t, reso)
|
|
testresolverquickidna(t, reso)
|
|
}
|
|
|
|
func TestNewResolverTCPDomain(t *testing.T) {
|
|
reso := netxlite.NewUnwrappedSerialResolver(
|
|
netxlite.NewUnwrappedDNSOverTCPTransport(new(net.Dialer).DialContext, "dns.google.com:53"))
|
|
testresolverquick(t, reso)
|
|
testresolverquickidna(t, reso)
|
|
}
|
|
|
|
func TestNewResolverDoTAddress(t *testing.T) {
|
|
reso := netxlite.NewUnwrappedSerialResolver(
|
|
netxlite.NewUnwrappedDNSOverTLSTransport(new(tls.Dialer).DialContext, "8.8.8.8:853"))
|
|
testresolverquick(t, reso)
|
|
testresolverquickidna(t, reso)
|
|
}
|
|
|
|
func TestNewResolverDoTDomain(t *testing.T) {
|
|
reso := netxlite.NewUnwrappedSerialResolver(
|
|
netxlite.NewUnwrappedDNSOverTLSTransport(new(tls.Dialer).DialContext, "dns.google.com:853"))
|
|
testresolverquick(t, reso)
|
|
testresolverquickidna(t, reso)
|
|
}
|
|
|
|
func TestNewResolverDoH(t *testing.T) {
|
|
reso := netxlite.NewUnwrappedSerialResolver(
|
|
netxlite.NewUnwrappedDNSOverHTTPSTransport(http.DefaultClient, "https://cloudflare-dns.com/dns-query"))
|
|
testresolverquick(t, reso)
|
|
testresolverquickidna(t, reso)
|
|
}
|