Skip to content
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

Jump to bottom

executor: fix user without process privilege can access cluster_statements_summary_evicted table #26208

Merged
merged 10 commits into from
Jul 19, 2021
Merged

executor: fix user without process privilege can access cluster_statements_summary_evicted table #26208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0e1e17a
fix user without process privilege can access cluster evicted
AilinKid Jul 13, 2021
a1c4da3
Merge branch 'master' into fix_cluster_evicted
AilinKid Jul 13, 2021
dd1de87
Merge branch 'master' into fix_cluster_evicted
AilinKid Jul 19, 2021
a5833be
Merge branch 'master' into fix_cluster_evicted
AilinKid Jul 19, 2021
fd43289
address comment
AilinKid Jul 19, 2021
021903d
Merge branch 'master' into fix_cluster_evicted
AilinKid Jul 19, 2021
f75d449
address comment
AilinKid Jul 19, 2021
1edd165
address comment
AilinKid Jul 19, 2021
9d52bea
Merge branch 'master' into fix_cluster_evicted
AilinKid Jul 19, 2021
9bb89ca
Merge branch 'master' into fix_cluster_evicted
ti-chi-bot Jul 19, 2021
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
3 changes: 3 additions & 0 deletions executor/infoschema_reader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1919,6 +1919,9 @@ func (e *memtableRetriever) dataForTableTiFlashReplica(ctx sessionctx.Context, s
}

func (e *memtableRetriever) setDataForStatementsSummaryEvicted(ctx sessionctx.Context) error {
if !hasPriv(ctx, mysql.ProcessPriv) {
return plannercore.ErrSpecificAccessDenied.GenWithStackByArgs("PROCESS")
AilinKid marked this conversation as resolved.
Show resolved Hide resolved
}
e.rows = stmtsummary.StmtSummaryByDigestMap.ToEvictedCountDatum()
switch e.table.Name.O {
case infoschema.ClusterTableStatementsSummaryEvicted:
Expand Down
23 changes: 23 additions & 0 deletions infoschema/tables_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1436,6 +1436,29 @@ func (s *testClusterTableSuite) TestStmtSummaryEvictedCountTable(c *C) {
Check(testkit.Rows("2"))
// TODO: Add more tests.

tk.MustExec("create user 'testuser'@'localhost'")
tk.MustExec("create user 'testuser2'@'localhost'")
tk.MustExec("grant process on *.* to 'testuser2'@'localhost'")
tk1 := s.newTestKitWithRoot(c)
defer tk1.MustExec("drop user 'testuser'@'localhost'")
defer tk1.MustExec("drop user 'testuser2'@'localhost'")

c.Assert(tk.Se.Auth(&auth.UserIdentity{
Username: "testuser",
Hostname: "localhost",
}, nil, nil), Equals, true)

err := tk.QueryToErr("select * from information_schema.CLUSTER_STATEMENTS_SUMMARY_EVICTED")
c.Assert(err, NotNil)
// This error is come from cop(TiDB) fetch from rpc server.
c.Assert(err.Error(), Equals, "other error: [planner:1227]Access denied; you need (at least one of) the PROCESS privilege(s) for this operation")
AilinKid marked this conversation as resolved.
Show resolved Hide resolved

c.Assert(tk.Se.Auth(&auth.UserIdentity{
Username: "testuser2",
Hostname: "localhost",
}, nil, nil), Equals, true)
err = tk.QueryToErr("select * from information_schema.CLUSTER_STATEMENTS_SUMMARY_EVICTED")
c.Assert(err, IsNil)
}

func (s *testTableSuite) TestStmtSummaryTableOther(c *C) {
Expand Down