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

server: unix socket should verify user's authentication #8381

Merged
merged 10 commits into from
Nov 22, 2018
Merged

server: unix socket should verify user's authentication #8381

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
883689c
unix socket should do auth
jackysp Nov 21, 2018
ca83024
update comment
jackysp Nov 21, 2018
a63943d
Merge branch 'master' into unix_socket
jackysp Nov 21, 2018
a4a2347
address comment
jackysp Nov 21, 2018
1f9e408
Merge branch 'master' into unix_socket
jackysp Nov 21, 2018
8be8f0c
address comments
jackysp Nov 21, 2018
14d3735
Merge branch 'unix_socket' of github.com:jackysp/tidb into unix_socket
jackysp Nov 21, 2018
c1f8b36
Merge branch 'master' into unix_socket
tiancaiamao Nov 22, 2018
ca2bcbc
tiny fix
jackysp Nov 22, 2018
9fdca29
Merge branch 'unix_socket' of github.com:jackysp/tidb into unix_socket
jackysp Nov 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions server/conn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,16 +391,17 @@ func (cc *clientConn) openSessionAndDoAuth(authData []byte) error {
if err != nil {
return errors.Trace(err)
}
if !cc.server.skipAuth() {
// Do Auth.
host := "localhost"
if !cc.server.isUnixSocket() {
addr := cc.bufReadConn.RemoteAddr().String()
host, _, err1 := net.SplitHostPort(addr)
if err1 != nil {
// Do Auth.
host, _, err = net.SplitHostPort(addr)
if err != nil {
return errors.Trace(errAccessDenied.GenWithStackByArgs(cc.user, addr, "YES"))
}
if !cc.ctx.Auth(&auth.UserIdentity{Username: cc.user, Hostname: host}, authData, cc.salt) {
return errors.Trace(errAccessDenied.GenWithStackByArgs(cc.user, host, "YES"))
}
}
if !cc.ctx.Auth(&auth.UserIdentity{Username: cc.user, Hostname: host}, authData, cc.salt) {
return errors.Trace(errAccessDenied.GenWithStackByArgs(cc.user, host, "YES"))
}
if cc.dbname != "" {
err = cc.useDB(context.Background(), cc.dbname)
Expand Down
2 changes: 1 addition & 1 deletion server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ func (s *Server) newConn(conn net.Conn) *clientConn {
return cc
}

func (s *Server) skipAuth() bool {
func (s *Server) isUnixSocket() bool {
return s.cfg.Socket != ""
}

Expand Down
3 changes: 3 additions & 0 deletions server/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,9 @@ func (dbt *DBTest) mustQueryRows(query string, args ...interface{}) {

func runTestRegression(c *C, overrider configOverrider, dbName string) {
runTestsOnNewDB(c, overrider, dbName, func(dbt *DBTest) {
// Show the user
dbt.mustExec("select user()")

// Create Table
dbt.mustExec("CREATE TABLE test (val TINYINT)")

Expand Down