Skip to content

Store block and allow list entries in canonical form (for the indexed lookup in the plugin) #21

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
codeling wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Store block and allow list entries in canonical form (for the indexed lookup in the plugin) #21

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
9 changes: 9 additions & 0 deletions admin/src/Table/AllowTable.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\Helper\IpHelper;
use Joomla\CMS\Table\Table;
use Joomla\Database\DatabaseDriver;

Expand All @@ -30,6 +31,14 @@ public function check()
{
$this->id = 0;
}
// addresses and networks are looked up by their canonical spelling, see
// IpHelper::canonicalEntry() ("2001:DB8::1" and "203.0.113.5/24" are
// kept as "2001:db8::1" and "203.0.113.0/24")
$canonical = IpHelper::canonicalEntry($this->ipaddress);
if ($canonical !== null)
{
$this->ipaddress = $canonical;
}
return parent::check();
}
}
9 changes: 9 additions & 0 deletions admin/src/Table/BlockTable.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\Helper\IpHelper;
use Joomla\CMS\Table\Table;
use Joomla\Database\DatabaseDriver;

Expand All @@ -30,6 +31,14 @@ public function check()
{
$this->id = 0;
}
// addresses and networks are looked up by their canonical spelling, see
// IpHelper::canonicalEntry() ("2001:DB8::1" and "203.0.113.5/24" are
// kept as "2001:db8::1" and "203.0.113.0/24")
$canonical = IpHelper::canonicalEntry($this->ipaddress);
if ($canonical !== null)
{
$this->ipaddress = $canonical;
}
return parent::check();
}
}
Loading