| commit | 21ec5640a560f95725c081391d9943d5d0beb88d | [log] [tgz] |
|---|---|---|
| author | Mike Jumper <mjumper@apache.org> | Thu Jun 25 19:25:22 2020 -0700 |
| committer | GitHub <noreply@github.com> | Thu Jun 25 19:25:22 2020 -0700 |
| tree | eb40272816979db25b69808b580e1a8f210b2b98 | |
| parent | e3e62f5860d27f341538209841b2fa5b93979a1a [diff] | |
| parent | 82168e1d770696127eb539da250bde572a7f5b0c [diff] |
GUACAMOLE-728: Merge changes leveraging PostgreSQL's legacy "ssl" parameter only for disabling SSL.
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLAuthenticationProviderModule.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLAuthenticationProviderModule.java index 3dbbe3b..331707c 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLAuthenticationProviderModule.java +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLAuthenticationProviderModule.java
@@ -85,12 +85,13 @@ if (sslMode != PostgreSQLSSLMode.PREFER) 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 (sslMode != PostgreSQLSSLMode.DISABLE) { + else { - // Sets the legacy SSL configuration mode required by older servers. - driverProperties.setProperty("ssl", "true"); - File sslClientCert = environment.getPostgreSQLSSLClientCertFile(); if (sslClientCert != null) driverProperties.setProperty("sslcert", sslClientCert.getAbsolutePath());