c/ooni-probe-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(i/t/tor.go): show correct command line (#673)

Browse Source 
While there, ensure that we print a warning if we cannot find
the correct tor binary.

Work part of https://github.com/ooni/probe/issues/1917.
This commit is contained in:
Simone Basso 2022-01-25 20:43:27 +01:00 committed by GitHub
parent 2a566f2046
commit 4d50dd6d54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/tunnel/config.go
View File

@ -35,7 +35,7 @@ type Config struct {
// Logger is the optional logger to use. If empty we use a default // Logger is the optional logger to use. If empty we use a default
// implementation that does not emit any output. // implementation that does not emit any output.
Logger model.InfoLogger Logger model.Logger
// TorArgs contains the optional arguments that you want us to pass // TorArgs contains the optional arguments that you want us to pass
// to the tor binary when invoking it. By default we do not // to the tor binary when invoking it. By default we do not
@ -76,7 +76,7 @@ type Config struct {
} }
// logger returns the logger to use. // logger returns the logger to use.
func (c *Config) logger() model.InfoLogger { func (c *Config) logger() model.Logger {
if c.Logger != nil { if c.Logger != nil {
return c.Logger return c.Logger
} }

1
internal/tunnel/tor.go
View File

@ -72,7 +72,6 @@ func torStart(ctx context.Context, config *Config) (Tunnel, error) {
extraArgs = append(extraArgs, "notice stderr") extraArgs = append(extraArgs, "notice stderr")
extraArgs = append(extraArgs, "Log") extraArgs = append(extraArgs, "Log")
extraArgs = append(extraArgs, fmt.Sprintf(`notice file %s`, logfile)) extraArgs = append(extraArgs, fmt.Sprintf(`notice file %s`, logfile))
config.logger().Infof("tunnel: tor: exec params: %s %+v", stateDir, extraArgs)
torStartConf, err := getTorStartConf(config, stateDir, extraArgs) torStartConf, err := getTorStartConf(config, stateDir, extraArgs)
if err != nil { if err != nil {
return nil, err return nil, err

10
internal/tunnel/tordesktop.go
View File

@ -4,16 +4,22 @@ package tunnel
// This file implements our strategy for running tor on desktop. // This file implements our strategy for running tor on desktop.
import "github.com/cretz/bine/tor" import (
"strings"
"github.com/cretz/bine/tor"
)
// getTorStartConf in this configuration uses torExePath to get a // getTorStartConf in this configuration uses torExePath to get a
// suitable tor binary and then executes it. // suitable tor binary and then executes it.
func getTorStartConf(config *Config, dataDir string, extraArgs []string) (*tor.StartConf, error) { func getTorStartConf(config *Config, dataDir string, extraArgs []string) (*tor.StartConf, error) {
exePath, err := config.torBinary() exePath, err := config.torBinary()
if err != nil { if err != nil {
config.logger().Warnf("cannot find tor binary: %s", err.Error())
return nil, err return nil, err
} }
config.logger().Infof("tunnel: tor: exec binary: %s", exePath) config.logger().Infof("tunnel: tor: exec: %s %s %s", exePath,
dataDir, strings.Join(extraArgs, " "))
return &tor.StartConf{ return &tor.StartConf{
ExePath: exePath, ExePath: exePath,
DataDir: dataDir, DataDir: dataDir,

5
internal/tunnel/tormobile.go
View File

@ -5,13 +5,16 @@ package tunnel
// This file implements our strategy for running tor on mobile. // This file implements our strategy for running tor on mobile.
import ( import (
"strings"
"github.com/cretz/bine/tor" "github.com/cretz/bine/tor"
"github.com/ooni/go-libtor" "github.com/ooni/go-libtor"
) )
// getTorStartConf in this configuration uses github.com/ooni/go-libtor. // getTorStartConf in this configuration uses github.com/ooni/go-libtor.
func getTorStartConf(config *Config, dataDir string, extraArgs []string) (*tor.StartConf, error) { func getTorStartConf(config *Config, dataDir string, extraArgs []string) (*tor.StartConf, error) {
config.logger().Info("tunnel: tor: using ooni/go-libtor") config.logger().Infof("tunnel: tor: exec: <ooni/go-libtor> %s %s",
dataDir, strings.Join(extraArgs, " "))
return &tor.StartConf{ return &tor.StartConf{
ProcessCreator: libtor.Creator, ProcessCreator: libtor.Creator,
DataDir: dataDir, DataDir: dataDir,