Merge pull request #32 from Crazybus/box_me_in_real_virtual_life

Add cmdProxy client to allow running commands on the host machine

.travis.yml

@@ -6,7 +6,6 @@ services:
   - docker
 
 script:
-  - go build
   - go test -v -race -coverprofile=coverage.txt -covermode=atomic
   - ./lope -blacklist GO golang:1.10 /usr/local/go/bin/go run build/build.go
 

build/build.go

@@ -55,6 +55,7 @@ func checksum(goos string, goarch string) error {
 func build(goos string, goarch string) error {
 	os.Setenv("GOOS", goos)
 	os.Setenv("GOARCH", goarch)
+    os.Setenv("CGO_ENABLED", "0")
 
 	cmd := exec.Command(
 		"/usr/local/go/bin/go",

cmdProxy/.gitignore

@@ -0,0 +1,6 @@
+# Ignore everything
+*
+
+# But not these files...
+!.gitignore
+!cmdProxy.go

cmdProxy/cmdProxy.go

@@ -0,0 +1,54 @@
+package main
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"os"
+	"path/filepath"
+)
+
+type lopeCmd struct {
+	Command string   `json:"command"`
+	Args    []string `json:"args"`
+}
+
+func run(cmd string, args []string, url string) {
+
+	lopeCmd := lopeCmd{
+		Command: cmd,
+		Args:    args,
+	}
+
+	b, err := json.Marshal(lopeCmd)
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+	req, err := http.NewRequest("POST", url, bytes.NewBuffer(b))
+	req.Header.Set("Content-Type", "application/json")
+
+	client := &http.Client{}
+	resp, err := client.Do(req)
+	if err != nil {
+		panic(err)
+	}
+	defer resp.Body.Close()
+
+	body, _ := ioutil.ReadAll(resp.Body)
+	fmt.Print(string(body))
+}
+
+func main() {
+	cmd := filepath.Base(os.Args[0])
+	args := os.Args[1:]
+
+	url, ok := os.LookupEnv("LOPE_PROXY_ADDR")
+	if !ok {
+		fmt.Println("Please set the 'LOPE_PROXY_ADDR' environment variable")
+		os.Exit(1)
+	}
+	run(cmd, args, url)
+}

lope.go

@@ -389,7 +389,7 @@ func (l *lope) commandProxy() {
 
 	l.params = append(l.params, "--add-host=localhost:"+ip)
 
-	l.envs = append(l.envs, "LOPE_PROXY_ADDR="+ip+":"+l.cfg.cmdProxyPort)
+	l.envs = append(l.envs, "LOPE_PROXY_ADDR=http://"+ip+":"+l.cfg.cmdProxyPort)
 }
 
 func debug(message string) {
@@ -433,7 +433,7 @@ func main() {
 	pwd, _ := os.Getwd()
 
 	var blacklist string
-	flag.StringVar(&blacklist, "blacklist", "HOME,SSH_AUTH_SOCK,TMPDIR", "Comma seperated list of environment variables that will be ignored by lope")
+	flag.StringVar(&blacklist, "blacklist", "HOME,SSH_AUTH_SOCK,TMPDIR,PATH", "Comma seperated list of environment variables that will be ignored by lope")
 
 	var whitelist string
 	flag.StringVar(&whitelist, "whitelist", "", "Comma seperated list of environment variables that will be be included by lope")

lope_integration_test.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"os"
 	"os/exec"
 	"path/filepath"
 	"strings"
@@ -9,6 +10,31 @@ import (
 
 var binaryName = filepath.FromSlash("./lope")
 
+func init() {
+	cmd := exec.Command("go", "build")
+	err := cmd.Run()
+	if err != nil {
+		panic(err)
+	}
+	cmd = exec.Command("go", "build", "-o", "lope", "cmdProxy.go")
+	cmd.Env = os.Environ()
+	cmd.Env = append(
+		cmd.Env,
+		"GOOS=linux",
+		"GOARCH=amd64",
+		"CGO_ENABLED=0",
+	)
+
+	cmd.Dir = "cmdProxy"
+	err = cmd.Run()
+	if err != nil {
+		panic(err)
+	}
+	if err := os.Chmod(filepath.FromSlash("cmdProxy/lope"), 0755); err != nil {
+		panic(err)
+	}
+}
+
 func TestLopeCli(t *testing.T) {
 
 	var tests = []struct {
@@ -50,15 +76,27 @@ func TestLopeCli(t *testing.T) {
 			},
 		},
 		{
-			"Run a command via the command proxy",
+			"Run a command via the command proxy api",
 			[]string{
 				"-noTty",
 				"-cmdProxy",
 				"alpine",
 				"wget", "-q", "-O-",
 				`--post-data='{"command":"lope", "args": ["-noTty", "alpine", "ls"]}'`,
 				"--header=Content-Type:application/json",
-				"http://$LOPE_PROXY_ADDR",
+				"$LOPE_PROXY_ADDR",
+			},
+			[]string{
+				"README.md",
+			},
+		},
+		{
+			"Run a command via the command proxy cli",
+			[]string{
+				"-noTty",
+				"-cmdProxy",
+				"alpine",
+				"cmdProxy/lope", "-noTty", "alpine", "ls",
 			},
 			[]string{
 				"README.md",

lope_test.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+	"net/url"
 	"strings"
 	"testing"
 )
@@ -530,18 +531,18 @@ func TestCommandProxy(t *testing.T) {
 			l.commandProxy()
 
 			got := ""
+			want := test.want
 			for _, e := range l.envs {
 				split := strings.Split(e, "=")
 				if split[0] == "LOPE_PROXY_ADDR" {
-					addr := split[1]
-					p := strings.Split(addr, ":")
-					if len(p) == 2 {
-						got = p[1]
+					addr, err := url.Parse(split[1])
+					if err != nil {
+						t.Errorf("got %q want %q", err, want)
 					}
+					got = addr.Port()
+
 				}
 			}
-			want := test.want
-
 			if got != want {
 				t.Errorf("got %q want %q", got, want)
 			}