| commit | c71107e395e3a5e7b7d6deef08e90b2ab1db4491 | [log] [tgz] |
|---|---|---|
| author | Mike Jumper <mjumper@apache.org> | Thu Jun 25 17:54:36 2020 -0700 |
| committer | GitHub <noreply@github.com> | Thu Jun 25 17:54:36 2020 -0700 |
| tree | 36f88cb8c288c3fa5a89be13864486ecfa554773 | |
| parent | 079b00932576592c5868d41caa12647328338f50 [diff] | |
| parent | 6fc09f4ee8f3319073938edb311a79f89f574d0f [diff] |
GUACAMOLE-728: Merge workaround for legacy Connector/J SSL behavior. Older versions of the MySQL / MariaDB driver do not support the same level of granular SSL/TLS control, and the legacy "useSSL" parameter cannot be specified without breaking the behavior of "sslMode".
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 aca3f42..4e4f35e 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
@@ -87,11 +87,9 @@ MySQLSSLMode sslMode = environment.getMySQLSSLMode(); driverProperties.setProperty("sslMode", sslMode.getDriverValue()); - // Set legacy properties + // For compatibility, set legacy useSSL property when SSL is disabled. 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();