31e478b04e
* fix(pkg.go.dev): import a subpackage containing the assets We're trying to fix this issue that pkg.go.dev does not build. Thanks to @hellais for this very neat idea! Let's keep our fingers crossed and see whether it fixes! * feat: use embedded geoip databases Closes https://github.com/ooni/probe/issues/1372. Work done as part of https://github.com/ooni/probe/issues/1369. * fix(assetsx): add tests * feat: simplify and just vendor uncompressed DBs * remove tests that seems not necessary anymore * fix: run go mod tidy * Address https://github.com/ooni/probe-cli/pull/260/files#r605181364 * rewrite a test in a better way * fix: gently cleanup the legacy assetsdir Do not remove the whole directory with brute force. Just zap the files whose name we know. Then attempt to delete the legacy directory as well. If not empty, just fail. This is fine because it means the user has stored other files inside the directory. * fix: create .miniooni if missing
130 lines
3.8 KiB
Go
130 lines
3.8 KiB
Go
package urlgetter
|
|
|
|
import (
|
|
"context"
|
|
"net/url"
|
|
"path/filepath"
|
|
"time"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/engine/internal/tunnel"
|
|
"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"
|
|
)
|
|
|
|
// 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
|
|
}
|
|
|
|
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 != "" {
|
|
tun, err := tunnel.Start(ctx, tunnel.Config{
|
|
Name: g.Config.Tunnel,
|
|
Session: g.Session,
|
|
WorkDir: filepath.Join(g.Session.TempDir(), "urlgetter-tunnel"),
|
|
})
|
|
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)
|
|
}
|