Merge pull request #10 from trimble-oss/super_flex_v2

Blanket check for super if host validation fails.

sql/mysql_db/mysql_db.go

@@ -304,15 +304,6 @@ func (db *MySQLDb) GetUser(user string, host string, roleSearch bool) *User {
 	if len(userEntries) == 1 {
 		readUserEntry := userEntries[0].(*User)
 
-		if host == readUserEntry.Host ||
-			(host == "127.0.0.1" && readUserEntry.Host == "localhost") ||
-			(host == "localhost" && readUserEntry.Host == "127.0.0.1") ||
-			(readUserEntry.Host == "%" && (!roleSearch || host == "")) {
-			if readUserEntry.IsSuperUser {
-				return readUserEntry
-			}
-		}
-
 		if lockTime, isLocked := lockUserMap.GetUser(readUserEntry); isLocked {
 			if time.Since(lockTime) > time.Hour {
 				readUserEntry.Locked = false
@@ -330,6 +321,9 @@ func (db *MySQLDb) GetUser(user string, host string, roleSearch bool) *User {
 				if hostIp != nil && network.Contains(hostIp) {
 					return readUserEntry
 				} else {
+					if readUserEntry.IsSuperUser {
+						return readUserEntry
+					}
 					return nil
 				}
 			} else {