fix -p 8080:127.0.0.1:80

Signed-off-by: Akihiro Suda <[email protected]>

Author: AkihiroSuda

README.md

@@ -41,7 +41,7 @@ $ sshocker -p 8080:80 -v .:/mnt/sshfs [email protected]
 
 Flags (similar to `docker run` flags):
 * `-v LOCALDIR:REMOTEDIR[:ro]`: Mount a reverse SSHFS
-* `-p [LOCALIP:]LOCALPORT:[REMOTEIP:]REMOTEPORT`: Expose a port
+* `-p [[LOCALIP:]LOCALPORT:]REMOTEPORT`: Expose a port
 
 SSH flags:
 * `-F`, `--ssh-config=FILE`: specify SSH config file used for `ssh -F`

cmd/sshocker/main.go

@@ -12,7 +12,7 @@ func newApp() *cli.App {
 	app := cli.NewApp()
 	app.Name = "sshocker"
 	app.Usage = "ssh + reverse sshfs + port forwarder, in Docker-like CLI"
-	app.UsageText = "sshocker run -p LOCALPORT:REMOTEPORT -v LOCALDIR:REMOTEDIR USER@HOST"
+	app.UsageText = "sshocker run -p LOCALIP:LOCALPORT:REMOTEPORT -v LOCALDIR:REMOTEDIR USER@HOST"
 
 	app.Flags = []cli.Flag{
 		&cli.BoolFlag{

cmd/sshocker/run.go

@@ -123,16 +123,3 @@ func parseFlagV(s string) (mount.Mount, error) {
 	}
 	return m, nil
 }
-
-// parseFlagP parses -p flag, akin to `docker run -p` flags.
-// The returned value conforms to the `ssh -L` syntax
-func parseFlagP(s string) (string, error) {
-	split := strings.Split(s, ":")
-	if len(split) >= 3 {
-		return s, nil
-	}
-	if len(split) == 2 {
-		return split[0] + ":localhost:" + split[1], nil
-	}
-	return "", errors.Errorf("cannot parse %q", s)
-}

cmd/sshocker/run_p.go

@@ -0,0 +1,45 @@
+package main
+
+import (
+	"fmt"
+	"strconv"
+	"strings"
+
+	"github.com/pkg/errors"
+)
+
+// parseFlagP parses -p flag, akin to `docker run -p` flags.
+// The returned value conforms to the `ssh -L` syntax
+func parseFlagP(s string) (string, error) {
+	split := strings.Split(s, ":")
+	switch len(split) {
+	case 1:
+		port, err := strconv.Atoi(split[0])
+		if err != nil {
+			return "", errors.Errorf("invalid port %q", split[0])
+		}
+		return fmt.Sprintf("0.0.0.0:%d:localhost:%d", port, port), nil
+	case 2:
+		localPort, err := strconv.Atoi(split[0])
+		if err != nil {
+			return "", errors.Errorf("invalid port %q", split[0])
+		}
+		remotePort, err := strconv.Atoi(split[1])
+		if err != nil {
+			return "", errors.Errorf("invalid port %q", split[1])
+		}
+		return fmt.Sprintf("0.0.0.0:%d:localhost:%d", localPort, remotePort), nil
+	case 3:
+		localIP := split[0]
+		localPort, err := strconv.Atoi(split[1])
+		if err != nil {
+			return "", errors.Errorf("invalid port %q", split[1])
+		}
+		remotePort, err := strconv.Atoi(split[2])
+		if err != nil {
+			return "", errors.Errorf("invalid port %q", split[2])
+		}
+		return fmt.Sprintf("%s:%d:localhost:%d", localIP, localPort, remotePort), nil
+	}
+	return "", errors.Errorf("cannot parse %q, should be [[LOCALIP:]LOCALPORT:]REMOTEPORT", s)
+}

cmd/sshocker/run_p_test.go

@@ -0,0 +1,28 @@
+package main
+
+import "testing"
+
+func TestParseFlagP(t *testing.T) {
+	testCases := map[string]string{
+		"80":                          "0.0.0.0:80:localhost:80",
+		"8080:80":                     "0.0.0.0:8080:localhost:80",
+		"127.0.0.1:8080:80":           "127.0.0.1:8080:localhost:80",
+		"127.0.0.1:8080:127.0.0.1:80": "",
+	}
+	for k, v := range testCases {
+		got, err := parseFlagP(k)
+		if v == "" {
+			if err == nil {
+				t.Errorf("error is expected for %q", k)
+			}
+			continue
+		}
+		if err != nil {
+			t.Errorf("failed to parse %q: %v", k, err)
+			continue
+		}
+		if got != v {
+			t.Errorf("expected %q, got %q for %q", v, got, k)
+		}
+	}
+}