gssh-agent 1.0.7 → 1.0.8

package/README.md

@@ -14,22 +14,13 @@ gssh 是一个供 Agent 使用的 SSH Session 管理工具。通过 Go 语言实
 
 ## 安装
 
-### 方式一：Homebrew（推荐）
+### 使用 npm（推荐）
 
 ```bash
-# 添加 tap（未来会支持）
-# brew tap forechoandlook/gssh
-# brew install gssh
-
-# 暂时使用手动安装方式
-git clone https://github.com/forechoandlook/gssh.git
-cd gssh
-go build -o bin/daemon cmd/daemon/main.go
-go build -o bin/gssh cmd/gssh/main.go
-./homebrew/install.sh
+npm install -g gssh-agent
 ```
 
-### 方式二：直接安装
+### 手动安装
 
 ```bash
 # 克隆项目
@@ -45,53 +36,11 @@ cp bin/daemon /usr/local/bin/gssh-daemon
 cp bin/gssh /usr/local/bin/gssh
 ```
 
-## 服务管理（macOS）
-
-### 使用 launchctl
+## 启动服务
 
 ```bash
-# 启动服务
-launchctl start com.gssh.daemon
-
-# 停止服务
-launchctl stop com.gssh.daemon
-
-# 查看状态
-launchctl list | grep gssh
-
-# 卸载服务
-launchctl unload ~/Library/LaunchAgents/gssh.plist
-rm ~/Library/LaunchAgents/gssh.plist
-```
-
-### 使用 Homebrew services
-
-```bash
-# 启动（首次安装后自动启动）
-brew services start gssh
-
-# 停止
-brew services stop gssh
-
-# 查看状态
-brew services list
-
-# 重启
-brew services restart gssh
-```
-
-### 使用 PM2（跨平台）
-
-```bash
-# 安装 PM2
-npm install -g pm2
-
-# 启动 daemon
-pm2 start gssh-daemon.sh --name gssh
-
-# 保存并设置开机自启
-pm2 save
-pm2 startup
+# 启动 gssh daemon
+gssh-daemon
 ```
 
 ## 使用方法
@@ -99,7 +48,7 @@ pm2 startup
 ### 连接 SSH（密码认证）
 
 ```bash
-gssh connect -u admin1 -h 139.196.175.163 -p 7080 -P 1234
+gssh connect -u admin1 -h xxxx -p xxxx -P xxxxx
 ```
 
 ### 连接 SSH（密钥认证）
@@ -116,6 +65,12 @@ gssh exec "ls -la"
 
 # 指定 session
 gssh exec -s <session_id> "pwd"
+
+# 带超时命令
+gssh exec -t 10 "ls -la"
+
+# sudo 命令
+gssh exec -S password "sudo systemctl restart nginx"
 ```
 
 ### 端口转发
@@ -123,16 +78,27 @@ gssh exec -s <session_id> "pwd"
 ```bash
 # 本地端口转发：本地 8080 -> 远程 80
 gssh forward -l 8080 -r 80
+
+# 远程端口转发：远程 9000 -> 本地 3000
+gssh forward -R -l 9000 -r 3000
+
+# 列出所有端口转发
+gssh forwards
+
+# 关闭端口转发
+gssh forward-close <forward_id>
 ```
 
-### 文件传输（SFTP/SCP）
+### 文件传输与同步（SFTP/SCP/SYNC）
 
 ```bash
-# 上传文件（本地 -> 远程）
+# 上传文件或文件夹（本地 -> 远程）
 gssh scp -put /path/to/local/file.txt /path/to/remote/file.txt
+gssh sync -put /path/to/local/dir /path/to/remote/dir
 
-# 下载文件（远程 -> 本地）
+# 下载文件或文件夹（远程 -> 本地）
 gssh scp -get /path/to/remote/file.txt /path/to/local/file.txt
+gssh sync -get /path/to/remote/dir /path/to/local/dir
 
 # 列出远程目录
 gssh sftp -c ls -p /path/to/remote/dir
@@ -178,6 +144,10 @@ gssh reconnect -s <session_id>
 | `-get` | 下载模式（远程 -> 本地） |
 | `-c command` | SFTP 命令（ls/mkdir/rm） |
 | `-p path` | SFTP 路径 |
+| `-t timeout` | 命令超时时间（秒） |
+| `-S password` | sudo 密码 |
+| `--ask-pass` | 交互输入 SSH 密码 |
+| `--ask-sudo-pass` | 交互输入 sudo 密码 |
 
 ## 开发
 

package/cmd/gssh/main.go

