From 3e20d17562406d1735720fe6b083e702cfc43de3 Mon Sep 17 00:00:00 2001 From: Viktor Gurov Date: Sat, 14 Dec 2019 19:32:59 +0300 Subject: [PATCH 1/4] full cmd: route delete $fml $tgt $gw --- src/usr/local/www/system_routes.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/usr/local/www/system_routes.php b/src/usr/local/www/system_routes.php index 63cf53fa1ca..0dd9d7bff45 100644 --- a/src/usr/local/www/system_routes.php +++ b/src/usr/local/www/system_routes.php @@ -67,7 +67,7 @@ } function delete_static_route($id) { - global $config, $a_routes, $changedesc_prefix; + global $config, $a_routes, $changedesc_prefix, $a_gateways; if (!isset($a_routes[$id])) { return; @@ -92,7 +92,7 @@ function delete_static_route($id) { foreach ($targets as $tgt) { $family = (is_subnetv6($tgt) ? "-inet6" : "-inet"); - mwexec("/sbin/route delete {$family} " . escapeshellarg($tgt)); + mwexec("/sbin/route delete {$family} " . escapeshellarg($tgt) . " " . $a_gateways[$a_routes[$id]['gateway']]['gateway']); } unset($targets); From c1c375e6fab9b334af8c290912324bf6aa42591b Mon Sep 17 00:00:00 2001 From: Viktor Gurov Date: Sat, 14 Dec 2019 19:48:29 +0300 Subject: [PATCH 2/4] more readable --- src/usr/local/www/system_routes.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/usr/local/www/system_routes.php b/src/usr/local/www/system_routes.php index 0dd9d7bff45..5ddab3870dd 100644 --- a/src/usr/local/www/system_routes.php +++ b/src/usr/local/www/system_routes.php @@ -92,7 +92,8 @@ function delete_static_route($id) { foreach ($targets as $tgt) { $family = (is_subnetv6($tgt) ? "-inet6" : "-inet"); - mwexec("/sbin/route delete {$family} " . escapeshellarg($tgt) . " " . $a_gateways[$a_routes[$id]['gateway']]['gateway']); + $gateway = $a_gateways[$a_routes[$id]['gateway']]['gateway']; + mwexec("/sbin/route delete {$family} " . escapeshellarg($tgt) . " " . $gateway); } unset($targets); From e43f0619b0f0937689ad78c023dfe077b1f84a10 Mon Sep 17 00:00:00 2001 From: Viktor Gurov Date: Mon, 16 Dec 2019 20:27:48 +0300 Subject: [PATCH 3/4] escapeshellarg() --- src/usr/local/www/system_routes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/usr/local/www/system_routes.php b/src/usr/local/www/system_routes.php index 5ddab3870dd..e8173380417 100644 --- a/src/usr/local/www/system_routes.php +++ b/src/usr/local/www/system_routes.php @@ -93,7 +93,7 @@ function delete_static_route($id) { foreach ($targets as $tgt) { $family = (is_subnetv6($tgt) ? "-inet6" : "-inet"); $gateway = $a_gateways[$a_routes[$id]['gateway']]['gateway']; - mwexec("/sbin/route delete {$family} " . escapeshellarg($tgt) . " " . $gateway); + mwexec("/sbin/route delete {$family} " . escapeshellarg($tgt) . " " . $escapeshellarg($gateway)); } unset($targets); From 6ad0603b9fc9a65a9bd10390976676ae48b3fbd0 Mon Sep 17 00:00:00 2001 From: Viktor Gurov Date: Mon, 16 Dec 2019 20:28:55 +0300 Subject: [PATCH 4/4] escapeshellarg() --- src/usr/local/www/system_routes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/usr/local/www/system_routes.php b/src/usr/local/www/system_routes.php index e8173380417..758e0cd13e5 100644 --- a/src/usr/local/www/system_routes.php +++ b/src/usr/local/www/system_routes.php @@ -93,7 +93,7 @@ function delete_static_route($id) { foreach ($targets as $tgt) { $family = (is_subnetv6($tgt) ? "-inet6" : "-inet"); $gateway = $a_gateways[$a_routes[$id]['gateway']]['gateway']; - mwexec("/sbin/route delete {$family} " . escapeshellarg($tgt) . " " . $escapeshellarg($gateway)); + mwexec("/sbin/route delete {$family} " . escapeshellarg($tgt) . " " . escapeshellarg($gateway)); } unset($targets);