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

GUACAMOLE-728: Use correct sslMode options for passing to JDBC driver.

Browse Source
This commit is contained in:
Virtually Nick
2020-06-16 14:50:44 -04:00
parent 986d5a1225
commit f06056b4e4
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,6 @@ import com.google.inject.Binder;
import com.google.inject.Module; import com.google.inject.Module;
import com.google.inject.name.Names; import com.google.inject.name.Names;
import java.io.File; import java.io.File;
import java.net.URI;
import java.util.Properties; import java.util.Properties;
import org.apache.guacamole.GuacamoleException; import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.auth.mysql.conf.MySQLDriver; import org.apache.guacamole.auth.mysql.conf.MySQLDriver;

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

@@ -30,32 +30,32 @@ public enum MySQLSSLMode {
* Do not use SSL at all. * Do not use SSL at all.
*/ */
@PropertyValue("disabled") @PropertyValue("disabled")
DISABLED("disabled"), DISABLED("DISABLED"),
/** /**
* Prefer SSL, but fall back to unencrypted. * Prefer SSL, but fall back to unencrypted.
*/ */
@PropertyValue("preferred") @PropertyValue("preferred")
PREFERRED("preferred"), PREFERRED("PREFERRED"),
/** /**
* Require SSL, but perform no certificate validation. * Require SSL, but perform no certificate validation.
*/ */
@PropertyValue("required") @PropertyValue("required")
REQUIRED("required"), REQUIRED("REQUIRED"),
/** /**
* Require SSL, and validate server certificate issuer. * Require SSL, and validate server certificate issuer.
*/ */
@PropertyValue("verify-ca") @PropertyValue("verify-ca")
VERIFY_CA("verify-ca"), VERIFY_CA("VERIFY_CA"),
/** /**
* Require SSL and validate both server certificate issuer and server * Require SSL and validate both server certificate issuer and server
* identity. * identity.
*/ */
@PropertyValue("verify-identity") @PropertyValue("verify-identity")
VERIFY_IDENTITY("verify-identity"); VERIFY_IDENTITY("VERIFY_IDENTITY");
/** /**
* The value expected by and passed on to the JDBC driver for the given * The value expected by and passed on to the JDBC driver for the given