refactor(sessionresolver): adapt to changing network conditions (#238)
* feat(sessionresolver): try many and use what works * fix(sessionresolver): make sure we can use quic * fix: the config struct is unnecessary * fix: make kvstore optional * feat: write simple integration test * feat: start adding tests * feat: continue writing tests * fix(sessionresolver): add more unit tests * fix(sessionresolver): finish adding tests * refactor(sessionresolver): changes after code review
This commit is contained in:
Simone Basso
GitHub
parent
12e1164940
commit
034db78f94
19 changed files with 1260 additions and 66 deletions
|
|
@ -1,31 +1,249 @@
|
|||
package sessionresolver_test
|
||||
package sessionresolver
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"net"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/ooni/probe-cli/v3/internal/engine/internal/sessionresolver"
|
||||
"github.com/ooni/probe-cli/v3/internal/engine/netx"
|
||||
"github.com/google/go-cmp/cmp"
|
||||
"github.com/ooni/probe-cli/v3/internal/engine/internal/multierror"
|
||||
)
|
||||
|
||||
func TestFallbackWorks(t *testing.T) {
|
||||
reso := sessionresolver.New(netx.Config{})
|
||||
defer reso.CloseIdleConnections()
|
||||
func TestNetworkWorks(t *testing.T) {
|
||||
reso := &Resolver{}
|
||||
if reso.Network() != "sessionresolver" {
|
||||
t.Fatal("unexpected Network")
|
||||
t.Fatal("unexpected value returned by Network")
|
||||
}
|
||||
}
|
||||
|
||||
func TestAddressWorks(t *testing.T) {
|
||||
reso := &Resolver{}
|
||||
if reso.Address() != "" {
|
||||
t.Fatal("unexpected Address")
|
||||
t.Fatal("unexpected value returned by Address")
|
||||
}
|
||||
addrs, err := reso.LookupHost(context.Background(), "antani.ooni.nu")
|
||||
if err == nil || !strings.HasSuffix(err.Error(), "no such host") {
|
||||
t.Fatal("not the error we expected")
|
||||
}
|
||||
|
||||
func TestTypicalUsageWithFailure(t *testing.T) {
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
cancel() // fail immediately
|
||||
reso := &Resolver{}
|
||||
addrs, err := reso.LookupHost(ctx, "ooni.org")
|
||||
if !errors.Is(err, ErrLookupHost) {
|
||||
t.Fatal("not the error we expected", err)
|
||||
}
|
||||
var me *multierror.Union
|
||||
if !errors.As(err, &me) {
|
||||
t.Fatal("cannot convert error")
|
||||
}
|
||||
for _, child := range me.Children {
|
||||
// net.DNSError does not include the underlying error
|
||||
// but just a string representing the error. This
|
||||
// means that we need to go down hunting what's the
|
||||
// real error that occurred and use more verbose code.
|
||||
{
|
||||
var errWrapper *errwrapper
|
||||
if !errors.As(child, &errWrapper) {
|
||||
t.Fatal("not an instance of errwrapper")
|
||||
}
|
||||
var dnsError *net.DNSError
|
||||
if errors.As(errWrapper.error, &dnsError) {
|
||||
if !strings.HasSuffix(dnsError.Err, "operation was canceled") {
|
||||
t.Fatal("not the error we expected", dnsError.Err)
|
||||
}
|
||||
continue
|
||||
}
|
||||
}
|
||||
// otherwise just unwrap and check whether it's
|
||||
// a real context.Canceled error.
|
||||
if !errors.Is(child, context.Canceled) {
|
||||
t.Fatal("unexpected sub-error", child)
|
||||
}
|
||||
}
|
||||
if addrs != nil {
|
||||
t.Fatal("expected nil here")
|
||||
}
|
||||
if len(reso.res) < 1 {
|
||||
t.Fatal("expected to see some resolvers here")
|
||||
}
|
||||
if reso.Stats() == "" {
|
||||
t.Fatal("expected to see some string returned by stats")
|
||||
}
|
||||
reso.CloseIdleConnections()
|
||||
if len(reso.res) != 0 {
|
||||
t.Fatal("expected to see no resolvers after CloseIdleConnections")
|
||||
}
|
||||
}
|
||||
|
||||
func TestTypicalUsageWithSuccess(t *testing.T) {
|
||||
expected := []string{"8.8.8.8", "8.8.4.4"}
|
||||
ctx := context.Background()
|
||||
reso := &Resolver{
|
||||
dnsClientMaker: &fakeDNSClientMaker{
|
||||
reso: &FakeResolver{Data: expected},
|
||||
},
|
||||
}
|
||||
addrs, err := reso.LookupHost(ctx, "dns.google")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if diff := cmp.Diff(expected, addrs); diff != "" {
|
||||
t.Fatal(diff)
|
||||
}
|
||||
}
|
||||
|
||||
func TestLittleLLookupHostWithInvalidURL(t *testing.T) {
|
||||
reso := &Resolver{}
|
||||
ctx := context.Background()
|
||||
ri := &resolverinfo{URL: "\t\t\t", Score: 0.99}
|
||||
addrs, err := reso.lookupHost(ctx, ri, "ooni.org")
|
||||
if err == nil || !strings.HasSuffix(err.Error(), "invalid control character in URL") {
|
||||
t.Fatal("not the error we expected", err)
|
||||
}
|
||||
if addrs != nil {
|
||||
t.Fatal("expected nil addrs here")
|
||||
}
|
||||
if reso.PrimaryFailure.Load() != 1 || reso.FallbackFailure.Load() != 1 {
|
||||
t.Fatal("not the counters we expected to see here")
|
||||
if ri.Score != 0 {
|
||||
t.Fatal("unexpected ri.Score", ri.Score)
|
||||
}
|
||||
}
|
||||
|
||||
func TestLittleLLookupHostWithSuccess(t *testing.T) {
|
||||
expected := []string{"8.8.8.8", "8.8.4.4"}
|
||||
reso := &Resolver{
|
||||
dnsClientMaker: &fakeDNSClientMaker{
|
||||
reso: &FakeResolver{Data: expected},
|
||||
},
|
||||
}
|
||||
ctx := context.Background()
|
||||
ri := &resolverinfo{URL: "dot://dns-nonexistent.ooni.org", Score: 0.1}
|
||||
addrs, err := reso.lookupHost(ctx, ri, "dns.google")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if diff := cmp.Diff(expected, addrs); diff != "" {
|
||||
t.Fatal(diff)
|
||||
}
|
||||
if ri.Score < 0.88 || ri.Score > 0.92 {
|
||||
t.Fatal("unexpected score", ri.Score)
|
||||
}
|
||||
}
|
||||
|
||||
func TestLittleLLookupHostWithFailure(t *testing.T) {
|
||||
errMocked := errors.New("mocked error")
|
||||
reso := &Resolver{
|
||||
dnsClientMaker: &fakeDNSClientMaker{
|
||||
reso: &FakeResolver{Err: errMocked},
|
||||
},
|
||||
}
|
||||
ctx := context.Background()
|
||||
ri := &resolverinfo{URL: "dot://dns-nonexistent.ooni.org", Score: 0.95}
|
||||
addrs, err := reso.lookupHost(ctx, ri, "dns.google")
|
||||
if !errors.Is(err, errMocked) {
|
||||
t.Fatal("not the error we expected", err)
|
||||
}
|
||||
if addrs != nil {
|
||||
t.Fatal("expected nil addrs here")
|
||||
}
|
||||
if ri.Score < 0.094 || ri.Score > 0.096 {
|
||||
t.Fatal("unexpected score", ri.Score)
|
||||
}
|
||||
}
|
||||
|
||||
func TestMaybeConfusionNoConfusion(t *testing.T) {
|
||||
reso := &Resolver{}
|
||||
rv := reso.maybeConfusion(nil, 0)
|
||||
if rv != -1 {
|
||||
t.Fatal("unexpected return value", rv)
|
||||
}
|
||||
}
|
||||
|
||||
func TestMaybeConfusionNoArray(t *testing.T) {
|
||||
reso := &Resolver{}
|
||||
rv := reso.maybeConfusion(nil, 11)
|
||||
if rv != 0 {
|
||||
t.Fatal("unexpected return value", rv)
|
||||
}
|
||||
}
|
||||
|
||||
func TestMaybeConfusionSingleEntry(t *testing.T) {
|
||||
reso := &Resolver{}
|
||||
state := []*resolverinfo{{}}
|
||||
rv := reso.maybeConfusion(state, 11)
|
||||
if rv != 0 {
|
||||
t.Fatal("unexpected return value", rv)
|
||||
}
|
||||
}
|
||||
|
||||
func TestMaybeConfusionTwoEntries(t *testing.T) {
|
||||
reso := &Resolver{}
|
||||
state := []*resolverinfo{{
|
||||
Score: 0.8,
|
||||
URL: "https://dns.google/dns-query",
|
||||
}, {
|
||||
Score: 0.4,
|
||||
URL: "http3://dns.google/dns-query",
|
||||
}}
|
||||
rv := reso.maybeConfusion(state, 11)
|
||||
if rv != 2 {
|
||||
t.Fatal("unexpected return value", rv)
|
||||
}
|
||||
if state[0].Score != 0.4 {
|
||||
t.Fatal("unexpected state[0].Score")
|
||||
}
|
||||
if state[0].URL != "http3://dns.google/dns-query" {
|
||||
t.Fatal("unexpected state[0].URL")
|
||||
}
|
||||
if state[1].Score != 0.8 {
|
||||
t.Fatal("unexpected state[1].Score")
|
||||
}
|
||||
if state[1].URL != "https://dns.google/dns-query" {
|
||||
t.Fatal("unexpected state[1].URL")
|
||||
}
|
||||
}
|
||||
|
||||
func TestMaybeConfusionManyEntries(t *testing.T) {
|
||||
reso := &Resolver{}
|
||||
state := []*resolverinfo{{
|
||||
Score: 0.8,
|
||||
URL: "https://dns.google/dns-query",
|
||||
}, {
|
||||
Score: 0.4,
|
||||
URL: "http3://dns.google/dns-query",
|
||||
}, {
|
||||
Score: 0.1,
|
||||
URL: "system:///",
|
||||
}, {
|
||||
Score: 0.01,
|
||||
URL: "dot://dns.google",
|
||||
}}
|
||||
rv := reso.maybeConfusion(state, 11)
|
||||
if rv != 3 {
|
||||
t.Fatal("unexpected return value", rv)
|
||||
}
|
||||
if state[0].Score != 0.1 {
|
||||
t.Fatal("unexpected state[0].Score")
|
||||
}
|
||||
if state[0].URL != "system:///" {
|
||||
t.Fatal("unexpected state[0].URL")
|
||||
}
|
||||
if state[1].Score != 0.4 {
|
||||
t.Fatal("unexpected state[1].Score")
|
||||
}
|
||||
if state[1].URL != "http3://dns.google/dns-query" {
|
||||
t.Fatal("unexpected state[1].URL")
|
||||
}
|
||||
if state[2].Score != 0.8 {
|
||||
t.Fatal("unexpected state[2].Score")
|
||||
}
|
||||
if state[2].URL != "https://dns.google/dns-query" {
|
||||
t.Fatal("unexpected state[2].URL")
|
||||
}
|
||||
if state[3].Score != 0.01 {
|
||||
t.Fatal("unexpected state[3].Score")
|
||||
}
|
||||
if state[3].URL != "dot://dns.google" {
|
||||
t.Fatal("unexpected state[3].URL")
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue