openprivacy
/
connectivity
3
0
Fork 2
Code Issues 1 Pull Requests 1 Releases 35 Wiki Activity

Fix errorAcn reference issues + add support for Tor specific shared library path
continuous-integration/drone/pr Build is passing Details

This commit is contained in:
Sarah Jamie Lewis 2023-05-24 11:06:34 -07:00
parent 1162cf4168
commit 380fd1834a
3 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -4,4 +4,6 @@ tor/tor/
vendor/ vendor/
*.cover.out *.cover.out
tmp/ tmp/
testing/tor/* testing/tor/*
tor/data-dir*
testing/data-dir*

20
error_acn.go
View File

@ -15,11 +15,11 @@ type ErrorACN struct {
versionCallbackCache func(string) versionCallbackCache func(string)
} }
func (e ErrorACN) GetStatusCallback() func(int, string) { func (e *ErrorACN) GetStatusCallback() func(int, string) {
return e.statusCallbackCache return e.statusCallbackCache
} }
func (e ErrorACN) GetVersionCallback() func(string) { func (e *ErrorACN) GetVersionCallback() func(string) {
return e.versionCallbackCache return e.versionCallbackCache
} }
@ -27,11 +27,11 @@ func (e *ErrorACN) GetInfo(addr string) (map[string]string, error) {
return nil, errors.New(acnError) return nil, errors.New(acnError)
} }
func (e ErrorACN) GetBootstrapStatus() (int, string) { func (e *ErrorACN) GetBootstrapStatus() (int, string) {
return -1, acnError return -1, acnError
} }
func (e ErrorACN) WaitTillBootstrapped() error { func (e *ErrorACN) WaitTillBootstrapped() error {
return errors.New(acnError) return errors.New(acnError)
} }
@ -43,24 +43,24 @@ func (e *ErrorACN) SetVersionCallback(callback func(string)) {
e.versionCallbackCache = callback e.versionCallbackCache = callback
} }
func (e ErrorACN) Restart() { func (e *ErrorACN) Restart() {
} }
func (e ErrorACN) Open(hostname string) (net.Conn, string, error) { func (e *ErrorACN) Open(hostname string) (net.Conn, string, error) {
return nil, "", fmt.Errorf(acnError) return nil, "", fmt.Errorf(acnError)
} }
func (e ErrorACN) Listen(identity PrivateKey, port int) (ListenService, error) { func (e *ErrorACN) Listen(identity PrivateKey, port int) (ListenService, error) {
return nil, fmt.Errorf(acnError) return nil, fmt.Errorf(acnError)
} }
func (e ErrorACN) GetPID() (int, error) { func (e *ErrorACN) GetPID() (int, error) {
return -1, fmt.Errorf(acnError) return -1, fmt.Errorf(acnError)
} }
func (e ErrorACN) GetVersion() string { func (e *ErrorACN) GetVersion() string {
return acnError return acnError
} }
func (e ErrorACN) Close() { func (e *ErrorACN) Close() {
} }

11
tor/torProvider.go
View File

@ -442,10 +442,19 @@ func newHideCmd(exePath string) process.Creator {
loggerDebug := &logWriter{log.LevelDebug} loggerDebug := &logWriter{log.LevelDebug}
loggerError := &logWriter{log.LevelError} loggerError := &logWriter{log.LevelError}
cmd := exec.CommandContext(ctx, exePath, args...) cmd := exec.CommandContext(ctx, exePath, args...)
cmd.Stdout = loggerDebug cmd.Stdout = loggerDebug
cmd.Stderr = loggerError cmd.Stderr = loggerError
cmd.SysProcAttr = sysProcAttr cmd.SysProcAttr = sysProcAttr
// override tor ld_library_path if requested
torLdLibPath,exists := os.LookupEnv("TOR_LD_LIBRARY_PATH")
if exists {
ldLibPath := fmt.Sprintf("LD_LIBRARY_PATH=%v", torLdLibPath)
cmd.Env = append([]string{ldLibPath},os.Environ()...)
}
return cmd, nil return cmd, nil
}) })
} }
@ -656,4 +665,4 @@ func dialControlPort(port int) (*control.Conn, error) {
return nil, err return nil, err
} }
return control.NewConn(textConn), nil return control.NewConn(textConn), nil
} }