From 3b34d2cd73479d4d37173ab888fc5f39a82a863a Mon Sep 17 00:00:00 2001 From: Tadashi Kanda Date: Thu, 28 Oct 2021 11:59:11 +0900 Subject: [PATCH 1/3] GUACAMOLE-1453: Enable SSL connection between Guacamole and DB using MaraiDB Connector/J --- .../auth/mysql/MySQLAuthenticationProviderModule.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 658c08a3a..9fdae08fd 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,9 +87,12 @@ public class MySQLAuthenticationProviderModule implements Module { driverProperties.setProperty("sslMode", sslMode.getDriverValue()); // For compatibility, set legacy useSSL property when SSL is disabled. - if (sslMode == MySQLSSLMode.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(); if (trustStore != null) From d722c3a759a0e12a2e30076548b5c003e4952c34 Mon Sep 17 00:00:00 2001 From: Tadashi Kanda Date: Thu, 28 Oct 2021 23:53:13 +0900 Subject: [PATCH 2/3] GUACAMOLE-1453: Reflect of indicate. --- .../auth/mysql/MySQLAuthenticationProviderModule.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 9fdae08fd..3cdac4ded 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,10 @@ public class MySQLAuthenticationProviderModule implements Module { driverProperties.setProperty("sslMode", sslMode.getDriverValue()); // For compatibility, set legacy useSSL property when SSL is disabled. - if (sslMode == MySQLSSLMode.DISABLED) { + if (sslMode == MySQLSSLMode.DISABLED) driverProperties.setProperty("useSSL", "false"); - } else { + else driverProperties.setProperty("useSSL", "true"); - } // Check other SSL settings and set as required File trustStore = environment.getMySQLSSLTrustStore(); From 23b9d91d6f73e0dde59f7bd69026867509f7623b Mon Sep 17 00:00:00 2001 From: Tadashi Kanda Date: Fri, 29 Oct 2021 00:39:17 +0900 Subject: [PATCH 3/3] GUACAMOLE-1453: Reflect of indicate.(minor change) --- .../guacamole/auth/mysql/MySQLAuthenticationProviderModule.java | 1 + 1 file changed, 1 insertion(+) 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 3cdac4ded..62cf0c4c0 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 @@ -89,6 +89,7 @@ public class MySQLAuthenticationProviderModule implements Module { // For compatibility, set legacy useSSL property when SSL is disabled. if (sslMode == MySQLSSLMode.DISABLED) driverProperties.setProperty("useSSL", "false"); + // For compatibility, set legacy useSSL property when SSL is eisabled.(Required for mariadb connector/j) else driverProperties.setProperty("useSSL", "true");