diff options
| author | Vincent Petry <vincent@nextcloud.com> | 2022-11-04 17:13:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-04 17:13:06 +0100 |
| commit | 4127f33f4edfbee5d4b4e24f40a7d1d10907f889 (patch) | |
| tree | d656c935e1737e85a22d25e03572c89d6c7a8075 /lib | |
| parent | de6012d1001c54b8fed2f9b5f379ef7baca74703 (diff) | |
| parent | 9151960af0ed421bb729b62a16cfb0cbb0d7f730 (diff) | |
| download | nextcloud-server-4127f33f4edfbee5d4b4e24f40a7d1d10907f889.tar.gz nextcloud-server-4127f33f4edfbee5d4b4e24f40a7d1d10907f889.zip | |
Merge pull request #34946 from nextcloud/backport/34804/stable25
[stable25] Skip general login with email for non-valid addresses and LDAP
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Authentication/Login/EmailLoginCommand.php | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/lib/private/Authentication/Login/EmailLoginCommand.php b/lib/private/Authentication/Login/EmailLoginCommand.php index e2e55cc12c8..7145ab9e14f 100644 --- a/lib/private/Authentication/Login/EmailLoginCommand.php +++ b/lib/private/Authentication/Login/EmailLoginCommand.php @@ -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( |