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
70 lines
1.6 KiB
Go
70 lines
1.6 KiB
Go
package tunnel_test
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"testing"
|
|
|
|
"github.com/apex/log"
|
|
"github.com/ooni/probe-cli/v3/internal/engine"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/tunnel"
|
|
)
|
|
|
|
func TestPsiphonStartWithCancelledContext(t *testing.T) {
|
|
// TODO(bassosimone): this test can use a mockable session so we
|
|
// can move it inside of the internal tests.
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
cancel() // fail immediately
|
|
sess, err := engine.NewSession(ctx, engine.SessionConfig{
|
|
Logger: log.Log,
|
|
SoftwareName: "miniooni",
|
|
SoftwareVersion: "0.1.0-dev",
|
|
TunnelDir: "testdata",
|
|
})
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
tunnel, err := tunnel.Start(ctx, &tunnel.Config{
|
|
Name: "psiphon",
|
|
Session: sess,
|
|
TunnelDir: "testdata",
|
|
})
|
|
if !errors.Is(err, context.Canceled) {
|
|
t.Fatal("not the error we expected")
|
|
}
|
|
if tunnel != nil {
|
|
t.Fatal("expected nil tunnel here")
|
|
}
|
|
}
|
|
|
|
func TestPsiphonStartStop(t *testing.T) {
|
|
if testing.Short() {
|
|
t.Skip("skip test in short mode")
|
|
}
|
|
ctx := context.Background()
|
|
sess, err := engine.NewSession(ctx, engine.SessionConfig{
|
|
Logger: log.Log,
|
|
SoftwareName: "ooniprobe-engine",
|
|
SoftwareVersion: "0.0.1",
|
|
TunnelDir: "testdata",
|
|
})
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
tunnel, err := tunnel.Start(context.Background(), &tunnel.Config{
|
|
Name: "psiphon",
|
|
Session: sess,
|
|
TunnelDir: "testdata",
|
|
})
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if tunnel.SOCKS5ProxyURL() == nil {
|
|
t.Fatal("expected non nil URL here")
|
|
}
|
|
if tunnel.BootstrapTime() <= 0 {
|
|
t.Fatal("expected positive bootstrap time here")
|
|
}
|
|
tunnel.Stop()
|
|
}
|