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

Merge 1.2.0 changes back to master.

Browse Source
This commit is contained in:
Michael Jumper
2020-06-25 19:04:43 -07:00
parent f94e7046ff e3e62f5860
commit 038e87a1c6
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -75,7 +75,15 @@ public class PostgreSQLAuthenticationProviderModule implements Module {
// Check the SSL mode and set if configured.
PostgreSQLSSLMode sslMode = environment.getPostgreSQLSSLMode();
driverProperties.setProperty("sslmode", sslMode.getDriverValue());
/**
* Older versions of the PostgreSQL JDBC driver do not support directly
* setting the "prefer" mode; however, the behavior defined by this
* mode is the default if nothing is set, so if that mode is requested
* in guacamole.properties we just don't set sslmode in the driver.
*/
if (sslMode != PostgreSQLSSLMode.PREFER)
driverProperties.setProperty("sslmode", sslMode.getDriverValue());
// If SSL is enabled, check for and set other SSL properties.
if (sslMode != PostgreSQLSSLMode.DISABLE) {