lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-17 01:54:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

(ldap) re-enable ldap_scope and legacy auth containers.

Browse Source
This commit is contained in:
Ad Schellevis 2016-11-24 20:56:26 +01:00
parent 364738997f
commit 0f881bc4d0
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/opnsense/mvc/app/library/OPNsense/Auth/LDAP.php
View File

@ -80,6 +80,17 @@ class LDAP implements IAuthConnector
*/
private $ldapExtendedQuery = null;
/**
* @var auth containers
*/
private $ldapAuthcontainers = null;
/**
* @var ldap scope
*/
private $ldapScope = "tree";
/**
* @var array list of already known usernames vs distinguished names
*/
@ -109,16 +120,20 @@ class LDAP implements IAuthConnector
/**
* search ldap tree
* @param string $filter ldap filter string to use
* @param string $ldap_scope scope either one or tree
* @return array|bool result list or false on errors
*/
private function search($filter, $ldap_scope = "tree")
private function search($filter)
{
$result = false;
if ($this->ldapHandle != null) {
// if we're looking at multple dn's, split and combine output
foreach (explode(";", $this->baseSearchDN) as $baseDN) {
if ($ldap_scope == "one") {
if (!empty($this->ldapAuthcontainers)) {
$searchpaths = $this->ldapAuthcontainers;
} else {
$searchpaths = $this->baseSearchDN;
}
foreach (explode(";", $searchpaths) as $baseDN) {
if ($this->ldapScope == "one") {
$sr=@ldap_list($this->ldapHandle, $baseDN, $filter, $this->ldapSearchAttr);
} else {
$sr=@ldap_search($this->ldapHandle, $baseDN, $filter, $this->ldapSearchAttr);
@ -185,6 +200,8 @@ class LDAP implements IAuthConnector
"ldap_bindpw" => "ldapBindPassword",
"ldap_attr_user" => "ldapAttributeUser",
"ldap_extended_query" => "ldapExtendedQuery",
"ldap_authcn" => "ldapAuthcontainers",
"ldap_scope" => "ldapScope",
"local_users" => "userDNmap"
);