fix validate_duplicate_rules

pythops · Oct 8, 2024 · 81829c6 · 81829c6
1 parent dfeb8ac
commit 81829c6
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/oryx-tui/src/section/firewall.rs b/oryx-tui/src/section/firewall.rs
@@ -280,10 +280,13 @@ impl Firewall {
     }
 
     fn validate_duplicate_rules(rules: &[FirewallRule], user_input: &UserInput) -> AppResult<()> {
-        if let Some(exiting_rule_with_same_ip) = rules
-            .iter()
-            .find(|rule| rule.ip == IpAddr::from_str(user_input.ip.field.value()).unwrap())
-        {
+        if let Some(exiting_rule_with_same_ip) = rules.iter().find(|rule| {
+            rule.ip == IpAddr::from_str(user_input.ip.field.value()).unwrap()
+                && match user_input.id {
+                    Some(uuid) => rule.id != uuid,
+                    None => true,
+                }
+        }) {
             let new_port = BlockedPort::from_str(user_input.port.field.value()).unwrap();
 
             if exiting_rule_with_same_ip.port == new_port {