From 7ae368d2cf57d55d8d70ac8ae9a56b988fc5d80c Mon Sep 17 00:00:00 2001 From: Spike Curtis Date: Wed, 25 Jun 2025 10:21:39 +0000 Subject: [PATCH] chore: update X11 forward session usage when there is a connection --- agent/agentssh/x11.go | 5 ++++ agent/agentssh/x11_test.go | 56 ++++++++++++++++++++++++++++++++------ 2 files changed, 53 insertions(+), 8 deletions(-) diff --git a/agent/agentssh/x11.go b/agent/agentssh/x11.go index 28286a5da9305..b02de0dcf003a 100644 --- a/agent/agentssh/x11.go +++ b/agent/agentssh/x11.go @@ -162,6 +162,11 @@ func (x *x11Forwarder) listenForConnections( x.logger.Warn(ctx, "failed to accept X11 connection", slog.Error(err)) return } + + // Update session usage time since a new X11 connection was forwarded. + x.mu.Lock() + session.usedAt = time.Now() + x.mu.Unlock() if x11.SingleConnection { x.logger.Debug(ctx, "single connection requested, closing X11 listener") x.closeAndRemoveSession(session) diff --git a/agent/agentssh/x11_test.go b/agent/agentssh/x11_test.go index 4946fa2ac03c7..83af8a2f83838 100644 --- a/agent/agentssh/x11_test.go +++ b/agent/agentssh/x11_test.go @@ -232,8 +232,31 @@ func TestServer_X11_EvictionLRU(t *testing.T) { }) } - // Create one more session which should evict the first (LRU) session and - // therefore reuse the very first display/port. + // Connect X11 forwarding to the first session. This is used to test that + // connecting counts as a use of the display. + x11Chans := c.HandleChannelOpen("x11") + payload := "hello world" + go func() { + conn, err := inproc.Dial(ctx, testutil.NewAddr("tcp", fmt.Sprintf("localhost:%d", agentssh.X11StartPort+agentssh.X11DefaultDisplayOffset))) + assert.NoError(t, err) + _, err = conn.Write([]byte(payload)) + assert.NoError(t, err) + _ = conn.Close() + }() + + x11 := testutil.RequireReceive(ctx, t, x11Chans) + ch, reqs, err := x11.Accept() + require.NoError(t, err) + go gossh.DiscardRequests(reqs) + got := make([]byte, len(payload)) + _, err = ch.Read(got) + require.NoError(t, err) + assert.Equal(t, payload, string(got)) + _ = ch.Close() + + // Create one more session which should evict a session and reuse the display. + // The first session was used to connect X11 forwarding, so it should not be evicted. + // Therefore, the second session should be evicted and its display reused. extraSess, err := c.NewSession() require.NoError(t, err) @@ -271,17 +294,34 @@ func TestServer_X11_EvictionLRU(t *testing.T) { require.NoError(t, sc.Err()) } - // The display number should have wrapped around to the starting value. - assert.Equal(t, agentssh.X11DefaultDisplayOffset, newDisplayNumber, "expected display number to be reused after eviction") + // The display number reused should correspond to the SECOND session (display offset 12) + expectedDisplay := agentssh.X11DefaultDisplayOffset + 2 // +1 was blocked port + assert.Equal(t, expectedDisplay, newDisplayNumber, "second session should have been evicted and its display reused") - // validate that the first session was torn down. - _, err = sessions[0].stdin.Write([]byte("echo DISPLAY=$DISPLAY\n")) + // First session should still be alive: send cmd and read output. + msgFirst := "still-alive" + _, err = sessions[0].stdin.Write([]byte("echo " + msgFirst + "\n")) + require.NoError(t, err) + for sessions[0].scanner.Scan() { + line := strings.TrimSpace(sessions[0].scanner.Text()) + if strings.Contains(line, msgFirst) { + break + } + } + require.NoError(t, sessions[0].scanner.Err()) + + // Second session should now be closed. + _, err = sessions[1].stdin.Write([]byte("echo dead\n")) require.ErrorIs(t, err, io.EOF) - err = sessions[0].sess.Wait() + err = sessions[1].sess.Wait() require.Error(t, err) // Cleanup. - for _, sh := range sessions[1:] { + for i, sh := range sessions { + if i == 1 { + // already closed + continue + } err = sh.stdin.Close() require.NoError(t, err) err = sh.sess.Wait() pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy