Skip to content

Commit

Permalink
Replace direct config accesses in firewall_rules_edit.php. Fixes #13614
Browse files Browse the repository at this point in the history
  • Loading branch information
Reid Linnemann committed Nov 4, 2022
1 parent 758ee42 commit 6115e76
Showing 1 changed file with 18 additions and 18 deletions.
36 changes: 18 additions & 18 deletions src/usr/local/www/firewall_rules_edit.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ function is_aoadv_used($rule_config) {

init_config_arr(array('filter', 'rule'));
filter_rules_sort();
$a_filter = &$config['filter']['rule'];
$a_filter = config_get_path('filter/rule', []);

if (isset($_REQUEST['id']) && is_numericint($_REQUEST['id'])) {
$id = $_REQUEST['id'];
Expand Down Expand Up @@ -381,16 +381,14 @@ function is_aoadv_used($rule_config) {
}

if (isset($_POST['ipprotocol']) && $_POST['gateway'] <> '') {
if (is_array($config['gateways']['gateway_group'])) {
foreach ($config['gateways']['gateway_group'] as $gw_group) {
if ($gw_group['name'] == $_POST['gateway'] && $_POST['ipprotocol'] != $a_gatewaygroups[$_POST['gateway']]['ipprotocol']) {
if ($_POST['ipprotocol'] == "inet46") {
$input_errors[] = gettext("Gateways can not be assigned in a rule that applies to both IPv4 and IPv6.");
} elseif ($_POST['ipprotocol'] == "inet6") {
$input_errors[] = gettext("An IPv4 gateway group can not be assigned in IPv6 rules.");
} elseif ($_POST['ipprotocol'] == "inet") {
$input_errors[] = gettext("An IPv6 gateway group can not be assigned in IPv4 rules.");
}
foreach (config_get_path('gateways/gateway_group',[]) as $gw_group) {
if ($gw_group['name'] == $_POST['gateway'] && $_POST['ipprotocol'] != $a_gatewaygroups[$_POST['gateway']]['ipprotocol']) {
if ($_POST['ipprotocol'] == "inet46") {
$input_errors[] = gettext("Gateways can not be assigned in a rule that applies to both IPv4 and IPv6.");
} elseif ($_POST['ipprotocol'] == "inet6") {
$input_errors[] = gettext("An IPv4 gateway group can not be assigned in IPv6 rules.");
} elseif ($_POST['ipprotocol'] == "inet") {
$input_errors[] = gettext("An IPv6 gateway group can not be assigned in IPv4 rules.");
}
}
}
Expand Down Expand Up @@ -1057,22 +1055,23 @@ function is_aoadv_used($rule_config) {
} else { // rule moved to different interface
// Update the separators of previous interface.
init_config_arr(array('filter', 'separator', strtolower($if)));
$a_separators = &$config['filter']['separator'][strtolower($if)];
$a_separators = config_get_path('filter/separator/' . strtolower($if));
$ridx = ifridx($if, $id); // get rule index within interface
$mvnrows = -1;
move_separators($a_separators, $ridx, $mvnrows);

config_set_path('filter/separator/' . strtolower($if), $a_separators);
$a_filter[$id] = $filterent; // save edited rule to new interface

// Update the separators of new interface.
init_config_arr(array('filter', 'separator', strtolower($tmpif)));
$a_separators = &$config['filter']['separator'][strtolower($tmpif)];
$a_separators = config_get_path('filter/separator/' . strtolower($tmpif));
$ridx = ifridx($tmpif, $id); // get rule index within interface
if ($ridx == 0) { // rule was placed at the top
$ridx = -1; // move all separators
}
$mvnrows = +1;
move_separators($a_separators, $ridx, $mvnrows);
config_set_path('filter/separator/' . strtolower($tmpif), $a_separators);
}

} else {
Expand All @@ -1098,17 +1097,18 @@ function is_aoadv_used($rule_config) {

// Update the separators
init_config_arr(array('filter', 'separator', strtolower($tmpif)));
$a_separators = &$config['filter']['separator'][strtolower($tmpif)];
$a_separators = config_get_path('filter/separator/' . strtolower($tmpif));
$ridx = ifridx($tmpif, $after); // get rule index within interface
$mvnrows = +1;
move_separators($a_separators, $ridx, $mvnrows);
config_set_path('filter/separator/' . strtolower($tmpif), $a_separators);
} else {
$a_filter[] = $filterent;
}
}

filter_rules_sort();

config_set_path('filter/rule', $a_filter);
if (write_config(gettext("Firewall: Rules - saved/edited a firewall rule."))) {
mark_subsystem_dirty('filter');
}
Expand Down Expand Up @@ -1268,7 +1268,7 @@ function build_flag_table() {

if ($edit_disabled) {
$extra = '';
foreach ($config['nat']['rule'] as $index => $nat_rule) {
foreach (config_get_path('nat/rule', []) as $index => $nat_rule) {
if ($nat_rule['associated-rule-id'] === $pconfig['associated-rule-id']) {
$extra = '<br/><a href="firewall_nat_edit.php?id='. $index .'">'. gettext('View the NAT rule') .'</a>';
}
Expand Down Expand Up @@ -1706,7 +1706,7 @@ function build_flag_table() {
))->setHelp('Choose 802.1p priority to apply.');

$schedules = array();
foreach ((array)$config['schedules']['schedule'] as $schedule) {
foreach (config_get_path('schedules/schedule', []) as $schedule) {
if ($schedule['name'] != "") {
$schedules[] = $schedule['name'];
}
Expand Down

0 comments on commit 6115e76

Please sign in to comment.