lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-16 01:24:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

dhcrelay: patch the last spot for rule generation #6983

Browse Source
This commit is contained in:
Franco Fichtner 2024-03-14 13:00:13 +01:00
parent e1b313852a
commit 0eb267f048
2 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/etc/inc/filter.lib.inc
View File

@ -202,6 +202,9 @@ function filter_core_rules_system($fw, $defaults)
{
global $config;
$dhcrelay6_interfaces = plugins_run('dhcrelay_interfaces', ['inet6']);
$dhcrelay6_interfaces = !empty($dhcrelay6_interfaces['dhcrelay']) ? $dhcrelay6_interfaces['dhcrelay'] : [];
// block All IPv6 except loopback traffic
$fw->registerFilterRule(
1,
@ -481,10 +484,7 @@ function filter_core_rules_system($fw, $defaults)
default:
$dhcpdv6_enabled = isset($config['dhcpdv6'][$intf]['enable']);
$track6_enabled = isset($intfinfo['track6-interface']);
$dhcrelay6_interfaces = array();
if (!empty($config['dhcrelay6']['interface']) && isset($config['dhcrelay6']['enable'])) {
$dhcrelay6_interfaces = explode(',', $config['dhcrelay6']['interface']);
}
if ($dhcpdv6_enabled || $track6_enabled || in_array($intf, $dhcrelay6_interfaces)) {
$fw->registerFilterRule(
1,

33
src/etc/inc/plugins.inc.d/dhcrelay.inc
View File

@ -35,6 +35,13 @@ function dhcrelay_configure()
];
}
function dhcrelay_run()
{
return [
'dhcrelay_interfaces' => 'dhcrelay_interfaces',
];
}
function dhcrelay_services()
{
$services = [];
@ -153,3 +160,29 @@ function dhcrelay_configure_do($verbose = false, $id = null)
service_log("done.\n", $verbose);
}
function dhcrelay_interfaces($family = null)
{
$mdl = new \OPNsense\DHCRelay\DHCRelay();
$interfaces = [];
foreach ($mdl->relays->iterateItems() as $relay) {
if ((string)$relay->enabled != '1') {
continue;
}
$destination = $mdl->getNodeByReference("destinations.{$relay->destination}");
if ($destination == null) {
continue;
}
$dstfamily = strpos((string)$destination->server, '.') !== false ? 'inet' : 'inet6';
if ($family !== null && $family != $dstfamily) {
continue;
}
$interfaces[(string)$relay->interface] = 1;
}
return array_keys($interfaces);
}