From: Dan Brown <redacted>
Date: Thu, 2 May 2024 22:16:16 +0000 (+0100)
Subject: Merge pull request #4985 from BookStackApp/ldap_ca_cert_control
X-Git-Tag: v24.05~1^2~7^2
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/b0720777bebe7bc4fdd32af47cd4438fb2f5da5b

Merge pull request #4985 from BookStackApp/ldap_ca_cert_control

LDAP CA TLS Cert Option, PR Review and continuation
---

b0720777bebe7bc4fdd32af47cd4438fb2f5da5b
diff --cc tests/Auth/LdapTest.php
index cb5fc5a87,717167729..3f80f00f4
--- a/tests/Auth/LdapTest.php
+++ b/tests/Auth/LdapTest.php
@@@ -32,9 -33,10 +33,10 @@@ class LdapTest extends TestCas
              'services.ldap.id_attribute'           => 'uid',
              'services.ldap.user_to_groups'         => false,
              'services.ldap.version'                => '3',
 -            'services.ldap.user_filter'            => '(&(uid=${user}))',
 +            'services.ldap.user_filter'            => '(&(uid={user}))',
              'services.ldap.follow_referrals'       => false,
              'services.ldap.tls_insecure'           => false,
+             'services.ldap.tls_ca_cert'            => false,
              'services.ldap.thumbnail_attribute'    => null,
          ]);
          $this->mockLdap = $this->mock(Ldap::class);