LDAP: coding style
This commit is contained in:
parent
84f522f406
commit
81cf4a22ef
|
@ -61,7 +61,8 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
//usually, LDAP attributes are said to be case insensitive. But there are exceptions of course.
|
//usually, LDAP attributes are said to be case insensitive. But there are exceptions of course.
|
||||||
$members = $this->access->readAttribute($dn_group, $this->access->connection->ldapGroupMemberAssocAttr);
|
$members = $this->access->readAttribute($dn_group,
|
||||||
|
$this->access->connection->ldapGroupMemberAssocAttr);
|
||||||
if(!$members) {
|
if(!$members) {
|
||||||
$this->access->connection->writeToCache('inGroup'.$uid.':'.$gid, false);
|
$this->access->connection->writeToCache('inGroup'.$uid.':'.$gid, false);
|
||||||
return false;
|
return false;
|
||||||
|
@ -127,7 +128,8 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
|
||||||
$this->access->connection->ldapGroupFilter,
|
$this->access->connection->ldapGroupFilter,
|
||||||
$this->access->connection->ldapGroupMemberAssocAttr.'='.$uid
|
$this->access->connection->ldapGroupMemberAssocAttr.'='.$uid
|
||||||
));
|
));
|
||||||
$groups = $this->access->fetchListOfGroups($filter, array($this->access->connection->ldapGroupDisplayName, 'dn'));
|
$groups = $this->access->fetchListOfGroups($filter,
|
||||||
|
array($this->access->connection->ldapGroupDisplayName, 'dn'));
|
||||||
$groups = array_unique($this->access->ownCloudGroupNames($groups), SORT_LOCALE_STRING);
|
$groups = array_unique($this->access->ownCloudGroupNames($groups), SORT_LOCALE_STRING);
|
||||||
$this->access->connection->writeToCache($cacheKey, $groups);
|
$this->access->connection->writeToCache($cacheKey, $groups);
|
||||||
|
|
||||||
|
@ -170,7 +172,8 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
|
||||||
return array();
|
return array();
|
||||||
}
|
}
|
||||||
|
|
||||||
$members = $this->access->readAttribute($groupDN, $this->access->connection->ldapGroupMemberAssocAttr);
|
$members = $this->access->readAttribute($groupDN,
|
||||||
|
$this->access->connection->ldapGroupMemberAssocAttr);
|
||||||
if(!$members) {
|
if(!$members) {
|
||||||
//in case users could not be retrieved, return empty resultset
|
//in case users could not be retrieved, return empty resultset
|
||||||
$this->access->connection->writeToCache($cachekey, array());
|
$this->access->connection->writeToCache($cachekey, array());
|
||||||
|
@ -263,8 +266,10 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
|
||||||
$this->access->getFilterPartForGroupSearch($search)
|
$this->access->getFilterPartForGroupSearch($search)
|
||||||
));
|
));
|
||||||
\OCP\Util::writeLog('user_ldap', 'getGroups Filter '.$filter, \OCP\Util::DEBUG);
|
\OCP\Util::writeLog('user_ldap', 'getGroups Filter '.$filter, \OCP\Util::DEBUG);
|
||||||
$ldap_groups = $this->access->fetchListOfGroups($filter, array($this->access->connection->ldapGroupDisplayName, 'dn'),
|
$ldap_groups = $this->access->fetchListOfGroups($filter,
|
||||||
$limit, $offset);
|
array($this->access->connection->ldapGroupDisplayName, 'dn'),
|
||||||
|
$limit,
|
||||||
|
$offset);
|
||||||
$ldap_groups = $this->access->ownCloudGroupNames($ldap_groups);
|
$ldap_groups = $this->access->ownCloudGroupNames($ldap_groups);
|
||||||
|
|
||||||
$this->access->connection->writeToCache($cachekey, $ldap_groups);
|
$this->access->connection->writeToCache($cachekey, $ldap_groups);
|
||||||
|
@ -285,7 +290,8 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
|
||||||
return $this->access->connection->getFromCache('groupExists'.$gid);
|
return $this->access->connection->getFromCache('groupExists'.$gid);
|
||||||
}
|
}
|
||||||
|
|
||||||
//getting dn, if false the group does not exist. If dn, it may be mapped only, requires more checking.
|
//getting dn, if false the group does not exist. If dn, it may be mapped
|
||||||
|
//only, requires more checking.
|
||||||
$dn = $this->access->groupname2dn($gid);
|
$dn = $this->access->groupname2dn($gid);
|
||||||
if(!$dn) {
|
if(!$dn) {
|
||||||
$this->access->connection->writeToCache('groupExists'.$gid, false);
|
$this->access->connection->writeToCache('groupExists'.$gid, false);
|
||||||
|
|
|
@ -36,7 +36,8 @@ class Group_Proxy extends lib\Proxy implements \OCP\GroupInterface {
|
||||||
public function __construct($serverConfigPrefixes, ILDAPWrapper $ldap) {
|
public function __construct($serverConfigPrefixes, ILDAPWrapper $ldap) {
|
||||||
parent::__construct($ldap);
|
parent::__construct($ldap);
|
||||||
foreach($serverConfigPrefixes as $configPrefix) {
|
foreach($serverConfigPrefixes as $configPrefix) {
|
||||||
$this->backends[$configPrefix] = new \OCA\user_ldap\GROUP_LDAP($this->getAccess($configPrefix));
|
$this->backends[$configPrefix] =
|
||||||
|
new \OCA\user_ldap\GROUP_LDAP($this->getAccess($configPrefix));
|
||||||
if(is_null($this->refBackend)) {
|
if(is_null($this->refBackend)) {
|
||||||
$this->refBackend = &$this->backends[$configPrefix];
|
$this->refBackend = &$this->backends[$configPrefix];
|
||||||
}
|
}
|
||||||
|
|
|
@ -80,7 +80,8 @@ class Access extends LDAPUtility {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
//LDAP attributes are not case sensitive
|
//LDAP attributes are not case sensitive
|
||||||
$result = \OCP\Util::mb_array_change_key_case($this->ldap->getAttributes($cr, $er), MB_CASE_LOWER, 'UTF-8');
|
$result = \OCP\Util::mb_array_change_key_case(
|
||||||
|
$this->ldap->getAttributes($cr, $er), MB_CASE_LOWER, 'UTF-8');
|
||||||
$attr = mb_strtolower($attr, 'UTF-8');
|
$attr = mb_strtolower($attr, 'UTF-8');
|
||||||
|
|
||||||
if(isset($result[$attr]) && $result[$attr]['count'] > 0) {
|
if(isset($result[$attr]) && $result[$attr]['count'] > 0) {
|
||||||
|
@ -669,7 +670,8 @@ class Access extends LDAPUtility {
|
||||||
$error = $this->ldap->errno($link_resource);
|
$error = $this->ldap->errno($link_resource);
|
||||||
if(!is_array($sr) || $error !== 0) {
|
if(!is_array($sr) || $error !== 0) {
|
||||||
\OCP\Util::writeLog('user_ldap',
|
\OCP\Util::writeLog('user_ldap',
|
||||||
'Error when searching: '.$this->ldap->error($link_resource).' code '.$this->ldap->errno($link_resource),
|
'Error when searching: '.$this->ldap->error($link_resource).
|
||||||
|
' code '.$this->ldap->errno($link_resource),
|
||||||
\OCP\Util::ERROR);
|
\OCP\Util::ERROR);
|
||||||
\OCP\Util::writeLog('user_ldap', 'Attempt for Paging? '.print_r($pagedSearchOK, true), \OCP\Util::ERROR);
|
\OCP\Util::writeLog('user_ldap', 'Attempt for Paging? '.print_r($pagedSearchOK, true), \OCP\Util::ERROR);
|
||||||
return array();
|
return array();
|
||||||
|
|
|
@ -396,7 +396,8 @@ class Connection extends LDAPUtility {
|
||||||
public function saveConfiguration() {
|
public function saveConfiguration() {
|
||||||
$trans = array_flip($this->getConfigTranslationArray());
|
$trans = array_flip($this->getConfigTranslationArray());
|
||||||
foreach($this->config as $key => $value) {
|
foreach($this->config as $key => $value) {
|
||||||
\OCP\Util::writeLog('user_ldap', 'LDAP: storing key '.$key.' value '.print_r($value, true), \OCP\Util::DEBUG);
|
\OCP\Util::writeLog('user_ldap', 'LDAP: storing key '.$key.
|
||||||
|
' value '.print_r($value, true), \OCP\Util::DEBUG);
|
||||||
switch ($key) {
|
switch ($key) {
|
||||||
case 'ldapAgentPassword':
|
case 'ldapAgentPassword':
|
||||||
$value = base64_encode($value);
|
$value = base64_encode($value);
|
||||||
|
@ -634,7 +635,8 @@ class Connection extends LDAPUtility {
|
||||||
if(!$this->config['ldapOverrideMainServer'] && !$this->getFromCache('overrideMainServer')) {
|
if(!$this->config['ldapOverrideMainServer'] && !$this->getFromCache('overrideMainServer')) {
|
||||||
$this->doConnect($this->config['ldapHost'], $this->config['ldapPort']);
|
$this->doConnect($this->config['ldapHost'], $this->config['ldapPort']);
|
||||||
$bindStatus = $this->bind();
|
$bindStatus = $this->bind();
|
||||||
$error = $this->ldap->isResource($this->ldapConnectionRes) ? $this->ldap->errno($this->ldapConnectionRes) : -1;
|
$error = $this->ldap->isResource($this->ldapConnectionRes) ?
|
||||||
|
$this->ldap->errno($this->ldapConnectionRes) : -1;
|
||||||
} else {
|
} else {
|
||||||
$bindStatus = false;
|
$bindStatus = false;
|
||||||
$error = null;
|
$error = null;
|
||||||
|
@ -692,7 +694,9 @@ class Connection extends LDAPUtility {
|
||||||
if(!$this->ldap->isResource($cr)) {
|
if(!$this->ldap->isResource($cr)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
$ldapLogin = @$this->ldap->bind($cr, $this->config['ldapAgentName'], $this->config['ldapAgentPassword']);
|
$ldapLogin = @$this->ldap->bind($cr,
|
||||||
|
$this->config['ldapAgentName'],
|
||||||
|
$this->config['ldapAgentPassword']);
|
||||||
if(!$ldapLogin) {
|
if(!$ldapLogin) {
|
||||||
\OCP\Util::writeLog('user_ldap',
|
\OCP\Util::writeLog('user_ldap',
|
||||||
'Bind failed: ' . $this->ldap->errno($cr) . ': ' . $this->ldap->error($cr),
|
'Bind failed: ' . $this->ldap->errno($cr) . ': ' . $this->ldap->error($cr),
|
||||||
|
|
|
@ -79,7 +79,8 @@ class USER_LDAP extends BackendUtility implements \OCP\UserInterface {
|
||||||
*/
|
*/
|
||||||
public function checkPassword($uid, $password) {
|
public function checkPassword($uid, $password) {
|
||||||
//find out dn of the user name
|
//find out dn of the user name
|
||||||
$filter = \OCP\Util::mb_str_replace('%uid', $uid, $this->access->connection->ldapLoginFilter, 'UTF-8');
|
$filter = \OCP\Util::mb_str_replace(
|
||||||
|
'%uid', $uid, $this->access->connection->ldapLoginFilter, 'UTF-8');
|
||||||
$ldap_users = $this->access->fetchListOfUsers($filter, 'dn');
|
$ldap_users = $this->access->fetchListOfUsers($filter, 'dn');
|
||||||
if(count($ldap_users) < 1) {
|
if(count($ldap_users) < 1) {
|
||||||
return false;
|
return false;
|
||||||
|
@ -158,7 +159,8 @@ class USER_LDAP extends BackendUtility implements \OCP\UserInterface {
|
||||||
//getting dn, if false the user does not exist. If dn, he may be mapped only, requires more checking.
|
//getting dn, if false the user does not exist. If dn, he may be mapped only, requires more checking.
|
||||||
$dn = $this->access->username2dn($uid);
|
$dn = $this->access->username2dn($uid);
|
||||||
if(!$dn) {
|
if(!$dn) {
|
||||||
\OCP\Util::writeLog('user_ldap', 'No DN found for '.$uid.' on '.$this->access->connection->ldapHost, \OCP\Util::DEBUG);
|
\OCP\Util::writeLog('user_ldap', 'No DN found for '.$uid.' on '.
|
||||||
|
$this->access->connection->ldapHost, \OCP\Util::DEBUG);
|
||||||
$this->access->connection->writeToCache('userExists'.$uid, false);
|
$this->access->connection->writeToCache('userExists'.$uid, false);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -36,7 +36,8 @@ class User_Proxy extends lib\Proxy implements \OCP\UserInterface {
|
||||||
public function __construct($serverConfigPrefixes, ILDAPWrapper $ldap) {
|
public function __construct($serverConfigPrefixes, ILDAPWrapper $ldap) {
|
||||||
parent::__construct($ldap);
|
parent::__construct($ldap);
|
||||||
foreach($serverConfigPrefixes as $configPrefix) {
|
foreach($serverConfigPrefixes as $configPrefix) {
|
||||||
$this->backends[$configPrefix] = new \OCA\user_ldap\USER_LDAP($this->getAccess($configPrefix));
|
$this->backends[$configPrefix] =
|
||||||
|
new \OCA\user_ldap\USER_LDAP($this->getAccess($configPrefix));
|
||||||
if(is_null($this->refBackend)) {
|
if(is_null($this->refBackend)) {
|
||||||
$this->refBackend = &$this->backends[$configPrefix];
|
$this->refBackend = &$this->backends[$configPrefix];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue