Changes for adding new auth method

go/mysql/auth_server.go

@@ -50,7 +50,7 @@ type AuthServer interface {
 	// expected. If anything else is returned, Negotiate()
 	// will be called on the connection, and the AuthServer
 	// needs to handle the packets.
-	AuthMethod(user string) (string, error)
+	AuthMethod(user, addr string) (string, error)
 
 	// Salt returns the salt to use for a connection.
 	// It should be 20 bytes of data.

go/mysql/auth_server_clientcert.go

@@ -46,7 +46,7 @@ func InitAuthServerClientCert() {
 }
 
 // AuthMethod is part of the AuthServer interface.
-func (ascc *AuthServerClientCert) AuthMethod(user string) (string, error) {
+func (ascc *AuthServerClientCert) AuthMethod(user, addr string) (string, error) {
 	return ascc.Method, nil
 }
 

go/mysql/auth_server_none.go

@@ -31,7 +31,7 @@ type AuthServerNone struct{}
 
 // AuthMethod is part of the AuthServer interface.
 // We always return MysqlNativePassword.
-func (a *AuthServerNone) AuthMethod(user string) (string, error) {
+func (a *AuthServerNone) AuthMethod(user, addr string) (string, error) {
 	return MysqlNativePassword, nil
 }
 

go/mysql/auth_server_static.go

@@ -225,7 +225,7 @@ func validateConfig(config map[string][]*AuthServerStaticEntry) error {
 }
 
 // AuthMethod is part of the AuthServer interface.
-func (a *AuthServerStatic) AuthMethod(user string) (string, error) {
+func (a *AuthServerStatic) AuthMethod(user, addr string) (string, error) {
 	return a.Method, nil
 }
 

go/mysql/server.go

@@ -206,15 +206,16 @@ func NewListener(protocol, address string, authServer AuthServer, handler Handle
 // ListenerConfig should be used with NewListenerWithConfig to specify listener parameters.
 type ListenerConfig struct {
 	// Protocol-Address pair and Listener are mutually exclusive parameters
-	Protocol           string
-	Address            string
-	Listener           net.Listener
-	AuthServer         AuthServer
-	Handler            Handler
-	ConnReadTimeout    time.Duration
-	ConnWriteTimeout   time.Duration
-	ConnReadBufferSize int
-	MaxConns           uint64
+	Protocol                 string
+	Address                  string
+	Listener                 net.Listener
+	AuthServer               AuthServer
+	Handler                  Handler
+	ConnReadTimeout          time.Duration
+	ConnWriteTimeout         time.Duration
+	ConnReadBufferSize       int
+	MaxConns                 uint64
+	AllowClearTextWithoutTLS bool
 }
 
 // NewListenerWithConfig creates new listener using provided config. There are
@@ -232,15 +233,16 @@ func NewListenerWithConfig(cfg ListenerConfig) (*Listener, error) {
 	}
 
 	return &Listener{
-		authServer:         cfg.AuthServer,
-		handler:            cfg.Handler,
-		listener:           l,
-		ServerVersion:      DefaultServerVersion,
-		connectionID:       1,
-		connReadTimeout:    cfg.ConnReadTimeout,
-		connWriteTimeout:   cfg.ConnWriteTimeout,
-		connReadBufferSize: cfg.ConnReadBufferSize,
-		maxConns:           cfg.MaxConns,
+		authServer:               cfg.AuthServer,
+		handler:                  cfg.Handler,
+		listener:                 l,
+		ServerVersion:            DefaultServerVersion,
+		connectionID:             1,
+		connReadTimeout:          cfg.ConnReadTimeout,
+		connWriteTimeout:         cfg.ConnWriteTimeout,
+		connReadBufferSize:       cfg.ConnReadBufferSize,
+		maxConns:                 cfg.MaxConns,
+		AllowClearTextWithoutTLS: sync2.NewAtomicBool(cfg.AllowClearTextWithoutTLS),
 	}, nil
 }
 
@@ -362,7 +364,7 @@ func (l *Listener) handle(conn net.Conn, connectionID uint32, acceptTime time.Ti
 	}
 
 	// See what auth method the AuthServer wants to use for that user.
-	authServerMethod, err := l.authServer.AuthMethod(user)
+	authServerMethod, err := l.authServer.AuthMethod(user, conn.RemoteAddr().String())
 	if err != nil {
 		c.writeErrorPacketFromError(err)
 		return