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

Firewall - groups : rename source/destination networks, closes https://github.com/opnsense/core/issues/5056

Browse Source
This commit is contained in:
Ad Schellevis 2021-06-18 20:35:27 +02:00
parent bb5acc7771
commit f2541f4e9f
1 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/www/interfaces_groups_edit.php
View File

@ -101,16 +101,43 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$rule_ifs[array_search($a_ifgroups[$id]['ifname'], $rule_ifs)] = $ifgroupentry['ifname'];
$rule['interface'] = implode(",", $rule_ifs);
}
foreach (['source', 'destination'] as $net) {
if (!empty($rule[$net]['network']) && $rule[$net]['network'] == $a_ifgroups[$id]['ifname']) {
$rule[$net]['network'] = $pconfig['ifname'];
}
}
}
}
if (!empty($config['nat']) && is_array($config['nat']['rule'])) {
foreach ($config['nat']['rule'] as &$rule) {
foreach (['rule', 'onetoone'] as $section) {
if (!empty($config['nat']) && is_array($config['nat'][$section])) {
foreach ($config['nat'][$section] as &$rule) {
$rule_ifs = explode(",", $rule['interface']);
if (in_array($a_ifgroups[$id]['ifname'], $rule_ifs)) {
// replace interface
$rule_ifs[array_search($a_ifgroups[$id]['ifname'], $rule_ifs)] = $ifgroupentry['ifname'];
$rule['interface'] = implode(",", $rule_ifs);
}
foreach (['source', 'destination'] as $net) {
if (!empty($rule[$net]['network']) && $rule[$net]['network'] == $a_ifgroups[$id]['ifname']) {
$rule[$net]['network'] = $pconfig['ifname'];
}
}
}
}
}
if (!empty($config['nat']) && !empty($config['nat']['outbound']) && is_array($config['nat']['outbound']['rule'])) {
foreach ($config['nat']['outbound']['rule'] as &$rule) {
$rule_ifs = explode(",", $rule['interface']);
if (in_array($a_ifgroups[$id]['ifname'], $rule_ifs)) {
// replace interface
$rule_ifs[array_search($a_ifgroups[$id]['ifname'], $rule_ifs)] = $ifgroupentry['ifname'];
$rule['interface'] = implode(",", $rule_ifs);
}
foreach (['source', 'destination'] as $net) {
if (!empty($rule[$net]['network']) && $rule[$net]['network'] == $a_ifgroups[$id]['ifname']) {
$rule[$net]['network'] = $pconfig['ifname'];
}
}
}
}
}