gssh-agent 1.0.0 → 1.0.2

package/README.md

@@ -10,6 +10,7 @@ gssh 是一个供 Agent 使用的 SSH Session 管理工具。通过 Go 语言实
 - 断线自动重连
 - 支持密码认证和 SSH 密钥认证
 - 被连接机器零配置（普通 SSH 即可）
+- SFTP 文件传输支持（上传/下载）
 
 ## 安装
 
@@ -124,6 +125,25 @@ gssh exec -s <session_id> "pwd"
 gssh forward -l 8080 -r 80
 ```
 
+### 文件传输（SFTP/SCP）
+
+```bash
+# 上传文件（本地 -> 远程）
+gssh scp -put /path/to/local/file.txt /path/to/remote/file.txt
+
+# 下载文件（远程 -> 本地）
+gssh scp -get /path/to/remote/file.txt /path/to/local/file.txt
+
+# 列出远程目录
+gssh sftp -c ls -p /path/to/remote/dir
+
+# 创建远程目录
+gssh sftp -c mkdir -p /path/to/remote/newdir
+
+# 删除远程文件
+gssh sftp -c rm -p /path/to/remote/file.txt
+```
+
 ### Session 管理
 
 ```bash
@@ -154,6 +174,10 @@ gssh reconnect -s <session_id>
 | `-l local` | 本地端口 |
 | `-r remote` | 远程端口 |
 | `-R` | 远程端口转发 |
+| `-put` | 上传模式（本地 -> 远程） |
+| `-get` | 下载模式（远程 -> 本地） |
+| `-c command` | SFTP 命令（ls/mkdir/rm） |
+| `-p path` | SFTP 路径 |
 
 ## 开发
 

package/cmd/gssh/main.go

