fixed access denied error message after go-mysql-org#589

Reinier Schoof · Reinier Schoof · commit e754fd19ffcc · 2021-06-22T15:53:53.000+02:00
diff --git a/server/conn.go b/server/conn.go
@@ -107,11 +107,11 @@ func (c *Conn) handshake() error {
 
 	if err := c.readHandshakeResponse(); err != nil {
 		if errors.Is(err, ErrAccessDenied) {
-			usingPasswd := ER_YES
+			var usingPasswd uint16 = ER_YES
 			if errors.Is(err, ErrAccessDeniedNoPassword) {
 				usingPasswd = ER_NO
 			}
-			err = NewDefaultError(ER_ACCESS_DENIED_ERROR, c.user, c.RemoteAddr().String(), usingPasswd)
+			err = NewDefaultError(ER_ACCESS_DENIED_ERROR, c.user, c.RemoteAddr().String(), MySQLErrName[usingPasswd])
 		}
 		_ = c.writeError(err)
 		return err
diff --git a/server/handshake_resp.go b/server/handshake_resp.go
@@ -148,7 +148,7 @@ func (c *Conn) readAuthData(data []byte, pos int) (auth []byte, authLen int, new
 		}
 		if isNULL {
 			// no auth length and no auth data, just \NUL, considered invalid auth data, and reject connection as MySQL does
-			return nil, 0, 0, NewDefaultError(ER_ACCESS_DENIED_ERROR, c.RemoteAddr().String(), c.user, ER_NO)
+			return nil, 0, 0, NewDefaultError(ER_ACCESS_DENIED_ERROR, c.RemoteAddr().String(), c.user, MySQLErrName[ER_NO])
 		}
 		auth = authData
 		authLen = readBytes

Original file line number	Diff line number	Diff line change
`@@ -107,11 +107,11 @@ func (c *Conn) handshake() error {`
`107`	`107`
`108`	`108`	`if err := c.readHandshakeResponse(); err != nil {`
`109`	`109`	`if errors.Is(err, ErrAccessDenied) {`
`110`		`- usingPasswd := ER_YES`
	`110`	`+ var usingPasswd uint16 = ER_YES`
`111`	`111`	`if errors.Is(err, ErrAccessDeniedNoPassword) {`
`112`	`112`	`usingPasswd = ER_NO`
`113`	`113`	`}`
`114`		`- err = NewDefaultError(ER_ACCESS_DENIED_ERROR, c.user, c.RemoteAddr().String(), usingPasswd)`
	`114`	`+ err = NewDefaultError(ER_ACCESS_DENIED_ERROR, c.user, c.RemoteAddr().String(), MySQLErrName[usingPasswd])`
`115`	`115`	`}`
`116`	`116`	`_ = c.writeError(err)`
`117`	`117`	`return err`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ func (c *Conn) readAuthData(data []byte, pos int) (auth []byte, authLen int, new`
`148`	`148`	`}`
`149`	`149`	`if isNULL {`
`150`	`150`	`// no auth length and no auth data, just \NUL, considered invalid auth data, and reject connection as MySQL does`
`151`		`- return nil, 0, 0, NewDefaultError(ER_ACCESS_DENIED_ERROR, c.RemoteAddr().String(), c.user, ER_NO)`
	`151`	`+ return nil, 0, 0, NewDefaultError(ER_ACCESS_DENIED_ERROR, c.RemoteAddr().String(), c.user, MySQLErrName[ER_NO])`
`152`	`152`	`}`
`153`	`153`	`auth = authData`
`154`	`154`	`authLen = readBytes`