From 8c2df77f2db42c197286677c8864a7464e0a3787 Mon Sep 17 00:00:00 2001 From: Virtually Nick Date: Sat, 2 May 2020 22:32:28 -0400 Subject: [PATCH] GUACAMOLE-728: Set legacy SSL options for MySQL --- .../auth/mysql/MySQLAuthenticationProviderModule.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLAuthenticationProviderModule.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLAuthenticationProviderModule.java index a58e9add8..f2908ee66 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLAuthenticationProviderModule.java +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLAuthenticationProviderModule.java @@ -28,6 +28,7 @@ import java.util.Properties; import org.apache.guacamole.GuacamoleException; import org.apache.guacamole.auth.mysql.conf.MySQLDriver; import org.apache.guacamole.auth.mysql.conf.MySQLEnvironment; +import org.apache.guacamole.auth.mysql.conf.MySQLSSLMode; import org.mybatis.guice.datasource.helper.JdbcHelper; /** @@ -84,7 +85,14 @@ public class MySQLAuthenticationProviderModule implements Module { driverProperties.setProperty("allowMultiQueries", "true"); // Set the SSL mode to use when conncting - driverProperties.setProperty("sslMode", environment.getMySQLSSLMode().toString()); + MySQLSSLMode sslMode = environment.getMySQLSSLMode(); + driverProperties.setProperty("sslMode", sslMode.toString()); + + // Set legacy properties + if (sslMode == MySQLSSLMode.DISABLED) + driverProperties.setProperty("useSSL", "false"); + else + driverProperties.setProperty("useSSL", "true"); // Check other SSL settings and set as required File trustStore = environment.getMySQLSSLTrustStore();