LDAP: don't die on unexpected collisions, handle empty display-name attributes properly
This commit is contained in:
parent
b9bd54bd98
commit
b523366acd
|
@ -168,7 +168,7 @@ class OC_LDAP {
|
||||||
* @param $ldapname optional, the display name of the object
|
* @param $ldapname optional, the display name of the object
|
||||||
* @returns string with with the name to use in ownCloud, false on DN outside of search DN
|
* @returns string with with the name to use in ownCloud, false on DN outside of search DN
|
||||||
*
|
*
|
||||||
* returns the internal ownCloud name for the given LDAP DN of the group
|
* returns the internal ownCloud name for the given LDAP DN of the group, false on DN outside of search DN or failure
|
||||||
*/
|
*/
|
||||||
static public function dn2groupname($dn, $ldapname = null) {
|
static public function dn2groupname($dn, $ldapname = null) {
|
||||||
if(strripos($dn, self::$ldapBaseGroups) !== (strlen($dn)-strlen(self::$ldapBaseGroups))) {
|
if(strripos($dn, self::$ldapBaseGroups) !== (strlen($dn)-strlen(self::$ldapBaseGroups))) {
|
||||||
|
@ -183,7 +183,7 @@ class OC_LDAP {
|
||||||
* @param $ldapname optional, the display name of the object
|
* @param $ldapname optional, the display name of the object
|
||||||
* @returns string with with the name to use in ownCloud
|
* @returns string with with the name to use in ownCloud
|
||||||
*
|
*
|
||||||
* returns the internal ownCloud name for the given LDAP DN of the user, false on DN outside of search DN
|
* returns the internal ownCloud name for the given LDAP DN of the user, false on DN outside of search DN or failure
|
||||||
*/
|
*/
|
||||||
static public function dn2username($dn, $ldapname = null) {
|
static public function dn2username($dn, $ldapname = null) {
|
||||||
if(strripos($dn, self::$ldapBaseUsers) !== (strlen($dn)-strlen(self::$ldapBaseUsers))) {
|
if(strripos($dn, self::$ldapBaseUsers) !== (strlen($dn)-strlen(self::$ldapBaseUsers))) {
|
||||||
|
@ -214,6 +214,11 @@ class OC_LDAP {
|
||||||
|
|
||||||
if(is_null($ldapname)) {
|
if(is_null($ldapname)) {
|
||||||
$ldapname = self::readAttribute($dn, $nameAttribute);
|
$ldapname = self::readAttribute($dn, $nameAttribute);
|
||||||
|
//we do not accept empty usernames
|
||||||
|
if(!isset($ldapname[0]) && empty($ldapname[0])) {
|
||||||
|
OCP\Util::writeLog('user_ldap', 'No or empty name for '.$dn.'.', OCP\Util::INFO);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
$ldapname = $ldapname[0];
|
$ldapname = $ldapname[0];
|
||||||
}
|
}
|
||||||
$ldapname = self::sanitizeUsername($ldapname);
|
$ldapname = self::sanitizeUsername($ldapname);
|
||||||
|
@ -229,8 +234,8 @@ class OC_LDAP {
|
||||||
return $oc_name;
|
return $oc_name;
|
||||||
}
|
}
|
||||||
|
|
||||||
//and this of course should never been thrown :)
|
//if everything else did not help..
|
||||||
throw new Exception('LDAP backend: unexpected collision of DN and ownCloud Name.');
|
OCP\Util::writeLog('user_ldap', 'Could not create unique ownCloud name for '.$dn.'.', OCP\Util::INFO);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -274,6 +279,12 @@ class OC_LDAP {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//we do not take empty usernames
|
||||||
|
if(!isset($ldapObject[$nameAttribute]) || empty($ldapObject[$nameAttribute])) {
|
||||||
|
OCP\Util::writeLog('user_ldap', 'No or empty name for '.$ldapObject['dn'].', skipping.', OCP\Util::INFO);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
//a new group! Then let's try to add it. We're shooting into the blue with the group name, assuming that in most cases there will not be a conflict. But first make sure, that the display name contains only allowed characters.
|
//a new group! Then let's try to add it. We're shooting into the blue with the group name, assuming that in most cases there will not be a conflict. But first make sure, that the display name contains only allowed characters.
|
||||||
$ocname = self::sanitizeUsername($ldapObject[$nameAttribute]);
|
$ocname = self::sanitizeUsername($ldapObject[$nameAttribute]);
|
||||||
if(self::mapComponent($ldapObject['dn'], $ocname, $isUsers)) {
|
if(self::mapComponent($ldapObject['dn'], $ocname, $isUsers)) {
|
||||||
|
@ -288,8 +299,8 @@ class OC_LDAP {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
//and this of course should never been thrown :)
|
//if everything else did not help..
|
||||||
throw new Exception('LDAP backend: unexpected collision of DN and ownCloud Name.');
|
OCP\Util::writeLog('user_ldap', 'Could not create unique ownCloud name for '.$ldapObject['dn'].', skipping.', OCP\Util::INFO);
|
||||||
}
|
}
|
||||||
return $ownCloudNames;
|
return $ownCloudNames;
|
||||||
}
|
}
|
||||||
|
|
|
@ -96,12 +96,18 @@ class OC_USER_LDAP extends OC_User_Backend {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
//update some settings, if necessary
|
//do we have a username for him/her?
|
||||||
$this->updateQuota($dn);
|
$ocname = OC_LDAP::dn2username($dn);
|
||||||
$this->updateEmail($dn);
|
|
||||||
|
|
||||||
//give back the display name
|
if($ocname){
|
||||||
return OC_LDAP::dn2username($dn);
|
//update some settings, if necessary
|
||||||
|
$this->updateQuota($dn);
|
||||||
|
$this->updateEmail($dn);
|
||||||
|
|
||||||
|
return $ocname;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue