]> BookStack Code Mirror - bookstack/commitdiff
Merge pull request #4985 from BookStackApp/ldap_ca_cert_control
authorDan Brown <redacted>
Thu, 2 May 2024 22:16:16 +0000 (23:16 +0100)
committerGitHub <redacted>
Thu, 2 May 2024 22:16:16 +0000 (23:16 +0100)
LDAP CA TLS Cert Option, PR Review and continuation

1  2 
.env.example.complete
app/Access/LdapService.php
app/Config/services.php
tests/Auth/LdapTest.php

Simple merge
Simple merge
Simple merge
index cb5fc5a8725f953efa686f1e572ed14638fb1a21,717167729f61d4991b347546329cb3a1758f930f..3f80f00f41e4abf454b2121abde1005aa3adef90
@@@ -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);