@@ -7,9 +7,13 @@ import (
 	"fmt"
 	"net"
 	"os"
+	"os/signal"
 	"strings"
+	"syscall"
 
 	"gssh/internal/protocol"
+
+	"golang.org/x/term"
 )
 
 const (
@@ -50,6 +54,10 @@ func main() {
 		err = handleForwards()
 	case "forward-close":
 		err = handleForwardClose()
+	case "scp":
+		err = handleSCP()
+	case "sftp":
+		err = handleSFTP()
 	case "help", "-h", "--help":
 		printUsage()
 	default:
@@ -64,6 +72,50 @@ func main() {
 	}
 }
 
+// readPassword reads password from terminal without echo
+func readPassword() (string, error) {
+	// Check if stdin is a terminal
+	if !term.IsTerminal(int(os.Stdin.Fd())) {
+		// Try to read from stdin
+		reader := bufio.NewReader(os.Stdin)
+		fmt.Print("Password: ")
+		password, err := reader.ReadString('\n')
+		if err != nil {
+			return "", err
+		}
+		return strings.TrimSuffix(password, "\n"), nil
+	}
+
+	fmt.Print("Password: ")
+	bytePassword, err := term.ReadPassword(int(os.Stdin.Fd()))
+	fmt.Println()
+	if err != nil {
+		return "", err
+	}
+	return string(bytePassword), nil
+}
+
+// readPassphrase reads passphrase from terminal without echo
+func readPassphrase() (string, error) {
+	if !term.IsTerminal(int(os.Stdin.Fd())) {
+		reader := bufio.NewReader(os.Stdin)
+		fmt.Print("Key passphrase: ")
+		passphrase, err := reader.ReadString('\n')
+		if err != nil {
+			return "", err
+		}
+		return strings.TrimSuffix(passphrase, "\n"), nil
+	}
+
+	fmt.Print("Key passphrase: ")
+	bytePassphrase, err := term.ReadPassword(int(os.Stdin.Fd()))
+	fmt.Println()
+	if err != nil {
+		return "", err
+	}
+	return string(bytePassphrase), nil
+}
+
 func sendRequest(method string, params interface{}) ([]byte, error) {
 	conn, err := net.Dial("unix", *socketPath)
 	if err != nil {
@@ -129,6 +181,8 @@ func handleConnect() error {
 	port := flag.Int("p", 22, "Port")
 	password := flag.String("P", "", "Password")
 	keyPath := flag.String("i", "", "SSH key path")
+	askPassword := flag.Bool("ask-pass", false, "Ask for password interactively")
+	askPassphrase := flag.Bool("ask-passphrase", false, "Ask for key passphrase interactively")
 
 	flag.CommandLine.Parse(flag.Args()[1:])
 
@@ -136,6 +190,28 @@ func handleConnect() error {
 		return fmt.Errorf("user and host are required")
 	}
 
+	// If no password provided via flag and -ask-pass is set, read interactively
+	if *password == "" && *askPassword {
+		p, err := readPassword()
+		if err != nil {
+			return fmt.Errorf("failed to read password: %w", err)
+		}
+		*password = p
+	}
+
+	// If key path provided and -ask-passphrase is set, read interactively
+	if *keyPath != "" && *askPassphrase {
+		passphrase, err := readPassphrase()
+		if err != nil {
+			return fmt.Errorf("failed to read passphrase: %w", err)
+		}
+		// Note: Passphrase support would require modifying the SSH client
+		// For now, we'll just warn that it's not supported
+		if passphrase != "" {
+			fmt.Println("Note: Passphrase for keys is not yet supported, ignoring")
+		}
+	}
+
 	params := protocol.ConnectParams{
 		User:     *user,
 		Host:     *host,
@@ -202,6 +278,9 @@ func handleExec() error {
 	args := flag.Args()[1:]
 
 	sessionID := flag.String("s", "", "Session ID")
+	sudoPassword := flag.String("S", "", "sudo password (will prompt if empty and -s flag used)")
+	askSudoPassword := flag.Bool("ask-sudo-pass", false, "Interactively ask for sudo password")
+
 	flag.CommandLine.Parse(args)
 
 	if flag.NArg() < 1 {
@@ -209,6 +288,21 @@ func handleExec() error {
 	}
 	command := strings.Join(flag.Args(), " ")
 
+	// If sudo password needed but not provided, prompt for it
+	if *askSudoPassword && *sudoPassword == "" {
+		p, err := readPassword()
+		if err != nil {
+			return fmt.Errorf("failed to read sudo password: %w", err)
+		}
+		*sudoPassword = p
+	}
+
+	// If command contains sudo and password provided, wrap the command
+	if *sudoPassword != "" && strings.Contains(command, "sudo") {
+		// Use printf to pipe password to sudo -S
+		command = fmt.Sprintf("printf '%%s\\n' '%s' | %s -S", *sudoPassword, command)
+	}
+
 	params := protocol.ExecParams{
 		SessionID: *sessionID,
 		Command:   command,
@@ -364,31 +458,160 @@ func handleForwardClose() error {
 	return nil
 }
 
+func handleSCP() error {
+	sessionID := flag.String("s", "", "Session ID")
+	isUpload := flag.Bool("put", false, "Upload mode (local->remote)")
+	isDownload := flag.Bool("get", false, "Download mode (remote->local)")
+
+	flag.CommandLine.Parse(flag.Args()[1:])
+
+	if flag.NArg() < 2 {
+		return fmt.Errorf("source and destination paths required")
+	}
+
+	source := flag.Arg(0)
+	dest := flag.Arg(1)
+
+	if !*isUpload && !*isDownload {
+		return fmt.Errorf("must specify -put or -get")
+	}
+
+	params := protocol.SCPParams{
+		SessionID: *sessionID,
+		Source:    source,
+		Dest:      dest,
+		IsUpload:  *isUpload,
+	}
+
+	result, err := sendRequest("scp", params)
+	if err != nil {
+		return err
+	}
+
+	var scpResult protocol.SCPResult
+	if err := json.Unmarshal(result, &scpResult); err != nil {
+		return fmt.Errorf("failed to parse result: %w", err)
+	}
+
+	if scpResult.Success {
+		fmt.Printf("Success: %s\n", scpResult.Message)
+	} else {
+		return fmt.Errorf("failed: %s", scpResult.Message)
+	}
+
+	return nil
+}
+
+func handleSFTP() error {
+	sessionID := flag.String("s", "", "Session ID")
+	command := flag.String("c", "", "SFTP command (ls, mkdir, rm)")
+	path := flag.String("p", ".", "Path")
+
+	flag.CommandLine.Parse(flag.Args()[1:])
+
+	if *command == "" {
+		return fmt.Errorf("SFTP command required (-c ls|mkdir|rm)")
+	}
+
+	switch *command {
+	case "ls":
+		params := protocol.SFTPParams{
+			SessionID: *sessionID,
+			Command:   "ls",
+			Path:      *path,
+		}
+		result, err := sendRequest("sftp_list", params)
+		if err != nil {
+			return err
+		}
+
+		var files []string
+		if err := json.Unmarshal(result, &files); err != nil {
+			return fmt.Errorf("failed to parse result: %w", err)
+		}
+
+		for _, f := range files {
+			fmt.Println(f)
+		}
+
+	case "mkdir":
+		params := protocol.SFTPParams{
+			SessionID: *sessionID,
+			Command:   "mkdir",
+			Path:      *path,
+		}
+		_, err := sendRequest("sftp_mkdir", params)
+		if err != nil {
+			return err
+		}
+		fmt.Printf("Directory created: %s\n", *path)
+
+	case "rm":
+		params := protocol.SFTPParams{
+			SessionID: *sessionID,
+			Command:   "rm",
+			Path:      *path,
+		}
+		_, err := sendRequest("sftp_remove", params)
+		if err != nil {
+			return err
+		}
+		fmt.Printf("File removed: %s\n", *path)
+
+	default:
+		return fmt.Errorf("unknown SFTP command: %s", *command)
+	}
+
+	return nil
+}
+
 func printUsage() {
 	fmt.Println(`gssh - SSH Session Manager for Agents (Stateless)
 
 Usage:
-  gssh connect -u user -h host [-p port] [-i key_path] [-P password]
+  gssh connect -u user -h host [-p port] [-i key_path] [-P password] [--ask-pass]
   gssh disconnect [-s session_id]
   gssh reconnect [-s session_id]
-  gssh exec [-s session_id] "command"
+  gssh exec [-s session_id] [-S password | --ask-sudo-pass] "sudo command"
   gssh list
   gssh use <session_id>
   gssh forward [-s session_id] -l local_port -r remote_port
   gssh forwards
   gssh forward-close <forward_id>
+  gssh scp [-s session_id] [-put|-get] <source> <dest>
+  gssh sftp [-s session_id] -c <command> -p <path>
 
 Note: For sudo commands, use key-based authentication or configure passwordless sudo.
 
 Options:
-  -socket path    Unix socket path (default: /tmp/gssh.sock)
-  -s session_id   Session ID
-  -u user         Username
-  -h host         Host
-  -p port         Port (default: 22)
-  -P password     Password
-  -i key_path     SSH key path
-  -l local        Local port
-  -r remote       Remote port
-  -R              Remote port forward`)
+  -socket path        Unix socket path (default: /tmp/gssh.sock)
+  -s session_id       Session ID
+  -u user             Username
+  -h host             Host
+  -p port             Port (default: 22)
+  -P password         Password (or use --ask-pass for interactive input)
+  -i key_path        SSH key path
+  -S password        sudo password (for executing sudo commands)
+  --ask-sudo-pass    Interactively ask for sudo password
+  -l local            Local port
+  -r remote           Remote port
+  -R                  Remote port forward
+  -put                Upload mode (local -> remote)
+  -get                Download mode (remote -> local)
+  -c command          SFTP command (ls, mkdir, rm)
+  -p path             Path for SFTP command
+  --ask-pass          Interactively ask for SSH password (secure)
+  --ask-passphrase    Interactively ask for key passphrase (secure)`)
+}
+
+// Restore terminal on exit
+func init() {
+	// Setup cleanup to restore terminal state on unexpected exit
+	c := make(chan os.Signal, 1)
+	signal.Notify(c, syscall.SIGINT, syscall.SIGTERM)
+	go func() {
+		<-c
+		term.Restore(int(os.Stdin.Fd()), &term.State{})
+		os.Exit(1)
+	}()
 }

package/go.mod

@@ -4,7 +4,12 @@ go 1.21
 
 require (
 	github.com/google/uuid v1.5.0
+	github.com/pkg/sftp v1.13.6
 	golang.org/x/crypto v0.18.0
+	golang.org/x/term v0.16.0
 )
 
-require golang.org/x/sys v0.16.0 // indirect
+require (
+	github.com/kr/fs v0.1.0 // indirect
+	golang.org/x/sys v0.16.0 // indirect
+)

package/go.sum

@@ -1,8 +1,54 @@
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
 github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8=
+github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
+github.com/pkg/sftp v1.13.6 h1:JFZT4XbOU7l77xGSpOdW+pwIMqP044IyjXX6FGyEKFo=
+github.com/pkg/sftp v1.13.6/go.mod h1:tz1ryNURKu77RL+GuCzmoJYxQczL3wLNNpPWagdg4Qk=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
 golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc=
 golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
 golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE=
 golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=