- 拆分原有单体 ssh.go,按职责重组为 types、utils、transport、login、keepalive、session、exec、pool、shell、terminal、forward、hostkey、state 等模块,并补充平台相关实现 - 重做登录与连接运行时,补齐基于 context 的建连、jump/proxy 链路、可配置认证顺序,以及 Unix/Windows 下的 ssh-agent 支持 - 新增正式非交互执行模型 ExecRequest/ExecResult,支持流式输出、溢出统计、超时控制,以及 posix/powershell/cmd/raw 多方言执行 - 保留旧 shell 风格兼容接口,同时让路径/用户探测等 helper 具备跨 shell fallback,避免 Windows 目标继续硬依赖 POSIX 命令 - 新增 TerminalSession 作为原始交互终端基座,提供 IO attach、resize、signal/control、退出状态与关闭原因管理 - 重构端口转发语义,默认复用当前 SSH 连接,并显式提供 detached 的本地/动态转发模式承载隔离场景 - 梳理 keepalive 与取消语义,区分仅取消本次操作和关闭整条连接,并统一连接状态与传输关闭路径 - 围绕新的 session/连接生命周期重做执行池与运行时支撑 - 大幅增强 SFTP 传输链路,补齐更安全的原子替换、校验、进度回调、重试隔离、可复用 client 生命周期与失败语义 - 新增取消语义、keepalive、SFTP、forward、terminal input 等关键回归测试,提升核心链路稳定性
165 lines
4.5 KiB
Go
165 lines
4.5 KiB
Go
package starssh
|
|
|
|
import (
|
|
"context"
|
|
"io"
|
|
"net"
|
|
"sync/atomic"
|
|
"testing"
|
|
"time"
|
|
|
|
"golang.org/x/crypto/ssh"
|
|
)
|
|
|
|
func TestStartLocalForwardUsesExistingConnectionByDefault(t *testing.T) {
|
|
oldDialSSHClient := dialSSHClient
|
|
oldNewDetachedForwardClient := newDetachedForwardClient
|
|
oldCloseSSHClient := closeSSHClient
|
|
t.Cleanup(func() {
|
|
dialSSHClient = oldDialSSHClient
|
|
newDetachedForwardClient = oldNewDetachedForwardClient
|
|
closeSSHClient = oldCloseSSHClient
|
|
})
|
|
|
|
baseClient := &ssh.Client{}
|
|
star := &StarSSH{}
|
|
star.setTransport(baseClient, nil)
|
|
|
|
var detachedCalls atomic.Int32
|
|
newDetachedForwardClient = func(ctx context.Context, input LoginInput) (*StarSSH, error) {
|
|
detachedCalls.Add(1)
|
|
return nil, nil
|
|
}
|
|
|
|
dialSSHClient = func(ctx context.Context, client *ssh.Client, network, address string) (net.Conn, error) {
|
|
if client != baseClient {
|
|
t.Errorf("expected existing ssh client, got %p want %p", client, baseClient)
|
|
}
|
|
serverConn, clientConn := net.Pipe()
|
|
go echoForwardPipe(serverConn)
|
|
return clientConn, nil
|
|
}
|
|
|
|
closeSSHClient = func(client sshClientRequester) error {
|
|
t.Fatal("default local forward should not close the main ssh client")
|
|
return nil
|
|
}
|
|
|
|
forwarder, err := star.StartLocalForward(ForwardRequest{
|
|
ListenAddr: "127.0.0.1:0",
|
|
TargetAddr: "example.internal:22",
|
|
})
|
|
if err != nil {
|
|
t.Fatalf("start local forward: %v", err)
|
|
}
|
|
defer forwarder.Close()
|
|
|
|
reply := exerciseForwarder(t, forwarder.Addr().String(), []byte("ping"))
|
|
if string(reply) != "ping" {
|
|
t.Fatalf("unexpected forwarded reply: %q", string(reply))
|
|
}
|
|
if detachedCalls.Load() != 0 {
|
|
t.Fatalf("default local forward should not create detached ssh client, calls=%d", detachedCalls.Load())
|
|
}
|
|
}
|
|
|
|
func TestStartLocalForwardDetachedUsesSeparateConnection(t *testing.T) {
|
|
oldDialSSHClient := dialSSHClient
|
|
oldNewDetachedForwardClient := newDetachedForwardClient
|
|
oldCloseSSHClient := closeSSHClient
|
|
t.Cleanup(func() {
|
|
dialSSHClient = oldDialSSHClient
|
|
newDetachedForwardClient = oldNewDetachedForwardClient
|
|
closeSSHClient = oldCloseSSHClient
|
|
})
|
|
|
|
baseClient := &ssh.Client{}
|
|
detachedClient := &ssh.Client{}
|
|
star := &StarSSH{LoginInfo: LoginInput{User: "tester", Addr: "127.0.0.1"}}
|
|
star.setTransport(baseClient, nil)
|
|
|
|
forwardClient := &StarSSH{}
|
|
forwardClient.setTransport(detachedClient, nil)
|
|
|
|
var detachedCalls atomic.Int32
|
|
newDetachedForwardClient = func(ctx context.Context, input LoginInput) (*StarSSH, error) {
|
|
detachedCalls.Add(1)
|
|
return forwardClient, nil
|
|
}
|
|
|
|
dialSSHClient = func(ctx context.Context, client *ssh.Client, network, address string) (net.Conn, error) {
|
|
if client != detachedClient {
|
|
t.Errorf("expected detached ssh client, got %p want %p", client, detachedClient)
|
|
}
|
|
serverConn, clientConn := net.Pipe()
|
|
go echoForwardPipe(serverConn)
|
|
return clientConn, nil
|
|
}
|
|
|
|
var closeCalls atomic.Int32
|
|
closeSSHClient = func(client sshClientRequester) error {
|
|
closeCalls.Add(1)
|
|
return nil
|
|
}
|
|
|
|
forwarder, err := star.StartLocalForwardDetached(ForwardRequest{
|
|
ListenAddr: "127.0.0.1:0",
|
|
TargetAddr: "example.internal:22",
|
|
})
|
|
if err != nil {
|
|
t.Fatalf("start detached local forward: %v", err)
|
|
}
|
|
|
|
reply := exerciseForwarder(t, forwarder.Addr().String(), []byte("pong"))
|
|
if string(reply) != "pong" {
|
|
t.Fatalf("unexpected detached forwarded reply: %q", string(reply))
|
|
}
|
|
|
|
if err := forwarder.Close(); err != nil {
|
|
t.Fatalf("close detached local forward: %v", err)
|
|
}
|
|
if detachedCalls.Load() != 1 {
|
|
t.Fatalf("expected one detached ssh login, got %d", detachedCalls.Load())
|
|
}
|
|
if closeCalls.Load() != 1 {
|
|
t.Fatalf("expected detached ssh client cleanup once, got %d", closeCalls.Load())
|
|
}
|
|
if got := star.snapshotSSHClient(); got != baseClient {
|
|
t.Fatal("detached local forward should not detach the main ssh client")
|
|
}
|
|
if got := forwardClient.snapshotSSHClient(); got != nil {
|
|
t.Fatal("detached local forward should close its detached ssh client")
|
|
}
|
|
}
|
|
|
|
func echoForwardPipe(conn net.Conn) {
|
|
defer conn.Close()
|
|
buf := make([]byte, 4096)
|
|
n, err := conn.Read(buf)
|
|
if err != nil {
|
|
return
|
|
}
|
|
_, _ = conn.Write(buf[:n])
|
|
}
|
|
|
|
func exerciseForwarder(t *testing.T, addr string, payload []byte) []byte {
|
|
t.Helper()
|
|
|
|
conn, err := net.DialTimeout("tcp", addr, time.Second)
|
|
if err != nil {
|
|
t.Fatalf("dial forward listener: %v", err)
|
|
}
|
|
defer conn.Close()
|
|
_ = conn.SetDeadline(time.Now().Add(2 * time.Second))
|
|
|
|
if _, err := conn.Write(payload); err != nil {
|
|
t.Fatalf("write forwarded payload: %v", err)
|
|
}
|
|
|
|
reply := make([]byte, len(payload))
|
|
if _, err := io.ReadFull(conn, reply); err != nil {
|
|
t.Fatalf("read forwarded reply: %v", err)
|
|
}
|
|
return reply
|
|
}
|