mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling of port ranges in this validation test. Ticket #7421

Browse Source
This commit is contained in:
jim-p 2017-03-24 13:58:55 -04:00
parent 01dc83959c
commit 0034bbc15a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2734,12 +2734,16 @@ function filter_generate_user_rule($rule) {
file_notice("Filter_Reload", $error_text);
return "# {$error_text}";
}
if ($rule['source']['port'] && !alias_expand($rule['source']['port'])) {
if ($rule['source']['port']
&& !(is_portrange(str_replace("-", ":", $rule['source']['port']))
|| alias_expand($rule['source']['port']))) {
$error_text = sprintf(gettext("Unresolvable source port alias '%1\$s' for rule '%2\$s'"), $rule['source']['port'], $rule['descr']);
file_notice("Filter_Reload", $error_text);
return "# {$error_text}";
}
if ($rule['destination']['port'] && !alias_expand($rule['destination']['port'])) {
if ($rule['destination']['port']
&& !(is_portrange(str_replace("-", ":", $rule['destination']['port']))
|| alias_expand($rule['destination']['port']))) {
$error_text = sprintf(gettext("Unresolvable destination port alias '%1\$s' for rule '%2\$s'"), $rule['destination']['port'], $rule['descr']);
file_notice("Filter_Reload", $error_text);
return "# {$error_text}";