upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-03 20:41:22 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 37

Enable password reset for user with same email address when only one is active

Browse source 
When two or more user share the same email address its not possible to
reset password by email. Even when only one account is active.

This pr reduce list of users returned by getByEmail by disabled users.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
This commit is contained in:
Daniel Kesselberg 2018-08-18 16:51:59 +02:00
parent 4b71df7b15
commit 031fdfb1fc
No known key found for this signature in database
GPG key ID: 36E3664E099D0614
2 changed files with 98 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
core/Controller/LostController.php
View file

@ -364,24 +364,27 @@ class LostController extends Controller {
* @throws \InvalidArgumentException
*/
protected function findUserByIdOrMail($input) {
$userNotFound = new \InvalidArgumentException(
$this->l10n->t('Couldn\'t send reset email. Please make sure your username is correct.')
);
$user = $this->userManager->get($input);
if ($user instanceof IUser) {
if (!$user->isEnabled()) {
throw new \InvalidArgumentException($this->l10n->t('Couldn\'t send reset email. Please make sure your username is correct.'));
}
return $user;
}
$users = $this->userManager->getByEmail($input);
if (count($users) === 1) {
$user = $users[0];
if (!$user->isEnabled()) {
throw new \InvalidArgumentException($this->l10n->t('Couldn\'t send reset email. Please make sure your username is correct.'));
throw $userNotFound;
}
return $user;
}
throw new \InvalidArgumentException($this->l10n->t('Couldn\'t send reset email. Please make sure your username is correct.'));
$users = \array_filter($this->userManager->getByEmail($input), function (IUser $user) {
return $user->isEnabled();
});
if (\count($users) === 1) {
return $users[0];
}
throw $userNotFound;
}
}

84
tests/Core/Controller/LostControllerTest.php
View file

@ -759,4 +759,88 @@ class LostControllerTest extends \Test\TestCase {
$this->assertSame($expectedResponse, $response);
}
public function testTwoUsersWithSameEmail() {
$user1 = $this->createMock(IUser::class);
$user1->expects($this->any())
->method('getEMailAddress')
->willReturn('test@example.com');
$user1->expects($this->any())
->method('getUID')
->willReturn('User1');
$user1->expects($this->any())
->method('isEnabled')
->willReturn(true);
$user2 = $this->createMock(IUser::class);
$user2->expects($this->any())
->method('getEMailAddress')
->willReturn('test@example.com');
$user2->expects($this->any())
->method('getUID')
->willReturn('User2');
$user2->expects($this->any())
->method('isEnabled')
->willReturn(true);
$this->userManager
->method('get')
->willReturn(null);
$this->userManager
->method('getByEmail')
->willReturn([$user1, $user2]);
// request password reset for test@example.com
$response = $this->lostController->email('test@example.com');
$expectedResponse = new JSONResponse([
'status' => 'error',
'msg' => 'Couldn\'t send reset email. Please make sure your username is correct.'
]);
$expectedResponse->throttle();
$this->assertEquals($expectedResponse, $response);
}
public function testTwoUsersWithSameEmailOneDisabled() {
$user1 = $this->createMock(IUser::class);
$user1->expects($this->any())
->method('getEMailAddress')
->willReturn('test@example.com');
$user1->expects($this->any())
->method('getUID')
->willReturn('User1');
$user1->expects($this->any())
->method('isEnabled')
->willReturn(true);
$user2 = $this->createMock(IUser::class);
$user2->expects($this->any())
->method('getEMailAddress')
->willReturn('test@example.com');
$user2->expects($this->any())
->method('getUID')
->willReturn('User2');
$user2->expects($this->any())
->method('isEnabled')
->willReturn(false);
$this->userManager
->method('get')
->willReturn(null);
$this->userManager
->method('getByEmail')
->willReturn([$user1, $user2]);
// request password reset for test@example.com
$response = $this->lostController->email('test@example.com');
$expectedResponse = new JSONResponse([
'status' => 'success'
]);
$expectedResponse->throttle();
$this->assertEquals($expectedResponse, $response);
}
}