safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 21:27:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-1453: Merge enable MySQL/MariaDB SSL connection using legacy property

Browse Source
This commit is contained in:
Virtually Nick
2021-10-28 13:09:44 -04:00
committed by GitHub
parent fc3748fd87 23b9d91d6f
commit 62b26fb594
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLAuthenticationProviderModule.java
View File

@@ -89,6 +89,9 @@ public class MySQLAuthenticationProviderModule implements Module {
// For compatibility, set legacy useSSL property when SSL is disabled. // For compatibility, set legacy useSSL property when SSL is disabled.
if (sslMode == MySQLSSLMode.DISABLED) if (sslMode == MySQLSSLMode.DISABLED)
driverProperties.setProperty("useSSL", "false"); driverProperties.setProperty("useSSL", "false");
// For compatibility, set legacy useSSL property when SSL is eisabled.(Required for mariadb connector/j)
else
driverProperties.setProperty("useSSL", "true");
// Check other SSL settings and set as required // Check other SSL settings and set as required
File trustStore = environment.getMySQLSSLTrustStore(); File trustStore = environment.getMySQLSSLTrustStore();