c5ad5eedeb
* feat: create tunnel inside NewSession We want to create the tunnel when we create the session. This change allows us to nicely ignore the problem of creating a tunnel when we already have a proxy, as well as the problem of locking. Everything is happening, in fact, inside of the NewSession factory. Modify miniooni such that --tunnel is just syntactic sugar for --proxy, at least for now. We want, in the future, to teach the tunnel to possibly use a socks5 proxy. Because starting a tunnel is a slow operation, we need a context in NewSession. This causes a bunch of places to change. Not really a big deal except we need to propagate the changes. Make sure that the mobile code can create a new session using a proxy for all the APIs we support. Make sure all tests are still green and we don't loose coverage of the various ways in which this code could be used. This change is part of https://github.com/ooni/probe/issues/985. * changes after merge * fix: only keep tests that can hopefully work While there, identify other places where we should add more tests or fix integration tests. Part of https://github.com/ooni/probe/issues/985
155 lines
4.5 KiB
Go
155 lines
4.5 KiB
Go
package urlgetter
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"net/url"
|
|
"path/filepath"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/engine/model"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/netx/archival"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/netx/errorx"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/netx/trace"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/tunnel"
|
|
)
|
|
|
|
// The Getter gets the specified target in the context of the
|
|
// given session and with the specified config.
|
|
//
|
|
// Other OONI experiment should use the Getter to factor code when
|
|
// the Getter implements the operations they wanna perform.
|
|
type Getter struct {
|
|
// Begin is the time when the experiment begun. If you do not
|
|
// set this field, every target is measured independently.
|
|
Begin time.Time
|
|
|
|
// Config contains settings for this run. If not set, then
|
|
// we will use the default config.
|
|
Config Config
|
|
|
|
// Session is the session for this run. This field must
|
|
// be set otherwise the code will panic.
|
|
Session model.ExperimentSession
|
|
|
|
// Target is the thing to measure in this run. This field must
|
|
// be set otherwise the code won't know what to do.
|
|
Target string
|
|
}
|
|
|
|
// Get performs the action described by g using the given context
|
|
// and returning the test keys and eventually an error
|
|
func (g Getter) Get(ctx context.Context) (TestKeys, error) {
|
|
if g.Config.Timeout > 0 {
|
|
var cancel context.CancelFunc
|
|
ctx, cancel = context.WithTimeout(ctx, g.Config.Timeout)
|
|
defer cancel()
|
|
}
|
|
if g.Begin.IsZero() {
|
|
g.Begin = time.Now()
|
|
}
|
|
saver := new(trace.Saver)
|
|
tk, err := g.get(ctx, saver)
|
|
// Make sure we have an operation in cases where we fail before
|
|
// hitting our httptransport that does error wrapping.
|
|
err = errorx.SafeErrWrapperBuilder{
|
|
Error: err,
|
|
Operation: errorx.TopLevelOperation,
|
|
}.MaybeBuild()
|
|
tk.FailedOperation = archival.NewFailedOperation(err)
|
|
tk.Failure = archival.NewFailure(err)
|
|
events := saver.Read()
|
|
tk.Queries = append(tk.Queries, archival.NewDNSQueriesList(g.Begin, events)...)
|
|
tk.NetworkEvents = append(
|
|
tk.NetworkEvents, archival.NewNetworkEventsList(g.Begin, events)...,
|
|
)
|
|
tk.Requests = append(
|
|
tk.Requests, archival.NewRequestList(g.Begin, events)...,
|
|
)
|
|
if len(tk.Requests) > 0 {
|
|
// OONI's convention is that the last request appears first
|
|
tk.HTTPResponseStatus = tk.Requests[0].Response.Code
|
|
tk.HTTPResponseBody = tk.Requests[0].Response.Body.Value
|
|
tk.HTTPResponseLocations = tk.Requests[0].Response.Locations
|
|
}
|
|
tk.TCPConnect = append(
|
|
tk.TCPConnect, archival.NewTCPConnectList(g.Begin, events)...,
|
|
)
|
|
tk.TLSHandshakes = append(
|
|
tk.TLSHandshakes, archival.NewTLSHandshakesList(g.Begin, events)...,
|
|
)
|
|
return tk, err
|
|
}
|
|
|
|
// TODO(bassosimone): this mechanism where we count breaks tests
|
|
// because now tests are not idempotent anymore. Therefore, we
|
|
// SHOULD be creating a temporary directory instead.
|
|
|
|
var (
|
|
// tunnelDirCount counts the number of tunnels started by
|
|
// the urlgetter package so far.
|
|
tunnelDirCount int64
|
|
|
|
// tunnelDirMu protects tunnelDirCount
|
|
tunnelDirMu sync.Mutex
|
|
)
|
|
|
|
func (g Getter) get(ctx context.Context, saver *trace.Saver) (TestKeys, error) {
|
|
tk := TestKeys{
|
|
Agent: "redirect",
|
|
Tunnel: g.Config.Tunnel,
|
|
}
|
|
if g.Config.DNSCache != "" {
|
|
tk.DNSCache = []string{g.Config.DNSCache}
|
|
}
|
|
if g.Config.NoFollowRedirects {
|
|
tk.Agent = "agent"
|
|
}
|
|
// start tunnel
|
|
var proxyURL *url.URL
|
|
if g.Config.Tunnel != "" {
|
|
// Every new instance of the tunnel goes into a separate
|
|
// directory within the temporary directory. Calling
|
|
// Session.Close will delete such a directory.
|
|
tunnelDirMu.Lock()
|
|
count := tunnelDirCount
|
|
tunnelDirCount++
|
|
tunnelDirMu.Unlock()
|
|
tun, err := tunnel.Start(ctx, &tunnel.Config{
|
|
Name: g.Config.Tunnel,
|
|
Session: g.Session,
|
|
TorArgs: g.Session.TorArgs(),
|
|
TorBinary: g.Session.TorBinary(),
|
|
TunnelDir: filepath.Join(
|
|
g.Session.TempDir(), fmt.Sprintf("urlgetter-tunnel-%d", count)),
|
|
})
|
|
if err != nil {
|
|
return tk, err
|
|
}
|
|
tk.BootstrapTime = tun.BootstrapTime().Seconds()
|
|
proxyURL = tun.SOCKS5ProxyURL()
|
|
tk.SOCKSProxy = proxyURL.String()
|
|
defer tun.Stop()
|
|
}
|
|
// create configuration
|
|
configurer := Configurer{
|
|
Config: g.Config,
|
|
Logger: g.Session.Logger(),
|
|
ProxyURL: proxyURL,
|
|
Saver: saver,
|
|
}
|
|
configuration, err := configurer.NewConfiguration()
|
|
if err != nil {
|
|
return tk, err
|
|
}
|
|
defer configuration.CloseIdleConnections()
|
|
// run the measurement
|
|
runner := Runner{
|
|
Config: g.Config,
|
|
HTTPConfig: configuration.HTTPConfig,
|
|
Target: g.Target,
|
|
}
|
|
return tk, runner.Run(ctx)
|
|
}
|