Working integration test for setting the default binary

Author: ddworken

README.md

@@ -164,6 +164,7 @@ GLOBAL OPTIONS:
    --set-default-user    Set the default SSH user to be used for kssh. Useful if you use ssh configs that do not set 
 					     a default SSH user 
    --clear-default-user  Clear the default SSH user
+   --set-keybase-binary  Run kssh with a specific keybase binary rather than resolving via $PATH 
 ```
 
 ## Architecture

src/cmd/kssh/kssh.go

@@ -103,6 +103,7 @@ var cliArguments = []kssh.CLIArgument{
 	{Name: "--clear-default-user", HasArgument: false},
 	{Name: "--help", HasArgument: false},
 	{Name: "-v", HasArgument: false, Preserve: true},
+	{Name: "--set-keybase-binary", HasArgument: true},
 }
 
 func generateHelpPage() string {
@@ -127,7 +128,8 @@ GLOBAL OPTIONS:
                          is using Keybase SSH CA
    --set-default-user    Set the default SSH user to be used for kssh. Useful if you use ssh configs that do not set 
 					     a default SSH user 
-   --clear-default-user  Clear the default SSH user`)
+   --clear-default-user  Clear the default SSH user
+   --set-keybase-binary  Run kssh with a specific keybase binary rather than resolving via $PATH `)
 }
 
 type Action int
@@ -188,6 +190,15 @@ func handleArgs(args []string) (string, []string, Action, error) {
 			fmt.Println("Cleared default bot, exiting...")
 			os.Exit(0)
 		}
+		if arg.Argument.Name == "--set-keybase-binary" {
+			err := kssh.SetKeybaseBinaryPath(arg.Value)
+			if err != nil {
+				fmt.Printf("Failed to set the keybase binary: %v\n", err)
+				os.Exit(1)
+			}
+			fmt.Println("Set keybase binary, exiting...")
+			os.Exit(0)
+		}
 		if arg.Argument.Name == "--provision" {
 			action = Provision
 		}

src/kssh/config.go

@@ -149,6 +149,17 @@ func GetDefaultSSHUser() (string, error) {
 	return lcf.DefaultSSHUser, nil
 }
 
+// Set the default SSH user to use for kssh connections.
+func SetKeybaseBinaryPath(path string) error {
+	lcf, err := getCurrentConfig()
+	if err != nil {
+		return err
+	}
+
+	lcf.KeybaseBinPath = path
+	return writeConfig(lcf)
+}
+
 // Set the default SSH user to use for kssh connections.
 func SetDefaultSSHUser(username string) error {
 	if strings.ContainsAny(username, " \t\n\r'\"") {

tests/Dockerfile-kssh

@@ -18,10 +18,13 @@ USER keybase
 # Install go
 USER root
 RUN add-apt-repository ppa:gophers/archive -y
-RUN apt-get update
-RUN apt-get install golang-1.11-go git sudo python3 python3-pip -y
+RUN apt-get update -y
+RUN apt-get install golang-1.11-go git sudo python3 python3-pip sudo -y
 RUN pip3 install pytest requests
-USER keybase
+
+# Make it so the keybase user has passwordless sudo so it can move the keybase binary around
+RUN echo "keybase ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/keybase && \
+    chmod 0440 /etc/sudoers.d/keybase
 
 # Install go dependencies (speeds up future builds)
 COPY --chown=keybase go.mod .

tests/tests/test_env_1.py

@@ -156,3 +156,15 @@ def test_kssh_default_user(self, test_config):
         assert_contains_hash(test_config.expected_hash, run_command_with_agent("bin/kssh -q -o StrictHostKeyChecking=no -J sshd-staging sshd-prod 'sha1sum /etc/unique'"))
         # Reset the default user
         run_command_with_agent("bin/kssh --clear-default-user")
+
+    def test_kssh_alternate_binary(self, test_config):
+        # Test it by creating another keybase binary earlier in the path and running kssh. This isn't a perfect test but it is
+        # enough to smoketest it
+        run_command("echo '#!/bin/bash' | sudo tee /usr/local/bin/keybase")
+        run_command("sudo chmod +x /usr/local/bin/keybase")
+        try:
+            run_command("bin/kssh --set-keybase-binary /usr/bin/keybase")
+            assert_contains_hash(test_config.expected_hash, run_command_with_agent("bin/kssh -q -o StrictHostKeyChecking=no user@sshd-staging 'sha1sum /etc/unique'"))
+            run_command("bin/kssh --set-keybase-binary ''")
+        finally:
+            run_command("sudo rm /usr/local/bin/keybase")