support serverRSAPublicKeyFile configuration properties

bereadyfor · oshai · commit 2e25357a99e9 · 2023-06-15T18:48:06.000+03:00
- For property naming, please refer to MySQL Connector/J.
diff --git a/r2dbc-mysql/src/main/java/MysqlConnectionFactoryProvider.kt b/r2dbc-mysql/src/main/java/MysqlConnectionFactoryProvider.kt
@@ -15,6 +15,7 @@ import io.r2dbc.spi.ConnectionFactoryOptions.USER
 import io.r2dbc.spi.ConnectionFactoryProvider
 import io.r2dbc.spi.Option
 import mu.KotlinLogging
+import java.nio.file.Paths
 import java.time.Duration
 import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty
@@ -30,6 +31,12 @@ class MysqlConnectionFactoryProvider : ConnectionFactoryProvider {
         @JvmField
         val APPLICATION_NAME: Option<String> = Option.valueOf("applicationName")
 
+        /**
+         * Server rsa public key file.
+         */
+        @JvmField
+        val SERVER_RSA_PUBLIC_KEY_FILE: Option<String> = Option.valueOf("serverRSAPublicKeyFile")
+
         /**
          * Driver option value.
          */
@@ -72,7 +79,8 @@ class MysqlConnectionFactoryProvider : ConnectionFactoryProvider {
             applicationName = connectionFactoryOptions.getValue(APPLICATION_NAME) as String?,
             connectionTimeout = (connectionFactoryOptions.getValue(CONNECT_TIMEOUT) as Duration?)?.toMillis()?.toInt() ?: 5000,
             queryTimeout = connectionFactoryOptions.getValue(STATEMENT_TIMEOUT) as Duration?,
-            ssl = MysqlSSLConfigurationFactory.create(connectionFactoryOptions)
+            ssl = MysqlSSLConfigurationFactory.create(connectionFactoryOptions),
+            rsaPublicKey = (connectionFactoryOptions.getValue(SERVER_RSA_PUBLIC_KEY_FILE) as String?)?.let { Paths.get(it) }
         )
         return JasyncConnectionFactory(MySQLConnectionFactory(configuration))
     }
diff --git a/r2dbc-mysql/src/test/java/com/github/jasync/r2dbc/mysql/MysqlConnectionFactoryProviderTest.kt b/r2dbc-mysql/src/test/java/com/github/jasync/r2dbc/mysql/MysqlConnectionFactoryProviderTest.kt
@@ -41,4 +41,26 @@ class MysqlConnectionFactoryProviderTest {
         // then
         assertEquals(3307, result.mySQLConnectionFactory.configuration.port)
     }
+
+    @Test
+    fun shouldNotUseWhenRsaPublicKeyIsNotSpecified() {
+        val options = ConnectionFactoryOptions.parse("r2dbc:mysql://user@host/")
+
+        // when
+        val result = provider.create(options)
+
+        // then
+        assertEquals(null, result.mySQLConnectionFactory.configuration.rsaPublicKey)
+    }
+
+    @Test
+    fun shouldUseSpecifiedRsaPublicKey() {
+        val options = ConnectionFactoryOptions.parse("r2dbc:mysql://user@host/db?serverRSAPublicKeyFile=rsa.pem")
+
+        // when
+        val result = provider.create(options)
+
+        // then
+        assertEquals("rsa.pem", result.mySQLConnectionFactory.configuration.rsaPublicKey.toString())
+    }
 }
