From bf0c6aef93a85557a9e130ba2e28d237630c61e5 Mon Sep 17 00:00:00 2001 From: Junze Bao Date: Mon, 6 Nov 2023 17:15:58 +0100 Subject: [PATCH 1/3] Enable KeepAlive for mux port forwarding Signed-off-by: Junze Bao --- .../session/portsession/muxportforwarding.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sessionmanagerplugin/session/portsession/muxportforwarding.go b/src/sessionmanagerplugin/session/portsession/muxportforwarding.go index 85fe0ce6..25965247 100644 --- a/src/sessionmanagerplugin/session/portsession/muxportforwarding.go +++ b/src/sessionmanagerplugin/session/portsession/muxportforwarding.go @@ -170,7 +170,7 @@ func (p *MuxPortForwarding) initialize(log log.T, agentVersion string) (err erro smuxConfig := smux.DefaultConfig() if version.DoesAgentSupportDisableSmuxKeepAlive(log, agentVersion) { // Disable smux KeepAlive or else it breaks Session Manager idle timeout. - smuxConfig.KeepAliveDisabled = true + smuxConfig.KeepAliveDisabled = false } if muxSession, err := smux.Client(muxConn, smuxConfig); err != nil { return err From 21f1143c00d37799de4d8ea453fa8b1d9b22fe8f Mon Sep 17 00:00:00 2001 From: Junze Bao Date: Tue, 19 Dec 2023 15:40:32 +0100 Subject: [PATCH 2/3] Adjust log level and remove fmt.Printf Signed-off-by: Junze Bao --- src/sessionmanagerplugin/session/session.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sessionmanagerplugin/session/session.go b/src/sessionmanagerplugin/session/session.go index 6f4d154b..5ea2a24e 100644 --- a/src/sessionmanagerplugin/session/session.go +++ b/src/sessionmanagerplugin/session/session.go @@ -219,7 +219,7 @@ func ValidateInputAndStartSession(args []string, out io.Writer) { // Execute create data channel and start the session func (s *Session) Execute(log log.T) (err error) { - fmt.Fprintf(os.Stdout, "\nStarting session with SessionId: %s\n", s.SessionId) + log.Infof("\nStarting session with SessionId: %s\n", s.SessionId) // sets the display mode s.DisplayMode = sessionutil.NewDisplayMode(log) From d37ff3c2d1b6b72ec63d39e0271ae4728af46da2 Mon Sep 17 00:00:00 2001 From: Junze Bao Date: Tue, 19 Dec 2023 15:47:58 +0100 Subject: [PATCH 3/3] Remove more fmt.Println logs Signed-off-by: Junze Bao --- .../session/portsession/basicportforwarding.go | 2 -- .../session/portsession/muxportforwarding.go | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/sessionmanagerplugin/session/portsession/basicportforwarding.go b/src/sessionmanagerplugin/session/portsession/basicportforwarding.go index 65f1057c..8e2d032c 100644 --- a/src/sessionmanagerplugin/session/portsession/basicportforwarding.go +++ b/src/sessionmanagerplugin/session/portsession/basicportforwarding.go @@ -132,7 +132,6 @@ func (p *BasicPortForwarding) startLocalConn(log log.T) (err error) { return err } log.Infof("Connection accepted for session %s.", p.sessionId) - fmt.Printf("Connection accepted for session %s.\n", p.sessionId) p.listener = &listener p.stream = &tcpConn @@ -159,7 +158,6 @@ func (p *BasicPortForwarding) startLocalListener(log log.T, portNumber string) ( } log.Info(displayMessage) - fmt.Println(displayMessage) return } diff --git a/src/sessionmanagerplugin/session/portsession/muxportforwarding.go b/src/sessionmanagerplugin/session/portsession/muxportforwarding.go index 25965247..faa70adf 100644 --- a/src/sessionmanagerplugin/session/portsession/muxportforwarding.go +++ b/src/sessionmanagerplugin/session/portsession/muxportforwarding.go @@ -252,10 +252,8 @@ func (p *MuxPortForwarding) handleClientConnections(log log.T, ctx context.Conte defer listener.Close() log.Infof(displayMsg) - fmt.Printf(displayMsg) log.Infof("Waiting for connections...\n") - fmt.Printf("\nWaiting for connections...\n") var once sync.Once for {