Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable sudo on agent.connect() when MUTAGEN_USE_SUDO environment var set to 1 #505

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Enable sudo on agent.connect() when MUTAGEN_USE_SUDO environment var set to 1 #505

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion pkg/agent/dial.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"errors"
"fmt"
"io"
"os"
"strings"
"time"
"unicode/utf8"
Expand All @@ -26,6 +27,10 @@ const (
// agentErrorInMemoryCutoff is the maximum number of bytes that Mutagen will
// capture in memory from the standard error output of an agent process.
agentErrorInMemoryCutoff = 32 * 1024

// notExistsFlag will be returns to signal the agent does not exist
// and so should be installed
notInstalledFlag string = "Agent not installed"
)

// connect connects to an agent-based endpoint using the specified transport,
Expand Down Expand Up @@ -65,8 +70,14 @@ func connect(logger *logging.Logger, transport Transport, mode, prompter string,
BaseName,
}, pathSeparator)

// Add sudo if environment variable says to add sudo
var sudo string
if os.Getenv("MUTAGEN_USE_SUDO") == "1" {
sudo = fmt.Sprintf("test ! -f '%s' && printf '%s' >&2 || sudo ", agentInvocationPath, notInstalledFlag)
}

// Compute the command to invoke.
command := fmt.Sprintf("%s %s --%s=%s", agentInvocationPath, mode, FlagLogLevel, logger.Level())
command := fmt.Sprintf("%s%s %s --%s=%s", sudo, agentInvocationPath, mode, FlagLogLevel, logger.Level())

// Set up (but do not start) an agent process.
message := "Connecting to agent (POSIX)..."
Expand Down Expand Up @@ -134,6 +145,12 @@ func connect(logger *logging.Logger, transport Transport, mode, prompter string,
// whitespace (primarily trailing newlines), and neutralize any control
// characters.
errorOutput := errorBuffer.String()

if errorOutput == notInstalledFlag {
// true=TryInstall
return nil, true, cmdExe, errors.New("agent not installed")
}

if !utf8.ValidString(errorOutput) {
return nil, false, false, errors.New("remote did not return UTF-8 output")
}
Expand Down