Mirrors/sysPass
2
0
Fork 0
mirror of https://github.com/nuxsmin/sysPass.git synced 2026-03-13 03:46:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

* [DEV] Fixed LDAP searching when group is not set.

Browse Source
This commit is contained in:
nuxsmin
2016-11-21 14:56:24 +01:00
parent 6b7b4663e4
commit edeb82735c
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
inc/SP/Auth/Ldap/LdapMsAds.class.php
View File

@@ -43,9 +43,13 @@ class LdapMsAds extends LdapBase
*/
protected function getGroupDnFilter()
{
$groupDN = (!empty($this->group)) ? $this->searchGroupDN() : '*';
if (empty($this->group)) {
return '(|(objectClass=inetOrgPerson)(objectClass=person)(objectClass=simpleSecurityObject))';
} else {
$groupDN = $this->searchGroupDN();
return '(&(|(memberOf=' . $groupDN . ')(groupMembership=' . $groupDN . ')(memberof:1.2.840.113556.1.4.1941:=' . $groupDN . '))(|(objectClass=inetOrgPerson)(objectClass=person)(objectClass=simpleSecurityObject)))';
return '(&(|(memberOf=' . $groupDN . ')(groupMembership=' . $groupDN . ')(memberof:1.2.840.113556.1.4.1941:=' . $groupDN . '))(|(objectClass=inetOrgPerson)(objectClass=person)(objectClass=simpleSecurityObject)))';
}
}
/**

8
inc/SP/Auth/Ldap/LdapStd.class.php
View File

@@ -42,9 +42,13 @@ class LdapStd extends LdapBase
*/
protected function getGroupDnFilter()
{
$groupDN = (!empty($this->group)) ? $this->searchGroupDN() : '*';
if (empty($this->group)){
return '(|(objectClass=inetOrgPerson)(objectClass=person)(objectClass=simpleSecurityObject))';
} else {
$groupDN = $this->searchGroupDN();
return '(&(|(memberOf=' . $groupDN . ')(groupMembership=' . $groupDN . '))(|(objectClass=inetOrgPerson)(objectClass=person)(objectClass=simpleSecurityObject)))';
return '(&(|(memberOf=' . $groupDN . ')(groupMembership=' . $groupDN . '))(|(objectClass=inetOrgPerson)(objectClass=person)(objectClass=simpleSecurityObject)))';
}
}
/**