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

GUACAMOLE-728: Change default JDBC SSL mode to prefer(red).

Browse Source
This commit is contained in:
Virtually Nick
2020-06-25 18:47:22 -04:00
parent 2522b37997
commit 788395ad9d
4 changed files with 9 additions and 7 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/conf/MySQLEnvironment.java
View File

@@ -106,7 +106,7 @@ public class MySQLEnvironment extends JDBCEnvironment {
/**
* The default SSL mode for connecting to MySQL servers.
*/
private final MySQLSSLMode DEFAULT_SSL_MODE = MySQLSSLMode.DISABLED;
private final MySQLSSLMode DEFAULT_SSL_MODE = MySQLSSLMode.PREFERRED;
/**
* Constructs a new MySQLEnvironment, providing access to MySQL-specific
@@ -309,7 +309,7 @@ public class MySQLEnvironment extends JDBCEnvironment {
/**
* Return the MySQL SSL mode as configured in guacamole.properties, or the
* default value of DISABLED if not configured.
* default value of PREFERRED if not configured.
*
* @return
* The SSL mode to use when connecting to the MySQL server.

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

@@ -180,8 +180,8 @@ public class MySQLGuacamoleProperties {
};
/**
* The SSL mode used to connect to the MySQL Server. By default SSL will
* not be used.
* The SSL mode used to connect to the MySQL Server. By default the driver
* will attempt SSL connections and fall back to plain-text if SSL fails.
*/
public static final EnumGuacamoleProperty<MySQLSSLMode> MYSQL_SSL_MODE =
new EnumGuacamoleProperty<MySQLSSLMode>(MySQLSSLMode.class) {