privileges: add SkipWithGrant check for RBAC methods #10681
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
Codecov Report
@@ Coverage Diff @@
## master #10681 +/- ##
===========================================
Coverage ? 79.6625%
===========================================
Files ? 414
Lines ? 87656
Branches ? 0
===========================================
Hits ? 69829
Misses ? 12650
Partials ? 5177 |
jackysp
reviewed
Jun 3, 2019
privilege/privileges/privileges.go
Outdated
| @@ -185,6 +185,10 @@ func (p *UserPrivileges) UserPrivilegesTable() [][]types.Datum { | |||
|
|
|||
| // ShowGrants implements privilege.Manager ShowGrants interface. | |||
| func (p *UserPrivileges) ShowGrants(ctx sessionctx.Context, user *auth.UserIdentity, roles []*auth.RoleIdentity) (grants []string, err error) { | |||
| if SkipWithGrant { | |||
| grants, err = nil, errNonexistingGrant.GenWithStackByArgs() | |||
There was a problem hiding this comment.
why not
Suggested change
| grants, err = nil, errNonexistingGrant.GenWithStackByArgs() | |
| return nil, errNonexistingGrant.GenWithStackByArgs() |
jackysp
reviewed
Jun 3, 2019
added 2 commits
June 4, 2019 11:04
jackysp
reviewed
Jun 4, 2019
privilege/privileges/privileges.go
Outdated
| @@ -185,6 +185,9 @@ func (p *UserPrivileges) UserPrivilegesTable() [][]types.Datum { | |||
|
|
|||
| // ShowGrants implements privilege.Manager ShowGrants interface. | |||
| func (p *UserPrivileges) ShowGrants(ctx sessionctx.Context, user *auth.UserIdentity, roles []*auth.RoleIdentity) (grants []string, err error) { | |||
| if SkipWithGrant { | |||
| return nil, errNonexistingGrant.GenWithStackByArgs() | |||
|
LGTM |
|
/run-all-tests |
|
Please cherry-pick this PR to release 3.0. |
|
/run-unit-test |
|
/run-integration-ddl-test |
zz-jason
added
status/LGT2
imtbkcat
pushed a commit
to imtbkcat/tidb
that referenced
this pull request
Jun 6, 2019
zz-jason
pushed a commit
that referenced
this pull request
Jun 6, 2019
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.
What problem does this PR solve?
RBAC methods in privileges package did not check
SkipWithGrant. This cause panic when enable--skip-grant-table.What is changed and how it works?
add check for
SkipWithGrant, whenSkipWithGrantis enabled, calling for RBAC method will be ignored.Check List
Tests
Code changes