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

Merge pull request #8074 from nextcloud/stable12-8069 

[stable12] do not catch and ignore ServerNotAvailable in the wrong spot
This commit is contained in:
Morris Jobke 2018-01-27 13:46:17 +01:00 committed by GitHub
parent 15551aafd1 23ffae497e
commit bae874c9b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/user_ldap/lib/Access.php
View File

@ -155,12 +155,14 @@ class Access extends LDAPUtility implements IUserTools {
/** /**
* reads a given attribute for an LDAP record identified by a DN * reads a given attribute for an LDAP record identified by a DN
*
* @param string $dn the record in question * @param string $dn the record in question
* @param string $attr the attribute that shall be retrieved * @param string $attr the attribute that shall be retrieved
* if empty, just check the record's existence * if empty, just check the record's existence
* @param string $filter * @param string $filter
* @return array|false an array of values on success or an empty * @return array|false an array of values on success or an empty
* array if $attr is empty, false otherwise * array if $attr is empty, false otherwise
* @throws ServerNotAvailableException
*/ */
public function readAttribute($dn, $attr, $filter = 'objectClass=*') { public function readAttribute($dn, $attr, $filter = 'objectClass=*') {
if(!$this->checkConnection()) { if(!$this->checkConnection()) {
@ -242,6 +244,7 @@ class Access extends LDAPUtility implements IUserTools {
* @return array|bool false if there was any error, true if an exists check * @return array|bool false if there was any error, true if an exists check
* was performed and the requested DN found, array with the * was performed and the requested DN found, array with the
* returned data on a successful usual operation * returned data on a successful usual operation
* @throws ServerNotAvailableException
*/ */
public function executeRead($cr, $dn, $attribute, $filter, $maxResults) { public function executeRead($cr, $dn, $attribute, $filter, $maxResults) {
$this->initPagedSearch($filter, array($dn), array($attribute), $maxResults, 0); $this->initPagedSearch($filter, array($dn), array($attribute), $maxResults, 0);

7
apps/user_ldap/lib/User_LDAP.php
View File

@ -35,6 +35,7 @@
namespace OCA\User_LDAP; namespace OCA\User_LDAP;
use OC\ServerNotAvailableException;
use OC\User\Backend; use OC\User\Backend;
use OC\User\NoUserException; use OC\User\NoUserException;
use OCA\User_LDAP\Exceptions\NotOnLDAP; use OCA\User_LDAP\Exceptions\NotOnLDAP;
@ -302,16 +303,18 @@ class User_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn
try { try {
$uuid = $this->access->getUserMapper()->getUUIDByDN($dn); $uuid = $this->access->getUserMapper()->getUUIDByDN($dn);
if(!$uuid) { if (!$uuid) {
return false; return false;
} }
$newDn = $this->access->getUserDnByUuid($uuid); $newDn = $this->access->getUserDnByUuid($uuid);
//check if renamed user is still valid by reapplying the ldap filter //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; return false;
} }
$this->access->getUserMapper()->setDNbyUUID($newDn, $uuid); $this->access->getUserMapper()->setDNbyUUID($newDn, $uuid);
return true; return true;
} catch (ServerNotAvailableException $e) {
throw $e;
} catch (\Exception $e) { } catch (\Exception $e) {
return false; return false;
} }