58adb68b2c
* refactor: move tracex outside of engine/netx Consistently with https://github.com/ooni/probe/issues/2121 and https://github.com/ooni/probe/issues/2115, we can now move tracex outside of engine/netx. The main reason why this makes sense now is that the package is now changed significantly from the one that we imported from ooni/probe-engine. We have improved its implementation, which had not been touched significantly for quite some time, and converted it to unit testing. I will document tomorrow some extra work I'd like to do with this package but likely could not do $soon. * go fmt * regen tutorials
72 lines
2.0 KiB
Go
72 lines
2.0 KiB
Go
package webconnectivity
|
|
|
|
import (
|
|
"context"
|
|
"sync"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/engine/experiment/webconnectivity"
|
|
"github.com/ooni/probe-cli/v3/internal/model"
|
|
"github.com/ooni/probe-cli/v3/internal/netxlite"
|
|
"github.com/ooni/probe-cli/v3/internal/tracex"
|
|
)
|
|
|
|
// newfailure is a convenience shortcut to save typing
|
|
var newfailure = tracex.NewFailure
|
|
|
|
// CtrlDNSResult is the result of the DNS check performed by
|
|
// the Web Connectivity test helper.
|
|
type CtrlDNSResult = webconnectivity.ControlDNSResult
|
|
|
|
// DNSConfig configures the DNS check.
|
|
type DNSConfig struct {
|
|
Domain string
|
|
Out chan CtrlDNSResult
|
|
Resolver model.Resolver
|
|
Wg *sync.WaitGroup
|
|
}
|
|
|
|
// DNSDo performs the DNS check.
|
|
func DNSDo(ctx context.Context, config *DNSConfig) {
|
|
defer config.Wg.Done()
|
|
addrs, err := config.Resolver.LookupHost(ctx, config.Domain)
|
|
if addrs == nil {
|
|
addrs = []string{} // fix: the old test helper did that
|
|
}
|
|
failure := dnsMapFailure(newfailure(err))
|
|
config.Out <- CtrlDNSResult{Failure: failure, Addrs: addrs}
|
|
}
|
|
|
|
// dnsMapFailure attempts to map netxlite failures to the strings
|
|
// used by the original OONI test helper.
|
|
//
|
|
// See https://github.com/ooni/backend/blob/6ec4fda5b18/oonib/testhelpers/http_helpers.py#L430
|
|
func dnsMapFailure(failure *string) *string {
|
|
switch failure {
|
|
case nil:
|
|
return nil
|
|
default:
|
|
switch *failure {
|
|
case netxlite.FailureDNSNXDOMAINError:
|
|
// We have a name for this string because dnsanalysis.go is
|
|
// already checking for this specific error string.
|
|
s := webconnectivity.DNSNameError
|
|
return &s
|
|
case netxlite.FailureDNSNoAnswer:
|
|
// In this case the legacy TH would produce an empty
|
|
// reply that is not attached to any error.
|
|
//
|
|
// See https://github.com/ooni/probe/issues/1707#issuecomment-944322725
|
|
return nil
|
|
case netxlite.FailureDNSNonRecoverableFailure,
|
|
netxlite.FailureDNSRefusedError,
|
|
netxlite.FailureDNSServerMisbehaving,
|
|
netxlite.FailureDNSTemporaryFailure:
|
|
s := "dns_server_failure"
|
|
return &s
|
|
default:
|
|
s := "unknown_error"
|
|
return &s
|
|
}
|
|
}
|
|
}
|