lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-16 09:34:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Auth) add extended query to user search

Browse Source
This commit is contained in:
Ad Schellevis 2015-07-28 14:20:18 +02:00
parent 28a9a3e535
commit 19918879fe
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,6 +87,7 @@ class LDAP
{
$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") {
$sr=@ldap_list($this->ldapHandle, $baseDN, $filter, $this->ldapSearchAttr);
@ -161,15 +162,21 @@ class LDAP
* search user by name or expression
* @param $username string username(s) to search
* @param $userNameAttribute string ldap attribute to use for the search
* @param $extendedQuery string|null additional search criteria (narrow down search)
* @return array|bool
*/
public function searchUsers($username, $userNameAttribute)
public function searchUsers($username, $userNameAttribute, $extendedQuery = null)
{
if ($this->ldapHandle !== false) {
// add $userNameAttribute to search results
$this->addSearchAttribute($userNameAttribute);
$result = array();
$searchResults = $this->search("({$userNameAttribute}={$username})");
if (empty($extendedQuery)) {
$searchResults = $this->search("({$userNameAttribute}={$username})");
} else {
// add additional search phrases
$searchResults = $this->search("(&({$userNameAttribute}={$username})({$extendedQuery}))");
}
if ($searchResults !== false) {
for ($i = 0; $i < $searchResults["count"]; $i++) {
// fetch distinguished name and most likely username (try the search field first)