LDAP: sanitize user and group base trees for strripos comparison. fixes oc-1302

This commit is contained in:
Arthur Schiwon 2012-08-05 21:28:59 +02:00
parent 6fbc4f712a
commit d546718179
1 changed files with 4 additions and 2 deletions

View File

@ -28,6 +28,8 @@ abstract class Access {
public function setConnector(Connection &$connection) {
$this->connection = $connection;
}
private function checkConnection() {
@ -181,7 +183,7 @@ abstract class Access {
* returns the internal ownCloud name for the given LDAP DN of the group, false on DN outside of search DN or failure
*/
public function dn2groupname($dn, $ldapname = null) {
if(mb_strripos($dn, $this->connection->ldapBaseGroups, 0, 'UTF-8') !== (mb_strlen($dn, 'UTF-8')-mb_strlen($this->connection->ldapBaseGroups, 'UTF-8'))) {
if(mb_strripos($dn, $this->sanitizeDN($this->connection->ldapBaseGroups), 0, 'UTF-8') !== (mb_strlen($dn, 'UTF-8')-mb_strlen($this->sanitizeDN($this->connection->ldapBaseGroups), 'UTF-8'))) {
return false;
}
return $this->dn2ocname($dn, $ldapname, false);
@ -196,7 +198,7 @@ abstract class Access {
* returns the internal ownCloud name for the given LDAP DN of the user, false on DN outside of search DN or failure
*/
public function dn2username($dn, $ldapname = null) {
if(mb_strripos($dn, $this->connection->ldapBaseUsers, 0, 'UTF-8') !== (mb_strlen($dn, 'UTF-8')-mb_strlen($this->connection->ldapBaseUsers, 'UTF-8'))) {
if(mb_strripos($dn, $this->sanitizeDN($this->connection->ldapBaseUsers), 0, 'UTF-8') !== (mb_strlen($dn, 'UTF-8')-mb_strlen($this->sanitizeDN($this->connection->ldapBaseUsers), 'UTF-8'))) {
return false;
}
return $this->dn2ocname($dn, $ldapname, true);