session error

mtojek · mtojek · commit 11fb0568ae71 · 2023-05-18T13:16:34.000+02:00
diff --git a/agent/agentssh/agentssh.go b/agent/agentssh/agentssh.go
@@ -198,25 +198,37 @@ func (s *Server) sessionHandler(session ssh.Session) {
 		return
 	}
 
-	err := s.sessionStart(session, extraEnv)
+	m := metricsForSession(magicType(session))
+	err := s.sessionStart(session, m, extraEnv)
 	var exitError *exec.ExitError
 	if xerrors.As(err, &exitError) {
-		s.logger.Debug(ctx, "ssh session returned", slog.Error(exitError))
+		s.logger.Warn(ctx, "ssh session returned", slog.Error(exitError))
+		m.sessionError.Add(1)
 		_ = session.Exit(exitError.ExitCode())
 		return
 	}
 	if err != nil {
 		s.logger.Warn(ctx, "ssh session failed", slog.Error(err))
 		// This exit code is designed to be unlikely to be confused for a legit exit code
 		// from the process.
-		metricSessionError.Add(1)
+		m.sessionError.Add(1)
 		_ = session.Exit(MagicSessionErrorCode)
 		return
 	}
 	_ = session.Exit(0)
 }
 
-func (s *Server) sessionStart(session ssh.Session, extraEnv []string) (retErr error) {
+func magicType(session ssh.Session) string {
+	for _, kv := range session.Environ() {
+		if !strings.HasPrefix(kv, MagicSessionTypeEnvironmentVariable) {
+			continue
+		}
+		return strings.TrimPrefix(kv, MagicSessionTypeEnvironmentVariable+"=")
+	}
+	return ""
+}
+
+func (s *Server) sessionStart(session ssh.Session, m sessionMetricsObject, extraEnv []string) (retErr error) {
 	ctx := session.Context()
 	env := append(session.Environ(), extraEnv...)
 	var magicType string
@@ -241,7 +253,6 @@ func (s *Server) sessionStart(session ssh.Session, extraEnv []string) (retErr er
 		s.logger.Warn(ctx, "invalid magic ssh session type specified", slog.F("type", magicType))
 	}
 
-	m := metricsForSession(magicType)
 	cmd, err := s.CreateCommand(ctx, session.RawCommand(), env)
 	if err != nil {
 		m.agentCreateCommandError.Add(1)
diff --git a/agent/agentssh/metrics.go b/agent/agentssh/metrics.go
@@ -14,8 +14,6 @@ var (
 	metricReversePortForwardingCallback = clientmetric.NewCounter("ssh_reverse_port_forwarding_callback")
 	metricX11Callback                   = clientmetric.NewCounter("ssh_x11_callback")
 
-	metricSessionError = clientmetric.NewCounter("ssh_session_error")
-
 	// PTY sessions
 
 	// SFTP
@@ -37,6 +35,7 @@ type sessionMetricsObject struct {
 	agentListenerError      *clientmetric.Metric
 	startPTYSession         *clientmetric.Metric
 	startNonPTYSession      *clientmetric.Metric
+	sessionError            *clientmetric.Metric
 
 	// Non-PTY sessions
 	nonPTYStdinPipeError   *clientmetric.Metric
@@ -60,6 +59,7 @@ func init() {
 			agentListenerError:      clientmetric.NewCounter(fmt.Sprintf("ssh_agent_%s_listener_error", magicType)),
 			startPTYSession:         clientmetric.NewCounter(fmt.Sprintf("ssh_agent_%s_start_pty_session", magicType)),
 			startNonPTYSession:      clientmetric.NewCounter(fmt.Sprintf("ssh_agent_%s_start_non_pty_session", magicType)),
+			sessionError:            clientmetric.NewCounter(fmt.Sprintf("ssh_agent_%s_session_error", magicType)),
 
 			nonPTYStdinPipeError:   clientmetric.NewCounter(fmt.Sprintf("ssh_server_%s_non_pty_stdin_pipe_error", magicType)),
 			nonPTYStdinIoCopyError: clientmetric.NewCounter(fmt.Sprintf("ssh_server_%s_non_pty_stdin_io_copy_error", magicType)),
