Skip to content

Fix an issue selecting MySQL database is not reflected in the audit logs #37175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
greedy52 merged 1 commit into from
Jan 24, 2024
Merged

Fix an issue selecting MySQL database is not reflected in the audit logs #37175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion lib/srv/db/audit_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,17 @@ func TestAuditMySQL(t *testing.T) {
// Simple query should trigger the query event.
_, err = mysql.Execute("select 1")
require.NoError(t, err)
requireQueryEvent(t, testCtx, libevents.DatabaseSessionQueryCode, "select 1")
requireQueryEventWithDBName(t, testCtx, libevents.DatabaseSessionQueryCode, "select 1", "")

// Switch to another database.
err = mysql.UseDB("foo")
require.NoError(t, err)
requireEvent(t, testCtx, libevents.MySQLInitDBCode)

// Check DatabaseName is updated.
_, err = mysql.Execute("select 2")
require.NoError(t, err)
requireQueryEventWithDBName(t, testCtx, libevents.DatabaseSessionQueryCode, "select 2", "foo")

// Closing connection should trigger session end event.
err = mysql.Close()
Expand Down Expand Up @@ -373,6 +383,17 @@ func requireQueryEvent(t *testing.T, testCtx *testContext, code, query string) {
require.Equal(t, query, event.(*events.DatabaseSessionQuery).DatabaseQuery)
}

func requireQueryEventWithDBName(t *testing.T, testCtx *testContext, code, query, dbName string) {
t.Helper()
event := waitForAnyEvent(t, testCtx)
require.Equal(t, code, event.GetCode())

queryEvent, ok := event.(*events.DatabaseSessionQuery)
require.True(t, ok)
require.Equal(t, query, queryEvent.DatabaseQuery)
require.Equal(t, dbName, queryEvent.DatabaseName)
}

func waitForAnyEvent(t *testing.T, testCtx *testContext) events.AuditEvent {
t.Helper()
select {
Expand Down
6 changes: 6 additions & 0 deletions lib/srv/db/mysql/engine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,12 @@ func (e *Engine) receiveFromClient(clientConn, serverConn net.Conn, clientErrCh
return

case *protocol.InitDB:
// Update DatabaseName when switching to another so the audit logs
// are up to date. E.g.:
// mysql> use foo;
// mysql> select * from users;
sessionCtx.DatabaseName = pkt.SchemaName()

e.Audit.EmitEvent(e.Context, makeInitDBEvent(sessionCtx, pkt))
case *protocol.CreateDB:
e.Audit.EmitEvent(e.Context, makeCreateDBEvent(sessionCtx, pkt))
Expand Down