sql: check privileges in CONFIGURE ZONE commands #40879
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Previously, any user could apply zone configurations to any object. This commit enforces that users must have appropriate privileges to run a CONFIGURE ZONE command. For system ranges, the system database, and tables in that database, the user must be an admin. For other databases and tables, the user must have CREATE privileges on the object. Release note (backward-incompatible change): CONFIGURE ZONE commands now fail if the user does not have sufficient privileges. If the target is a system range, the "system" database, or a table in that database, the user must be an admin. For all other databases and tables, the user must have the CREATE privilege on the target database or table. Note that this change may be backward-incompatible for users who run scripted CONFIGURE ZONE commands via a user with restricted permissions. To add the necessary permissions, use the GRANT command via an admin user. To grant the admin role to a user, run `GRANT admin TO <user>`. To grant the CREATE privilege on a database or table, run `GRANT CREATE ON [DATABASE | TABLE] <name> TO <user>`. Release justification: Fix for high-priority bug in existing functionality. Fixes cockroachdb#40693
|
This change is |
|
@awoods187 Would you please review the privileges logic as described in the commit message? |
rohany
approved these changes
Sep 18, 2019
There was a problem hiding this comment.
Code LGTM
Reviewable status:
complete! 0 of 0 LGTMs obtained (waiting on @awoods187 and @rohany)
53 tasks
|
LGTM if @awoods187 is happy with this. If you'd prefer to be more conservative with this change it would be fine with me if we continued to require the admin role in 19.2, and then made this more granular in 20.1. |
|
In a way this is more conservative than requiring admin, since the status quo is that any user can configure zones. So it's a less drastic change to continue allowing non-admins to configure zones, as long as they have the CREATE privilege. bors r+ |
|
sgtm |
|
bors r+ |
craig bot
pushed a commit
that referenced
this pull request
Sep 23, 2019
40879: sql: check privileges in CONFIGURE ZONE commands r=solongordon a=solongordon Previously, any user could apply zone configurations to any object. This commit enforces that users must have appropriate privileges to run a CONFIGURE ZONE command. For system ranges, the system database, and tables in that database, the user must be an admin. For other databases and tables, the user must have CREATE privileges on the object. Release note (backward-incompatible change): CONFIGURE ZONE commands now fail if the user does not have sufficient privileges. If the target is a system range, the "system" database, or a table in that database, the user must be an admin. For all other databases and tables, the user must have the CREATE privilege on the target database or table. Note that this change may be backward-incompatible for users who run scripted CONFIGURE ZONE commands via a user with restricted permissions. To add the necessary permissions, use the GRANT command via an admin user. To grant the admin role to a user, run `GRANT admin TO <user>`. To grant the CREATE privilege on a database or table, run `GRANT CREATE ON [DATABASE | TABLE] <name> TO <user>`. Release justification: Fix for high-priority bug in existing functionality. Fixes #40693 Co-authored-by: Solon Gordon <solon@cockroachlabs.com>
Build succeeded |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously, any user could apply zone configurations to any object. This
commit enforces that users must have appropriate privileges to run a
CONFIGURE ZONE command. For system ranges, the system database, and
tables in that database, the user must be an admin. For other databases
and tables, the user must have CREATE privileges on the object.
Release note (backward-incompatible change): CONFIGURE ZONE commands
now fail if the user does not have sufficient privileges. If the target
is a system range, the "system" database, or a table in that database,
the user must be an admin. For all other databases and tables, the user
must have the CREATE privilege on the target database or table.
Note that this change may be backward-incompatible for users who run
scripted CONFIGURE ZONE commands via a user with restricted permissions.
To add the necessary permissions, use the GRANT command via an admin
user. To grant the admin role to a user, run
GRANT admin TO <user>. Togrant the CREATE privilege on a database or table, run
GRANT CREATE ON [DATABASE | TABLE] <name> TO <user>.Release justification: Fix for high-priority bug in existing
functionality.
Fixes #40693