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

sql: crdb_internal.leases should be placed behind VIEWCLUSTERMETADATA #120014

Merged
merged 1 commit into from
Mar 12, 2024
Merged

sql: crdb_internal.leases should be placed behind VIEWCLUSTERMETADATA #120014

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions pkg/sql/crdb_internal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -877,6 +877,9 @@ CREATE TABLE crdb_internal.leases (
populate: func(
ctx context.Context, p *planner, _ catalog.DatabaseDescriptor, addRow func(...tree.Datum) error,
) error {
if err := p.CheckPrivilege(ctx, syntheticprivilege.GlobalPrivilegeObject, privilege.VIEWCLUSTERMETADATA); err != nil {
return err
}
nodeID, _ := p.execCfg.NodeInfo.NodeID.OptionalNodeID() // zero if not available
var leaseEntries []crdbInternalLeasesTableEntry
p.LeaseMgr().VisitLeases(func(desc catalog.Descriptor, takenOffline bool, _ int, expiration tree.DTimestamp) (wantMore bool) {
Expand Down
13 changes: 13 additions & 0 deletions pkg/sql/logictest/testdata/logic_test/crdb_internal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,6 +795,9 @@ select * from crdb_internal.gossip_alerts
query error user testuser does not have VIEWCLUSTERMETADATA system privilege
select * from crdb_internal.node_inflight_trace_spans

query error user testuser does not have VIEWCLUSTERMETADATA system privilege
select * from crdb_internal.leases;

query error user testuser does not have REPAIRCLUSTERMETADATA system privilege
SELECT * FROM crdb_internal.check_consistency(true, b'\x02', b'\x04')

Expand Down Expand Up @@ -1655,6 +1658,11 @@ subtest end
# test validates that this is no longer the case.
subtest allow_role_memberships_to_change_during_transaction

user root

statement ok
GRANT SYSTEM VIEWCLUSTERMETADATA TO testuser

user testuser

statement ok
Expand All @@ -1663,4 +1671,9 @@ set allow_role_memberships_to_change_during_transaction=true
statement ok
SELECT * FROM crdb_internal.leases;

user root

statement ok
REVOKE SYSTEM VIEWCLUSTERMETADATA FROM testuser

subtest end