ba9151d4fa
This diff adds the prototype websteps implementation that used to live at https://github.com/ooni/probe-cli/pull/506. The code is reasonably good already and it's pointing to a roaming test helper that I've properly configured. You can run websteps with: ``` ./miniooni -n websteps ``` This will go over the test list for your country. At this stage the mechanics of the experiment is set, but we still need to have a conversation on the following topics: 1. whether we're okay with reusing the data format used by other OONI experiments, or we would like to use a more compact data format (which may either be a more compact JSON or we can choose to always submit compressed measurements for websteps); 2. the extent to which we would like to keep the measurement as a collection of "the experiment saw this" and "the test helper saw that" and let the pipeline choose an overall score: this is clearly an option, but there is also the opposite option to build a summary of the measurement on the probe. Compared to the previous prototype of websteps, the main architectural change we have here is that we are following the point of view of the probe and the test helper is much more dumb. Basically, the probe will choose which redirection to follow and ask the test helper every time it discovers a new URL to measure it w/o redirections. Reference issue: https://github.com/ooni/probe/issues/1733
95 lines
2.6 KiB
Go
95 lines
2.6 KiB
Go
// Command oohelper contains a simple command line
|
|
// client for the Web Connectivity test helper.
|
|
package main
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"flag"
|
|
"fmt"
|
|
"net/http"
|
|
|
|
"github.com/apex/log"
|
|
"github.com/ooni/probe-cli/v3/internal/cmd/oohelper/internal"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/experiment/webstepsx"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/netx"
|
|
"github.com/ooni/probe-cli/v3/internal/measurex"
|
|
"github.com/ooni/probe-cli/v3/internal/runtimex"
|
|
)
|
|
|
|
var (
|
|
ctx, cancel = context.WithCancel(context.Background())
|
|
debug = flag.Bool("debug", false, "Toggle debug mode")
|
|
httpClient *http.Client
|
|
resolver netx.Resolver
|
|
server = flag.String("server", "", "URL of the test helper")
|
|
target = flag.String("target", "", "Target URL for the test helper")
|
|
fwebsteps = flag.Bool("websteps", false, "Use the websteps TH")
|
|
)
|
|
|
|
func newhttpclient() *http.Client {
|
|
// Use a nonstandard resolver, which is enough to work around the
|
|
// puzzling https://github.com/ooni/probe/issues/1409 issue.
|
|
childResolver, err := netx.NewDNSClient(
|
|
netx.Config{Logger: log.Log}, "dot://8.8.8.8:853")
|
|
runtimex.PanicOnError(err, "netx.NewDNSClient should not fail here")
|
|
txp := netx.NewHTTPTransport(netx.Config{
|
|
BaseResolver: childResolver,
|
|
Logger: log.Log,
|
|
})
|
|
return &http.Client{Transport: txp}
|
|
}
|
|
|
|
func init() {
|
|
httpClient = newhttpclient()
|
|
resolver = netx.NewResolver(netx.Config{Logger: log.Log})
|
|
}
|
|
|
|
func main() {
|
|
defer cancel()
|
|
logmap := map[bool]log.Level{
|
|
true: log.DebugLevel,
|
|
false: log.InfoLevel,
|
|
}
|
|
flag.Parse()
|
|
log.SetLevel(logmap[*debug])
|
|
apimap := map[bool]func() interface{}{
|
|
false: wcth,
|
|
true: webstepsth,
|
|
}
|
|
cresp := apimap[*fwebsteps]()
|
|
data, err := json.MarshalIndent(cresp, "", " ")
|
|
runtimex.PanicOnError(err, "json.MarshalIndent failed")
|
|
fmt.Printf("%s\n", string(data))
|
|
}
|
|
|
|
func webstepsth() interface{} {
|
|
serverURL := *server
|
|
if serverURL == "" {
|
|
serverURL = "https://1.th.ooni.org/api/v1/websteps"
|
|
}
|
|
clnt := &webstepsx.THClient{
|
|
DNServers: []*measurex.ResolverInfo{{
|
|
Network: "udp",
|
|
Address: "8.8.4.4:53",
|
|
}},
|
|
HTTPClient: httpClient,
|
|
ServerURL: serverURL,
|
|
}
|
|
cresp, err := clnt.Run(ctx, *target)
|
|
runtimex.PanicOnError(err, "client.Run failed")
|
|
return cresp
|
|
}
|
|
|
|
func wcth() interface{} {
|
|
serverURL := *server
|
|
if serverURL == "" {
|
|
serverURL = "https://wcth.ooni.io/"
|
|
}
|
|
clnt := internal.OOClient{HTTPClient: httpClient, Resolver: resolver}
|
|
config := internal.OOConfig{TargetURL: *target, ServerURL: serverURL}
|
|
cresp, err := clnt.Do(ctx, config)
|
|
runtimex.PanicOnError(err, "client.Do failed")
|
|
return cresp
|
|
}
|