add shell CLI option

Author: noboruma

README.md

@@ -88,11 +88,13 @@ You can search hosts or hostname using repectively `F1` amd `F4` to jump directl
 
 ### CLI mode
 
-It is also possible to use s1h as a CLI to copy files around:
+It is also possible to use `s1h` as a CLI to shell and copy files.
+This approach might be more convenient if you rely on shell history to pass things around.
+Mostly this approach helps with password managements.
 ```
 s1h cp [hos1:]/path1 [hos2:]/path2
+s1h shell hos1
 ```
-Which might be more convenient if you rely on shell history to pass things around.
 
 ### What about password?
 

cmd/s1h/main.go

@@ -65,6 +65,10 @@ func main() {
 			removeCmd := flag.NewFlagSet("remove", flag.ExitOnError)
 			removeCmd.StringVar(&hostname, "hostname", "", "The hostname to remove")
 			err := removeCmd.Parse(os.Args[2:])
+			if err != nil {
+				fmt.Println("Error remote:", err)
+				os.Exit(1)
+			}
 			if hostname == "" {
 				fmt.Println("Please provide the hostname to remove.")
 				os.Exit(1)
@@ -92,6 +96,17 @@ func main() {
 				fmt.Println("Error while copying: ", err.Error())
 				os.Exit(1)
 			}
+		case "shell":
+			if len(os.Args) != 3 {
+				fmt.Println("Missing args: s1h shell host")
+				os.Exit(1)
+			}
+			configs := loadConfigs()
+			err := cli.Shell(configs, os.Args[2])
+			if err != nil {
+				fmt.Println("Error while copying: ", err.Error())
+				os.Exit(1)
+			}
 		default:
 			fmt.Println("Unknown command. Expected 'upsert' or 'remove'.")
 			os.Exit(1)

internal/cli/cp.go

@@ -30,59 +30,72 @@ func extractPath(endpoint string) string {
 	return endpoint[n+1:]
 }
 
-func Copy(configs []ssh.SSHConfig, first, second string) error {
-	firstHost := extractHost(first)
-	secondHost := extractHost(second)
+func findConfig(configs []ssh.SSHConfig, host string) (ssh.SSHConfig, bool) {
+	for i := range configs {
+		if configs[i].Host == host {
+			return configs[i], true
+		}
+	}
+	return ssh.SSHConfig{}, false
+}
+
+func Copy(configs []ssh.SSHConfig, left, right string) error {
+	leftHost := extractHost(left)
+	rightHost := extractHost(right)
 
 	var leftClient, rightClient *cssh.Client
 	var leftConfig, rightConfig ssh.SSHConfig
 	var err error
-	if firstHost != "" { // remote -> local | remote
-		for i := range configs {
-			if configs[i].Host == firstHost {
-				leftConfig = configs[i]
-				break
-			}
+	if leftHost != "" { // remote -> local | remote
+		var has bool
+		leftConfig, has = findConfig(configs, leftHost)
+		if !has {
+			return fmt.Errorf("config %s not found", leftHost)
 		}
 		leftClient, err = ssh.SSHClient(leftConfig)
 		if err != nil {
 			return err
 		}
 
-		if secondHost != "" { // remote -> remote
-			for i := range configs {
-				if configs[i].Host == secondHost {
-					rightConfig = configs[i]
-					break
-				}
+		if rightHost != "" { // remote -> remote
+			rightConfig, has = findConfig(configs, rightHost)
+			if !has {
+				return fmt.Errorf("config %s not found", rightHost)
 			}
 			rightClient, err = ssh.SSHClient(rightConfig)
 			if err != nil {
 				return err
 			}
 			tempPath := filepath.Join(os.TempDir(),
-				removeSlashes("s1h"+first+second))
-			err = ssh.DownloadFile(leftClient, extractPath(firstHost), tempPath)
+				removeSlashes("s1h"+left+right))
+			err = ssh.DownloadFile(leftClient, extractPath(leftHost), tempPath)
 			if err != nil {
 				return err
 			}
 			defer os.Remove(tempPath)
-			err = ssh.UploadFile(rightClient, tempPath, extractPath(secondHost))
+			err = ssh.UploadFile(rightClient, tempPath, extractPath(rightHost))
 		} else { // remote -> local
-			err = ssh.DownloadFile(leftClient, extractPath(firstHost), second)
+			err = ssh.DownloadFile(leftClient, extractPath(leftHost), right)
 		}
 	} else { // local -> remote
-		for i := range configs {
-			if configs[i].Host == secondHost {
-				rightConfig = configs[i]
-				break
-			}
+		var has bool
+		rightConfig, has = findConfig(configs, rightHost)
+		if !has {
+			return fmt.Errorf("config %s not found", rightHost)
 		}
 		rightClient, err = ssh.SSHClient(rightConfig)
 		if err != nil {
 			return err
 		}
-		err = ssh.UploadFile(rightClient, extractPath(firstHost), second)
+		err = ssh.UploadFile(rightClient, left, extractPath(right))
 	}
 	return err
 }
+
+func Shell(configs []ssh.SSHConfig, host string) error {
+	cfg, has := findConfig(configs, host)
+	if !has {
+		return fmt.Errorf("config %s not found", host)
+	}
+	return ssh.ExecuteSSHShell(cfg)
+}

internal/ssh/ssh.go

@@ -283,12 +283,12 @@ func UploadFile(client *ssh.Client, localFile, remotePath string) error {
 	info, err := sftpClient.Stat(remotePath)
 	if err == nil {
 		if info.IsDir() {
-			remotePath = filepath.Join(localFile, filepath.Base(remotePath))
+			remotePath = filepath.Join(remotePath, filepath.Base(localFile))
 		}
 	}
 	dstFile, err := sftpClient.Create(remotePath)
 	if err != nil {
-		return fmt.Errorf("failed to create remote file: %w", err)
+		return fmt.Errorf("failed to create remote file %s: %w", remotePath, err)
 	}
 	defer dstFile.Close()