85664f1e31
This diff contains significant improvements over the previous implementation of the torsf experiment. We add support for configuring different rendezvous methods after the convo at https://github.com/ooni/probe/issues/2004. In doing that, I've tried to use a terminology that is consistent with the names being actually used by tor developers. In terms of what to do next, this diff basically instruments torsf to always rendezvous using domain fronting. Yet, it's also possible to change the rendezvous method from the command line, when using miniooni, which allows to experiment a bit more. In the same vein, by default we use a persistent tor datadir, but it's also possible to use a temporary datadir using the cmdline. Here's how a generic invocation of `torsf` looks like: ```bash ./miniooni -O DisablePersistentDatadir=true \ -O RendezvousMethod=amp \ -O DisableProgress=true \ torsf ``` (The default is `DisablePersistentDatadir=false` and `RendezvousMethod=domain_fronting`.) With this implementation, we can start measuring whether snowflake and tor together can boostrap, which seems the most important thing to focus on at the beginning. Understanding why the bootstrap most often does not converge with a temporary datadir on Android devices remains instead an open problem for now. (I'll also update the relevant issues or create new issues after commit this.) We also address some methodology improvements that were proposed in https://github.com/ooni/probe/issues/1686. Namely: 1. we record the tor version; 2. we include the bootstrap percentage by reading the logs; 3. we set the anomaly key correctly; 4. we measure the bytes send and received (by `tor` not by `snowflake`, since doing it for snowflake seems more complex at this stage). What remains to be done is the possibility of including Snowflake events into the measurement, which is not possible until the new improvements at common/event in snowflake.git are included into a tagged version of snowflake itself. (I'll make sure to mention this aspect to @cohosh in https://github.com/ooni/probe/issues/2004.)
341 lines
11 KiB
Go
341 lines
11 KiB
Go
package engine
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"errors"
|
|
"net/http"
|
|
"os"
|
|
"runtime"
|
|
"time"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/bytecounter"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/geolocate"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/netx/httptransport"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/probeservices"
|
|
"github.com/ooni/probe-cli/v3/internal/model"
|
|
"github.com/ooni/probe-cli/v3/internal/version"
|
|
)
|
|
|
|
const dateFormat = "2006-01-02 15:04:05"
|
|
|
|
func formatTimeNowUTC() string {
|
|
return time.Now().UTC().Format(dateFormat)
|
|
}
|
|
|
|
// Experiment is an experiment instance.
|
|
type Experiment struct {
|
|
byteCounter *bytecounter.Counter
|
|
callbacks model.ExperimentCallbacks
|
|
measurer model.ExperimentMeasurer
|
|
report probeservices.ReportChannel
|
|
session *Session
|
|
testName string
|
|
testStartTime string
|
|
testVersion string
|
|
}
|
|
|
|
// NewExperiment creates a new experiment given a measurer. The preferred
|
|
// way to create an experiment is the ExperimentBuilder. Though this function
|
|
// allows the programmer to create a custom, external experiment.
|
|
func NewExperiment(sess *Session, measurer model.ExperimentMeasurer) *Experiment {
|
|
return &Experiment{
|
|
byteCounter: bytecounter.New(),
|
|
callbacks: model.NewPrinterCallbacks(sess.Logger()),
|
|
measurer: measurer,
|
|
session: sess,
|
|
testName: measurer.ExperimentName(),
|
|
testStartTime: formatTimeNowUTC(),
|
|
testVersion: measurer.ExperimentVersion(),
|
|
}
|
|
}
|
|
|
|
// KibiBytesReceived accounts for the KibiBytes received by the HTTP clients
|
|
// managed by this session so far, including experiments.
|
|
func (e *Experiment) KibiBytesReceived() float64 {
|
|
return e.byteCounter.KibiBytesReceived()
|
|
}
|
|
|
|
// KibiBytesSent is like KibiBytesReceived but for the bytes sent.
|
|
func (e *Experiment) KibiBytesSent() float64 {
|
|
return e.byteCounter.KibiBytesSent()
|
|
}
|
|
|
|
// Name returns the experiment name.
|
|
func (e *Experiment) Name() string {
|
|
return e.testName
|
|
}
|
|
|
|
// GetSummaryKeys returns a data structure containing a
|
|
// summary of the test keys for probe-cli.
|
|
func (e *Experiment) GetSummaryKeys(m *model.Measurement) (interface{}, error) {
|
|
return e.measurer.GetSummaryKeys(m)
|
|
}
|
|
|
|
// OpenReport is an idempotent method to open a report. We assume that
|
|
// you have configured the available probe services, either manually or
|
|
// through using the session's MaybeLookupBackends method.
|
|
func (e *Experiment) OpenReport() (err error) {
|
|
return e.OpenReportContext(context.Background())
|
|
}
|
|
|
|
// ReportID returns the open reportID, if we have opened a report
|
|
// successfully before, or an empty string, otherwise.
|
|
func (e *Experiment) ReportID() string {
|
|
if e.report == nil {
|
|
return ""
|
|
}
|
|
return e.report.ReportID()
|
|
}
|
|
|
|
// Measure performs a measurement with input. We assume that you have
|
|
// configured the available test helpers, either manually or by calling
|
|
// the session's MaybeLookupBackends() method.
|
|
//
|
|
// Return value: strictly either a non-nil measurement and
|
|
// a nil error or a nil measurement and a non-nil error.
|
|
//
|
|
// CAVEAT: while this API is perfectly fine for experiments that
|
|
// return a single measurement, it will only return the first measurement
|
|
// when used with an asynchronous experiment. We plan on eventually
|
|
// migrating all experiments to run in asynchronous fashion.
|
|
//
|
|
// Deprecated: use MeasureWithContext instead, please.
|
|
func (e *Experiment) Measure(input string) (*model.Measurement, error) {
|
|
return e.MeasureWithContext(context.Background(), input)
|
|
}
|
|
|
|
// experimentAsyncWrapper makes a sync experiment behave like it was async
|
|
type experimentAsyncWrapper struct {
|
|
*Experiment
|
|
}
|
|
|
|
var _ model.ExperimentMeasurerAsync = &experimentAsyncWrapper{}
|
|
|
|
// RunAsync implements ExperimentMeasurerAsync.RunAsync.
|
|
func (eaw *experimentAsyncWrapper) RunAsync(
|
|
ctx context.Context, sess model.ExperimentSession, input string,
|
|
callbacks model.ExperimentCallbacks) (<-chan *model.ExperimentAsyncTestKeys, error) {
|
|
out := make(chan *model.ExperimentAsyncTestKeys)
|
|
measurement := eaw.Experiment.newMeasurement(input)
|
|
start := time.Now()
|
|
err := eaw.Experiment.measurer.Run(ctx, eaw.session, measurement, eaw.callbacks)
|
|
stop := time.Now()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
go func() {
|
|
defer close(out) // signal the reader we're done!
|
|
out <- &model.ExperimentAsyncTestKeys{
|
|
Extensions: measurement.Extensions,
|
|
Input: measurement.Input,
|
|
MeasurementRuntime: stop.Sub(start).Seconds(),
|
|
TestKeys: measurement.TestKeys,
|
|
}
|
|
}()
|
|
return out, nil
|
|
}
|
|
|
|
// MeasureAsync runs an async measurement. This operation could post
|
|
// one or more measurements onto the returned channel. We'll close the
|
|
// channel when we've emitted all the measurements.
|
|
//
|
|
// Arguments:
|
|
//
|
|
// - ctx is the context for deadline/cancellation/timeout;
|
|
//
|
|
// - input is the input (typically a URL but it could also be
|
|
// just an endpoint or an empty string for input-less experiments
|
|
// such as, e.g., ndt7 and dash).
|
|
//
|
|
// Return value:
|
|
//
|
|
// - on success, channel where to post measurements (the channel
|
|
// will be closed when done) and nil error;
|
|
//
|
|
// - on failure, nil channel and non-nil error.
|
|
func (e *Experiment) MeasureAsync(
|
|
ctx context.Context, input string) (<-chan *model.Measurement, error) {
|
|
err := e.session.MaybeLookupLocationContext(ctx) // this already tracks session bytes
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
ctx = bytecounter.WithSessionByteCounter(ctx, e.session.byteCounter)
|
|
ctx = bytecounter.WithExperimentByteCounter(ctx, e.byteCounter)
|
|
var async model.ExperimentMeasurerAsync
|
|
if v, okay := e.measurer.(model.ExperimentMeasurerAsync); okay {
|
|
async = v
|
|
} else {
|
|
async = &experimentAsyncWrapper{e}
|
|
}
|
|
in, err := async.RunAsync(ctx, e.session, input, e.callbacks)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
out := make(chan *model.Measurement)
|
|
go func() {
|
|
defer close(out) // we need to signal the consumer we're done
|
|
for tk := range in {
|
|
measurement := e.newMeasurement(input)
|
|
measurement.Extensions = tk.Extensions
|
|
measurement.Input = tk.Input
|
|
measurement.MeasurementRuntime = tk.MeasurementRuntime
|
|
measurement.TestKeys = tk.TestKeys
|
|
if err := measurement.Scrub(e.session.ProbeIP()); err != nil {
|
|
// If we fail to scrub the measurement then we are not going to
|
|
// submit it. Most likely causes of error here are unlikely,
|
|
// e.g., the TestKeys being not serializable.
|
|
e.session.Logger().Warnf("can't scrub measurement: %s", err.Error())
|
|
continue
|
|
}
|
|
out <- measurement
|
|
}
|
|
}()
|
|
return out, nil
|
|
}
|
|
|
|
// MeasureWithContext is like Measure but with context.
|
|
//
|
|
// Return value: strictly either a non-nil measurement and
|
|
// a nil error or a nil measurement and a non-nil error.
|
|
//
|
|
// CAVEAT: while this API is perfectly fine for experiments that
|
|
// return a single measurement, it will only return the first measurement
|
|
// when used with an asynchronous experiment. We plan on eventually
|
|
// migrating all experiments to run in asynchronous fashion.
|
|
func (e *Experiment) MeasureWithContext(
|
|
ctx context.Context, input string,
|
|
) (measurement *model.Measurement, err error) {
|
|
out, err := e.MeasureAsync(ctx, input)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
for m := range out {
|
|
if measurement == nil {
|
|
measurement = m // as documented just return the first one
|
|
}
|
|
}
|
|
if measurement == nil {
|
|
err = errors.New("experiment returned no measurements")
|
|
}
|
|
return
|
|
}
|
|
|
|
// SaveMeasurement saves a measurement on the specified file path.
|
|
func (e *Experiment) SaveMeasurement(measurement *model.Measurement, filePath string) error {
|
|
return e.saveMeasurement(
|
|
measurement, filePath, json.Marshal, os.OpenFile,
|
|
func(fp *os.File, b []byte) (int, error) {
|
|
return fp.Write(b)
|
|
},
|
|
)
|
|
}
|
|
|
|
// SubmitAndUpdateMeasurement submits a measurement and updates the
|
|
// fields whose value has changed as part of the submission.
|
|
func (e *Experiment) SubmitAndUpdateMeasurement(measurement *model.Measurement) error {
|
|
return e.SubmitAndUpdateMeasurementContext(context.Background(), measurement)
|
|
}
|
|
|
|
// SubmitAndUpdateMeasurementContext submits a measurement and updates the
|
|
// fields whose value has changed as part of the submission.
|
|
func (e *Experiment) SubmitAndUpdateMeasurementContext(
|
|
ctx context.Context, measurement *model.Measurement) error {
|
|
if e.report == nil {
|
|
return errors.New("report is not open")
|
|
}
|
|
return e.report.SubmitMeasurement(ctx, measurement)
|
|
}
|
|
|
|
// newMeasurement creates a new measurement for this experiment with the given input.
|
|
func (e *Experiment) newMeasurement(input string) *model.Measurement {
|
|
utctimenow := time.Now().UTC()
|
|
m := &model.Measurement{
|
|
DataFormatVersion: probeservices.DefaultDataFormatVersion,
|
|
Input: model.MeasurementTarget(input),
|
|
MeasurementStartTime: utctimenow.Format(dateFormat),
|
|
MeasurementStartTimeSaved: utctimenow,
|
|
ProbeIP: geolocate.DefaultProbeIP,
|
|
ProbeASN: e.session.ProbeASNString(),
|
|
ProbeCC: e.session.ProbeCC(),
|
|
ProbeNetworkName: e.session.ProbeNetworkName(),
|
|
ReportID: e.ReportID(),
|
|
ResolverASN: e.session.ResolverASNString(),
|
|
ResolverIP: e.session.ResolverIP(),
|
|
ResolverNetworkName: e.session.ResolverNetworkName(),
|
|
SoftwareName: e.session.SoftwareName(),
|
|
SoftwareVersion: e.session.SoftwareVersion(),
|
|
TestName: e.testName,
|
|
TestStartTime: e.testStartTime,
|
|
TestVersion: e.testVersion,
|
|
}
|
|
m.AddAnnotation("engine_name", "ooniprobe-engine")
|
|
m.AddAnnotation("engine_version", version.Version)
|
|
m.AddAnnotation("platform", e.session.Platform())
|
|
m.AddAnnotation("architecture", runtime.GOARCH)
|
|
return m
|
|
}
|
|
|
|
// OpenReportContext will open a report using the given context
|
|
// to possibly limit the lifetime of this operation.
|
|
func (e *Experiment) OpenReportContext(ctx context.Context) error {
|
|
if e.report != nil {
|
|
return nil // already open
|
|
}
|
|
// use custom client to have proper byte accounting
|
|
httpClient := &http.Client{
|
|
Transport: &httptransport.ByteCountingTransport{
|
|
HTTPTransport: e.session.httpDefaultTransport, // proxy is OK
|
|
Counter: e.byteCounter,
|
|
},
|
|
}
|
|
client, err := e.session.NewProbeServicesClient(ctx)
|
|
if err != nil {
|
|
e.session.logger.Debugf("%+v", err)
|
|
return err
|
|
}
|
|
client.HTTPClient = httpClient // patch HTTP client to use
|
|
template := e.newReportTemplate()
|
|
e.report, err = client.OpenReport(ctx, template)
|
|
if err != nil {
|
|
e.session.logger.Debugf("experiment: probe services error: %s", err.Error())
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (e *Experiment) newReportTemplate() probeservices.ReportTemplate {
|
|
return probeservices.ReportTemplate{
|
|
DataFormatVersion: probeservices.DefaultDataFormatVersion,
|
|
Format: probeservices.DefaultFormat,
|
|
ProbeASN: e.session.ProbeASNString(),
|
|
ProbeCC: e.session.ProbeCC(),
|
|
SoftwareName: e.session.SoftwareName(),
|
|
SoftwareVersion: e.session.SoftwareVersion(),
|
|
TestName: e.testName,
|
|
TestStartTime: e.testStartTime,
|
|
TestVersion: e.testVersion,
|
|
}
|
|
}
|
|
|
|
func (e *Experiment) saveMeasurement(
|
|
measurement *model.Measurement, filePath string,
|
|
marshal func(v interface{}) ([]byte, error),
|
|
openFile func(name string, flag int, perm os.FileMode) (*os.File, error),
|
|
write func(fp *os.File, b []byte) (n int, err error),
|
|
) error {
|
|
data, err := marshal(measurement)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
data = append(data, byte('\n'))
|
|
filep, err := openFile(filePath, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0600)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if _, err := write(filep, data); err != nil {
|
|
return err
|
|
}
|
|
return filep.Close()
|
|
}
|