refactor: 重构 starssh 核心运行时并补强 ssh/exec/terminal/sftp 能力
- 拆分原有单体 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 等关键回归测试,提升核心链路稳定性
This commit is contained in:
@@ -0,0 +1,290 @@
|
||||
package starssh
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"bytes"
|
||||
"io"
|
||||
"os"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
type terminalInputProvider struct {
|
||||
io.Reader
|
||||
source io.Reader
|
||||
}
|
||||
|
||||
func (p terminalInputProvider) TerminalInputSource() io.Reader {
|
||||
return p.source
|
||||
}
|
||||
|
||||
type prefixedReadCloser struct {
|
||||
io.Reader
|
||||
io.Closer
|
||||
}
|
||||
|
||||
func TestPrepareTerminalInputReaderBufioReaderPreservesBufferedBytes(t *testing.T) {
|
||||
reader, writer, err := os.Pipe()
|
||||
if err != nil {
|
||||
t.Fatalf("create pipe: %v", err)
|
||||
}
|
||||
defer reader.Close()
|
||||
|
||||
if _, err := writer.Write([]byte("hello world")); err != nil {
|
||||
writer.Close()
|
||||
t.Fatalf("write pipe: %v", err)
|
||||
}
|
||||
if err := writer.Close(); err != nil {
|
||||
t.Fatalf("close writer: %v", err)
|
||||
}
|
||||
|
||||
buffered := bufio.NewReaderSize(reader, 4)
|
||||
peeked, err := buffered.Peek(5)
|
||||
if err != nil {
|
||||
t.Fatalf("prime buffer: %v", err)
|
||||
}
|
||||
if string(peeked) != "hello" {
|
||||
t.Fatalf("unexpected buffered prefix: %q", string(peeked))
|
||||
}
|
||||
|
||||
prepared, cancel, cancelable, err := prepareTerminalInputReader(buffered)
|
||||
if err != nil {
|
||||
t.Fatalf("prepare input: %v", err)
|
||||
}
|
||||
defer cancel()
|
||||
|
||||
if !cancelable {
|
||||
t.Fatal("expected cancelable reader")
|
||||
}
|
||||
|
||||
data, err := io.ReadAll(prepared)
|
||||
if err != nil {
|
||||
t.Fatalf("read prepared input: %v", err)
|
||||
}
|
||||
if string(data) != "hello world" {
|
||||
t.Fatalf("unexpected prepared input: %q", string(data))
|
||||
}
|
||||
}
|
||||
|
||||
func TestPrepareTerminalInputReaderBufioReadWriterPreservesBufferedBytes(t *testing.T) {
|
||||
reader, writer, err := os.Pipe()
|
||||
if err != nil {
|
||||
t.Fatalf("create pipe: %v", err)
|
||||
}
|
||||
defer reader.Close()
|
||||
|
||||
if _, err := writer.Write([]byte("buffered payload")); err != nil {
|
||||
writer.Close()
|
||||
t.Fatalf("write pipe: %v", err)
|
||||
}
|
||||
if err := writer.Close(); err != nil {
|
||||
t.Fatalf("close writer: %v", err)
|
||||
}
|
||||
|
||||
readWriter := bufio.NewReadWriter(bufio.NewReaderSize(reader, 8), bufio.NewWriter(io.Discard))
|
||||
if _, err := readWriter.Reader.Peek(8); err != nil {
|
||||
t.Fatalf("prime readwriter buffer: %v", err)
|
||||
}
|
||||
|
||||
prepared, cancel, cancelable, err := prepareTerminalInputReader(readWriter)
|
||||
if err != nil {
|
||||
t.Fatalf("prepare readwriter input: %v", err)
|
||||
}
|
||||
defer cancel()
|
||||
|
||||
if !cancelable {
|
||||
t.Fatal("expected cancelable readwriter input")
|
||||
}
|
||||
|
||||
data, err := io.ReadAll(prepared)
|
||||
if err != nil {
|
||||
t.Fatalf("read prepared readwriter input: %v", err)
|
||||
}
|
||||
if string(data) != "buffered payload" {
|
||||
t.Fatalf("unexpected prepared readwriter input: %q", string(data))
|
||||
}
|
||||
}
|
||||
|
||||
func TestPrepareTerminalInputReaderBufioReaderFallbackKeepsData(t *testing.T) {
|
||||
buffered := bufio.NewReader(bytes.NewBufferString("abc123"))
|
||||
if _, err := buffered.Peek(3); err != nil {
|
||||
t.Fatalf("prime buffer: %v", err)
|
||||
}
|
||||
|
||||
prepared, cancel, cancelable, err := prepareTerminalInputReader(buffered)
|
||||
if err != nil {
|
||||
t.Fatalf("prepare fallback input: %v", err)
|
||||
}
|
||||
defer cancel()
|
||||
|
||||
if cancelable {
|
||||
t.Fatal("expected non-cancelable reader")
|
||||
}
|
||||
|
||||
data, err := io.ReadAll(prepared)
|
||||
if err != nil {
|
||||
t.Fatalf("read fallback input: %v", err)
|
||||
}
|
||||
if string(data) != "abc123" {
|
||||
t.Fatalf("unexpected fallback input: %q", string(data))
|
||||
}
|
||||
}
|
||||
|
||||
func TestPrepareTerminalInputReaderProviderPrefersExplicitSource(t *testing.T) {
|
||||
reader, writer, err := os.Pipe()
|
||||
if err != nil {
|
||||
t.Fatalf("create pipe: %v", err)
|
||||
}
|
||||
defer reader.Close()
|
||||
|
||||
if _, err := writer.Write([]byte("provider data")); err != nil {
|
||||
writer.Close()
|
||||
t.Fatalf("write pipe: %v", err)
|
||||
}
|
||||
if err := writer.Close(); err != nil {
|
||||
t.Fatalf("close writer: %v", err)
|
||||
}
|
||||
|
||||
buffered := bufio.NewReader(reader)
|
||||
prefix, err := buffered.Peek(len("provider data"))
|
||||
if err != nil {
|
||||
t.Fatalf("prime buffer: %v", err)
|
||||
}
|
||||
|
||||
source := prefixedReadCloser{
|
||||
Reader: io.MultiReader(bytes.NewReader(append([]byte(nil), prefix...)), reader),
|
||||
Closer: reader,
|
||||
}
|
||||
provider := terminalInputProvider{
|
||||
Reader: buffered,
|
||||
source: source,
|
||||
}
|
||||
|
||||
prepared, cancel, cancelable, err := prepareTerminalInputReader(provider)
|
||||
if err != nil {
|
||||
t.Fatalf("prepare provider input: %v", err)
|
||||
}
|
||||
defer cancel()
|
||||
|
||||
if !cancelable {
|
||||
t.Fatal("expected provider-backed input to be cancelable")
|
||||
}
|
||||
|
||||
data, err := io.ReadAll(prepared)
|
||||
if err != nil {
|
||||
t.Fatalf("read provider input: %v", err)
|
||||
}
|
||||
if string(data) != "provider data" {
|
||||
t.Fatalf("unexpected provider input: %q", string(data))
|
||||
}
|
||||
}
|
||||
|
||||
func TestPrepareTerminalInputReaderProviderCancelUnblocksRead(t *testing.T) {
|
||||
reader, writer := io.Pipe()
|
||||
defer reader.Close()
|
||||
defer writer.Close()
|
||||
|
||||
buffered := bufio.NewReader(reader)
|
||||
provider := terminalInputProvider{
|
||||
Reader: buffered,
|
||||
source: reader,
|
||||
}
|
||||
|
||||
prepared, cancel, cancelable, err := prepareTerminalInputReader(provider)
|
||||
if err != nil {
|
||||
t.Fatalf("prepare input: %v", err)
|
||||
}
|
||||
|
||||
if !cancelable {
|
||||
t.Fatal("expected provider-backed input to be cancelable")
|
||||
}
|
||||
|
||||
done := make(chan error, 1)
|
||||
go func() {
|
||||
buf := make([]byte, 1)
|
||||
_, readErr := prepared.Read(buf)
|
||||
done <- readErr
|
||||
}()
|
||||
|
||||
time.Sleep(50 * time.Millisecond)
|
||||
cancel()
|
||||
|
||||
select {
|
||||
case readErr := <-done:
|
||||
if readErr == nil {
|
||||
t.Fatal("expected cancel to interrupt blocking read")
|
||||
}
|
||||
case <-time.After(time.Second):
|
||||
t.Fatal("blocking read did not unblock after cancel")
|
||||
}
|
||||
}
|
||||
|
||||
func TestPrepareTerminalInputReaderBufioReaderCancelUnblocksRead(t *testing.T) {
|
||||
reader, writer := io.Pipe()
|
||||
defer reader.Close()
|
||||
defer writer.Close()
|
||||
|
||||
buffered := bufio.NewReader(reader)
|
||||
prepared, cancel, cancelable, err := prepareTerminalInputReader(buffered)
|
||||
if err != nil {
|
||||
t.Fatalf("prepare input: %v", err)
|
||||
}
|
||||
|
||||
if !cancelable {
|
||||
t.Fatal("expected bufio reader to be cancelable")
|
||||
}
|
||||
|
||||
done := make(chan error, 1)
|
||||
go func() {
|
||||
buf := make([]byte, 1)
|
||||
_, readErr := prepared.Read(buf)
|
||||
done <- readErr
|
||||
}()
|
||||
|
||||
time.Sleep(50 * time.Millisecond)
|
||||
cancel()
|
||||
|
||||
select {
|
||||
case readErr := <-done:
|
||||
if readErr == nil {
|
||||
t.Fatal("expected cancel to interrupt blocking read")
|
||||
}
|
||||
case <-time.After(time.Second):
|
||||
t.Fatal("blocking bufio reader did not unblock after cancel")
|
||||
}
|
||||
}
|
||||
|
||||
func TestPrepareTerminalInputReaderBufioReadWriterCancelUnblocksRead(t *testing.T) {
|
||||
reader, writer := io.Pipe()
|
||||
defer reader.Close()
|
||||
defer writer.Close()
|
||||
|
||||
readWriter := bufio.NewReadWriter(bufio.NewReader(reader), bufio.NewWriter(io.Discard))
|
||||
prepared, cancel, cancelable, err := prepareTerminalInputReader(readWriter)
|
||||
if err != nil {
|
||||
t.Fatalf("prepare readwriter input: %v", err)
|
||||
}
|
||||
|
||||
if !cancelable {
|
||||
t.Fatal("expected bufio readwriter to be cancelable")
|
||||
}
|
||||
|
||||
done := make(chan error, 1)
|
||||
go func() {
|
||||
buf := make([]byte, 1)
|
||||
_, readErr := prepared.Read(buf)
|
||||
done <- readErr
|
||||
}()
|
||||
|
||||
time.Sleep(50 * time.Millisecond)
|
||||
cancel()
|
||||
|
||||
select {
|
||||
case readErr := <-done:
|
||||
if readErr == nil {
|
||||
t.Fatal("expected cancel to interrupt blocking read")
|
||||
}
|
||||
case <-time.After(time.Second):
|
||||
t.Fatal("blocking readwriter input did not unblock after cancel")
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user