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.)
85 lines
1.9 KiB
Go
85 lines
1.9 KiB
Go
package tunnel
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"net"
|
|
"net/url"
|
|
"path/filepath"
|
|
"time"
|
|
|
|
"github.com/ooni/psiphon/tunnel-core/ClientLibrary/clientlib"
|
|
)
|
|
|
|
// psiphonTunnel is a psiphon tunnel
|
|
type psiphonTunnel struct {
|
|
// bootstrapTime is the bootstrapTime of the bootstrap
|
|
bootstrapTime time.Duration
|
|
|
|
// tunnel is the underlying psiphon tunnel
|
|
tunnel *clientlib.PsiphonTunnel
|
|
}
|
|
|
|
// psiphonMakeWorkingDir creates the working directory
|
|
func psiphonMakeWorkingDir(config *Config) (string, error) {
|
|
workdir := filepath.Join(config.TunnelDir, config.Name)
|
|
if err := config.mkdirAll(workdir, 0700); err != nil {
|
|
return "", err
|
|
}
|
|
return workdir, nil
|
|
}
|
|
|
|
// psiphonStart starts the psiphon tunnel.
|
|
func psiphonStart(ctx context.Context, config *Config) (Tunnel, DebugInfo, error) {
|
|
debugInfo := DebugInfo{
|
|
LogFilePath: "",
|
|
Name: "psiphon",
|
|
Version: "",
|
|
}
|
|
select {
|
|
case <-ctx.Done():
|
|
return nil, debugInfo, ctx.Err() // simplifies unit testing this code
|
|
default:
|
|
}
|
|
if config.TunnelDir == "" {
|
|
return nil, debugInfo, ErrEmptyTunnelDir
|
|
}
|
|
configJSON, err := config.Session.FetchPsiphonConfig(ctx)
|
|
if err != nil {
|
|
return nil, debugInfo, err
|
|
}
|
|
workdir, err := psiphonMakeWorkingDir(config)
|
|
if err != nil {
|
|
return nil, debugInfo, err
|
|
}
|
|
start := time.Now()
|
|
tunnel, err := config.startPsiphon(ctx, configJSON, workdir)
|
|
if err != nil {
|
|
return nil, debugInfo, err
|
|
}
|
|
stop := time.Now()
|
|
return &psiphonTunnel{
|
|
tunnel: tunnel,
|
|
bootstrapTime: stop.Sub(start),
|
|
}, debugInfo, nil
|
|
}
|
|
|
|
// Stop is an idempotent method that shuts down the tunnel
|
|
func (t *psiphonTunnel) Stop() {
|
|
t.tunnel.Stop()
|
|
}
|
|
|
|
// SOCKS5ProxyURL returns the SOCKS5 proxy URL.
|
|
func (t *psiphonTunnel) SOCKS5ProxyURL() *url.URL {
|
|
return &url.URL{
|
|
Scheme: "socks5",
|
|
Host: net.JoinHostPort(
|
|
"127.0.0.1", fmt.Sprintf("%d", t.tunnel.SOCKSProxyPort)),
|
|
}
|
|
}
|
|
|
|
// BootstrapTime returns the bootstrap time
|
|
func (t *psiphonTunnel) BootstrapTime() time.Duration {
|
|
return t.bootstrapTime
|
|
}
|