@@ -73,7 +73,7 @@ func main() {
 		err = handleForwards(socketPath)
 	case "forward-close":
 		err = handleForwardClose(subArgs, socketPath)
-	case "scp":
+	case "scp", "sync":
 		err = handleSCP(subArgs, socketPath)
 	case "sftp":
 		err = handleSFTP(subArgs, socketPath)
@@ -625,6 +625,8 @@ Usage:
   gssh forward-close <forward_id>
   gssh scp [-s session_id] -put <local> <remote>
   gssh scp [-s session_id] -get <remote> <local>
+  gssh sync [-s session_id] -put <local> <remote>
+  gssh sync [-s session_id] -get <remote> <local>
   gssh sftp [-s session_id] -c <ls|mkdir|rm> -p <path>
   gssh -v, --version
 
@@ -654,6 +656,7 @@ Examples:
   gssh reconnect 549b6eff-f62c-4dae-a7e9-298815233cf4
   gssh forward -l 8080 -r 80
   gssh scp -put local.txt /home/user/remote.txt
+  gssh sync -put local_dir /home/user/remote_dir
 `, version)
 }
 

package/internal/client/ssh.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/pkg/sftp"
 	"golang.org/x/crypto/ssh"
+	"golang.org/x/crypto/ssh/knownhosts"
 )
 
 // SSHClient encapsulates SSH connection logic
@@ -32,12 +33,84 @@ func (k *KeyboardInteractiveHandler) Challenge(name, instruction string, questio
 	return answers, nil
 }
 
+// getHostKeyCallback returns a host key callback that verifies the host key against the user's known_hosts file.
+// If the host is unknown, it implements Trust-On-First-Use (TOFU) by adding the new key to the known_hosts file.
+func getHostKeyCallback() (ssh.HostKeyCallback, error) {
+	homeDir, err := os.UserHomeDir()
+	if err != nil {
+		return nil, fmt.Errorf("could not get user home dir: %w", err)
+	}
+
+	knownHostsPath := filepath.Join(homeDir, ".ssh", "known_hosts")
+
+	// Ensure the .ssh directory exists
+	if err := os.MkdirAll(filepath.Dir(knownHostsPath), 0700); err != nil {
+		return nil, fmt.Errorf("failed to create .ssh directory: %w", err)
+	}
+
+	// Create the known_hosts file if it doesn't exist
+	if _, err := os.Stat(knownHostsPath); os.IsNotExist(err) {
+		f, err := os.OpenFile(knownHostsPath, os.O_CREATE|os.O_RDWR, 0600)
+		if err != nil {
+			return nil, fmt.Errorf("failed to create known_hosts file: %w", err)
+		}
+		f.Close()
+	}
+
+	cb, err := knownhosts.New(knownHostsPath)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create knownhosts callback: %w", err)
+	}
+
+	return func(hostname string, remote net.Addr, key ssh.PublicKey) error {
+		err := cb(hostname, remote, key)
+		if err == nil {
+			return nil
+		}
+
+		keyErr, ok := err.(*knownhosts.KeyError)
+		if !ok {
+			return err
+		}
+
+		// If len(keyErr.Want) is 0, it means the key is completely unknown (not a mismatch).
+		// We implement Trust-On-First-Use (TOFU) by adding the new key to known_hosts.
+		if len(keyErr.Want) == 0 {
+			f, fErr := os.OpenFile(knownHostsPath, os.O_APPEND|os.O_WRONLY, 0600)
+			if fErr != nil {
+				return fmt.Errorf("failed to open known_hosts for appending: %w", fErr)
+			}
+			defer f.Close()
+
+			addresses := []string{knownhosts.Normalize(hostname)}
+			if remoteString := remote.String(); remoteString != hostname {
+				addresses = append(addresses, knownhosts.Normalize(remoteString))
+			}
+
+			line := knownhosts.Line(addresses, key)
+			if _, wErr := f.WriteString(line + "\n"); wErr != nil {
+				return fmt.Errorf("failed to append key to known_hosts: %w", wErr)
+			}
+			return nil
+		}
+
+		// It's a key mismatch (security risk: MITM or host key changed). Reject the connection.
+		return err
+	}, nil
+}
+
 // NewSSHClient creates a new SSH client
 func NewSSHClient(user, host string, port int, authMethods ...ssh.AuthMethod) (*SSHClient, error) {
+	hostKeyCallback, err := getHostKeyCallback()
+	if err != nil {
+		return nil, fmt.Errorf("failed to get host key callback: %w", err)
+	}
+
 	config := &ssh.ClientConfig{
 		User:            user,
 		Auth:            authMethods,
-		HostKeyCallback: ssh.InsecureIgnoreHostKey(),
+		HostKeyCallback: hostKeyCallback,
+		Timeout:         10 * time.Second,
 	}
 
 	addr := fmt.Sprintf("%s:%d", host, port)
@@ -169,8 +242,56 @@ func (c *SSHClient) NewSFTPClient() (*SFTPClient, error) {
 	return &SFTPClient{Client: sftpClient}, nil
 }
 
-// Upload uploads a local file to remote
+// Upload uploads a local file or directory to remote
 func (s *SFTPClient) Upload(localPath, remotePath string) (int64, error) {
+	localInfo, err := os.Stat(localPath)
+	if err != nil {
+		return 0, fmt.Errorf("failed to stat local path: %w", err)
+	}
+
+	if !localInfo.IsDir() {
+		return s.uploadFile(localPath, remotePath)
+	}
+
+	var totalWritten int64
+	err = filepath.Walk(localPath, func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+
+		relPath, err := filepath.Rel(localPath, path)
+		if err != nil {
+			return err
+		}
+
+		targetPath := filepath.ToSlash(filepath.Join(remotePath, relPath))
+
+		if info.IsDir() {
+			s.Client.MkdirAll(targetPath)
+			return nil
+		}
+
+		// Sync logic
+		remoteInfo, err := s.Client.Stat(targetPath)
+		if err == nil && remoteInfo.Size() == info.Size() && remoteInfo.ModTime().Unix() == info.ModTime().Unix() {
+			return nil
+		}
+
+		written, err := s.uploadFile(path, targetPath)
+		if err != nil {
+			return err
+		}
+
+		totalWritten += written
+		s.Client.Chtimes(targetPath, info.ModTime(), info.ModTime())
+
+		return nil
+	})
+
+	return totalWritten, err
+}
+
+func (s *SFTPClient) uploadFile(localPath, remotePath string) (int64, error) {
 	localFile, err := os.Open(localPath)
 	if err != nil {
 		return 0, fmt.Errorf("failed to open local file: %w", err)
@@ -199,8 +320,62 @@ func (s *SFTPClient) Upload(localPath, remotePath string) (int64, error) {
 	return written, nil
 }
 
-// Download downloads a remote file to local
+// Download downloads a remote file or directory to local
 func (s *SFTPClient) Download(remotePath, localPath string) (int64, error) {
+	remoteInfo, err := s.Client.Stat(remotePath)
+	if err != nil {
+		return 0, fmt.Errorf("failed to stat remote path: %w", err)
+	}
+
+	if !remoteInfo.IsDir() {
+		return s.downloadFile(remotePath, localPath)
+	}
+
+	var totalWritten int64
+	walker := s.Client.Walk(remotePath)
+	for walker.Step() {
+		if walker.Err() != nil {
+			return totalWritten, walker.Err()
+		}
+
+		path := walker.Path()
+		info := walker.Stat()
+
+		relPath, err := filepath.Rel(remotePath, path)
+		if err != nil {
+			return totalWritten, err
+		}
+
+		if err := checkPathTraversal(relPath); err != nil {
+			return totalWritten, err
+		}
+
+		targetPath := filepath.Join(localPath, relPath)
+
+		if info.IsDir() {
+			os.MkdirAll(targetPath, info.Mode())
+			continue
+		}
+
+		// Sync logic
+		localInfo, err := os.Stat(targetPath)
+		if err == nil && localInfo.Size() == info.Size() && localInfo.ModTime().Unix() == info.ModTime().Unix() {
+			continue
+		}
+
+		written, err := s.downloadFile(path, targetPath)
+		if err != nil {
+			return totalWritten, err
+		}
+
+		totalWritten += written
+		os.Chtimes(targetPath, info.ModTime(), info.ModTime())
+	}
+
+	return totalWritten, nil
+}
+
+func (s *SFTPClient) downloadFile(remotePath, localPath string) (int64, error) {
 	remoteFile, err := s.Client.Open(remotePath)
 	if err != nil {
 		return 0, fmt.Errorf("failed to open remote file: %w", err)
@@ -380,6 +555,14 @@ func (pw *progressWriter) Write(p []byte) (n int, err error) {
 	return
 }
 
+// checkPathTraversal ensures that relPath does not escape the destination directory
+func checkPathTraversal(relPath string) error {
+	if !filepath.IsLocal(relPath) {
+		return fmt.Errorf("path traversal detected: %s escapes destination", relPath)
+	}
+	return nil
+}
+
 // expandPath expands ~ to home directory
 func expandPath(path string) string {
 	if len(path) > 0 && path[0] == '~' {

package/internal/client/ssh_test.go

@@ -31,3 +31,46 @@ func TestNewAuthMethodsFromKeyPath(t *testing.T) {
 		t.Error("expected error for non-existent key")
 	}
 }
+
+func TestCheckPathTraversal(t *testing.T) {
+	tests := []struct {
+		name    string
+		relPath string
+		wantErr bool
+	}{
+		{
+			name:    "safe path within directory",
+			relPath: "safe_file.txt",
+			wantErr: false,
+		},
+		{
+			name:    "safe path same as directory",
+			relPath: ".",
+			wantErr: false,
+		},
+		{
+			name:    "path traversal attempt with ../",
+			relPath: "../etc/passwd",
+			wantErr: true,
+		},
+		{
+			name:    "absolute path traversal",
+			relPath: "/etc/passwd",
+			wantErr: true,
+		},
+		{
+			name:    "deep nested safe path",
+			relPath: "a/b/c/d.txt",
+			wantErr: false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			err := checkPathTraversal(tt.relPath)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("checkPathTraversal() error = %v, wantErr %v", err, tt.wantErr)
+			}
+		})
+	}
+}

package/internal/portforward/forwarder.go

@@ -73,12 +73,20 @@ func (f *Forwarder) startLocalForward() {
 				f.mu.RUnlock()
 				return
 			}
+			listener := f.listener
 			f.mu.RUnlock()
 
+			if listener == nil {
+				time.Sleep(1 * time.Second)
+				continue
+			}
+
 			// Set deadline to prevent blocking forever
-			f.listener.(*net.TCPListener).SetDeadline(time.Now().Add(5 * time.Second))
+			if tcpListener, ok := listener.(*net.TCPListener); ok {
+				tcpListener.SetDeadline(time.Now().Add(5 * time.Second))
+			}
 
-			conn, err := f.listener.Accept()
+			conn, err := listener.Accept()
 			if err != nil {
 				// Check if it's a timeout
 				if netErr, ok := err.(net.Error); ok && netErr.Timeout() {
@@ -117,14 +125,24 @@ func (f *Forwarder) handleLocalConnection(localConn net.Conn) {
 	// Use 127.0.0.1 instead of localhost to avoid IPv6 issues
 	remoteAddr := fmt.Sprintf("127.0.0.1:%d", f.RemotePort)
 
-	remoteConn, err := net.DialTimeout("tcp", remoteAddr, 5*time.Second)
+	// Dial the remote endpoint *through* the SSH tunnel
+	f.mu.RLock()
+	client := f.sshClient
+	f.mu.RUnlock()
+
+	if client == nil {
+		log.Printf("[portforward] SSH client is nil, cannot connect to remote %s", remoteAddr)
+		return
+	}
+
+	remoteConn, err := client.Dial("tcp", remoteAddr)
 	if err != nil {
-		log.Printf("[portforward] Failed to connect to remote %s: %v", remoteAddr, err)
+		log.Printf("[portforward] Failed to connect to remote %s via SSH: %v", remoteAddr, err)
 		return
 	}
 	defer remoteConn.Close()
 
-	log.Printf("[portforward] Tunnel established to remote %s", remoteAddr)
+	log.Printf("[portforward] Tunnel established to remote %s via SSH", remoteAddr)
 
 	// Bidirectional copy
 	done := make(chan struct{})
@@ -146,39 +164,29 @@ func (f *Forwarder) startRemoteForward() {
 	go func() {
 		defer f.wg.Done()
 
-		// Request the SSH server to listen on remote:remotePort and forward connections to us
-		addr := fmt.Sprintf(":%d", f.RemotePort)
-		payload := ssh.Marshal(struct {
-			Addr string
-			Port uint32
-		}{Addr: addr, Port: uint32(f.RemotePort)})
-
-		// Use timeout for the request
-		type result struct {
-			ok  bool
-			err error
+		f.mu.RLock()
+		client := f.sshClient
+		f.mu.RUnlock()
+
+		if client == nil {
+			log.Printf("[portforward] SSH client is nil, cannot start remote forward")
+			return
 		}
-		resultCh := make(chan result, 1)
-		go func() {
-			ok, _, err := f.sshClient.SendRequest("tcpip-forward", true, payload)
-			resultCh <- result{ok: ok, err: err}
-		}()
-
-		select {
-		case r := <-resultCh:
-			if r.err != nil {
-				log.Printf("[portforward] Failed to send tcpip-forward request: %v", r.err)
-				return
-			}
-			if !r.ok {
-				log.Printf("[portforward] SSH server rejected tcpip-forward request for port %d", f.RemotePort)
-				return
-			}
-		case <-time.After(5 * time.Second):
-			log.Printf("[portforward] tcpip-forward request timed out")
+
+		// Request the SSH server to listen on remote:remotePort and forward connections to us
+		remoteAddr := fmt.Sprintf("0.0.0.0:%d", f.RemotePort)
+
+		// Note: The ssh.Client.Listen internally sends the tcpip-forward request
+		listener, err := client.Listen("tcp", remoteAddr)
+		if err != nil {
+			log.Printf("[portforward] Failed to listen on remote port %d via SSH: %v", f.RemotePort, err)
 			return
 		}
 
+		f.mu.Lock()
+		f.listener = listener
+		f.mu.Unlock()
+
 		log.Printf("[portforward] Remote forward: SSH server listening on port %d", f.RemotePort)
 
 		// Accept forwarded connections in a loop
@@ -188,10 +196,16 @@ func (f *Forwarder) startRemoteForward() {
 				f.mu.RUnlock()
 				return
 			}
+			currentListener := f.listener
 			f.mu.RUnlock()
 
-			// Wait for a forwarded connection with timeout
-			ch, reqs, err := f.sshClient.OpenChannel("forwarded-tcpip", nil)
+			if currentListener == nil {
+				time.Sleep(1 * time.Second)
+				continue
+			}
+
+			// Wait for a forwarded connection
+			remoteConn, err := currentListener.Accept()
 			if err != nil {
 				f.mu.RLock()
 				closed := f.closed
@@ -199,21 +213,18 @@ func (f *Forwarder) startRemoteForward() {
 				if closed {
 					return
 				}
-				// Log and continue - don't block
 				log.Printf("[portforward] Error accepting forwarded connection: %v", err)
-				time.Sleep(1 * time.Second)
-				continue
+				return // Listener is broken or closed
 			}
 
-			// Discard any requests
-			go ssh.DiscardRequests(reqs)
+			log.Printf("[portforward] Accepted remote connection from %v", remoteConn.RemoteAddr())
 
-			// Connect to local port
+			// Connect to local port to forward the traffic
 			localAddr := fmt.Sprintf("127.0.0.1:%d", f.LocalPort)
 			localConn, err := net.DialTimeout("tcp", localAddr, 5*time.Second)
 			if err != nil {
 				log.Printf("[portforward] Failed to connect to local port %d: %v", f.LocalPort, err)
-				ch.Close()
+				remoteConn.Close()
 				continue
 			}
 
@@ -225,12 +236,20 @@ func (f *Forwarder) startRemoteForward() {
 
 			// Bidirectional copy
 			go func() {
-				io.Copy(ch, localConn)
-				ch.Close()
-				localConn.Close()
-			}()
-			go func() {
-				io.Copy(localConn, ch)
+				defer func() {
+					remoteConn.Close()
+					localConn.Close()
+					f.mu.Lock()
+					delete(f.conns, localConn)
+					f.mu.Unlock()
+				}()
+				done := make(chan struct{})
+				go func() {
+					io.Copy(remoteConn, localConn)
+					close(done)
+				}()
+				io.Copy(localConn, remoteConn)
+				<-done
 			}()
 		}
 	}()
@@ -244,7 +263,6 @@ func (f *Forwarder) Close() {
 		return
 	}
 	f.closed = true
-	f.mu.Unlock()
 
 	if f.listener != nil {
 		f.listener.Close()
@@ -253,6 +271,7 @@ func (f *Forwarder) Close() {
 	for conn := range f.conns {
 		conn.Close()
 	}
+	f.mu.Unlock()
 
 	f.wg.Wait()
 }
@@ -262,8 +281,6 @@ func (f *Forwarder) Restart(sshClient *ssh.Client) {
 	f.mu.Lock()
 	f.sshClient = sshClient
 	f.closed = false
-	f.conns = make(map[net.Conn]bool)
-	f.mu.Unlock()
 
 	if f.listener != nil {
 		f.listener.Close()
@@ -273,11 +290,21 @@ func (f *Forwarder) Restart(sshClient *ssh.Client) {
 		// Create new listener
 		addr := fmt.Sprintf("localhost:%d", f.LocalPort)
 		listener, err := net.Listen("tcp", addr)
-		if err != nil {
-			return
+		if err == nil {
+			f.listener = listener
+		} else {
+			f.listener = nil
+			log.Printf("[portforward] Failed to recreate listener on %s: %v", addr, err)
 		}
-		f.listener = listener
+	} else {
+		f.listener = nil // Will be re-initialized in startRemoteForward
 	}
 
+	for conn := range f.conns {
+		conn.Close()
+	}
+	f.conns = make(map[net.Conn]bool)
+	f.mu.Unlock()
+
 	f.Start()
 }