Skip to content

Fix misleading failed-login log entries when login-email is enabled #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gebeer wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix misleading failed-login log entries when login-email is enabled #30

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions LoginRegister.module
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,25 +378,27 @@ class LoginRegister extends WireData implements Module, ConfigurableModule {

if(!$name || !$pass) return false;

$name = $nameIsEmail ? $this->emailToName($name) : $sanitizer->pageName($name);
$pass = substr($pass, 0, 128);
$user = $session->login($name, $pass);
$user = null;

if((!$user || $user->name !== $name) && $nameIsEmail) {
// login failed, but login by email is supported
// attempt login a second time by finding user with email address and using their name
$user = null;
$email = $sanitizer->selectorValue($nameField->attr('value'));
$matches = $this->wire('users')->find("include=all, email=$email");
if($nameIsEmail && strpos($name, '@') !== false) {
// Resolve email to an actual user name before attempting login so that
// failed first-pass log entries are not generated for successful email logins.
$email = $sanitizer->selectorValue($name);
$matches = $this->wire('users')->find("include=all, email=$email");
$qty = $matches->count();
if($qty === 1) {
$user = $session->login($matches->first()->name, $pass);
$name = $user->name;
$name = $matches->first()->name;
} else if($qty > 1) {
$this->error($this->_('Cannot login because more than one account uses this email address.'));
$name = '';
}
} else {
$name = $sanitizer->pageName($name);
}

if($name) $user = $session->login($name, $pass);

if($user && $user->name === $name) {
// successful login
$this->loginSuccess($user);
Expand Down Expand Up @@ -1194,4 +1196,3 @@ class LoginRegister extends WireData implements Module, ConfigurableModule {
}

}