39cb5959c9
* fix(model/archival.go): more optional keys Basically, `t0` and `transaction_id` should be optional. Version 0.4.x of web_connectivity should not include them, version 0.5.x should. There is a technical reason why v0.4.x should not include them. The code it is based on, tracex, does not record these two fields. Whereas, v0.5.x, uses measurexlite, which records these two fields. Part of https://github.com/ooni/probe/issues/2238 * fix(webconnectivity@v0.5): add more fields This diff adds the following fields to webconnectivity@v0.5: 1. agent, always set to "redirect" (legacy field); 2. client_resolver, properly initialized w/ the resolver's IPv4 address; 3. retries, legacy field always set to null; 4. socksproxy, legacy field always set to null. Part of https://github.com/ooni/probe/issues/2238 * fix(webconnectivity@v0.5): register extensions The general idea behind this field is that we would be able in the future to tweak the data model for some fields, by declaring we're using a later version, so it seems useful to add it. See https://github.com/ooni/probe/issues/2238 * fix(measurexlite): use tcp or quic for tls handshake network This diff fixes a bug where measurexlite was using "tls" as the protocol for the TLS handshake when using TCP. While this choice _could_ make sense, the rest of the code we have written so far uses "tcp" instead. Using "tcp" makes more sense because it allows you to search for the same endpoint across different events by checking for the same network and for the same endpoint rather than special casing TLS handshakes for using "tls" when the endpoint is "tcp". See https://github.com/ooni/probe/issues/2238 * chore: run alltests.yml for "alltestsbuild" branches Part of https://github.com/ooni/probe/issues/2238
149 lines
3.7 KiB
Go
149 lines
3.7 KiB
Go
package webconnectivity
|
|
|
|
//
|
|
// Measurer
|
|
//
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"net/http/cookiejar"
|
|
"sync"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/atomicx"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/experiment/webconnectivity"
|
|
"github.com/ooni/probe-cli/v3/internal/model"
|
|
"golang.org/x/net/publicsuffix"
|
|
)
|
|
|
|
// Measurer for the web_connectivity experiment.
|
|
type Measurer struct {
|
|
// Contains the experiment's config.
|
|
Config *Config
|
|
}
|
|
|
|
// NewExperimentMeasurer creates a new model.ExperimentMeasurer.
|
|
func NewExperimentMeasurer(config *Config) model.ExperimentMeasurer {
|
|
return &Measurer{
|
|
Config: config,
|
|
}
|
|
}
|
|
|
|
// ExperimentName implements model.ExperimentMeasurer.
|
|
func (m *Measurer) ExperimentName() string {
|
|
return "web_connectivity"
|
|
}
|
|
|
|
// ExperimentVersion implements model.ExperimentMeasurer.
|
|
func (m *Measurer) ExperimentVersion() string {
|
|
return "0.5.4"
|
|
}
|
|
|
|
// Run implements model.ExperimentMeasurer.
|
|
func (m *Measurer) Run(ctx context.Context, sess model.ExperimentSession,
|
|
measurement *model.Measurement, callbacks model.ExperimentCallbacks) error {
|
|
// Reminder: when this function returns an error, the measurement result
|
|
// WILL NOT be submitted to the OONI backend. You SHOULD only return an error
|
|
// for fundamental errors (e.g., the input is invalid or missing).
|
|
|
|
// honour InputOrQueryBackend
|
|
input := measurement.Input
|
|
if input == "" {
|
|
return errors.New("no input provided")
|
|
}
|
|
|
|
// convert the input string to a URL
|
|
inputParser := &InputParser{
|
|
AcceptedSchemes: []string{
|
|
"http",
|
|
"https",
|
|
},
|
|
AllowEndpoints: false,
|
|
DefaultScheme: "",
|
|
}
|
|
URL, err := inputParser.Parse(string(measurement.Input))
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// initialize the experiment's test keys
|
|
tk := NewTestKeys()
|
|
measurement.TestKeys = tk
|
|
|
|
// create variables required to run parallel tasks
|
|
idGenerator := &atomicx.Int64{}
|
|
wg := &sync.WaitGroup{}
|
|
|
|
// create cookiejar
|
|
jar, err := cookiejar.New(&cookiejar.Options{
|
|
PublicSuffixList: publicsuffix.List,
|
|
})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// obtain the test helper's address
|
|
testhelpers, _ := sess.GetTestHelpersByName("web-connectivity")
|
|
var thAddr string
|
|
for _, th := range testhelpers {
|
|
if th.Type == "https" {
|
|
thAddr = th.Address
|
|
measurement.TestHelpers = map[string]any{
|
|
"backend": &th,
|
|
}
|
|
break
|
|
}
|
|
}
|
|
if thAddr == "" {
|
|
sess.Logger().Warnf("continuing without a valid TH address")
|
|
tk.SetControlFailure(webconnectivity.ErrNoAvailableTestHelpers)
|
|
}
|
|
|
|
registerExtensions(measurement)
|
|
|
|
// start background tasks
|
|
resos := &DNSResolvers{
|
|
DNSCache: NewDNSCache(),
|
|
Domain: URL.Hostname(),
|
|
IDGenerator: idGenerator,
|
|
Logger: sess.Logger(),
|
|
TestKeys: tk,
|
|
URL: URL,
|
|
ZeroTime: measurement.MeasurementStartTimeSaved,
|
|
WaitGroup: wg,
|
|
CookieJar: jar,
|
|
Referer: "",
|
|
Session: sess,
|
|
THAddr: thAddr,
|
|
UDPAddress: "",
|
|
}
|
|
resos.Start(ctx)
|
|
|
|
// wait for background tasks to join
|
|
wg.Wait()
|
|
|
|
// If the context passed to us has been cancelled, we cannot
|
|
// trust this experiment's results to be okay.
|
|
if err := ctx.Err(); err != nil {
|
|
return err
|
|
}
|
|
|
|
// perform any deferred computation on the test keys
|
|
tk.Finalize(sess.Logger())
|
|
|
|
// return whether there was a fundamental failure, which would prevent
|
|
// the measurement from being submitted to the OONI collector.
|
|
return tk.fundamentalFailure
|
|
}
|
|
|
|
// registerExtensions registers the extensions used by this
|
|
// experiment into the given measurement.
|
|
func registerExtensions(m *model.Measurement) {
|
|
model.ArchivalExtHTTP.AddTo(m)
|
|
model.ArchivalExtDNS.AddTo(m)
|
|
model.ArchivalExtNetevents.AddTo(m)
|
|
model.ArchivalExtTCPConnect.AddTo(m)
|
|
model.ArchivalExtTLSHandshake.AddTo(m)
|
|
model.ArchivalExtTunnel.AddTo(m)
|
|
}
|