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.

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

planner,privilege: requires extra privileges for REPLACE and INSERT ON DUPLICATE statements (#23911) #23938

Merged
merged 14 commits into from
May 10, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Apr 9, 2021

cherry-pick #23911 to release-4.0
You can switch your code base to this Pull Request by using git-extras:

# In tidb repo:
git pr https://github.com/pingcap/tidb/pull/23938

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/tidb.git pr/23938:release-4.0-2f877e80301d

What problem does this PR solve?

Issue Number: close #23909

Problem Summary:

The REPLACE statements requires Insert+Delete privileges, and INSERT INTO ON DUPLICATE requires Insert+Update privileges, but currently TiDB only checks for the Insert privilege, allowing users to delete or change records even without the permission.

What is changed and how it works?

Add back the extra privilege check when the InsertStmt contains the OnDuplicate clause or IsReplace.

Related changes

  • Need to cherry-pick to the release branch
    • release-4.0, release-5.0

Check List

Tests

  • Unit test

Side effects

Release note

  • Users now need both Insert and Delete privileges on a table to perform REPLACE.
  • Users now need both Insert and Update privileges on a table to perform INSERT … ON DUPLICATE KEY UPDATE.

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@kennytm you're already a collaborator in bot's repo.

@morgo
Copy link
Contributor

morgo commented Apr 9, 2021

/run-sqllogic-test-1
/run-unit-test

@morgo
Copy link
Contributor

morgo commented Apr 9, 2021

/run-unit-test

@kennytm
Copy link
Contributor

kennytm commented Apr 13, 2021

PTAL @bb7133

@morgo
Copy link
Contributor

morgo commented Apr 14, 2021

/LGTM

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 14, 2021
@tiancaiamao
Copy link
Contributor

/LGTM

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • morgo
  • tiancaiamao

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Apr 22, 2021
@tiancaiamao
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: 3e1d3c5

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 22, 2021
@lysu
Copy link
Contributor

lysu commented Apr 26, 2021

/LGTM

@kennytm
Copy link
Contributor

kennytm commented May 7, 2021

/run-unit-test

Data race fixed by #23122.

@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label May 10, 2021
@XuHuaiyu
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

@XuHuaiyu: /merge is only allowed for the committers in list.

In response to this:

/merge

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@kennytm
Copy link
Contributor

kennytm commented May 10, 2021

/run-mybatis-test

@kennytm
Copy link
Contributor

kennytm commented May 10, 2021

/merge

@kennytm
Copy link
Contributor

kennytm commented May 10, 2021

/merge

https://ci.pingcap.net/blue/rest/organizations/jenkins/pipelines/tidb_ghpr_integration_common_test/runs/1376/nodes/139/log/?start=0

[2021-05-10T06:52:44.920Z] testing tidb...
[2021-05-10T06:52:44.920Z] panic: No error should happen when connecting to test database, but got err=dial tcp 127.0.0.1:4000: connect: connection refused

@kennytm
Copy link
Contributor

kennytm commented May 10, 2021

/merge

@ti-chi-bot
Copy link
Member

@ti-srebot: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot ti-chi-bot merged commit 01119cb into pingcap:release-4.0 May 10, 2021
@zhouqiang-cl zhouqiang-cl modified the milestones: v4.0.11, v4.0.13 May 17, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Cherry pick PR approved by release team. component/privilege sig/sql-infra SIG: SQL Infra size/M Denotes a PR that changes 30-99 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/4.0-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants