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

Firewall, rule parsing, disable empty port aliases to avoid rule loading issues, related to https://github.com/opnsense/core/issues/1858

Browse Source
This commit is contained in:
Ad Schellevis 2018-07-23 20:40:56 +02:00
parent eeb14c29fc
commit c76006cd5e
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/opnsense/mvc/app/library/OPNsense/Firewall/Rule.php
View File

@ -263,6 +263,10 @@ abstract class Rule
$rule[$target."_port"] = $port;
} elseif (Util::isAlias($port)) {
$rule[$target."_port"] = '$'.$port;
if (!Util::isAlias($port, true)) {
// unable to map port
$rule['disabled'] = true;
}
}
}
if (!isset($rule[$target])) {

4
src/opnsense/mvc/app/library/OPNsense/Firewall/SNatRule.php
View File

@ -98,6 +98,10 @@ class SNatRule extends Rule
foreach (array("sourceport", "dstport", "natport") as $fieldname) {
if (!empty($rule[$fieldname]) && Util::isAlias($rule[$fieldname])) {
$rule[$fieldname] = "$".$rule[$fieldname];
if (!Util::isAlias($rule[$fieldname], true)) {
// unable to map port
$rule['disabled'] = true;
}
}
}
if (!empty($rule['staticnatport']) || !empty($rule['nonat'])) {