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

GUACAMOLE-1135: Merge return MySQL StoreUrls in URI format

Browse Source
This commit is contained in:
Virtually Nick
2020-08-05 16:17:27 -04:00
committed by GitHub
parent 21eb3b4e23 d32ebd656a
commit d4fb1b0549
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,7 +95,7 @@ public class MySQLAuthenticationProviderModule implements Module {
File trustStore = environment.getMySQLSSLTrustStore(); File trustStore = environment.getMySQLSSLTrustStore();
if (trustStore != null) if (trustStore != null)
driverProperties.setProperty("trustCertificateKeyStoreUrl", driverProperties.setProperty("trustCertificateKeyStoreUrl",
trustStore.getAbsolutePath()); trustStore.toURI().toString());
String trustPassword = environment.getMySQLSSLTrustPassword(); String trustPassword = environment.getMySQLSSLTrustPassword();
if (trustPassword != null) if (trustPassword != null)
@@ -105,7 +105,7 @@ public class MySQLAuthenticationProviderModule implements Module {
File clientStore = environment.getMySQLSSLClientStore(); File clientStore = environment.getMySQLSSLClientStore();
if (clientStore != null) if (clientStore != null)
driverProperties.setProperty("clientCertificateKeyStoreUrl", driverProperties.setProperty("clientCertificateKeyStoreUrl",
clientStore.getAbsolutePath()); clientStore.toURI().toString());
String clientPassword = environment.getMYSQLSSLClientPassword(); String clientPassword = environment.getMYSQLSSLClientPassword();
if (clientPassword != null) if (clientPassword != null)