Skip to content

Unsaved settings match the settings page: purge age, log level, common usernames (B4) #254

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

Merged
codeling merged 1 commit into from
Nov 5, 2026
+11 −7
Merged

Unsaved settings match the settings page: purge age, log level, common usernames (B4) #254

Show file tree
Hide file tree
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
11 changes: 9 additions & 2 deletions src/Extension/Bfstop.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,13 @@ class Bfstop extends CMSPlugin implements SubscriberInterface
'adaptiveDelayMax' => 0,
'adaptiveDelayThresholdMin' => 50,
'adaptiveDelayThresholdMax' => 200,
// failed logins are purged after this many weeks unless the
// administrator chose another time (0 = never). Keeping them for ever
// is not needed to protect anything, and they are personal data
// (addresses, usernames)
'deleteOld' => 4,
'logLevel' => 8, // Log::ERROR
'riskCommonUsernames' => "admin\nadministrator\nroot\ntest\nwebmaster",
);

private LoggerHelper $logger;
Expand Down Expand Up @@ -390,7 +397,7 @@ private function accountThrottleDelay($logEntry)

private function init()
{
$this->logger = new LoggerHelper($this->getIntParam('logLevel', LoggerHelper::Disabled),
$this->logger = new LoggerHelper($this->getIntParam('logLevel', self::DefaultSettings['logLevel']),
LoggerHelper::maxBytesFromMegabytes($this->getIntParam('logMaxSize', LoggerHelper::DefaultMaxSizeMB)));
$this->mydb = new DatabaseHelper($this->logger);
$this->notifier = new NotifierHelper($this->logger, $this->mydb,
Expand Down Expand Up @@ -794,7 +801,7 @@ public function onAfterInitialise($event)
$now = time();
if ($now > ($lastPurge + $purgeInterval))
{
$purgeAge = $this->getIntParam('deleteOld', DatabaseHelper::$DEFAULT_PURGE_WEEKS);
$purgeAge = $this->getIntParam('deleteOld', self::DefaultSettings['deleteOld']);
if ($purgeAge > 0)
{
$this->mydb->purgeOldEntries($purgeAge);
Expand Down
4 changes: 0 additions & 4 deletions src/Helper/DatabaseHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ class DatabaseHelper
// TokenunblockModel::TokenValidDays must stay in sync with this
public static $UNBLOCK_TOKEN_VALID_DAYS = 3;

// failed logins are purged after this many weeks unless the administrator
// chose another time (0 = never). Keeping them for ever is not needed to
// protect anything, and they are personal data (addresses, usernames)
public static $DEFAULT_PURGE_WEEKS = 4;

// upper bound for the rows of the failed logins, however the purge age is
// set: a visitor can add one for every request, from as many addresses as
Expand Down
3 changes: 2 additions & 1 deletion src/Helper/RiskHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

defined('_JEXEC') or die;

use Codeling\Plugin\System\Bfstop\Extension\Bfstop;
use Joomla\CMS\Log\Log;
use Joomla\Registry\Registry;

Expand Down Expand Up @@ -58,7 +59,7 @@ private static function knownIpScore(DatabaseHelper $db, LoggerHelper $logger, R
*/
public static function isCommonUsername(Registry $params, $username)
{
$list = (string) $params->get('riskCommonUsernames', '');
$list = (string) $params->get('riskCommonUsernames', Bfstop::DefaultSettings['riskCommonUsernames']);
$candidates = array_filter(array_map('trim', explode("\n", str_replace("\r", '', $list))));
foreach ($candidates as $candidate)
{
Expand Down
Loading