proof of concepts: Introduce reader and write groutine

.github/workflows/test.yml

@@ -96,7 +96,7 @@ jobs:
 
       - name: test
         run: |
-          go test -v '-covermode=count' '-coverprofile=coverage.out'
+          go test -v -race '-covermode=atomic' '-coverprofile=coverage.out'
 
       - name: Send coverage
         uses: shogo82148/actions-goveralls@v1

atomic_bool_go118.go

@@ -16,6 +16,22 @@ import "sync/atomic"
 *                               Sync utils                                    *
 ******************************************************************************/
 
+// noCopy may be embedded into structs which must not be copied
+// after the first use.
+//
+// See https://github.com/golang/go/issues/8005#issuecomment-190753527
+// for details.
+type noCopy struct{}
+
+// Lock is a no-op used by -copylocks checker from `go vet`.
+func (*noCopy) Lock() {}
+
+// Unlock is a no-op used by -copylocks checker from `go vet`.
+// noCopy should implement sync.Locker from Go 1.11
+// https://github.com/golang/go/commit/c2eba53e7f80df21d51285879d51ab81bcfbf6bc
+// https://github.com/golang/go/issues/26165
+func (*noCopy) Unlock() {}
+
 // atomicBool is an implementation of atomic.Bool for older version of Go.
 // it is a wrapper around uint32 for usage as a boolean value with
 // atomic access.

auth.go

@@ -9,6 +9,7 @@
 package mysql
 
 import (
+	"context"
 	"crypto/rand"
 	"crypto/rsa"
 	"crypto/sha1"
@@ -225,12 +226,12 @@ func encryptPassword(password string, seed []byte, pub *rsa.PublicKey) ([]byte,
 	return rsa.EncryptOAEP(sha1, rand.Reader, pub, plain, nil)
 }
 
-func (mc *mysqlConn) sendEncryptedPassword(seed []byte, pub *rsa.PublicKey) error {
+func (mc *mysqlConn) sendEncryptedPassword(ctx context.Context, seed []byte, pub *rsa.PublicKey) error {
 	enc, err := encryptPassword(mc.cfg.Passwd, seed, pub)
 	if err != nil {
 		return err
 	}
-	return mc.writeAuthSwitchPacket(enc)
+	return mc.writeAuthSwitchPacket(ctx, enc)
 }
 
 func (mc *mysqlConn) auth(authData []byte, plugin string) ([]byte, error) {
@@ -296,9 +297,9 @@ func (mc *mysqlConn) auth(authData []byte, plugin string) ([]byte, error) {
 	}
 }
 
-func (mc *mysqlConn) handleAuthResult(oldAuthData []byte, plugin string) error {
+func (mc *mysqlConn) handleAuthResult(ctx context.Context, oldAuthData []byte, plugin string) error {
 	// Read Result Packet
-	authData, newPlugin, err := mc.readAuthResult()
+	authData, newPlugin, err := mc.readAuthResult(ctx)
 	if err != nil {
 		return err
 	}
@@ -320,12 +321,12 @@ func (mc *mysqlConn) handleAuthResult(oldAuthData []byte, plugin string) error {
 		if err != nil {
 			return err
 		}
-		if err = mc.writeAuthSwitchPacket(authResp); err != nil {
+		if err = mc.writeAuthSwitchPacket(ctx, authResp); err != nil {
 			return err
 		}
 
 		// Read Result Packet
-		authData, newPlugin, err = mc.readAuthResult()
+		authData, newPlugin, err = mc.readAuthResult(ctx)
 		if err != nil {
 			return err
 		}
@@ -346,35 +347,32 @@ func (mc *mysqlConn) handleAuthResult(oldAuthData []byte, plugin string) error {
 		case 1:
 			switch authData[0] {
 			case cachingSha2PasswordFastAuthSuccess:
-				if err = mc.resultUnchanged().readResultOK(); err == nil {
+				if err = mc.resultUnchanged().readResultOK(ctx); err == nil {
 					return nil // auth successful
 				}
 
 			case cachingSha2PasswordPerformFullAuthentication:
 				if mc.cfg.TLS != nil || mc.cfg.Net == "unix" {
 					// write cleartext auth packet
-					err = mc.writeAuthSwitchPacket(append([]byte(mc.cfg.Passwd), 0))
+					err = mc.writeAuthSwitchPacket(ctx, append([]byte(mc.cfg.Passwd), 0))
 					if err != nil {
 						return err
 					}
 				} else {
 					pubKey := mc.cfg.pubKey
 					if pubKey == nil {
-						// request public key from server
-						data, err := mc.buf.takeSmallBuffer(4 + 1)
-						if err != nil {
-							return err
-						}
-						data[4] = cachingSha2PasswordRequestPublicKey
-						err = mc.writePacket(data)
+						mc.data[4] = cachingSha2PasswordRequestPublicKey
+						err = mc.writePacket(ctx, mc.data[:5])
 						if err != nil {
 							return err
 						}
 
-						if data, err = mc.readPacket(); err != nil {
+						packet, err := mc.readPacket(ctx)
+						if err != nil {
 							return err
 						}
 
+						data := packet.data
 						if data[0] != iAuthMoreData {
 							return fmt.Errorf("unexpected resp from server for caching_sha2_password, perform full authentication")
 						}
@@ -392,12 +390,12 @@ func (mc *mysqlConn) handleAuthResult(oldAuthData []byte, plugin string) error {
 					}
 
 					// send encrypted password
-					err = mc.sendEncryptedPassword(oldAuthData, pubKey)
+					err = mc.sendEncryptedPassword(ctx, oldAuthData, pubKey)
 					if err != nil {
 						return err
 					}
 				}
-				return mc.resultUnchanged().readResultOK()
+				return mc.resultUnchanged().readResultOK(ctx)
 
 			default:
 				return ErrMalformPkt
@@ -422,11 +420,11 @@ func (mc *mysqlConn) handleAuthResult(oldAuthData []byte, plugin string) error {
 			}
 
 			// send encrypted password
-			err = mc.sendEncryptedPassword(oldAuthData, pub.(*rsa.PublicKey))
+			err = mc.sendEncryptedPassword(ctx, oldAuthData, pub.(*rsa.PublicKey))
 			if err != nil {
 				return err
 			}
-			return mc.resultUnchanged().readResultOK()
+			return mc.resultUnchanged().readResultOK(ctx)
 		}
 
 	default: