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

server: set connection to TCP socket when unix and TCP used (#23463) #23513

Merged
merged 30 commits into from
May 11, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Mar 24, 2021

cherry-pick #23463 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/23513

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

git push git@github.com:ti-srebot/tidb.git pr/23513:release-4.0-fab0b934a47f

What problem does this PR solve?

Issue Number: Fixes #23460

Problem Summary:

If a unix socket configuration is present, the server will set connections to type UnixSocket irrespective of if it was used. This is a problem when the server is listening on both, since connections of type unixSocket do not validate the host portion of the user.

Although ideally the function isUnixSocket() could be a clientConnection property, this improves the security, because if both types of socket are used, the function will return FALSE.

What is changed and how it works?

Fixes #23460

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test

Side effects

  • Breaking backward compatibility (fixes security issue. It is possible, but unlikely users depend on it)

Release note

  • When TiDB was configured to listen on TCP and UNIX sockets, connections over TCP did not correctly validate that the remote host was permitted to connect.

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

/run-all-tests

@ti-srebot ti-srebot added priority/release-blocker This issue blocks a release. Please solve it ASAP. sig/sql-infra SIG: SQL Infra size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/4.0-cherry-pick labels Mar 24, 2021
@ti-srebot ti-srebot added this to the v4.0.11 milestone Mar 24, 2021
@ti-srebot
Copy link
Contributor Author

@morgo please accept the invitation then you can push to the cherry-pick pull requests.
https://github.com/ti-srebot/tidb/invitations

@morgo
Copy link
Contributor

morgo commented Mar 24, 2021

/run-check-dev

@morgo
Copy link
Contributor

morgo commented Mar 24, 2021

/run-check_dev

@djshow832
Copy link
Contributor

/lgtm

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

@xhebox xhebox left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • djshow832
  • xhebox

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 2, 2021
@xhebox
Copy link
Contributor

xhebox commented Apr 2, 2021

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 8f4c61d

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

morgo commented Apr 6, 2021

/merge

@morgo
Copy link
Contributor

morgo commented Apr 7, 2021

/run-unit-test

1 similar comment
@djshow832
Copy link
Contributor

/run-unit-test

@djshow832
Copy link
Contributor

/merge

@zhouqiang-cl
Copy link
Contributor

/merge

@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label May 11, 2021
@ti-chi-bot ti-chi-bot merged commit 62dace6 into pingcap:release-4.0 May 11, 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. priority/release-blocker This issue blocks a release. Please solve it ASAP. sig/sql-infra SIG: SQL Infra size/XS Denotes a PR that changes 0-9 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.

7 participants