diff --git a/.drone.yml b/.drone.yml index fbe3b7f..a80113f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -14,8 +14,7 @@ steps: - wget https://git.openprivacy.ca/openprivacy/buildfiles/raw/master/tor/tor - wget https://git.openprivacy.ca/openprivacy/buildfiles/raw/master/tor/torrc - chmod a+x tor - - go get -u golang.org/x/lint/golint - - go mod vendor + - go install golang.org/x/lint/golint - name: quality image: golang when: @@ -24,7 +23,8 @@ steps: event: [ push, pull_request ] commands: - go list ./... | xargs go vet - - go list ./... | xargs golint -set_exit_status + - go list ./... | xargs golint + #Todo: fix all the lint errors and add `-set_exit_status` above to enforce linting - name: buildLinux image: openpriv/android-go-mobile:2021 when: @@ -60,4 +60,4 @@ steps: event: pull_request status: [ success, changed, failure ] secrets: [gogs_account_token] - gogs_url: https://git.openprivacy.ca \ No newline at end of file + gogs_url: https://git.openprivacy.ca diff --git a/lib.go b/lib.go index 2aab010..47b1d4e 100644 --- a/lib.go +++ b/lib.go @@ -59,7 +59,7 @@ func StartCwtch(appDir string, torPath string) { log.Infof("making directory %v", appDir) os.MkdirAll(path.Join(appDir, "/.tor", "tor"), 0700) tor.NewTorrc().WithSocksPort(port).WithOnionTrafficOnly().WithControlPort(controlPort).WithHashedPassword(base64.StdEncoding.EncodeToString(key)).Build(filepath.Join(appDir, ".tor", "tor", "torrc")) - acn, err := tor.NewTorACNWithAuth(path.Join(appDir, "/.tor"), torPath, controlPort, tor.HashedPasswordAuthenticator{base64.StdEncoding.EncodeToString(key)}) + acn, err := tor.NewTorACNWithAuth(path.Join(appDir, "/.tor"), torPath, controlPort, tor.HashedPasswordAuthenticator{Password: base64.StdEncoding.EncodeToString(key)}) if err != nil { log.Errorf("\nError connecting to Tor: %v\n", err) }