dan
/
ricochet-go
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cli: Add -tor-control and -connect flags

This commit is contained in:
John Brooks 2016-11-05 22:19:13 -06:00
parent 1be58828fe
commit 4fa48bfa8f
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ricochet-cli/main.go
View File

@ -23,7 +23,10 @@ var (
backendServer string backendServer string
unsafeBackend bool unsafeBackend bool
backendMode bool backendMode bool
connectAuto bool
configPath string = "identity.ricochet" configPath string = "identity.ricochet"
torAddress string
torPassword string
) )
func main() { func main() {
@ -41,6 +44,9 @@ func main() {
flag.StringVar(&backendServer, "listen", "", "Listen on `<address>` for client frontend connections") flag.StringVar(&backendServer, "listen", "", "Listen on `<address>` for client frontend connections")
flag.BoolVar(&unsafeBackend, "allow-unsafe-backend", false, "Allow a remote backend address. This is NOT RECOMMENDED and may harm your security or privacy. Do not use without a secure, trusted link") flag.BoolVar(&unsafeBackend, "allow-unsafe-backend", false, "Allow a remote backend address. This is NOT RECOMMENDED and may harm your security or privacy. Do not use without a secure, trusted link")
flag.BoolVar(&backendMode, "only-backend", false, "Run backend without any commandline UI") flag.BoolVar(&backendMode, "only-backend", false, "Run backend without any commandline UI")
flag.BoolVar(&connectAuto, "connect", true, "Start connecting to the network automatically")
flag.StringVar(&torAddress, "tor-control", "", "Use the tor control port at `<address>`, which may be 'host:port' or 'unix:/path'")
flag.StringVar(&torPassword, "tor-control-password", "", "Use `<password>` to authenticate to the tor control port")
flag.Parse() flag.Parse()
if len(flag.Args()) > 1 { if len(flag.Args()) > 1 {
flag.Usage() flag.Usage()
@ -60,6 +66,9 @@ func main() {
} else if configPath != "identity.ricochet" { } else if configPath != "identity.ricochet" {
fmt.Printf("Cannot use -identity with -attach, because identity is stored at the backend\n") fmt.Printf("Cannot use -identity with -attach, because identity is stored at the backend\n")
os.Exit(1) os.Exit(1)
} else if torAddress != "" || torPassword != "" {
fmt.Printf("Cannot use -tor-control with -attach, because tor connections happen on the backend\n")
os.Exit(1)
} }
} }
@ -176,6 +185,13 @@ func startBackend() error {
return err return err
} }
if torAddress != "" {
core.Network.SetControlAddress(torAddress)
}
if torPassword != "" {
core.Network.SetControlPassword(torPassword)
}
var listener net.Listener var listener net.Listener
if backendServer == "" { if backendServer == "" {
// In-process backend, using 'InnerNet' as a fake socket // In-process backend, using 'InnerNet' as a fake socket
@ -209,5 +225,11 @@ func startBackend() error {
} }
}() }()
if connectAuto {
go func() {
core.Network.Start()
}()
}
return nil return nil
} }