Skip to content

enhancement for mysqlConn handleAuthResult #1250

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

Merged
merged 2 commits into from
Jan 19, 2022
Merged

enhancement for mysqlConn handleAuthResult #1250

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5969d0
enhancement for mysqlConn handleAuthResult
zjj Aug 13, 2021
253e197
Merge branch 'go-sql-driver:master' into master
zjj Jan 8, 2022
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: 13 additions & 2 deletions auth.go
View file
Open in desktop
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