From cf0d8ea2d0b9e74218c1e37728619976435a4c9e Mon Sep 17 00:00:00 2001 From: Adrian Date: Mon, 15 Jun 2020 02:48:03 +1000 Subject: [PATCH] Apply the trustStore setting when ssl is true - Fixes #1782 (#2449) Previously the truststore configuration option was applied only when StartTLS is called on a plain LDAP connection, however, the trust store is equally applicable to a full TLS connection (i.e. when ldap.ssl is set to true). --- src/main/scala/gitbucket/core/util/LDAPUtil.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/gitbucket/core/util/LDAPUtil.scala b/src/main/scala/gitbucket/core/util/LDAPUtil.scala index b13f1b2a3..3fd8c9da1 100644 --- a/src/main/scala/gitbucket/core/util/LDAPUtil.scala +++ b/src/main/scala/gitbucket/core/util/LDAPUtil.scala @@ -149,7 +149,7 @@ object LDAPUtil { keystore: String, error: String )(f: LDAPConnection => Either[String, A]): Either[String, A] = { - if (tls) { + if (tls || ssl) { // Dynamically set Sun as the security provider Security.addProvider(getSslProvider())