Skip to content

Commit

Permalink
enhancement for mysqlConn handleAuthResult (#1250)
Browse files Browse the repository at this point in the history
  • Loading branch information
zjj committed Jan 19, 2022
1 parent 0d7b91a commit 217d050
Showing 1 changed file with 13 additions and 2 deletions.
15 changes: 13 additions & 2 deletions auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -367,13 +367,20 @@ func (mc *mysqlConn) handleAuthResult(oldAuthData []byte, plugin string) error {
return err
}
data[4] = cachingSha2PasswordRequestPublicKey
mc.writePacket(data)
err = mc.writePacket(data)
if err != nil {
return err
}

// parse public key
if data, err = mc.readPacket(); err != nil {
return err
}

if data[0] != iAuthMoreData {
return fmt.Errorf("unexpect resp from server for caching_sha2_password perform full authentication")
}

// parse public key
block, rest := pem.Decode(data[1:])
if block == nil {
return fmt.Errorf("No Pem data found, data: %s", rest)
Expand Down Expand Up @@ -406,6 +413,10 @@ func (mc *mysqlConn) handleAuthResult(oldAuthData []byte, plugin string) error {
return nil // auth successful
default:
block, _ := pem.Decode(authData)
if block == nil {
return fmt.Errorf("no Pem data found, data: %s", authData)
}

pub, err := x509.ParsePKIXPublicKey(block.Bytes)
if err != nil {
return err
Expand Down

0 comments on commit 217d050

Please sign in to comment.