From 1dbcf112e6b5a1cf9bba928e3aff0483aba478fd Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Thu, 24 Aug 2023 19:47:04 +0200 Subject: [PATCH] Firewall: Rules - fix group priority handling introduced in https://github.com/opnsense/core/commit/8e197ff73ee3412696110b3ff668598d9c10b2e9 , closes https://github.com/opnsense/core/issues/6772 --- .../app/library/OPNsense/Firewall/Rule.php | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/src/opnsense/mvc/app/library/OPNsense/Firewall/Rule.php b/src/opnsense/mvc/app/library/OPNsense/Firewall/Rule.php index 40f81a43f..0ce3c1950 100644 --- a/src/opnsense/mvc/app/library/OPNsense/Firewall/Rule.php +++ b/src/opnsense/mvc/app/library/OPNsense/Firewall/Rule.php @@ -402,21 +402,14 @@ abstract class Rule public function ruleOrigin() { - - switch ($this->rule['#priority']) { - case 200000: - $origin = 'floating'; - break; - case 300000: - $origin = 'group'; - break; - case 400000: - $origin = 'interface'; - break; - default: - $origin = 'internal'; + if ($this->rule['#priority'] >= 200000 && $this->rule['#priority'] < 300000) { + return 'floating'; + } elseif ($this->rule['#priority'] >= 300000 && $this->rule['#priority'] < 400000) { + return 'group'; + } elseif ($this->rule['#priority'] >= 400000 && $this->rule['#priority'] < 500000) { + return 'interface'; } - return $origin; + return 'internal'; } /**