c31591f298
This is the extension of https://github.com/ooni/probe-cli/pull/431, and my final deliverable for GSoC 2021. The diff introduces: 1) The new `testhelper` which supports testing multiple IP endpoints per domain and introduces HTTP/3 control measurements. The specification of the `testhelper` can be found at https://github.com/ooni/spec/pull/219. The `testhelper` algorithm consists of three main steps: * `InitialChecks` verifies that the input URL can be parsed, has an expected scheme, and contains a valid domain name. * `Explore` enumerates all the URLs that it discovers by redirection from the original URL, or by detecting h3 support at the target host. * `Generate` performs a step-by-step measurement of each discovered URL. 2) A prototype of the corresponding new experiment `websteps` which uses the control measurement of the `testhelper` to know which URLs to measure, and what to expect. The prototype does not yet have: * unit and integration tests, * an analysis tool to compare the control and the probe measurement. This PR is my final deliverable as it is the outcome of the trials, considerations and efforts of my GSoC weeks at OONI. It fully integrates HTTP/3 (QUIC) support which has been only used in the `urlgetter` experiment until now. Related issues: https://github.com/ooni/probe/issues/1729 and https://github.com/ooni/probe/issues/1733.
39 lines
1.1 KiB
Go
39 lines
1.1 KiB
Go
package websteps
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/engine/httpx"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/model"
|
|
"github.com/ooni/probe-cli/v3/internal/errorsx"
|
|
)
|
|
|
|
// CtrlRequest is the request sent by the probe
|
|
type CtrlRequest struct {
|
|
HTTPRequest string `json:"url"`
|
|
HTTPRequestHeaders map[string][]string `json:"headers"`
|
|
Addrs []string `json:"addrs"`
|
|
}
|
|
|
|
// ControlResponse is the response from the control service.
|
|
type ControlResponse struct {
|
|
URLMeasurements []*URLMeasurement `json:"urls"`
|
|
}
|
|
|
|
// Control performs the control request and returns the response.
|
|
func Control(
|
|
ctx context.Context, sess model.ExperimentSession,
|
|
thAddr string, creq CtrlRequest) (out ControlResponse, err error) {
|
|
clnt := httpx.Client{
|
|
BaseURL: thAddr,
|
|
HTTPClient: sess.DefaultHTTPClient(),
|
|
Logger: sess.Logger(),
|
|
}
|
|
// make sure error is wrapped
|
|
err = errorsx.SafeErrWrapperBuilder{
|
|
Error: clnt.PostJSON(ctx, "/", creq, &out),
|
|
Operation: errorsx.TopLevelOperation,
|
|
}.MaybeBuild()
|
|
return
|
|
}
|