Address comments

gravitational · Nov 13, 2024 · 66dbb95 · 66dbb95
1 parent 57e01f7
commit 66dbb95
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/lib/srv/regular/sshserver.go b/lib/srv/regular/sshserver.go
@@ -2194,7 +2194,8 @@ func (s *Server) handleTCPIPForwardRequest(ctx context.Context, ccx *sshutils.Co
 		return trace.Wrap(err)
 	}
 
-	// Update the src addr port.
+	// If the client didn't request a specific port, the chosen port needs to
+	// be reported back.
 	srcHost, _, err := sshutils.SplitHostPort(scx.SrcAddr)
 	if err != nil {
 		return trace.Wrap(err)

diff --git a/lib/srv/regular/sshserver_test.go b/lib/srv/regular/sshserver_test.go
@@ -19,7 +19,6 @@
 package regular
 
 import (
-	"bytes"
 	"context"
 	"crypto/tls"
 	"encoding/json"
@@ -747,10 +746,9 @@ func TestTCPIPForward(t *testing.T) {
 			// Dial the test server over the SSH connection.
 			ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 			t.Cleanup(cancel)
-			req, err := http.NewRequestWithContext(ctx, http.MethodGet, ts.URL, &bytes.Buffer{})
+			req, err := http.NewRequestWithContext(ctx, http.MethodGet, ts.URL, nil)
 			require.NoError(t, err)
-			client := &http.Client{}
-			resp, err := client.Do(req)
+			resp, err := ts.Client().Do(req)
 			require.NoError(t, err)
 			t.Cleanup(func() {
 				require.NoError(t, resp.Body.Close())