webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-30 04:23:11 +03:00
Code Activity

Merge pull request #1096 from christophert/add-ldaptlsinsecure

Browse Source 
Add option to disable LDAPS Certificate Validation
This commit is contained in:
Dan Brown
2018-12-22 16:38:50 +00:00
committed by GitHub
parent f4ea5f1f55 730cb78b45
commit 7c8edf5673
3 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Auth/Access/LdapService.php
View File

@ -170,6 +170,16 @@ class LdapService
}
$hostName = $ldapServer[0] . ($hasProtocol?':':'') . $ldapServer[1];
$defaultPort = $ldapServer[0] === 'ldaps' ? 636 : 389;
/*
* Check if TLS_INSECURE is set. The handle is set to NULL due to the nature of
* the LDAP_OPT_X_TLS_REQUIRE_CERT option. It can only be set globally and not
* per handle.
*/
if($this->config['tls_insecure']) {
$this->ldap->setOption(NULL, LDAP_OPT_X_TLS_REQUIRE_CERT, LDAP_OPT_X_TLS_NEVER);
}
$ldapConnection = $this->ldap->connect($hostName, count($ldapServer) > 2 ? intval($ldapServer[2]) : $defaultPort);
if ($ldapConnection === false) {