Merge 777143d into 8d64174

Makefile

@@ -1,4 +1,4 @@
-.PHONY: test test-verbose test-profile test-race clean docker bootstrap
+.PHONY: test test-verbose test-profile test-env clean docker bootstrap
 
 PACKAGES = `go list ./... | grep -v vendor/`
 
@@ -13,8 +13,10 @@ test:
 test-verbose:
 	go test $(PACKAGES) -v --cover
 
-test-race:
-	go test $(PACKAGES) -race --cover
+test-env:
+	docker build -t sshvps -f ./test_env/Dockerfile.sshvps ./test_env
+	docker run --rm -d -p 22:22 -p 8081:8081 --name testvps --privileged sshvps
+	bash ./test_env/info.sh
 
 clean: inertia
 	rm -f inertia

client/bootstrap/docker.sh

@@ -39,3 +39,5 @@ if !(hash docker 2>/dev/null); then
         sh $DOCKER_DEST
     fi
 fi
+
+sudo service docker start

client/remote.go

@@ -25,12 +25,13 @@ import (
 	"golang.org/x/crypto/ssh"
 )
 
-//
+// RemoteVPS contains parameters for the VPS
 type RemoteVPS struct {
-	User string
-	IP   string
-	PEM  string
-	Port string
+	User    string
+	IP      string
+	SSHPort string
+	PEM     string
+	Port    string
 }
 
 // SSHSession can run remote commands over SSH
