fix port-less host parsing

Author: seanlafferty-ibm

sql/mysql_db/mysql_db.go

@@ -21,7 +21,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"net"
-	"net/url"
 	"sort"
 	"strings"
 	"sync"
@@ -768,11 +767,15 @@ func (db *MySQLDb) AuthMethod(user, addr string) (string, error) {
 	if addr == "@" || addr == "" {
 		host = "localhost"
 	} else {
-		addrUrl, err := url.Parse(addr)
+		splitHost, _, err := net.SplitHostPort(addr)
 		if err != nil {
-			return "", err
+			if err.(*net.AddrError).Err == "missing port in address" {
+				host = addr
+			} else {
+				return "", err
+			}
+			host = splitHost
 		}
-		host = addrUrl.Hostname()
 	}
 
 	rd := db.Reader()
@@ -796,14 +799,18 @@ func (db *MySQLDb) Salt() ([]byte, error) {
 // ValidateHash implements the interface mysql.AuthServer. This is called when the method used is "mysql_native_password".
 func (db *MySQLDb) ValidateHash(salt []byte, user string, authResponse []byte, addr net.Addr) (mysql.Getter, error) {
 	var host string
+	var err error
 	if addr.Network() == "unix" {
 		host = "localhost"
 	} else {
-		addrUrl, err := url.Parse(addr.String())
+		host, _, err = net.SplitHostPort(addr.String())
 		if err != nil {
-			return nil, err
+			if err.(*net.AddrError).Err == "missing port in address" {
+				host = addr.String()
+			} else {
+				return nil, err
+			}
 		}
-		host = addrUrl.Hostname()
 	}
 
 	rd := db.Reader()
@@ -832,14 +839,18 @@ func (db *MySQLDb) ValidateHash(salt []byte, user string, authResponse []byte, a
 // Negotiate implements the interface mysql.AuthServer. This is called when the method used is not "mysql_native_password".
 func (db *MySQLDb) Negotiate(c *mysql.Conn, user string, addr net.Addr) (mysql.Getter, error) {
 	var host string
+	var err error
 	if addr.Network() == "unix" {
 		host = "localhost"
 	} else {
-		addrUrl, err := url.Parse(addr.String())
+		host, _, err = net.SplitHostPort(addr.String())
 		if err != nil {
-			return nil, err
+			if err.(*net.AddrError).Err == "missing port in address" {
+				host = addr.String()
+			} else {
+				return nil, err
+			}
 		}
-		host = addrUrl.Hostname()
 	}
 
 	rd := db.Reader()