Skip to content

Fix limit retry #67

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
wopsononock wants to merge 2 commits into
base: 3_4-update
Choose a base branch
from
Open

Fix limit retry #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c92b7c0
Merge pull request #60 from ulsdevteam/3_4-update
wopsononock Feb 23, 2026
9a58a1d
Adapted ForceRetry fix from stable-3_3
wopsononock Apr 15, 2026
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
11 changes: 11 additions & 0 deletions features/LimitRetry.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@
use APP\plugins\generic\betterPassword\handlers\DisabledLoginHandler;
use PKP\core\PKPApplication;
use PKP\db\DAORegistry;
use PKP\facades\Locale;
use PKP\plugins\Hook;
use PKP\security\Validation;
use Carbon\CarbonInterval;

class LimitRetry
{
Expand Down Expand Up @@ -83,15 +85,24 @@ private function _handleTemplateDisplay(): void
// And the user is not currently locked
if ($user->getCount() < $this->_maxRetries || $user->getFailedTime() <= time() - $this->_lockSeconds) {
$badpwFailedLoginsDao->resetCount($user);
// Update the local counter
$count = 0;
}
}

// Update the count to represent this failed attempt
$badpwFailedLoginsDao->incCount($user);
// Update the local counter
$count ++;

// Warn the user if the attempts have been exhausted
if ($count >= $this->_maxRetries) {
$label = CarbonInterval::seconds(max($this->_lockExpiresSeconds, $this->_lockSeconds))
->cascade()
->locale(Locale::getLocale())
->forHumans(['parts' => 2, 'short' => false]);
$templateManager->assign('error', 'plugins.generic.betterPassword.validation.betterPasswordLocked');
$templateManager->assign('reason', $label);
}
});
}
Expand Down
2 changes: 1 addition & 1 deletion locale/en/locale.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ msgid "plugins.generic.betterPassword.validation.betterPasswordCheckBlocklist"
msgstr "Your password was found in a blocklist of known bad passwords."

msgid "plugins.generic.betterPassword.validation.betterPasswordLocked"
msgstr "Your account has been temporarily locked due to bad password attempts."
msgstr "Your account has been temporarily locked due to bad password attempts. It will unlock automatically within {$reason}. For immediate access, use the \"Forgot your password?\" link to reset your password."

msgid "plugins.generic.betterPassword.validation.betterPasswordUnexpectedError"
msgstr "Your password could not be changed at this time. Please try again later."
Expand Down