@@ -50,7 +51,7 @@ func NewSSHRunner(r *RemoteVPS) *SSHRunner {
 
 // Run runs a command remotely.
 func (runner *SSHRunner) Run(cmd string) (*bytes.Buffer, *bytes.Buffer, error) {
-	session, err := getSSHSession(runner.r.PEM, runner.r.IP, runner.r.User)
+	session, err := getSSHSession(runner.r.PEM, runner.r.IP, runner.r.SSHPort, runner.r.User)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -152,7 +153,7 @@ func (remote *RemoteVPS) InstallDocker(session SSHSession) error {
 	cmdStr := string(installDockerSh)
 	_, stderr, err := remote.RunSSHCommand(session, cmdStr)
 	if err != nil {
-		println(stderr)
+		println(stderr.String())
 		return err
 	}
 
@@ -235,7 +236,7 @@ func (remote *RemoteVPS) GetDaemonAPIToken(session SSHSession) (string, error) {
 }
 
 // AddNewRemote adds a new remote to the project config file.
-func AddNewRemote(name, IP, user, pemLoc, port string) error {
+func AddNewRemote(name, IP, sshPort, user, pemLoc, port string) error {
 	// Just wipe configuration for MVP.
 	config, err := GetProjectConfigFromDisk()
 	if err != nil {
@@ -244,10 +245,11 @@ func AddNewRemote(name, IP, user, pemLoc, port string) error {
 
 	config.CurrentRemoteName = name
 	config.CurrentRemoteVPS = &RemoteVPS{
-		IP:   IP,
-		User: user,
-		PEM:  pemLoc,
-		Port: port,
+		IP:      IP,
+		SSHPort: sshPort,
+		User:    user,
+		PEM:     pemLoc,
+		Port:    port,
 	}
 
 	_, err = config.Write()
@@ -259,7 +261,7 @@ func AddNewRemote(name, IP, user, pemLoc, port string) error {
 }
 
 // Stubbed out for testing.
-func getSSHSession(PEM, IP, user string) (*ssh.Session, error) {
+func getSSHSession(PEM, IP, sshPort, user string) (*ssh.Session, error) {
 	privateKey, err := ioutil.ReadFile(PEM)
 	if err != nil {
 		return nil, err
@@ -270,7 +272,7 @@ func getSSHSession(PEM, IP, user string) (*ssh.Session, error) {
 		return nil, err
 	}
 
-	client, err := ssh.Dial("tcp", IP+":22", cfg)
+	client, err := ssh.Dial("tcp", IP+":"+sshPort, cfg)
 	if err != nil {
 		return nil, err
 	}

cmd/remote.go

@@ -20,6 +20,7 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
+	"strings"
 
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
@@ -96,16 +97,23 @@ file. Specify a VPS name.`,
 		}
 		user := response
 
-		fmt.Println("Enter IP address of remote:")
+		fmt.Println("Enter IP address of remote (include SSH port if not standard '22'):")
 		_, err = fmt.Scanln(&response)
 		if err != nil {
 			log.Fatal("That is not a valid IP address - please try again.")
 		}
 		address := response
+		sshPort := "22"
+		if strings.Contains(address, ":") {
+			addressComponents := strings.Split(address, ":")
+			address = addressComponents[0]
+			sshPort = addressComponents[1]
+		}
+
 		fmt.Println("Port " + port + " will be used as the daemon port.")
-		fmt.Println("Run this 'inertia remote add' with the -p flag to set a custom port.")
+		fmt.Println("Run 'inertia remote add' with the -p flag to set a custom port.")
 
-		err = client.AddNewRemote(args[0], address, user, pemLoc, port)
+		err = client.AddNewRemote(args[0], address, sshPort, user, pemLoc, port)
 		if err != nil {
 			log.WithError(err)
 		}

test_env/Dockerfile.sshvps

@@ -0,0 +1,22 @@
+FROM ubuntu:16.04
+
+RUN apt-get update && apt-get install -y sudo && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y openssh-server
+RUN mkdir /var/run/sshd
+RUN echo 'root:inertia' | chpasswd
+
+RUN sed -i 's/PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config
+RUN echo "AuthorizedKeysFile     %h/.ssh/authorized_keys" >> /etc/ssh/sshd_config
+
+# SSH login fix. Otherwise user is kicked off after login
+RUN sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/sshd
+
+ENV NOTVISIBLE "in users profile"
+RUN echo "export VISIBLE=now" >> /etc/profile
+
+RUN mkdir $HOME/.ssh/
+COPY . .
+RUN cat test_key.pub >> $HOME/.ssh/authorized_keys
+
+EXPOSE 22 8081
+CMD ["/usr/sbin/sshd", "-D"]

test_env/info.sh

@@ -0,0 +1,5 @@
+# Script for neatly outputting information about the test VPS
+
+echo ""
+echo "Test VPS is online (kill using 'docker kill testvps')"
+echo "Test key:" $GOPATH/src/github.com/ubclaunchpad/inertia/test_env/test_key

test_env/test_key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAw+14SQTAidfYPDizCYPv0gWq4+wFeInCrZGo4BFbMcP7xhH+
+htmm0qx7ctYbCS0tQmCvCnt4W5jwhqH9v65/b1PWv1qQbXbJq0iyeSspgpaB8xq+
+AkWoBkUOT8iaUzESDgJfEpC9q1s7dAUpmRDD0JMVzdsv1VQqpR22VWtnpcFtAkNk
+3CIXiKFYJ5677dVSrc45dhO4R67LguSPxpXNRcg26/cFKWQO+y2StnYVEEUtvoWN
+z2tGQu2hftJtjzzCFXckH8VTJ8EgX0+3Co5jXEbm1idFGFgcAP1WT3xuGh+wpCXM
+LYVdF18VxGzZe0bxStZ/+bhsaYfFLyU8qL7RnQIDAQABAoIBAFELWLczjQU30I1Q
+ktZ7yebhS0gOaFDtAydS2j0dUNCsFehfpx5Wx8fbaxEceYB5PIB5h85ZNncFM3Et
+bs4sOzBsyKbMqnNtMIx2fMTcUsZexZAu3qwH7jHxvLLJ8vQ4lxRObM88KgjIqzYZ
+sJRNOAJ95QYLBaVDtIQqXzLEQ9JvDnB5++i18eIF31UXbcjvhNn4M2Goku2EZ9T8
+ny0KnRDh9W/Is6ndsBGkDEbXFVMCs6ubIeL7LdJ1W/QNK4HB3ZeRWHMR+lElp+o5
+4BY+5bQN7RrTPQmzU0lD1UAIOuPNQeUiGQs4jsV4Oz21z6AWMgg/qAjn91LaWcCH
+JnDv++ECgYEA/zJbzNhxF7Kk64U1//XWhtZ3EdlbiapLq26Z10emtED9FrPJxGCz
++fDR2BwWUEpZDY3TBMmjeQeO+VN++PYGMjFogZIKNIuOhu2Qs7u92nCLyeB1aeTm
+h90/5II64qCy5KN2fvU6Q2cxNNrCs0Dchh1GYYCH7+IR5NkelTQWRuUCgYEAxItZ
+8JYoxfegJmK3RpzYWrbuK2tP7msA9VNSbzMdgFpLG9I+bSJPuQfdOfnhfZG/YG40
+MBpUH1X9Jn06Ie6YsbQTeEWUY4H5RKdNKSyyJYepw6C/ndRCuInGPaqQ6FSfccld
+mwB3ziaIZVjSaaLGpDFaSgosW4a8hDBbe+4wvFkCgYEAhfGKmWPpSATt5uhORYBl
+DvS2Hlo1X3ZQrTQp7wKejvGlZSsMddRD4qXxnjpvw8iiISkVXufus3GyK08Vz9ph
+uiqQraFXVekB7/P1BUE/Ds4PsO/s8J3CGgGYrXllKtopyzO42D4iTIp3G0TO+ILM
+vF/VNwvdTZ0cwz7qfGmQX7kCgYAJqOOpvGeSm0IGwPFLCihkBPudrK+IA0BPzmGN
+z5BSn51zZ5jj2jza1jUcRVi8yC4EukXcW17pD1vayWrTAhwFF9mhHqJVZazvn91d
++bFjwNAqKjtgsW76DONuYnSuxoHzoLb2CEbbHe+0M3Jb+MEUjsxmOSvG789SG+JT
+K/i/OQKBgQD3rq8dDSVYaLcSFwg9RfRKF+Ahtml86lm4FrfZlLEfwb6TaR/Unsh0
+XF56ZdrKh0nbOW/125RSc8STCv5klDGnBCD56Qzbin9+W6j1TWyJFMdNeaxjWK+U
+lq07qdr3cY+O1F4otlDitNuhLE88dtGJM5lEyumokiH1yXwhbBtZ4w==
+-----END RSA PRIVATE KEY-----

test_env/test_key.pub

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDD7XhJBMCJ19g8OLMJg+/SBarj7AV4icKtkajgEVsxw/vGEf6G2abSrHty1hsJLS1CYK8Ke3hbmPCGof2/rn9vU9a/WpBtdsmrSLJ5KymCloHzGr4CRagGRQ5PyJpTMRIOAl8SkL2rWzt0BSmZEMPQkxXN2y/VVCqlHbZVa2elwW0CQ2TcIheIoVgnnrvt1VKtzjl2E7hHrsuC5I/Glc1FyDbr9wUpZA77LZK2dhUQRS2+hY3Pa0ZC7aF+0m2PPMIVdyQfxVMnwSBfT7cKjmNcRubWJ0UYWBwA/VZPfG4aH7CkJcwthV0XXxXEbNl7RvFK1n/5uGxph8UvJTyovtGd