gssh-agent 1.0.2 → 1.0.3

package/cmd/gssh/main.go

@@ -18,6 +18,7 @@ import (
 
 const (
 	defaultSocketPath = "/tmp/gssh.sock"
+	version          = "0.1.0"
 )
 
 var (
@@ -25,6 +26,20 @@ var (
 )
 
 func main() {
+	// Check for version flag before parsing
+	if len(os.Args) > 1 && (os.Args[1] == "-v" || os.Args[1] == "--version") {
+		fmt.Printf("gssh version %s\n", version)
+		os.Exit(0)
+	}
+
+	// Check for help flag before parsing
+	for _, arg := range os.Args[1:] {
+		if arg == "-h" || arg == "--help" {
+			printUsage()
+			os.Exit(0)
+		}
+	}
+
 	flag.Parse()
 
 	if flag.NArg() < 1 {
@@ -58,7 +73,7 @@ func main() {
 		err = handleSCP()
 	case "sftp":
 		err = handleSFTP()
-	case "help", "-h", "--help":
+	case "help":
 		printUsage()
 	default:
 		fmt.Fprintf(os.Stderr, "Unknown command: %s\n", cmd)
@@ -566,42 +581,51 @@ func handleSFTP() error {
 }
 
 func printUsage() {
-	fmt.Println(`gssh - SSH Session Manager for Agents (Stateless)
+	fmt.Printf(`gssh - SSH Session Manager for Agents v%s
 
 Usage:
   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] [-S password | --ask-sudo-pass] "sudo command"
+  gssh exec [-s session_id] [-S password | --ask-sudo-pass] "command"
   gssh list
   gssh use <session_id>
-  gssh forward [-s session_id] -l local_port -r remote_port
+  gssh forward [-s session_id] -l local_port -r remote_port [-R]
   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.
+  gssh scp [-s session_id] -put <local> <remote>
+  gssh scp [-s session_id] -get <remote> <local>
+  gssh sftp [-s session_id] -c <ls|mkdir|rm> -p <path>
+  gssh -v, --version
 
 Options:
-  -socket path        Unix socket path (default: /tmp/gssh.sock)
+  -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
+  -P password         Password
+  -i key_path         SSH key path
+  -S password         sudo password
+  --ask-pass          Ask for password interactively
+  --ask-sudo-pass     Ask for sudo password interactively
   -l local            Local port
   -r remote           Remote port
-  -R                  Remote port forward
-  -put                Upload mode (local -> remote)
-  -get                Download mode (remote -> local)
+  -R                  Remote port forward (default: local)
+  -put                Upload (local -> remote)
+  -get                Download (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)`)
+  -v, --version       Show version
+
+Examples:
+  gssh connect -u admin -h 192.168.1.1 -P password
+  gssh exec "ls -la"
+  gssh forward -l 8080 -r 80
+  gssh forward -l 9000 -r 3000 -R
+  gssh scp -put local.txt /home/user/remote.txt
+  gssh sftp -c ls -p /home/user
+`, version)
 }
 
 // Restore terminal on exit

package/internal/session/manager.go

@@ -2,6 +2,7 @@ package session
 
 import (
 	"fmt"
+	"strings"
 	"sync"
 	"time"
 
@@ -45,6 +46,54 @@ func NewManager() *Manager {
 	}
 }
 
+// needsShell returns true if the command needs to be executed through a shell
+func needsShell(cmd string) bool {
+	// Check for heredoc
+	if strings.Contains(cmd, "<<") {
+		return true
+	}
+
+	// Check for newlines (multi-line commands)
+	if strings.Contains(cmd, "\n") {
+		return true
+	}
+
+	// Check for pipe
+	if strings.Contains(cmd, " | ") {
+		return true
+	}
+
+	// Check for redirection
+	if strings.ContainsAny(cmd, "><") {
+		// Make sure it's not in a string context
+		if strings.Contains(cmd, ">") || strings.Contains(cmd, "<") {
+			return true
+		}
+	}
+
+	// Check for logical operators
+	if strings.Contains(cmd, " && ") || strings.Contains(cmd, " || ") {
+		return true
+	}
+
+	// Check for background execution
+	if strings.HasSuffix(strings.TrimSpace(cmd), "&") {
+		return true
+	}
+
+	// Check for command substitution
+	if strings.Contains(cmd, "$(") || strings.Contains(cmd, "`") {
+		return true
+	}
+
+	// Check for environment variables (but not $$ which is PID)
+	if strings.Contains(cmd, "${") || (strings.Contains(cmd, "$") && !strings.Contains(cmd, "$$")) {
+		return true
+	}
+
+	return false
+}
+
 // Connect creates a new SSH session
 func (m *Manager) Connect(user, host string, port int, password, keyPath string) (*protocol.Session, error) {
 	m.mu.Lock()
@@ -194,9 +243,11 @@ func (m *Manager) Exec(sessionID, command string) (*protocol.ExecResult, error)
 	}
 	defer session.Close()
 
-	// 直接执行命令，不通过 shell
-	
+	// 检测是否需要通过 shell 执行
 	fullCmd := command
+	if needsShell(command) {
+		fullCmd = fmt.Sprintf("/bin/zsh -c %q", command)
+	}
 
 	output, err := session.CombinedOutput(fullCmd)
 	if err != nil {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gssh-agent",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "SSH Session Manager for Agents - Stateless SSH client with SFTP support",
   "bin": {
     "gssh": "./bin/gssh",