[client] Bound the SSH session request queue and keep resizes from blocking the session loop (#8363)

* Bound the SSH session request queue by bytes and stop resizes reaching a loop with no consumer

* Give the window change drain loop a body

* Avoid an empty case clause in the SSH request filter

* Charge only the newest resize to the request queue and classify requests before the byte limit
This commit is contained in:
Viktor Liu
2026-10-26 23:04:32 +09:00
committed by GitHub
parent 280aa188d8
commit 08b924f739
4 changed files with 276 additions and 29 deletions
@@ -338,3 +338,65 @@ func TestFilterSessionRequests_RefusedRequestsStayInOrder(t *testing.T) {
t.Fatal("filter did not close its output")
}
}
// A rejected subsystem starts no command, so nothing drains the window channel. A resize
// after it must be refused instead of blocking the session's request loop.
func TestSession_ResizeAfterRejectedSubsystemDoesNotStallLoop(t *testing.T) {
addr, hostKey := startNoAuthServer(t)
client := dialNoAuthServer(t, addr, hostKey)
session, err := client.NewSession()
require.NoError(t, err)
t.Cleanup(func() { _ = session.Close() })
require.NoError(t, session.RequestPty("xterm", 24, 80, cryptossh.TerminalModes{}))
ok, err := session.SendRequest("subsystem", true, cryptossh.Marshal(struct{ Name string }{"nope"}))
require.NoError(t, err)
require.False(t, ok, "unknown subsystem must be rejected")
winch := cryptossh.Marshal(struct{ Columns, Rows, Width, Height uint32 }{100, 40, 0, 0})
_, err = session.SendRequest("window-change", false, winch)
require.NoError(t, err)
done := make(chan bool, 1)
go func() {
ok, err := session.SendRequest("env", true, cryptossh.Marshal(struct{ Key, Value string }{"A", "b"}))
done <- err == nil && ok
}()
select {
case ok := <-done:
assert.True(t, ok, "env request after the resize should be accepted")
case <-time.After(5 * time.Second):
t.Fatal("session request loop stalled behind a resize with no command running")
}
}
// A resize that reaches the loop while the command handler never reads window changes
// (sftp) must not leave the loop goroutine behind once the handler returns.
func TestSession_ResizeDuringSFTPDoesNotLeakRequestLoop(t *testing.T) {
addr, hostKey := startNoAuthServer(t)
loops := func() int {
buf := make([]byte, 1<<22)
return strings.Count(string(buf[:runtime.Stack(buf, true)]), "ssh.(*session).handleRequests")
}
before := loops()
winch := cryptossh.Marshal(struct{ Columns, Rows, Width, Height uint32 }{100, 40, 0, 0})
for i := 0; i < 10; i++ {
client := dialNoAuthServer(t, addr, hostKey)
session, err := client.NewSession()
require.NoError(t, err)
require.NoError(t, session.RequestPty("xterm", 24, 80, cryptossh.TerminalModes{}))
ok, err := session.SendRequest("subsystem", true, cryptossh.Marshal(struct{ Name string }{"sftp"}))
require.NoError(t, err)
require.True(t, ok, "the sftp subsystem must be accepted for the resize to matter")
// The sftp handler may already have ended the session, so a send can fail.
_, _ = session.SendRequest("window-change", false, winch)
_, _ = session.SendRequest("window-change", false, winch)
_ = session.Close()
_ = client.Close()
}
assert.Eventually(t, func() bool { return loops() <= before }, 10*time.Second, 100*time.Millisecond,
"session request loops must exit after the clients disconnect")
}