handle more cases of duplicate rules

pythops · Oct 7, 2024 · 8b19b07 · 8b19b07
1 parent 534609b
commit 8b19b07
Showing 1 changed file with 23 additions and 0 deletions.
diff --git a/oryx-tui/src/section/firewall.rs b/oryx-tui/src/section/firewall.rs
@@ -313,6 +313,7 @@ impl Firewall {
                             {
                                 let new_port =
                                     BlockedPort::from_str(user_input.port.field.value()).unwrap();
+
                                 if exiting_rule_with_same_ip.port == new_port {
                                     Notification::send(
                                         "Duplicate Rule",
@@ -321,6 +322,28 @@ impl Firewall {
                                     )?;
                                     return Err("Rule validation error".into());
                                 }
+
+                                match exiting_rule_with_same_ip.port {
+                                    BlockedPort::Single(_) => {
+                                        if new_port == BlockedPort::All {
+                                            Notification::send(
+                                                "Duplicate Rule",
+                                                crate::notification::NotificationLevel::Warning,
+                                                sender.clone(),
+                                            )?;
+                                            return Err("Rule validation error".into());
+                                        }
+                                    }
+
+                                    BlockedPort::All => {
+                                        Notification::send(
+                                            "Duplicate Rule",
+                                            crate::notification::NotificationLevel::Warning,
+                                            sender.clone(),
+                                        )?;
+                                        return Err("Rule validation error".into());
+                                    }
+                                }
                             }
 
                             let rule = FirewallRule {