upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-22 14:50:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 53

Skip general login with email for non-valid addresses and LDAP

Browse source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl 2022-10-25 15:38:31 +02:00
parent e3aac7d573
commit 298d2b9b58
No known key found for this signature in database
GPG key ID: 4C614C6ED2CDE6DF
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/private/Authentication/Login/EmailLoginCommand.php
View file

@ -38,9 +38,21 @@ class EmailLoginCommand extends ALoginCommand {
public function process(LoginData $loginData): LoginResult {
if ($loginData->getUser() === false) {
if (!filter_var($loginData->getUsername(), FILTER_VALIDATE_EMAIL)) {
return $this->processNextOrFinishSuccessfully($loginData);
}
$users = $this->userManager->getByEmail($loginData->getUsername());
// we only allow login by email if unique
if (count($users) === 1) {
// FIXME: This is a workaround to still stick to configured LDAP login filters
// this can be removed once the email login is properly implemented in the local user backend
// as described in https://github.com/nextcloud/server/issues/5221
if ($users[0]->getBackendClassName() === 'LDAP') {
return $this->processNextOrFinishSuccessfully($loginData);
}
$username = $users[0]->getUID();
if ($username !== $loginData->getUsername()) {
$user = $this->userManager->checkPassword(

5
tests/lib/Authentication/Login/EmailLoginCommandTest.php
View file

@ -55,7 +55,7 @@ class EmailLoginCommandTest extends ALoginCommandTest {
public function testProcessNotAnEmailLogin() {
$data = $this->getFailedLoginData();
$this->userManager->expects($this->once())
$this->userManager->expects($this->never())
->method('getByEmail')
->with($this->username)
->willReturn([]);
@ -67,9 +67,10 @@ class EmailLoginCommandTest extends ALoginCommandTest {
public function testProcessDuplicateEmailLogin() {
$data = $this->getFailedLoginData();
$data->setUsername('user@example.com');
$this->userManager->expects($this->once())
->method('getByEmail')
->with($this->username)
->with('user@example.com')
->willReturn([
$this->createMock(IUser::class),
$this->createMock(IUser::class),