Add client_ed25519 tests for MariaDB 10.4.

Signed-off-by: Bradley Grainger <[email protected]>

Author: bgrainger

.ci/config/config.compression.json

@@ -3,7 +3,7 @@
       "ConnectionString": "server=127.0.0.1;user id=mysqltest;password='test;key=\"val';port=3306;database=mysqltest;ssl mode=none;UseCompression=true;DefaultCommandTimeout=3600",
       "PasswordlessUser": "no_password",
       "SecondaryDatabase": "testdb2",
-      "UnsupportedFeatures": "RsaEncryption,CachingSha2Password,Tls12,UuidToBin",
+      "UnsupportedFeatures": "Ed25519,RsaEncryption,CachingSha2Password,Tls12,UuidToBin",
       "MySqlBulkLoaderLocalCsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.CSV",
       "MySqlBulkLoaderLocalTsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.TSV"
     }

.ci/config/config.json

@@ -3,7 +3,7 @@
       "ConnectionString": "server=127.0.0.1;user id=mysqltest;password='test;key=\"val';port=3306;database=mysqltest;ssl mode=none;DefaultCommandTimeout=3600",
       "PasswordlessUser": "no_password",
       "SecondaryDatabase": "testdb2",
-      "UnsupportedFeatures": "RsaEncryption,CachingSha2Password,Tls12,UuidToBin",
+      "UnsupportedFeatures": "Ed25519,RsaEncryption,CachingSha2Password,Tls12,UuidToBin",
       "MySqlBulkLoaderLocalCsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.CSV",
       "MySqlBulkLoaderLocalTsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.TSV"
     }

.ci/docker-run.sh

@@ -60,6 +60,11 @@ for i in `seq 1 30`; do
 		if [ $? -ne 0 ]; then continue; fi
 	fi
 
+	if [[ $OMIT_FEATURES != *"Ed25519"* ]]; then
+		docker exec -it $NAME bash -c 'mysql -uroot -ptest < /etc/mysql/conf.d/init_ed25519.sql' >/dev/null 2>&1
+		if [ $? -ne 0 ]; then continue; fi
+	fi
+
 	# exit if successful
 	docker exec -it $NAME mysql -ussltest -ptest \
 		--ssl-mode=REQUIRED \

.ci/server/init_ed25519.sql

@@ -0,0 +1,3 @@
+INSTALL SONAME 'auth_ed25519';
+CREATE USER 'ed25519user'@'%' IDENTIFIED VIA ed25519 USING PASSWORD('Ed255!9');
+GRANT ALL PRIVILEGES ON *.* TO 'ed25519user'@'%';

.travis.yml

@@ -5,22 +5,22 @@ services: docker
 env:
   - IMAGE=mysql:5.6
     NAME=mysql
-    OMIT_FEATURES=Json,Sha256Password,RsaEncryption,LargePackets,CachingSha2Password,SessionTrack,Tls11,Tls12,UuidToBin
+    OMIT_FEATURES=Ed25519,Json,Sha256Password,RsaEncryption,LargePackets,CachingSha2Password,SessionTrack,Tls11,Tls12,UuidToBin
   - IMAGE=mysql:5.7
     NAME=mysql
-    OMIT_FEATURES=RsaEncryption,CachingSha2Password,Tls12,UuidToBin
+    OMIT_FEATURES=Ed25519,RsaEncryption,CachingSha2Password,Tls12,UuidToBin
   - IMAGE=mysql:8.0
     NAME=mysql
-    OMIT_FEATURES=None
+    OMIT_FEATURES=Ed25519
   - IMAGE=percona:5.7.22
     NAME=percona
-    OMIT_FEATURES=CachingSha2Password,UuidToBin
+    OMIT_FEATURES=CachingSha2Password,Ed25519,UuidToBin
   - IMAGE=mariadb:10.2
     NAME=mariadb
-    OMIT_FEATURES=Json,Sha256Password,CachingSha2Password,RoundDateTime,UuidToBin
+    OMIT_FEATURES=Ed25519,Json,Sha256Password,CachingSha2Password,RoundDateTime,UuidToBin
   - IMAGE=mariadb:10.3
     NAME=mariadb
-    OMIT_FEATURES=Json,Sha256Password,CachingSha2Password,RoundDateTime,UuidToBin
+    OMIT_FEATURES=Ed25519,Json,Sha256Password,CachingSha2Password,RoundDateTime,UuidToBin
   - IMAGE=mariadb:10.4
     NAME=mariadb
     OMIT_FEATURES=Json,Sha256Password,CachingSha2Password,RoundDateTime,UuidToBin

tests/README.md

