fix(oohelperd): reduce errors to what the old TH would emit (#543)

Reducing the errors is not done in a perfect way.

We have documented the most striking differences inside
https://github.com/ooni/probe/issues/1707#issuecomment-942283746 and
some attempts to improve the situation further inside
https://github.com/ooni/probe/issues/1707#issuecomment-942341255.

A better strategy for the future would be to introduce more
specific timeout errors, such as dns_timeout_error, etc.

More testing may be needed to further validate and compare the
old and the new TH, but this requires Jafar improvements to
more precisely simulate more complex censorship.

internal/cmd/oohelperd/internal/webconnectivity/dns_test.go

@@ -0,0 +1,87 @@
+package webconnectivity
+
+import (
+	"context"
+	"sync"
+	"testing"
+
+	"github.com/google/go-cmp/cmp"
+	"github.com/ooni/probe-cli/v3/internal/engine/experiment/webconnectivity"
+	"github.com/ooni/probe-cli/v3/internal/netxlite"
+	"github.com/ooni/probe-cli/v3/internal/netxlite/mocks"
+)
+
+func stringPointerForString(s string) *string {
+	return &s
+}
+
+func Test_dnsMapFailure(t *testing.T) {
+	tests := []struct {
+		name    string
+		failure *string
+		want    *string
+	}{{
+		name:    "nil",
+		failure: nil,
+		want:    nil,
+	}, {
+		name:    "nxdomain",
+		failure: stringPointerForString(netxlite.FailureDNSNXDOMAINError),
+		want:    stringPointerForString(webconnectivity.DNSNameError),
+	}, {
+		name:    "no answer",
+		failure: stringPointerForString(netxlite.FailureDNSNoAnswer),
+		want:    stringPointerForString("dns_server_failure"),
+	}, {
+		name:    "non recoverable failure",
+		failure: stringPointerForString(netxlite.FailureDNSNonRecoverableFailure),
+		want:    stringPointerForString("dns_server_failure"),
+	}, {
+		name:    "refused",
+		failure: stringPointerForString(netxlite.FailureDNSRefusedError),
+		want:    stringPointerForString("dns_server_failure"),
+	}, {
+		name:    "server misbehaving",
+		failure: stringPointerForString(netxlite.FailureDNSServerMisbehaving),
+		want:    stringPointerForString("dns_server_failure"),
+	}, {
+		name:    "temporary failure",
+		failure: stringPointerForString(netxlite.FailureDNSTemporaryFailure),
+		want:    stringPointerForString("dns_server_failure"),
+	}, {
+		name:    "anything else",
+		failure: stringPointerForString(netxlite.FailureEOFError),
+		want:    stringPointerForString("unknown_error"),
+	}}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := dnsMapFailure(tt.failure)
+			if diff := cmp.Diff(tt.want, got); diff != "" {
+				t.Fatal(diff)
+			}
+		})
+	}
+}
+
+func TestDNSDo(t *testing.T) {
+	t.Run("returns non-nil addresses list on nxdomin", func(t *testing.T) {
+		ctx := context.Background()
+		config := &DNSConfig{
+			Domain: "antani.ooni.org",
+			Out:    make(chan webconnectivity.ControlDNSResult, 1),
+			Resolver: &mocks.Resolver{
+				MockLookupHost: func(ctx context.Context, domain string) ([]string, error) {
+					return nil, netxlite.ErrOODNSNoSuchHost
+				},
+			},
+			Wg: &sync.WaitGroup{},
+		}
+		config.Wg.Add(1)
+		DNSDo(ctx, config)
+		config.Wg.Wait()
+		resp := <-config.Out
+		if resp.Addrs == nil || len(resp.Addrs) != 0 {
+			t.Fatal("returned nil Addrs or Addrs containing replies")
+		}
+	})
+}