2ef5fb503a
* fix(webconnectivity): allow measuring https://1.1.1.1 There were two issues preventing us from doing so: 1. in netx, the address resolver was too later in the resolver chain. Therefore, its result wasn't added to the events. 2. when building the DNSCache (in httpget.go), we didn't consider the case where the input is an address. We need to treat this case specially to make sure there is no DNSCache. See https://github.com/ooni/probe/issues/1376. * fix: add unit tests for code making the dnscache * fix(netx): make sure all tests pass * chore: bump webconnectivity version
61 lines
1.5 KiB
Go
61 lines
1.5 KiB
Go
package webconnectivity
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"net/url"
|
|
"sort"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/model"
|
|
)
|
|
|
|
// DNSLookupConfig contains settings for the DNS lookup.
|
|
type DNSLookupConfig struct {
|
|
Session model.ExperimentSession
|
|
URL *url.URL
|
|
}
|
|
|
|
// DNSLookupResult contains the result of the DNS lookup.
|
|
type DNSLookupResult struct {
|
|
Addrs map[string]int64
|
|
Failure *string
|
|
TestKeys urlgetter.TestKeys
|
|
}
|
|
|
|
// DNSLookup performs the DNS lookup part of Web Connectivity.
|
|
func DNSLookup(ctx context.Context, config DNSLookupConfig) (out DNSLookupResult) {
|
|
target := fmt.Sprintf("dnslookup://%s", config.URL.Hostname())
|
|
config.Session.Logger().Infof("%s...", target)
|
|
result, err := urlgetter.Getter{Session: config.Session, Target: target}.Get(ctx)
|
|
out.Addrs = make(map[string]int64)
|
|
for _, query := range result.Queries {
|
|
for _, answer := range query.Answers {
|
|
if answer.IPv4 != "" {
|
|
out.Addrs[answer.IPv4] = answer.ASN
|
|
continue
|
|
}
|
|
if answer.IPv6 != "" {
|
|
out.Addrs[answer.IPv6] = answer.ASN
|
|
continue
|
|
}
|
|
}
|
|
}
|
|
config.Session.Logger().Infof("%s... %+v", target, err)
|
|
out.Failure = result.Failure
|
|
out.TestKeys = result
|
|
return
|
|
}
|
|
|
|
// Addresses returns the IP addresses in the DNSLookupResult
|
|
func (r DNSLookupResult) Addresses() (out []string) {
|
|
out = []string{}
|
|
for addr := range r.Addrs {
|
|
out = append(out, addr)
|
|
}
|
|
sort.Slice(out, func(i, j int) bool {
|
|
return out[i] < out[j]
|
|
})
|
|
return
|
|
}
|