Displaying mode and controls to additional participants

lib/client/api.go

@@ -2165,8 +2165,6 @@ func (tc *TeleportClient) Join(ctx context.Context, mode types.SessionParticipan
 		}
 	}
 
-	fmt.Printf("Joining session with participant mode: %v. \n\n", mode)
-
 	// running shell with a given session means "join" it:
 	err = nc.RunInteractiveShell(ctx, mode, session, tc.OnChannelRequest, beforeStart)
 	return trace.Wrap(err)

lib/kube/proxy/sess.go

@@ -58,6 +58,10 @@ import (
 	"github.com/gravitational/teleport/lib/utils"
 )
 
+// SessionControlsInfoBroadcast is sent in tandem with session creation to inform any joining
+// users about the session controls.
+const SessionControlsInfoBroadcast = "Controls\r\n  - CTRL-C: Leave the session\r\n  - t: Forcefully terminate the session (moderators only)"
+
 const sessionRecorderID = "session-recorder"
 
 const (
@@ -498,7 +502,7 @@ func newSession(ctx authContext, forwarder *Forwarder, req *http.Request, params
 	s.io.OnReadError = s.disconnectPartyOnErr
 
 	s.BroadcastMessage("Creating session with ID: %v...", id.String())
-	s.BroadcastMessage(srv.SessionControlsInfoBroadcast)
+	s.BroadcastMessage(SessionControlsInfoBroadcast)
 
 	go func() {
 		if _, open := <-s.io.TerminateNotifier(); open {

lib/srv/sess.go

@@ -19,6 +19,7 @@
 package srv
 
 import (
+	"bytes"
 	"context"
 	"encoding/json"
 	"errors"
@@ -66,10 +67,6 @@ const (
 	PresenceMaxDifference  = time.Minute
 )
 
-// SessionControlsInfoBroadcast is sent in tandem with session creation
-// to inform any joining users about the session controls.
-const SessionControlsInfoBroadcast = "Controls\r\n  - CTRL-C: Leave the session\r\n  - t: Forcefully terminate the session (moderators only)"
-
 const (
 	// sessionRecordingWarningMessage is sent when the session recording is
 	// going to be disabled.
@@ -1291,7 +1288,6 @@ func (s *session) startInteractive(ctx context.Context, scx *ServerContext, p *p
 	s.io.AddReader("reader", inReader)
 	s.io.AddWriter(sessionRecorderID, utils.WriteCloserWithContext(scx.srv.Context(), s.Recorder()))
 	s.BroadcastMessage("Creating session with ID: %v", s.id)
-	s.BroadcastMessage(SessionControlsInfoBroadcast)
 
 	if err := s.startTerminal(ctx, scx); err != nil {
 		return trace.Wrap(err)
@@ -1941,6 +1937,21 @@ func (s *session) addParty(p *party, mode types.SessionParticipantMode) error {
 	s.participants[p.id] = p
 	p.ctx.AddCloser(p)
 
+	// Display participant mode and available controls to additional participants
+	if len(s.parties) > 1 {
+		var modeCtrl bytes.Buffer
+		modeCtrl.WriteString(fmt.Sprintf("Teleport > Joining session with participant mode: %s\r\n", string(mode)))
+		modeCtrl.WriteString("Teleport > Controls\r\n")
+		modeCtrl.WriteString("Teleport >   - CTRL-C: Leave the session\r\n")
+		if p.mode == types.SessionModeratorMode {
+			modeCtrl.WriteString("Teleport >   - t: Forcefully terminate the session\r\n")
+		}
+		_, err := p.Write(modeCtrl.Bytes())
+		if err != nil {
+			s.log.Errorf("Could not write bytes: %v", err)
+		}
+	}
+
 	// Write last chunk (so the newly joined parties won't stare at a blank
 	// screen).
 	if _, err := p.Write(s.io.GetRecentHistory()); err != nil {