Emit the correct session ID for SessionLeave events

Fixes #9574
gravitational · Jan 5, 2022 · 422e640 · 422e640
1 parent 672425f
commit 422e640
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/integration/integration_test.go b/integration/integration_test.go
@@ -497,7 +497,7 @@ func testAuditOn(t *testing.T, suite *integrationTestSuite) {
 			start := findByType(events.SessionStartEvent)
 			require.Equal(t, first, start)
 			require.Equal(t, 0, start.GetInt("bytes"))
-			require.NotEmpty(t, start.GetString(events.SessionEventID))
+			require.Equal(t, string(sessionID), start.GetString(events.SessionEventID))
 			require.NotEmpty(t, start.GetString(events.TerminalSize))
 
 			// If session are being recorded at nodes, the SessionServerID should contain
@@ -522,15 +522,15 @@ func testAuditOn(t *testing.T, suite *integrationTestSuite) {
 			end := findByType(events.SessionEndEvent)
 			require.NotNil(t, end)
 			require.Equal(t, 0, end.GetInt("bytes"))
-			require.NotEmpty(t, end.GetString(events.SessionEventID))
+			require.Equal(t, string(sessionID), end.GetString(events.SessionEventID))
 
 			// there should always be 'session.leave' event
 			leave := findByType(events.SessionLeaveEvent)
 			require.NotNil(t, leave)
 			require.Equal(t, 0, leave.GetInt("bytes"))
-			require.NotEmpty(t, leave.GetString(events.SessionEventID))
+			require.Equal(t, string(sessionID), leave.GetString(events.SessionEventID))
 
-			// all of them should have a proper time:
+			// all of them should have a proper time
 			for _, e := range history {
 				require.False(t, e.GetTime("time").IsZero())
 			}

diff --git a/lib/srv/sess.go b/lib/srv/sess.go
@@ -264,7 +264,7 @@ func (s *SessionRegistry) emitSessionLeaveEvent(party *party) {
 			ServerAddr:      party.ctx.ServerConn.LocalAddr().String(),
 		},
 		SessionMetadata: apievents.SessionMetadata{
-			SessionID: party.id.String(),
+			SessionID: party.s.ID(),
 		},
 		UserMetadata: apievents.UserMetadata{
 			User: party.user,