route shells exec/send/screen through server API instead of SSH

Author: realrasengan

cmd/latch/main.go

@@ -279,35 +279,31 @@ func main() {
 				fatal("%v", err)
 			}
 		case "ssh":
-			args, nhc := shellArgs(4)
-			if len(args) < 1 {
-				fatal("usage: latch shells ssh [--no-host-check] <shell-id>")
+			if len(os.Args) < 4 {
+				fatal("usage: latch shells ssh <shell-id>")
 			}
-			if err := client.ShellsSSH(config.Path(), args[0], nhc); err != nil {
+			if err := client.ShellsSSH(config.Path(), os.Args[3]); err != nil {
 				fatal("%v", err)
 			}
 		case "exec":
-			args, nhc := shellArgs(4)
-			if len(args) < 2 {
-				fatal("usage: latch shells exec [--no-host-check] <shell-id> <command>")
+			if len(os.Args) < 5 {
+				fatal("usage: latch shells exec <shell-id> <command>")
 			}
-			if err := client.ShellsExec(config.Path(), args[0], args[1], nhc); err != nil {
+			if err := client.ShellsExec(config.Path(), os.Args[3], os.Args[4]); err != nil {
 				fatal("%v", err)
 			}
 		case "send":
-			args, nhc := shellArgs(4)
-			if len(args) < 2 {
-				fatal("usage: latch shells send [--no-host-check] <shell-id> <text>")
+			if len(os.Args) < 5 {
+				fatal("usage: latch shells send <shell-id> <text>")
 			}
-			if err := client.ShellsSend(config.Path(), args[0], args[1], nhc); err != nil {
+			if err := client.ShellsSend(config.Path(), os.Args[3], os.Args[4]); err != nil {
 				fatal("%v", err)
 			}
 		case "screen":
-			args, nhc := shellArgs(4)
-			if len(args) < 1 {
-				fatal("usage: latch shells screen [--no-host-check] <shell-id>")
+			if len(os.Args) < 4 {
+				fatal("usage: latch shells screen <shell-id>")
 			}
-			if err := client.ShellsScreen(config.Path(), args[0], nhc); err != nil {
+			if err := client.ShellsScreen(config.Path(), os.Args[3]); err != nil {
 				fatal("%v", err)
 			}
 		case "key":
@@ -346,20 +342,6 @@ func main() {
 	}
 }
 
-// shellArgs extracts positional args and --no-host-check flag from os.Args[start:].
-func shellArgs(start int) ([]string, bool) {
-	var args []string
-	var noHostCheck bool
-	for _, a := range os.Args[start-1:] {
-		if a == "--no-host-check" {
-			noHostCheck = true
-		} else {
-			args = append(args, a)
-		}
-	}
-	return args, noHostCheck
-}
-
 func shellsUsage() {
 	fmt.Fprintln(os.Stderr, "usage: latch shells <command>")
 	fmt.Fprintln(os.Stderr, "")

internal/client/shells.go

@@ -51,7 +51,7 @@ func apiRequest(method, path string, body interface{}, result interface{}) error
 		}
 	}
 
-	resp, err := (&http.Client{Timeout: 30 * time.Second}).Do(req)
+	resp, err := (&http.Client{Timeout: 120 * time.Second}).Do(req)
 	if err != nil {
 		return fmt.Errorf("server unreachable: %w", err)
 	}
@@ -204,19 +204,8 @@ func ShellsRestart(cfgPath, nameOrID string) error {
 	return nil
 }
 
-// shellSSH builds an SSH command for connecting to a shell through the relay.
-func shellSSH(host string, noHostCheck bool, args ...string) *exec.Cmd {
-	sshArgs := []string{}
-	if noHostCheck {
-		sshArgs = append(sshArgs, "-o", "StrictHostKeyChecking=no", "-o", "UserKnownHostsFile=/dev/null")
-	}
-	sshArgs = append(sshArgs, "-J", "relay.unixshells.com", "default@"+host)
-	sshArgs = append(sshArgs, args...)
-	return exec.Command("ssh", sshArgs...)
-}
-
 // ShellsSSH connects to a shell via SSH through the relay.
-func ShellsSSH(cfgPath, nameOrID string, noHostCheck bool) error {
+func ShellsSSH(cfgPath, nameOrID string) error {
 	shellID, cfg, err := resolveShellID(cfgPath, nameOrID)
 	if err != nil {
 		return err
@@ -225,60 +214,66 @@ func ShellsSSH(cfgPath, nameOrID string, noHostCheck bool) error {
 	device := "shell-" + shellID
 	host := device + "." + cfg.RelayUser + ".unixshells.com"
 
-	cmd := shellSSH(host, noHostCheck)
+	cmd := exec.Command("ssh", "-J", "relay.unixshells.com", "default@"+host)
 	cmd.Stdin = os.Stdin
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 	return cmd.Run()
 }
 
-// ShellsExec runs a command on a shell via SSH through the relay.
-func ShellsExec(cfgPath, nameOrID, command string, noHostCheck bool) error {
+// ShellsExec runs a command on a shell via the server API.
+func ShellsExec(cfgPath, nameOrID, command string) error {
 	shellID, cfg, err := resolveShellID(cfgPath, nameOrID)
 	if err != nil {
 		return err
 	}
 
-	device := "shell-" + shellID
-	host := device + "." + cfg.RelayUser + ".unixshells.com"
+	var result struct {
+		Output string `json:"output"`
+		Error  string `json:"error"`
+	}
+	if err := apiRequest("POST", "/api/shells/"+shellID+"/exec?username="+cfg.RelayUser, map[string]string{
+		"command": command,
+	}, &result); err != nil {
+		return err
+	}
 
-	cmd := shellSSH(host, noHostCheck, command)
-	cmd.Stdin = os.Stdin
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	return cmd.Run()
+	fmt.Print(result.Output)
+	if result.Error != "" {
+		return fmt.Errorf("%s", result.Error)
+	}
+	return nil
 }
 
-// ShellsSend injects text into a session on a shell via SSH through the relay.
-func ShellsSend(cfgPath, nameOrID, text string, noHostCheck bool) error {
+// ShellsSend injects text into a session on a shell via the server API.
+func ShellsSend(cfgPath, nameOrID, text string) error {
 	shellID, cfg, err := resolveShellID(cfgPath, nameOrID)
 	if err != nil {
 		return err
 	}
 
-	device := "shell-" + shellID
-	host := device + "." + cfg.RelayUser + ".unixshells.com"
-
-	cmd := shellSSH(host, noHostCheck, "latch", "send", "default", text)
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	return cmd.Run()
+	return apiRequest("POST", "/api/shells/"+shellID+"/send?username="+cfg.RelayUser, map[string]string{
+		"session": "default",
+		"text":    text,
+	}, nil)
 }
 
-// ShellsScreen reads the terminal screen from a shell via SSH through the relay.
-func ShellsScreen(cfgPath, nameOrID string, noHostCheck bool) error {
+// ShellsScreen reads the terminal screen from a shell via the server API.
+func ShellsScreen(cfgPath, nameOrID string) error {
 	shellID, cfg, err := resolveShellID(cfgPath, nameOrID)
 	if err != nil {
 		return err
 	}
 
-	device := "shell-" + shellID
-	host := device + "." + cfg.RelayUser + ".unixshells.com"
+	var result struct {
+		Screen string `json:"screen"`
+	}
+	if err := apiRequest("GET", "/api/shells/"+shellID+"/screen?username="+cfg.RelayUser, nil, &result); err != nil {
+		return err
+	}
 
-	cmd := shellSSH(host, noHostCheck, "latch", "screen")
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	return cmd.Run()
+	fmt.Print(result.Screen)
+	return nil
 }
 
 // ShellsKeyAdd adds an SSH key to a shell (sends verification email).