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

fix: use golang.org/x/sys/execabs (#224)

Browse Source 
Closes https://github.com/ooni/probe-engine/issues/1195
This commit is contained in:
Simone Basso
2021-02-10 07:40:48 +01:00
committed by GitHub
parent f53b3be66e
commit 18ca6d5f35
6 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/ooniprobe/internal/autorun/autorun_darwin.go
+4 -4
View File
@@ -6,7 +6,6 @@ import (
"fmt"
"io/ioutil"
"os"
"os/exec"
"strconv"
"strings"
"text/template"
@@ -14,6 +13,7 @@ import (
"github.com/apex/log"
"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/utils"
"github.com/ooni/probe-cli/v3/internal/engine/shellx"
"golang.org/x/sys/execabs"
"golang.org/x/sys/unix"
)
@@ -55,7 +55,7 @@ func runQuiteQuietly(name string, arg ...string) error {
}
func darwinVersionMajor() (int, error) {
out, err := exec.Command("uname", "-r").Output()
out, err := execabs.Command("uname", "-r").Output()
if err != nil {
return 0, err
}
@@ -129,7 +129,7 @@ func (m managerDarwin) Start() error {
}
func (managerDarwin) stop() error {
var failure *exec.ExitError
var failure *execabs.ExitError
err := runQuiteQuietly("launchctl", "bootout", serviceTarget)
if errors.As(err, &failure) && failure.ExitCode() == int(unix.ESRCH) {
err = nil
@@ -158,7 +158,7 @@ func (m managerDarwin) Stop() error {
func (m managerDarwin) Status() (string, error) {
err := runQuiteQuietly("launchctl", "kill", "SIGINFO", serviceTarget)
var failure *exec.ExitError
var failure *execabs.ExitError
if errors.As(err, &failure) {
switch failure.ExitCode() {
case int(unix.ESRCH):
cmd/ooniprobe/internal/utils/homedir/homedir.go
+8 -7
View File
@@ -6,12 +6,13 @@ import (
"bytes"
"errors"
"os"
"os/exec"
"path/filepath"
"runtime"
"strconv"
"strings"
"sync"
"golang.org/x/sys/execabs"
)
// DisableCache will disable caching of the home directory. Caching is enabled
@@ -103,7 +104,7 @@ func dirDarwin() (string, error) {
var stdout bytes.Buffer
// If that fails, try OS specific commands
cmd := exec.Command("sh", "-c", `dscl -q . -read /Users/"$(whoami)" NFSHomeDirectory | sed 's/^[^ ]*: //'`)
cmd := execabs.Command("sh", "-c", `dscl -q . -read /Users/"$(whoami)" NFSHomeDirectory | sed 's/^[^ ]*: //'`)
cmd.Stdout = &stdout
if err := cmd.Run(); err == nil {
result := strings.TrimSpace(stdout.String())
@@ -114,7 +115,7 @@ func dirDarwin() (string, error) {
// try the shell
stdout.Reset()
cmd = exec.Command("sh", "-c", "cd && pwd")
cmd = execabs.Command("sh", "-c", "cd && pwd")
cmd.Stdout = &stdout
if err := cmd.Run(); err == nil {
result := strings.TrimSpace(stdout.String())
@@ -125,7 +126,7 @@ func dirDarwin() (string, error) {
// try to figure out the user and check the default location
stdout.Reset()
cmd = exec.Command("whoami")
cmd = execabs.Command("whoami")
cmd.Stdout = &stdout
if err := cmd.Run(); err == nil {
user := strings.TrimSpace(stdout.String())
@@ -150,7 +151,7 @@ func dirUnix() (string, error) {
var stdout bytes.Buffer
// If that fails, try OS specific commands
cmd := exec.Command("getent", "passwd", strconv.Itoa(os.Getuid()))
cmd := execabs.Command("getent", "passwd", strconv.Itoa(os.Getuid()))
cmd.Stdout = &stdout
if err := cmd.Run(); err == nil {
if passwd := strings.TrimSpace(stdout.String()); passwd != "" {
@@ -164,7 +165,7 @@ func dirUnix() (string, error) {
// If all else fails, try the shell
stdout.Reset()
cmd = exec.Command("sh", "-c", "cd && pwd")
cmd = execabs.Command("sh", "-c", "cd && pwd")
cmd.Stdout = &stdout
if err := cmd.Run(); err == nil {
result := strings.TrimSpace(stdout.String())
@@ -175,7 +176,7 @@ func dirUnix() (string, error) {
// try to figure out the user and check the default location
stdout.Reset()
cmd = exec.Command("whoami")
cmd = execabs.Command("whoami")
cmd.Stdout = &stdout
if err := cmd.Run(); err == nil {
user := strings.TrimSpace(stdout.String())