lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-15 00:54:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Firewall / scrubbing: fix two parsing bugs:

Browse Source 
o port aliases not being prefixed with $
o special proto type "tcp/udp" not translated to {tcp udp}

closes https://github.com/opnsense/core/issues/4363
This commit is contained in:
Ad Schellevis 2020-09-19 17:18:55 +02:00
parent 8855e26867
commit 09eec2755b
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/etc/inc/filter.inc
View File

@ -612,7 +612,16 @@ function filter_generate_scrubing(&$FilterIflist)
}
}
$scrub_rule_out .= count($interfaces) > 1 ? "{ " . implode(' ', $interfaces) . " } " : $interfaces[0];
$scrub_rule_out .= $scrub_rule['proto'] != 'any' ? " proto " . $scrub_rule['proto'] : "";
switch ($scrub_rule['proto']) {
case 'any':
break;
case 'tcp/udp':
$scrub_rule_out .= " proto {tcp udp}";
break;
default:
$scrub_rule_out .= " proto " . $scrub_rule['proto'];
break;
}
$scrub_rule_out .= " from ";
if (is_alias($scrub_rule['src'])) {
$scrub_rule_out .= !empty($scrub_rule['srcnot']) ? "!" : "";
@ -623,7 +632,11 @@ function filter_generate_scrubing(&$FilterIflist)
} else {
$scrub_rule_out .= "any";
}
$scrub_rule_out .= !empty($scrub_rule['srcport']) ? " port " . $scrub_rule['srcport'] : "";
if (!empty($scrub_rule['srcport']) && is_alias($scrub_rule['srcport'])) {
$scrub_rule_out .= " port $" . $scrub_rule['srcport'];
} else {
$scrub_rule_out .= !empty($scrub_rule['srcport']) ? " port " . $scrub_rule['srcport'] : "";
}
$scrub_rule_out .= " to ";
if (is_alias($scrub_rule['dst'])) {
$scrub_rule_out .= !empty($scrub_rule['dstnot']) ? "!" : "";
@ -634,7 +647,11 @@ function filter_generate_scrubing(&$FilterIflist)
} else {
$scrub_rule_out .= "any";
}
$scrub_rule_out .= !empty($scrub_rule['dstport']) ? " port " . $scrub_rule['dstport'] : "";
if (!empty($scrub_rule['dstport']) && is_alias($scrub_rule['dstport'])) {
$scrub_rule_out .= " port $" . $scrub_rule['dstport'];
} else {
$scrub_rule_out .= !empty($scrub_rule['dstport']) ? " port " . $scrub_rule['dstport'] : "";
}
$scrub_rule_out .= !empty($scrub_rule['no-df']) ? " no-df " : "";
$scrub_rule_out .= !empty($scrub_rule['random-id']) ? " random-id " : "";
$scrub_rule_out .= !empty($scrub_rule['max-mss']) ? " max-mss " . $scrub_rule['max-mss'] . " " : "";