config for mysql ssl write to tmp

airbytehq · Dec 23, 2024 · 062ff87 · 062ff87
1 parent 24eef1f
commit 062ff87
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/...cdk/bulk/toolkits/extract-jdbc/src/main/kotlin/io/airbyte/cdk/jdbc/SSLCertificateUtils.kt b/...cdk/bulk/toolkits/extract-jdbc/src/main/kotlin/io/airbyte/cdk/jdbc/SSLCertificateUtils.kt
@@ -46,7 +46,7 @@ private val log = KotlinLogging.logger {}
  */
 object SSLCertificateUtils {
 
-    private const val DEFAULT_ROOT_FOLDER = "/tmp"
+    const val DEFAULT_ROOT_FOLDER = "/tmp"
     private const val PKCS_12 = "PKCS12"
     private const val X509 = "X.509"
     private val RANDOM: Random = SecureRandom()
@@ -255,6 +255,20 @@ object SSLCertificateUtils {
         )
     }
 
+    fun keyStoreFromClientCertificate(
+        certString: String,
+        keyString: String,
+        keyStorePassword: String,
+    ): URI {
+        return keyStoreFromClientCertificate(
+            certString,
+            keyString,
+            keyStorePassword,
+            FileSystems.getDefault(),
+            DEFAULT_ROOT_FOLDER,
+        )
+    }
+
     fun keyStoreFromClientCertificate(
         certString: String,
         keyString: String,

diff --git a/...ce-mysql/src/main/kotlin/io/airbyte/integrations/source/mysql/MySqlSourceConfiguration.kt b/...ce-mysql/src/main/kotlin/io/airbyte/integrations/source/mysql/MySqlSourceConfiguration.kt
@@ -9,6 +9,7 @@ import io.airbyte.cdk.command.JdbcSourceConfiguration
 import io.airbyte.cdk.command.SourceConfiguration
 import io.airbyte.cdk.command.SourceConfigurationFactory
 import io.airbyte.cdk.jdbc.SSLCertificateUtils
+import io.airbyte.cdk.jdbc.SSLCertificateUtils.DEFAULT_ROOT_FOLDER
 import io.airbyte.cdk.ssh.SshConnectionOptions
 import io.airbyte.cdk.ssh.SshNoTunnelMethod
 import io.airbyte.cdk.ssh.SshTunnelMethodConfiguration
@@ -218,9 +219,7 @@ class MySqlSourceConfigurationFactory @Inject constructor(val featureFlags: Set<
             buildKeyStore("trust") {
                 SSLCertificateUtils.keyStoreFromCertificate(
                     sslData.caCertificate,
-                    password,
-                    FileSystems.getDefault(),
-                    directory = "",
+                    password
                 )
             }
         extraJdbcProperties[TRUST_KEY_STORE_URL] = caCertKeyStoreUrl.toString()
@@ -237,8 +236,7 @@ class MySqlSourceConfigurationFactory @Inject constructor(val featureFlags: Set<
                 SSLCertificateUtils.keyStoreFromClientCertificate(
                     sslData.clientCertificate,
                     sslData.clientKey,
-                    password,
-                    directory = ""
+                    password
                 )
             }
         extraJdbcProperties[CLIENT_KEY_STORE_URL] = clientCertKeyStoreUrl.toString()