Skip to content

O
OpnSense
Commit 029393ad authored by Franco Fichtner's avatar Franco Fichtner
Browse files
Options

firewall: url_safe() conversion, closes #1168 

While there, kill "if (write_config())" constructs as this
really isn't a thing.
parent 34604d5a
Hide whitespace changes
Inline Side-by-side
Showing with 111 additions and 143 deletions
src/www/firewall_aliases.php
View file @ 029393ad
......@@ -169,11 +169,10 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
} else {
configd_run("filter kill table {$alias_name}");
unset($a_aliases[$_POST['id']]);
if (write_config()) {
filter_configure();
mark_subsystem_dirty('aliases');
}
header('Location: firewall_aliases.php');
write_config();
filter_configure();
mark_subsystem_dirty('aliases');
header(url_safe('Location: /firewall_aliases.php'));
exit;
}
}
......
src/www/firewall_aliases_edit.php
View file @ 029393ad
......@@ -257,16 +257,15 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
// Sort list
$a_aliases = msort($a_aliases, "name");
if (write_config()) {
// post save actions
mark_subsystem_dirty('aliases');
if (strpos($pconfig['type'],'url') !== false || $pconfig['type'] == 'geoip') {
// update URL Table Aliases
configd_run('filter refresh_url_alias', true);
}
write_config();
// post save actions
mark_subsystem_dirty('aliases');
if (strpos($pconfig['type'],'url') !== false || $pconfig['type'] == 'geoip') {
// update URL Table Aliases
configd_run('filter refresh_url_alias', true);
}
header('Location: firewall_aliases.php');
header(url_safe('Location: /firewall_aliases.php'));
exit;
}
}
......
src/www/firewall_aliases_import.php
View file @ 029393ad
......@@ -145,10 +145,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
// Sort list
$config['aliases']['alias'] = msort($config['aliases']['alias'], "name");
if (write_config()) {
mark_subsystem_dirty('aliases');
}
header("Location: firewall_aliases.php");
write_config();
mark_subsystem_dirty('aliases');
header(url_safe('Location: /firewall_aliases.php'));
exit;
}
}
......
src/www/firewall_nat.php
View file @ 029393ad
......@@ -93,10 +93,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
mark_subsystem_dirty('filter');
}
unset($a_nat[$id]);
if (write_config()) {
mark_subsystem_dirty('natconf');
}
header("Location: firewall_nat.php");
write_config();
mark_subsystem_dirty('natconf');
header(url_safe('Location: /firewall_nat.php'));
exit;
} elseif (isset($pconfig['act']) && $pconfig['act'] == 'del_x' && isset($pconfig['rule']) && count($pconfig['rule']) > 0) {
/* delete selected rules */
......@@ -111,10 +110,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
unset($a_nat[$rulei]);
}
}
if (write_config()) {
mark_subsystem_dirty('natconf');
}
header("Location: firewall_nat.php");
write_config();
mark_subsystem_dirty('natconf');
header(url_safe('Location: /firewall_nat.php'));
exit;
} elseif ( isset($pconfig['act']) && $pconfig['act'] == 'move') {
// move records
......@@ -125,10 +123,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
}
$a_nat = legacy_move_config_list_items($a_nat, $id, $pconfig['rule']);
}
if (write_config()) {
mark_subsystem_dirty('natconf');
}
header("Location: firewall_nat.php");
write_config();
mark_subsystem_dirty('natconf');
header(url_safe('Location: /firewall_nat.php'));
exit;
} elseif (isset($pconfig['act']) && $pconfig['act'] == 'toggle' && isset($id)) {
// toggle item
......@@ -137,10 +134,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
} else {
$a_nat[$id]['disabled'] = true;
}
if (write_config("Firewall: NAT: Outbound, enable/disable NAT rule")) {
mark_subsystem_dirty('natconf');
}
header("Location: firewall_nat.php");
write_config('Firewall: NAT: Outbound, toggle NAT rule');
mark_subsystem_dirty('natconf');
header(url_safe('Location: /firewall_nat.php'));
exit;
}
}
......
src/www/firewall_nat_1to1.php
View file @ 029393ad
......@@ -53,7 +53,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
unset($a_1to1[$id]);
write_config();
mark_subsystem_dirty('natconf');
header("Location: firewall_nat_1to1.php");
header(url_safe('Location: /firewall_nat_1to1.php'));
exit;
} elseif (isset($pconfig['action']) && $pconfig['action'] == 'del_x' && isset($pconfig['rule']) && count($pconfig['rule']) > 0) {
// delete selected
......@@ -62,7 +62,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
}
write_config();
mark_subsystem_dirty('natconf');
header("Location: firewall_nat_1to1.php");
header(url_safe('Location: /firewall_nat_1to1.php'));
exit;
} elseif (isset($pconfig['action']) && $pconfig['action'] == 'move') {
// move selected
......@@ -75,7 +75,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
write_config();
mark_subsystem_dirty('natconf');
header("Location: firewall_nat_1to1.php");
header(url_safe('Location: /firewall_nat_1to1.php'));
exit;
}
} elseif (isset($pconfig['action']) && $pconfig['action'] == 'toggle' && isset($id)) {
......@@ -87,7 +87,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
}
write_config('Toggled NAT 1:1 rule');
mark_subsystem_dirty('natconf');
header("Location: firewall_nat_1to1.php");
header(url_safe('Location: /firewall_nat_1to1.php'));
exit;
}
}
......
src/www/firewall_nat_1to1_edit.php
View file @ 029393ad
......@@ -147,10 +147,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$a_1to1[] = $natent;
}
if (write_config()) {
mark_subsystem_dirty('natconf');
}
header("Location: firewall_nat_1to1.php");
write_config();
mark_subsystem_dirty('natconf');
header(url_safe('Location: /firewall_nat_1to1.php'));
exit;
}
}
......
src/www/firewall_nat_edit.php
View file @ 029393ad
......@@ -359,11 +359,10 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
}
}
if (write_config()) {
mark_subsystem_dirty('natconf');
}
write_config();
mark_subsystem_dirty('natconf');
header("Location: firewall_nat.php");
header(url_safe('Location: /firewall_nat.php'));
exit;
}
}
......
src/www/firewall_nat_npt.php
View file @ 029393ad
......@@ -52,7 +52,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
unset($a_npt[$id]);
write_config();
mark_subsystem_dirty('natconf');
header("Location: firewall_nat_npt.php");
header(url_safe('Location: /firewall_nat_npt.php'));
exit;
} elseif (isset($pconfig['act']) && $pconfig['act'] == 'del_x' && isset($pconfig['rule']) && count($pconfig['rule']) > 0) {
/* delete selected rules */
......@@ -63,7 +63,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
}
write_config();
mark_subsystem_dirty('natconf');
header("Location: firewall_nat_npt.php");
header(url_safe('Location: /firewall_nat_npt.php'));
exit;
} elseif (isset($pconfig['act']) && $pconfig['act'] == 'move') {
// move records
......@@ -76,7 +76,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
}
write_config();
mark_subsystem_dirty('natconf');
header("Location: firewall_nat_npt.php");
header(url_safe('Location: /firewall_nat_npt.php'));
exit;
} elseif (isset($pconfig['act']) && $pconfig['act'] == 'toggle' && isset($id)) {
// toggle item
......@@ -87,7 +87,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
}
write_config('Toggled NAT NPT rule');
mark_subsystem_dirty('natconf');
header("Location: firewall_nat_npt.php");
header(url_safe('Location: /firewall_nat_npt.php'));
exit;
}
}
......
src/www/firewall_nat_npt_edit.php
View file @ 029393ad
......@@ -124,10 +124,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$a_npt[] = $natent;
}
if (write_config()) {
mark_subsystem_dirty('natconf');
}
header("Location: firewall_nat_npt.php");
write_config();
mark_subsystem_dirty('natconf');
header(url_safe('Location: /firewall_nat_npt.php'));
exit;
}
}
......
src/www/firewall_nat_out.php
View file @ 029393ad
......@@ -117,18 +117,16 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
$config['nat']['outbound']['mode'] = $pconfig['mode'];
if (write_config()) {
mark_subsystem_dirty('natconf');
}
header("Location: firewall_nat_out.php");
write_config();
mark_subsystem_dirty('natconf');
header(url_safe('Location: /firewall_nat_out.php'));
exit;
} elseif (isset($pconfig['act']) && $pconfig['act'] == 'del' && isset($id)) {
// delete single record
unset($a_out[$id]);
if (write_config()) {
mark_subsystem_dirty('natconf');
}
header("Location: firewall_nat_out.php");
write_config();
mark_subsystem_dirty('natconf');
header(url_safe('Location: /firewall_nat_out.php'));
exit;
} elseif (isset($pconfig['act']) && $pconfig['act'] == 'del_x' && isset($pconfig['rule']) && count($pconfig['rule']) > 0) {
/* delete selected rules */
......@@ -137,10 +135,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
unset($a_out[$rulei]);
}
}
if (write_config()) {
mark_subsystem_dirty('natconf');
}
header("Location: firewall_nat_out.php");
write_config();
mark_subsystem_dirty('natconf');
header(url_safe('Location: /firewall_nat_out.php'));
exit;
} elseif ( isset($pconfig['act']) && $pconfig['act'] == 'move' && isset($pconfig['rule']) && count($pconfig['rule']) > 0) {
// if rule not set/found, move to end
......@@ -148,10 +145,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
$id = count($a_out);
}
$a_out = legacy_move_config_list_items($a_out, $id, $pconfig['rule']);
if (write_config()) {
mark_subsystem_dirty('natconf');
}
header("Location: firewall_nat_out.php");
write_config();
mark_subsystem_dirty('natconf');
header(url_safe('Location: /firewall_nat_out.php'));
exit;
} elseif (isset($pconfig['act']) && $pconfig['act'] == 'toggle' && isset($id)) {
// toggle item disabled / enabled
......@@ -160,10 +156,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
} else {
$a_out[$id]['disabled'] = true;
}
if (write_config("Firewall: NAT: Outbound, enable/disable NAT rule")) {
mark_subsystem_dirty('natconf');
}
header("Location: firewall_nat_out.php");
write_config('Firewall: NAT: Outbound, toggle NAT rule');
mark_subsystem_dirty('natconf');
header(url_safe('Location: /firewall_nat_out.php'));
exit;
}
}
......
src/www/firewall_nat_out_edit.php
View file @ 029393ad
......@@ -309,10 +309,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$a_out[] = $natent;
}
}
if (write_config()) {
mark_subsystem_dirty('natconf');
}
header("Location: firewall_nat_out.php");
write_config();
mark_subsystem_dirty('natconf');
header(url_safe('Location: /firewall_nat_out.php'));
exit;
}
}
......
src/www/firewall_rules.php
View file @ 029393ad
......@@ -73,10 +73,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
}
}
unset($a_filter[$id]);
if (write_config()) {
mark_subsystem_dirty('filter');
}
header("Location: firewall_rules.php?if=" . htmlspecialchars($current_if));
write_config();
mark_subsystem_dirty('filter');
header(url_safe('Location: /firewall_rules.php?if=%s', array($current_if)));
exit;
} elseif (isset($pconfig['act']) && $pconfig['act'] == 'del_x' && isset($pconfig['rule']) && count($pconfig['rule']) > 0) {
// delete selected rules
......@@ -92,10 +91,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
}
unset($a_filter[$rulei]);
}
if (write_config()) {
mark_subsystem_dirty('filter');
}
header("Location: firewall_rules.php?if=" . htmlspecialchars($current_if));
write_config();
mark_subsystem_dirty('filter');
header(url_safe('Location: /firewall_rules.php?if=%s', array($current_if)));
exit;
} elseif ( isset($pconfig['act']) && $pconfig['act'] == 'move' && isset($pconfig['rule']) && count($pconfig['rule']) > 0) {
// move selected rules
......@@ -104,12 +102,10 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
$id = count($a_filter);
}
$a_filter = legacy_move_config_list_items($a_filter, $id, $pconfig['rule']);
if (write_config()) {
mark_subsystem_dirty('filter');
}
header("Location: firewall_rules.php?if=" . htmlspecialchars($current_if));
write_config();
mark_subsystem_dirty('filter');
header(url_safe('Location: /firewall_rules.php?if=%s', array($current_if)));
exit;
} elseif (isset($pconfig['act']) && $pconfig['act'] == 'toggle' && isset($id)) {
// toggle item
if(isset($a_filter[$id]['disabled'])) {
......@@ -117,10 +113,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
} else {
$a_filter[$id]['disabled'] = true;
}
if (write_config()) {
mark_subsystem_dirty('filter');
}
header("Location: firewall_rules.php?if=" . htmlspecialchars($current_if));
write_config();
mark_subsystem_dirty('filter');
header(url_safe('Location: /firewall_rules.php?if=%s', array($current_if)));
exit;
}
}
......
src/www/firewall_rules_edit.php
View file @ 029393ad
......@@ -453,15 +453,12 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
filter_rules_sort();
configure_cron();
// write to config
if (write_config()) {
mark_subsystem_dirty('filter');
}
write_config();
mark_subsystem_dirty('filter');
if (!empty($pconfig['floating'])) {
header("Location: firewall_rules.php?if=FloatingRules");
} else {
header("Location: firewall_rules.php?if=" . htmlspecialchars($pconfig['interface']));
}
header(url_safe('Location: /firewall_rules.php?if=%s', array(
!empty($pconfig['floating']) ? 'FloatingRules' : $pconfig['interface']
)));
exit;
}
}
......
src/www/firewall_schedule.php
View file @ 029393ad
......@@ -64,7 +64,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
} else {
unset($a_schedules[$id]);
write_config();
header("Location: firewall_schedule.php");
header(url_safe('Location: /firewall_schedule.php'));
exit;
}
}
......
src/www/firewall_schedule_edit.php
View file @ 029393ad
......@@ -203,12 +203,12 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
} else {
$a_schedules[] = $schedule;
}
schedule_sort();
if (write_config()) {
filter_configure();
}
write_config();
filter_configure();
header("Location: firewall_schedule.php");
header(url_safe('Location: /firewall_schedule.php'));
exit;
}
}
......
src/www/firewall_scrub.php
View file @ 029393ad
......@@ -73,33 +73,30 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
} elseif (isset($config['system']['scrub_interface_disable'])) {
unset($config['system']['scrub_interface_disable']);
}
if (write_config()) {
mark_subsystem_dirty('filter');
}
header("Location: firewall_scrub.php");
write_config();
mark_subsystem_dirty('filter');
header(url_safe('Location: /firewall_scrub.php'));
exit;
} elseif (isset($pconfig['apply'])) {
filter_configure();
clear_subsystem_dirty('filter');
header("Location: firewall_scrub.php?savemsg=yes");
header(url_safe('Location: /firewall_scrub.php?savemsg=yes'));
exit;
} elseif (isset($pconfig['act']) && $pconfig['act'] == 'del' && isset($id)) {
// delete single item
unset($a_scrub[$id]);
if (write_config()) {
mark_subsystem_dirty('filter');
}
header("Location: firewall_scrub.php");
write_config();
mark_subsystem_dirty('filter');
header(url_safe('Location: /firewall_scrub.php'));
exit;
} elseif (isset($pconfig['act']) && $pconfig['act'] == 'del_x' && isset($pconfig['rule']) && count($pconfig['rule']) > 0) {
// delete selected rules
foreach ($pconfig['rule'] as $rule_index) {
unset($a_scrub[$rule_index]);
}
if (write_config()) {
mark_subsystem_dirty('filter');
}
header("Location: firewall_scrub.php");
write_config();
mark_subsystem_dirty('filter');
header(url_safe('Location: /firewall_scrub.php'));
exit;
} elseif ( isset($pconfig['act']) && $pconfig['act'] == 'move' && isset($pconfig['rule']) && count($pconfig['rule']) > 0) {
// move selected rules
......@@ -108,10 +105,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$id = count($a_scrub);
}
$a_scrub = legacy_move_config_list_items($a_scrub, $id, $pconfig['rule']);
if (write_config()) {
mark_subsystem_dirty('filter');
}
header("Location: firewall_scrub.php");
write_config();
mark_subsystem_dirty('filter');
header(url_safe('Location: /firewall_scrub.php'));
exit;
} elseif (isset($pconfig['act']) && $pconfig['act'] == 'toggle' && isset($id)) {
......@@ -121,10 +117,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
} else {
$a_scrub[$id]['disabled'] = true;
}
if (write_config()) {
mark_subsystem_dirty('filter');
}
header("Location: firewall_scrub.php");
write_config();
mark_subsystem_dirty('filter');
header(url_safe('Location: /firewall_scrub.php'));
exit;
}
}
......
src/www/firewall_scrub_edit.php
View file @ 029393ad
......@@ -162,11 +162,10 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
}
}
// write to config
if (write_config()) {
mark_subsystem_dirty('filter');
}
write_config();
mark_subsystem_dirty('filter');
header("Location: firewall_scrub.php");
header(url_safe('Location: /firewall_scrub.php'));
exit;
}
}
......
src/www/firewall_virtual_ip.php
View file @ 029393ad
......@@ -170,7 +170,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
$input_errors = deleteVIPEntry($id);
if (count($input_errors) == 0) {
write_config();
header("Location: firewall_virtual_ip.php");
header(url_safe('Location: /firewall_virtual_ip.php'));
exit;
}
} elseif (isset($pconfig['act']) && $pconfig['act'] == 'del_x' && isset($pconfig['rule']) && count($pconfig['rule']) > 0) {
......@@ -181,7 +181,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
}
}
write_config();
header("Location: firewall_virtual_ip.php");
header(url_safe('Location: /firewall_virtual_ip.php'));
exit;
} elseif (isset($pconfig['act']) && $pconfig['act'] == 'move' && isset($pconfig['rule']) && count($pconfig['rule']) > 0) {
// move selected rules
......@@ -191,7 +191,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
}
$a_vip = legacy_move_config_list_items($a_vip, $id, $pconfig['rule']);
write_config();
header("Location: firewall_virtual_ip.php");
header(url_safe('Location: /firewall_virtual_ip.php'));
exit;
}
}
......
src/www/firewall_virtual_ip_edit.php
View file @ 029393ad
......@@ -215,11 +215,10 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
} else {
$a_vip[] = $vipent;
}
if (write_config()) {
mark_subsystem_dirty('vip');
file_put_contents('/tmp/.firewall_virtual_ip.apply', serialize($toapplylist));
}
header("Location: firewall_virtual_ip.php");
write_config();
mark_subsystem_dirty('vip');
file_put_contents('/tmp/.firewall_virtual_ip.apply', serialize($toapplylist));
header(url_safe('Location: /firewall_virtual_ip.php'));
exit;
}
}
......
src/www/system_routes.php
View file @ 029393ad
......@@ -127,9 +127,8 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
$id = count($a_routes);
}
$a_routes = legacy_move_config_list_items($a_routes, $id, $pconfig['route']);
if (write_config()) {
mark_subsystem_dirty('staticroutes');
}
write_config();
mark_subsystem_dirty('staticroutes');
}
header(url_safe('Location: /system_routes.php'));
exit;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023