Merge pull request #8073 from nextcloud/stable13-8069
[stable13] do not catch and ignore ServerNotAvailable in the wrong spot
This commit is contained in:
commit
bb7a2b2329
|
@ -168,12 +168,14 @@ class Access extends LDAPUtility implements IUserTools {
|
|||
|
||||
/**
|
||||
* reads a given attribute for an LDAP record identified by a DN
|
||||
*
|
||||
* @param string $dn the record in question
|
||||
* @param string $attr the attribute that shall be retrieved
|
||||
* if empty, just check the record's existence
|
||||
* @param string $filter
|
||||
* @return array|false an array of values on success or an empty
|
||||
* array if $attr is empty, false otherwise
|
||||
* @throws ServerNotAvailableException
|
||||
*/
|
||||
public function readAttribute($dn, $attr, $filter = 'objectClass=*') {
|
||||
if(!$this->checkConnection()) {
|
||||
|
@ -255,6 +257,7 @@ class Access extends LDAPUtility implements IUserTools {
|
|||
* @return array|bool false if there was any error, true if an exists check
|
||||
* was performed and the requested DN found, array with the
|
||||
* returned data on a successful usual operation
|
||||
* @throws ServerNotAvailableException
|
||||
*/
|
||||
public function executeRead($cr, $dn, $attribute, $filter, $maxResults) {
|
||||
$this->initPagedSearch($filter, array($dn), array($attribute), $maxResults, 0);
|
||||
|
|
|
@ -38,6 +38,7 @@
|
|||
|
||||
namespace OCA\User_LDAP;
|
||||
|
||||
use OC\ServerNotAvailableException;
|
||||
use OC\User\Backend;
|
||||
use OC\User\NoUserException;
|
||||
use OCA\User_LDAP\Exceptions\NotOnLDAP;
|
||||
|
@ -317,16 +318,18 @@ class User_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn
|
|||
|
||||
try {
|
||||
$uuid = $this->access->getUserMapper()->getUUIDByDN($dn);
|
||||
if(!$uuid) {
|
||||
if (!$uuid) {
|
||||
return false;
|
||||
}
|
||||
$newDn = $this->access->getUserDnByUuid($uuid);
|
||||
//check if renamed user is still valid by reapplying the ldap filter
|
||||
if(!is_array($this->access->readAttribute($newDn, '', $this->access->connection->ldapUserFilter))) {
|
||||
if (!is_array($this->access->readAttribute($newDn, '', $this->access->connection->ldapUserFilter))) {
|
||||
return false;
|
||||
}
|
||||
$this->access->getUserMapper()->setDNbyUUID($newDn, $uuid);
|
||||
return true;
|
||||
} catch (ServerNotAvailableException $e) {
|
||||
throw $e;
|
||||
} catch (\Exception $e) {
|
||||
return false;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue