gssh-agent 1.0.4 → 1.0.5

package/internal/portforward/forwarder.go

@@ -6,6 +6,7 @@ import (
 	"log"
 	"net"
 	"sync"
+	"time"
 
 	"golang.org/x/crypto/ssh"
 )
@@ -72,16 +73,32 @@ func (f *Forwarder) startLocalForward() {
 				f.mu.RUnlock()
 				return
 			}
+			listener := f.listener
 			f.mu.RUnlock()
 
-			conn, err := f.listener.Accept()
+			if listener == nil {
+				time.Sleep(1 * time.Second)
+				continue
+			}
+
+			// Set deadline to prevent blocking forever
+			if tcpListener, ok := listener.(*net.TCPListener); ok {
+				tcpListener.SetDeadline(time.Now().Add(5 * time.Second))
+			}
+
+			conn, err := listener.Accept()
 			if err != nil {
+				// Check if it's a timeout
+				if netErr, ok := err.(net.Error); ok && netErr.Timeout() {
+					continue
+				}
 				f.mu.RLock()
 				closed := f.closed
 				f.mu.RUnlock()
 				if closed {
 					return
 				}
+				log.Printf("[portforward] Accept error: %v", err)
 				continue
 			}
 
@@ -105,15 +122,27 @@ func (f *Forwarder) handleLocalConnection(localConn net.Conn) {
 
 	log.Printf("[portforward] Connection accepted from %s", localConn.RemoteAddr())
 
-	remoteAddr := fmt.Sprintf("localhost:%d", f.RemotePort)
-	remoteConn, err := f.sshClient.Dial("tcp", remoteAddr)
+	// Use 127.0.0.1 instead of localhost to avoid IPv6 issues
+	remoteAddr := fmt.Sprintf("127.0.0.1:%d", f.RemotePort)
+
+	// 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{})
@@ -135,38 +164,48 @@ func (f *Forwarder) startRemoteForward() {
 	go func() {
 		defer f.wg.Done()
 
-		// Request the SSH server to listen on remote:remotePort and forward connections to us
-		// Payload format: string (address) + uint32 (port)
-		addr := fmt.Sprintf(":%d", f.RemotePort)
-		payload := ssh.Marshal(struct {
-			Addr string
-			Port uint32
-		}{Addr: addr, Port: uint32(f.RemotePort)})
-
-		ok, _, err := f.sshClient.SendRequest("tcpip-forward", true, payload)
-		if err != nil {
-			log.Printf("[portforward] Failed to send tcpip-forward request: %v", err)
+		f.mu.RLock()
+		client := f.sshClient
+		f.mu.RUnlock()
+
+		if client == nil {
+			log.Printf("[portforward] SSH client is nil, cannot start remote forward")
 			return
 		}
-		if !ok {
-			log.Printf("[portforward] SSH server rejected tcpip-forward request for port %d", f.RemotePort)
+
+		// 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)
 
-		// Now we need to accept forwarded connections from the SSH server
-		// The SSH server will open a "forwarded-tcpip" channel for each connection
+		// Accept forwarded connections in a loop
 		for {
 			f.mu.RLock()
 			if f.closed {
 				f.mu.RUnlock()
 				return
 			}
+			currentListener := f.listener
 			f.mu.RUnlock()
 
+			if currentListener == nil {
+				time.Sleep(1 * time.Second)
+				continue
+			}
+
 			// Wait for a forwarded connection
-			ch, reqs, err := f.sshClient.OpenChannel("forwarded-tcpip", nil)
+			remoteConn, err := currentListener.Accept()
 			if err != nil {
 				f.mu.RLock()
 				closed := f.closed
@@ -175,18 +214,17 @@ func (f *Forwarder) startRemoteForward() {
 					return
 				}
 				log.Printf("[portforward] Error accepting forwarded connection: %v", err)
-				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
-			localAddr := fmt.Sprintf("localhost:%d", f.LocalPort)
-			localConn, err := net.Dial("tcp", localAddr)
+			// 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
 			}
 
@@ -198,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
 			}()
 		}
 	}()
@@ -217,7 +263,6 @@ func (f *Forwarder) Close() {
 		return
 	}
 	f.closed = true
-	f.mu.Unlock()
 
 	if f.listener != nil {
 		f.listener.Close()
@@ -226,6 +271,7 @@ func (f *Forwarder) Close() {
 	for conn := range f.conns {
 		conn.Close()
 	}
+	f.mu.Unlock()
 
 	f.wg.Wait()
 }
@@ -235,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()
@@ -246,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()
 }

package/internal/protocol/types.go

@@ -72,6 +72,7 @@ type ReconnectParams struct {
 type ExecParams struct {
 	SessionID string `json:"session_id,omitempty"`
 	Command   string `json:"command"`
+	Timeout   int    `json:"timeout,omitempty"` // 超时时间（秒），0 表示无超时
 }
 
 type ForwardParams struct {
@@ -108,6 +109,7 @@ type SCPResult struct {
 // SFTPParams represents SFTP command parameters
 type SFTPParams struct {
 	SessionID string `json:"session_id,omitempty"`
-	Command   string `json:"command"` // "ls", "cd", "pwd", "mkdir", "rm", "rmdir"
+	Command   string `json:"command"`
+	Timeout   int    `json:"timeout,omitempty"` // 超时时间（秒），0 表示无超时 // "ls", "cd", "pwd", "mkdir", "rm", "rmdir"
 	Path      string `json:"path"`
 }

package/internal/session/manager.go

@@ -96,42 +96,65 @@ func needsShell(cmd string) bool {
 // Connect creates a new SSH session
 func (m *Manager) Connect(user, host string, port int, password, keyPath string) (*protocol.Session, error) {
 	m.mu.Lock()
-	defer m.mu.Unlock()
 
 	// Check if session already exists
 	for _, s := range m.sessions {
 		if s.Host == host && s.User == user && s.Port == port {
-			if s.Status == "connected" {
-				return toProtocolSession(s), fmt.Errorf("session already exists")
+			s.mu.RLock()
+			status := s.Status
+			s.mu.RUnlock()
+
+			if status == "connected" || status == "connecting" || status == "reconnecting" {
+				m.defaultID = s.ID
+				m.mu.Unlock()
+				return toProtocolSession(s), nil
 			}
-			// Try to reconnect
+
+			// Mark as connecting to prevent concurrent connect attempts
+			s.mu.Lock()
+			s.Status = "connecting"
+			s.mu.Unlock()
+
+			// Switch default session
+			m.defaultID = s.ID
+
+			m.mu.Unlock()
+
+			// Perform network connect outside of Manager lock
 			sshClient, err := client.Connect(user, host, port, password, keyPath)
 			if err != nil {
+				s.mu.Lock()
+				s.Status = "offline"
+				s.mu.Unlock()
 				return nil, err
 			}
+
+			s.mu.Lock()
+			// Check if a disconnect was requested while we were connecting
+			if s.Status != "connecting" {
+				s.mu.Unlock()
+				sshClient.Close()
+				return nil, fmt.Errorf("session was disconnected while connecting")
+			}
 			s.SSHClient = sshClient
 			s.Status = "connected"
+			s.mu.Unlock()
+
 			return toProtocolSession(s), nil
 		}
 	}
 
-	// Create new session
-	sshClient, err := client.Connect(user, host, port, password, keyPath)
-	if err != nil {
-		return nil, err
-	}
-
-	id := uuid.New().String()
+	// Create new session placeholder
+	id := uuid.New().String()[:8]
 	ms := &ManagedSession{
-		ID:        id,
-		Host:      host,
-		User:      user,
-		Port:      port,
-		Status:    "connected",
-		Password:  password,
-		KeyPath:   keyPath,
-		SSHClient: sshClient,
-		Forwards:  make(map[string]*portforward.Forwarder),
+		ID:       id,
+		Host:     host,
+		User:     user,
+		Port:     port,
+		Status:   "connecting",
+		Password: password,
+		KeyPath:  keyPath,
+		Forwards: make(map[string]*portforward.Forwarder),
 	}
 
 	m.sessions[id] = ms
@@ -140,6 +163,31 @@ func (m *Manager) Connect(user, host string, port int, password, keyPath string)
 	if m.defaultID == "" {
 		m.defaultID = id
 	}
+	m.mu.Unlock()
+
+	// Perform network connect outside of Manager lock
+	sshClient, err := client.Connect(user, host, port, password, keyPath)
+	if err != nil {
+		// Clean up the placeholder since initialization failed completely
+		m.mu.Lock()
+		delete(m.sessions, id)
+		if m.defaultID == id {
+			m.defaultID = ""
+		}
+		m.mu.Unlock()
+		return nil, err
+	}
+
+	ms.mu.Lock()
+	// Check if a disconnect was requested while we were connecting
+	if ms.Status != "connecting" {
+		ms.mu.Unlock()
+		sshClient.Close()
+		return nil, fmt.Errorf("session was disconnected while connecting")
+	}
+	ms.SSHClient = sshClient
+	ms.Status = "connected"
+	ms.mu.Unlock()
 
 	// Start reconnect monitor
 	go m.monitorReconnect(ms)
@@ -149,28 +197,32 @@ func (m *Manager) Connect(user, host string, port int, password, keyPath string)
 
 // Disconnect closes a session
 func (m *Manager) Disconnect(sessionID string) error {
+	m.mu.Lock()
+
 	// Use default session if not specified
 	if sessionID == "" {
 		sessionID = m.defaultID
 	}
 
-	m.mu.Lock()
-	defer m.mu.Unlock()
-
 	ms, ok := m.sessions[sessionID]
 	if !ok {
+		m.mu.Unlock()
 		return fmt.Errorf("session not found")
 	}
 
-	if ms.SSHClient != nil {
-		ms.SSHClient.Close()
+	// Clear default ID when disconnecting
+	if m.defaultID == sessionID {
+		m.defaultID = ""
 	}
+	m.mu.Unlock()
 
+	ms.mu.Lock()
+	sshClient := ms.SSHClient
 	ms.Status = "disconnected"
+	ms.mu.Unlock()
 
-	// Clear default ID when disconnecting
-	if m.defaultID == sessionID {
-		m.defaultID = ""
+	if sshClient != nil {
+		sshClient.Close()
 	}
 
 	return nil
@@ -191,21 +243,36 @@ func (m *Manager) Reconnect(sessionID string) (*protocol.Session, error) {
 		return nil, fmt.Errorf("session not found")
 	}
 
+	ms.mu.Lock()
+	if ms.Status == "connecting" || ms.Status == "reconnecting" {
+		ms.mu.Unlock()
+		return nil, fmt.Errorf("session is currently connecting")
+	}
+	existingClient := ms.SSHClient
+	ms.Status = "reconnecting"
+	ms.mu.Unlock()
+
 	// Close existing connection
-	if ms.SSHClient != nil {
-		ms.SSHClient.Close()
+	if existingClient != nil {
+		existingClient.Close()
 	}
 
 	// Create new connection
 	sshClient, err := client.Connect(ms.User, ms.Host, ms.Port, ms.Password, ms.KeyPath)
 	if err != nil {
 		ms.mu.Lock()
-		ms.Status = "disconnected"
+		ms.Status = "offline"
 		ms.mu.Unlock()
 		return nil, err
 	}
 
 	ms.mu.Lock()
+	// Check if a disconnect was requested while we were reconnecting
+	if ms.Status != "reconnecting" {
+		ms.mu.Unlock()
+		sshClient.Close()
+		return nil, fmt.Errorf("session was disconnected while reconnecting")
+	}
 	ms.SSHClient = sshClient
 	ms.Status = "connected"
 	ms.mu.Unlock()
@@ -224,7 +291,7 @@ func (m *Manager) Reconnect(sessionID string) (*protocol.Session, error) {
 }
 
 // Exec executes a command on a session
-func (m *Manager) Exec(sessionID, command string) (*protocol.ExecResult, error) {
+func (m *Manager) Exec(sessionID, command string, timeout int) (*protocol.ExecResult, error) {
 	m.mu.RLock()
 	var ms *ManagedSession
 	if sessionID != "" {
@@ -259,18 +326,51 @@ func (m *Manager) Exec(sessionID, command string) (*protocol.ExecResult, error)
 		fullCmd = fmt.Sprintf("/bin/sh -c %q", command)
 	}
 
-	output, err := session.CombinedOutput(fullCmd)
+	// 执行命令，支持超时
+	var output []byte
+	var exitErr *ssh.ExitError
+	var ok bool
+
+	if timeout > 0 {
+		type result struct {
+			out []byte
+			err error
+		}
+		done := make(chan result, 1)
+		go func() {
+			out, err := session.CombinedOutput(fullCmd)
+			done <- result{out, err}
+		}()
+		select {
+		case res := <-done:
+			output = res.out
+			err = res.err
+			// 命令执行完成
+		case <-time.After(time.Duration(timeout) * time.Second):
+			session.Signal(ssh.SIGKILL)
+			return &protocol.ExecResult{
+				Stdout:   "",
+				Stderr:   "",
+				ExitCode: -1,
+			}, fmt.Errorf("command timed out after %d seconds", timeout)
+		}
+	} else {
+		output, err = session.CombinedOutput(fullCmd)
+	}
+
+	ms.mu.Lock()
+	ms.LastCmd = command
+	ms.mu.Unlock()
+
 	if err != nil {
-		exitErr, ok := err.(*ssh.ExitError)
+		exitErr, ok = err.(*ssh.ExitError)
 		if ok {
-			ms.LastCmd = command
 			return &protocol.ExecResult{
 				Stdout:   string(output),
 				Stderr:   "",
 				ExitCode: exitErr.ExitStatus(),
 			}, nil
 		}
-		ms.LastCmd = command
 		return &protocol.ExecResult{
 			Stdout:   string(output),
 			Stderr:   "",
@@ -278,7 +378,6 @@ func (m *Manager) Exec(sessionID, command string) (*protocol.ExecResult, error)
 		}, nil
 	}
 
-	ms.LastCmd = command
 	return &protocol.ExecResult{
 		Stdout:   string(output),
 		Stderr:   "",
@@ -346,7 +445,7 @@ func (m *Manager) AddForward(sessionID, forwardType string, localPort, remotePor
 		return nil, err
 	}
 
-	id := uuid.New().String()
+	id := uuid.New().String()[:8]
 	forwarder.ID = id
 
 	m.forwardMu.Lock()
@@ -573,14 +672,30 @@ func (m *Manager) monitorReconnect(ms *ManagedSession) {
 			return
 		}
 
-		if sshClient == nil || sshClient.Client == nil {
+		isAlive := false
+		if sshClient != nil && sshClient.Client != nil {
+			// Try to send a keepalive request
+			_, _, err := sshClient.Client.SendRequest("keepalive@gssh", true, nil)
+			if err == nil {
+				isAlive = true
+			}
+		}
+
+		if !isAlive {
 			ms.mu.Lock()
 			ms.Status = "reconnecting"
+			if sshClient != nil {
+				sshClient.Close()
+				ms.SSHClient = nil
+			}
 			ms.mu.Unlock()
 
 			// Try to reconnect
 			newClient, err := client.Connect(ms.User, ms.Host, ms.Port, ms.Password, ms.KeyPath)
 			if err != nil {
+				ms.mu.Lock()
+				ms.Status = "offline"
+				ms.mu.Unlock()
 				continue
 			}