Interim support for MySQL 8

Interim support for MySQL 8 with some caveats described in the README.

Author: Chris Board

.idea/caches/build_file_checksums.ser

@@ -20,19 +20,19 @@ else
 }
 
 archivesBaseName="AndroidMySQLConnector"
-version '0.25'
+version '0.28'
 group 'com.BoardiesITSolutions'
 
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
     defaultConfig {
         //applicationId "com.BoardiesITSolutions.AndroidMySQLConnector"
         minSdkVersion 19
-        targetSdkVersion 28
-        versionCode 14
-        versionName "0.25"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        targetSdkVersion 29
+        versionCode 20
+        versionName "0.28"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -83,13 +83,11 @@ android {
 }
 
 def getArtifactFullPath() {
-    return ".//build/outputs/aar/${archivesBaseName}-${project.version}.aar"
+    //return ".//build/outputs/aar/${archivesBaseName}-${project.version}.aar"
+    return ".//build/outputs/aar/${archivesBaseName}-debug.aar"
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:28.0.0-rc02'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
 }

.idea/caches/gradle_models.ser

@@ -1,11 +1,9 @@
 package com.BoardiesITSolutions.AndroidMySQLConnector;
 
 import android.annotation.TargetApi;
-import android.content.Context;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
-import android.support.v4.app.Fragment;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.RequiresApi;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 
 
@@ -84,6 +82,8 @@ public class Connection
     public static final int CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS = 0x00400000;
     public static final int CLIENT_SESSION_TRACK = 0x00800000;
 
+    public static final int CLIENT_OPTIONAL_RESULTSET_METADATA = 1 << 25;
+
     //Character Sets
     private final int LATIN1_SWEDISH_CI = 0x08;
     private final int UTF8_GENERAL_CI = 0x21;
@@ -324,6 +324,11 @@ private void processWelcomePacket() throws MySQLConnException, IOException {
             temp = mysqlIO.swapByteArray(temp);
             connectionID = mysqlIO.fromByteArray(temp);
             byte[] salt1 = (byte[]) mysqlIO.extractData(8);
+            if (this.majorVersion == 8)
+            {
+                //Log.d("Connection", "Version 8 detected. Shifting 1 byte");
+                //mysqlIO.shiftCurrentBytePosition(1);
+            }
             authSalt = Connection.toString(salt1, 0, salt1.length);
             //There is a null terminator at the end of the salt, shift by one as we don't need it
             mysqlIO.shiftCurrentBytePosition(1);
@@ -364,9 +369,16 @@ private void processWelcomePacket() throws MySQLConnException, IOException {
             //Check if the server is supporting compression, if it does, we need to turn off as we don't
             if ((Connection.this.serverCapabilities & CLIENT_COMPRESS) == CLIENT_COMPRESS)
             {
+                Log.d("Connection", "Disabling client compress");
                 clientCapabilities &= ~CLIENT_COMPRESS;
             }
 
+            //If MySQL 8 turn off can accept expired password
+            if (this.getMajorVersion() >= 8)
+            {
+                clientCapabilities &= ~CLIENT_OPTIONAL_RESULTSET_METADATA;
+            }
+
             //Check if the server is set to don't allow database.table, if so unset it so we can
             //Having this enabled means SHOW TABLES and SHOW DATABASES can't be executed as it will only
             //use the database that we are  connected to
@@ -773,7 +785,11 @@ public Statement createStatement()
 
     private void parseVersionNumber()
     {
-        this.serverVersion = this.serverVersion.substring(0, this.serverVersion.indexOf("-")-1);
+        if (this.serverVersion.contains("-"))
+        {
+            this.serverVersion = this.serverVersion.substring(0, this.serverVersion.indexOf("-") - 1);
+        }
+
         this.serverVersion = this.serverVersion.replaceAll("[^\\d.]", "");
         if ((this.serverVersion != null) && this.serverVersion.length() > 0)
         {

.idea/codeStyles/Project.xml

@@ -1,16 +1,14 @@
 package com.BoardiesITSolutions.AndroidMySQLConnector;
 
 import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 import android.util.Log;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.net.Socket;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;

.idea/gradle.xml

@@ -1,5 +1,6 @@
 package com.BoardiesITSolutions.AndroidMySQLConnector.PacketManager;
 
+import android.os.Message;
 import android.util.Log;
 
 import com.BoardiesITSolutions.AndroidMySQLConnector.Connection;
@@ -10,6 +11,7 @@
 import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 
@@ -130,7 +132,38 @@ private void createAuthenticationPacket() throws IOException
             else
             {
                 Log.e("AuthResponse", "Only mysql_native_password is currently supported");
-                throw new UnsupportedOperationException("mysql_native_password is currently only supported. Please use this authentication method");
+                Log.d("AuthResponse", "Auth Plugin Name: " + this.mysqlConn.getAuthPluginName());
+                if (this.mysqlConn.getAuthPluginName().equals("caching_sha2_password"))
+                {
+                    Log.d("AuthResponse", "Using MySQL Caching Sha2 Password");
+
+                    String password = this.mysqlConn.getPassword();
+
+                    MessageDigest hash1MD = sha256();
+                    byte[] hash1 = hash1MD.digest(password.getBytes(StandardCharsets.UTF_8));
+                    MessageDigest hash2MD = sha256();
+                    hash2MD.update(hash1MD.digest(hash1));
+                    hash2MD.update(this.mysqlConn.getAuthSalt().getBytes(StandardCharsets.UTF_8));
+                    byte[] hash2 = hash1MD.digest();
+
+                    byte[] hash3 = new byte[hash1.length];
+                    //Perform XOR
+                    int i = 0;
+                    for (byte b : hash1)
+                    {
+                        hash3[i] = (byte) (b ^ hash2[i++]);
+                    }
+
+                    dataOutPacket.write(hash3);
+
+                    //byte[] hash1 = sha256String(password);
+                    //byte[] hash2 = sha256Bytes(hash1);
+
+                }
+                else
+                {
+                    throw new UnsupportedOperationException("mysql_native_password is currently only supported. Please use this authentication method");
+                }
             }
 
             //Add the database if we have a database available
@@ -199,6 +232,22 @@ private void createAuthenticationPacket() throws IOException
             ex.printStackTrace();
         }
     }
+
+    private MessageDigest sha256() throws NoSuchAlgorithmException
+    {
+        return MessageDigest.getInstance("SHA-256");
+        //byte[] encodedHash = digest.digest(data.getBytes(StandardCharsets.UTF_8));
+
+    }
+
+    /**
+     * Uses for MySQL Native Password
+     * @param password
+     * @param seed
+     * @return
+     * @throws NoSuchAlgorithmException
+     * @throws UnsupportedEncodingException
+     */
     private byte[] scramblePassword(String password, String seed) throws NoSuchAlgorithmException, UnsupportedEncodingException
     {
         MessageDigest md = MessageDigest.getInstance("SHA-1");

AndroidMySQLConnector/build.gradle

@@ -1,7 +1,7 @@
 package com.BoardiesITSolutions.AndroidMySQLConnector.PacketManager;
 
 import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 
 import com.BoardiesITSolutions.AndroidMySQLConnector.Connection;
 import com.BoardiesITSolutions.AndroidMySQLConnector.Exceptions.InvalidSQLPacketException;

AndroidMySQLConnector/src/main/java/com/BoardiesITSolutions/AndroidMySQLConnector/Connection.java

@@ -1,6 +1,6 @@
 package com.BoardiesITSolutions.AndroidMySQLConnector.PacketManager;
 
-import android.support.v7.widget.ThemedSpinnerAdapter;
+import androidx.appcompat.widget.ThemedSpinnerAdapter;
 import android.util.Log;
 
 import com.BoardiesITSolutions.AndroidMySQLConnector.Connection;