From 64fabb2dbe889a873a92138375cd6fa89e6ba332 Mon Sep 17 00:00:00 2001 From: Samuel K Date: Sun, 8 Nov 2026 12:57:16 -0600 Subject: [PATCH] fix(tunnelserver): preserve session failure on terminal exit --- .../tunnelserver/lifecycle_terminal_client.go | 4 ++ .../tunnelserver/lifecycle_terminal_test.go | 38 +++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/pkg/agent/tunnelserver/lifecycle_terminal_client.go b/pkg/agent/tunnelserver/lifecycle_terminal_client.go index 681e50cc1..adb04e3fc 100644 --- a/pkg/agent/tunnelserver/lifecycle_terminal_client.go +++ b/pkg/agent/tunnelserver/lifecycle_terminal_client.go @@ -325,6 +325,10 @@ func (a *terminalAttachment) Exit(ctx context.Context, exit tunnel.TerminalExit) } a.exited = true a.session.mu.Lock() + if err := a.session.err; err != nil { + a.session.mu.Unlock() + return err + } if a.session.phase != clientActive { a.session.mu.Unlock() return status.Error(codes.FailedPrecondition, "terminal invocation inactive") diff --git a/pkg/agent/tunnelserver/lifecycle_terminal_test.go b/pkg/agent/tunnelserver/lifecycle_terminal_test.go index 98daf4ec0..f3ce49778 100644 --- a/pkg/agent/tunnelserver/lifecycle_terminal_test.go +++ b/pkg/agent/tunnelserver/lifecycle_terminal_test.go @@ -776,6 +776,44 @@ func (s *terminalSuite) TestOversizedInputFrame() { s.Equal(codes.ResourceExhausted, status.Code(err)) } +func (s *terminalSuite) TestExitPreservesSessionFailure() { + ctx, cancel := context.WithCancel(context.Background()) + failure := status.Error(codes.ResourceExhausted, "terminal input frame too large") + client := &terminalClient{ + ctx: ctx, cancel: cancel, sends: make(chan terminalSend), + phase: clientActive, err: failure, + } + a := &terminalAttachment{ + session: client, id: "id", input: newTerminalInput(), + outputCancel: func() {}, canceled: make(chan struct{}), + } + client.active = a + sent := make(chan struct{}) + senderDone := make(chan struct{}) + go func() { + defer close(senderDone) + select { + case item := <-client.sends: + close(sent) + item.done <- io.EOF + case <-ctx.Done(): + } + }() + defer func() { + cancel() + <-senderDone + }() + + err := a.Exit(context.Background(), tunnel.TerminalExit{}) + s.Same(failure, err) + s.Equal(codes.ResourceExhausted, status.Code(err)) + select { + case <-sent: + s.Fail("exit sent after session failure") + default: + } +} + func (s *terminalSuite) TestForwarderReceiveExitsAfterUpstreamFailure() { release := make(chan struct{}) owner := testTerminalOwner{