mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #662 from owncloud/fix_ldap_escape_dn_2 

LDAP: ldap_explode_dn escaped too much, fix it by manual replacement. ...
This commit is contained in:
blizzz 2012-12-02 10:43:43 -08:00
parent 8596226787 44119e2051
commit d57b870f3e
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/user_ldap/lib/access.php
View File

@ -118,10 +118,17 @@ abstract class Access {
//escape DN values according to RFC 2253 – this is already done by ldap_explode_dn
//to use the DN in search filters, \ needs to be escaped to \5c additionally
//to use them in bases, we convert them back to simple backslashes in readAttribute()
$aDN = ldap_explode_dn($dn, false);
unset($aDN['count']);
$dn = implode(',', $aDN);
$dn = str_replace('\\', '\\5c', $dn);
$replacements = array(
'\,' => '\5c2C',
'\=' => '\5c3D',
'\+' => '\5c2B',
'\<' => '\5c3C',
'\>' => '\5c3E',
'\;' => '\5c3B',
'\"' => '\5c22',
'\#' => '\5c23',
);
$dn = str_replace(array_keys($replacements),array_values($replacements), $dn);
return $dn;
}