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: Properly expose JDBC driver values from enums.

Browse Source
This commit is contained in:
Virtually Nick
2020-06-16 11:44:07 -04:00
parent 31288fc4d0
commit 986d5a1225
4 changed files with 51 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -75,10 +75,12 @@ public class PostgreSQLAuthenticationProviderModule implements Module {
// Check the SSL mode and set if configured.
PostgreSQLSSLMode sslMode = environment.getPostgreSQLSSLMode();
driverProperties.setProperty("sslmode", sslMode.toString());
driverProperties.setProperty("sslmode", sslMode.getDriverValue());
// If SSL is enabled, check for and set other SSL properties.
if (sslMode != PostgreSQLSSLMode.DISABLE) {
// Sets the legacy SSL configuration mode required by older servers.
driverProperties.setProperty("ssl", "true");
File sslClientCert = environment.getPostgreSQLSSLClientCertFile();

36
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/conf/PostgreSQLSSLMode.java
View File

@@ -63,42 +63,32 @@ public enum PostgreSQLSSLMode {
VERIFY_FULL("verify-full");
/**
* The value actually passed on to the JDBC driver.
* The value expected by and passed on to the JDBC driver for the given
* SSL operation mode.
*/
private final String configValue;
private final String driverValue;
/**
* Create a new instance of this enum with the given configValue as the
* Create a new instance of this enum with the given driverValue as the
* value that will be used when configuring the JDBC driver.
*
* @param configValue
* @param driverValue
* The value to use when configuring the JDBC driver.
*/
PostgreSQLSSLMode(String configValue) {
this.configValue = configValue;
}
@Override
public String toString() {
return configValue;
PostgreSQLSSLMode(String driverValue) {
this.driverValue = driverValue;
}
/**
* Given the String value, determine the correct enum value that matches
* the string, or null if there is no match.
*
* @param value
* The String value to test to find a match.
* Returns the String value for a given Enum that properly configures the
* JDBC driver for the desired mode of SSL operation.
*
* @return
* The enum value matching the given String.
* The String value for the current Enum that configures the JDBC driver
* for the desired mode of SSL operation.
*/
public static PostgreSQLSSLMode getValue(String value) {
for (PostgreSQLSSLMode mode : PostgreSQLSSLMode.values()) {
if (mode.toString().equals(value))
return mode;
}
return null;
public String getDriverValue() {
return driverValue;
}
}