@@ -21,18 +21,19 @@ Otherwise, set the following options appropriately:
 * `Data.MySqlBulkLoaderLocalCsvFile`: (Optional) The path to a test CSV file.
 * `Data.MySqlBulkLoaderLocalTsvFile`: (Optional) The path to a test TSV file.
 * `Data.UnsupportedFeatures`: A comma-delimited list of `ServerFeature` enum values that your test database server does *not* support
+  * `CachingSha2Password`: a user named `caching-sha2-user` exists on your server and uses the `caching_sha2_password` auth plugin
+  * `Ed25519`: a user named `ed25519user` exists on your server and uses the `client_ed25519` auth plugin
+  * `ErrorCodes`: server returns error codes in error packet (some MySQL proxies do not)
   * `Json`: the `JSON` data type (MySQL 5.7 and later)
-  * `StoredProcedures`: create and execute stored procedures
-  * `Sha256Password`: a user named `sha256user` exists on your server and uses the `sha256_password` auth plugin
-  * `RsaEncryption`: server supports RSA public key encryption (for `sha256_password` and `caching_sha2_password`)
   * `LargePackets`: large packets (over 4MB)
-  * `CachingSha2Password`: a user named `caching-sha2-user` exists on your server and uses the `caching_sha2_password` auth plugin
+  * `RoundDateTime`: server rounds `datetime` values to the specified precision (not implemented in MariaDB)
+  * `RsaEncryption`: server supports RSA public key encryption (for `sha256_password` and `caching_sha2_password`)
   * `SessionTrack`: server supports `CLIENT_SESSION_TRACK` capability (MySQL 5.7 and later)
+  * `Sha256Password`: a user named `sha256user` exists on your server and uses the `sha256_password` auth plugin
+  * `StoredProcedures`: create and execute stored procedures
   * `Timeout`: server can cancel queries promptly (so timed tests don't time out)
-  * `ErrorCodes`: server returns error codes in error packet (some MySQL proxies do not)
   * `Tls11`: server supports TLS 1.1
   * `Tls12`: server supports TLS 1.2
-  * `RoundDateTime`: server rounds `datetime` values to the specified precision (not implemented in MariaDB)
   * `UuidToBin`: server supports `UUID_TO_BIN` (MySQL 8.0 and later)
 
 ## Running Tests

tests/SideBySide/ConnectAsync.cs

@@ -1,11 +1,13 @@
 using System;
 using System.Data;
 using System.Diagnostics;
-using System.IO;
 using System.Security.Authentication;
 using System.Threading;
 using System.Threading.Tasks;
 using MySql.Data.MySqlClient;
+#if !BASELINE
+using MySqlConnector.Authentication.Ed25519;
+#endif
 using Xunit;
 
 namespace SideBySide
@@ -347,6 +349,23 @@ public async Task CachingSha2WithoutSecureConnection()
 			}
 		}
 
+#if !BASELINE
+#if !NETCOREAPP1_1_2 && !NETCOREAPP2_0
+		[SkippableFact(ServerFeatures.Ed25519)]
+		public async Task Ed25519Authentication()
+		{
+			Ed25519AuthenticationPlugin.Install();
+
+			var csb = AppConfig.CreateConnectionStringBuilder();
+			csb.UserID = "ed25519user";
+			csb.Password = "Ed255!9";
+			csb.Database = null;
+			using (var connection = new MySqlConnection(csb.ConnectionString))
+				await connection.OpenAsync();
+		}
+#endif
+#endif
+
 		// To create a MariaDB GSSAPI user for a current user
 		// - install plugin if not already done , e.g mysql -uroot -e "INSTALL SONAME 'auth_gssapi'"
 		// create MariaDB's gssapi user

tests/SideBySide/ServerFeatures.cs

@@ -20,5 +20,6 @@ public enum ServerFeatures
 		Tls12 = 2048,
 		RoundDateTime = 4096,
 		UuidToBin = 8192,
+		Ed25519 = 16384,
 	}
 }

tests/SideBySide/SideBySide.csproj

@@ -36,6 +36,7 @@
 
   <ItemGroup Condition=" '$(Configuration)' != 'Baseline' ">
     <ProjectReference Include="..\..\src\MySqlConnector\MySqlConnector.csproj" />
+    <ProjectReference Include="..\..\src\MySqlConnector.Authentication.Ed25519\MySqlConnector.Authentication.Ed25519.csproj" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(Configuration)' == 'Baseline' ">

tests/SideBySide/config.json.example

@@ -1,6 +1,6 @@
 {
     "Data": {
       "ConnectionString": "server=127.0.0.1;user id=root;password=pass;port=3306;database=mysqltest",
-      "UnsupportedFeatures": "CachingSha2Password,RsaEncryption,Sha256Password,UuidToBin"
+      "UnsupportedFeatures": "CachingSha2Password,Ed25519,RsaEncryption,Sha256Password,UuidToBin"
     }
 }