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

GUACAMOLE-728: Merge changes leveraging PostgreSQL's legacy "ssl" parameter only for disabling SSL.

Browse Source
This commit is contained in:
Mike Jumper
2020-06-25 19:25:22 -07:00
committed by GitHub
parent e3e62f5860 82168e1d77
commit 21ec5640a5
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,12 +85,13 @@ public class PostgreSQLAuthenticationProviderModule implements Module {
if (sslMode != PostgreSQLSSLMode.PREFER) if (sslMode != PostgreSQLSSLMode.PREFER)
driverProperties.setProperty("sslmode", sslMode.getDriverValue()); driverProperties.setProperty("sslmode", sslMode.getDriverValue());
// If SSL is requested disabled, also set the legacy property.
if (sslMode == PostgreSQLSSLMode.DISABLE)
driverProperties.setProperty("ssl", "false");
// If SSL is enabled, check for and set other SSL properties. // If SSL is enabled, check for and set other SSL properties.
if (sslMode != PostgreSQLSSLMode.DISABLE) { else {
// Sets the legacy SSL configuration mode required by older servers.
driverProperties.setProperty("ssl", "true");
File sslClientCert = environment.getPostgreSQLSSLClientCertFile(); File sslClientCert = environment.getPostgreSQLSSLClientCertFile();
if (sslClientCert != null) if (sslClientCert != null)
driverProperties.setProperty("sslcert", sslClientCert.getAbsolutePath()); driverProperties.setProperty("sslcert", sslClientCert.getAbsolutePath());