do not edit enabled rule

pythops · pythops · commit 3faee02fe1b3 · 2024-10-07T18:48:38.000+02:00
diff --git a/oryx-tui/src/handler.rs b/oryx-tui/src/handler.rs
@@ -62,7 +62,9 @@ pub fn handle_key_events(
                         app.filter.handle_key_events(key_event, true);
                     }
                     ActivePopup::NewFirewallRule => {
-                        app.section.firewall.handle_keys(key_event)?;
+                        app.section
+                            .firewall
+                            .handle_keys(key_event, sender.clone())?;
                         app.is_editing = false;
                     }
                     _ => {}
@@ -78,7 +80,12 @@ pub fn handle_key_events(
                     }
                 }
                 ActivePopup::NewFirewallRule => {
-                    if app.section.firewall.handle_keys(key_event).is_ok() {
+                    if app
+                        .section
+                        .firewall
+                        .handle_keys(key_event, sender.clone())
+                        .is_ok()
+                    {
                         app.active_popup = None;
                         app.is_editing = false;
                     }
@@ -91,7 +98,9 @@ pub fn handle_key_events(
                     app.filter.handle_key_events(key_event, true);
                 }
                 ActivePopup::NewFirewallRule => {
-                    app.section.firewall.handle_keys(key_event)?;
+                    app.section
+                        .firewall
+                        .handle_keys(key_event, sender.clone())?;
                 }
                 _ => {}
             },
@@ -106,7 +115,7 @@ pub fn handle_key_events(
             _ => {}
         }
 
-        app.section.handle_keys(key_event)?;
+        app.section.handle_keys(key_event, sender.clone())?;
         return Ok(());
     }
 
@@ -145,14 +154,14 @@ pub fn handle_key_events(
         KeyCode::Char('/') => {
             if app.section.focused_section == FocusedSection::Inspection {
                 app.is_editing = true;
-                app.section.handle_keys(key_event)?;
+                app.section.handle_keys(key_event, sender.clone())?;
             }
         }
 
         KeyCode::Char('n') | KeyCode::Char('e') => {
             if app.section.focused_section == FocusedSection::Firewall {
                 app.is_editing = true;
-                app.section.handle_keys(key_event)?;
+                app.section.handle_keys(key_event, sender)?;
                 app.active_popup = Some(ActivePopup::NewFirewallRule);
             }
         }
@@ -187,7 +196,7 @@ pub fn handle_key_events(
             }
         }
         _ => {
-            app.section.handle_keys(key_event)?;
+            app.section.handle_keys(key_event, sender.clone())?;
         }
     }
 
diff --git a/oryx-tui/src/notification.rs b/oryx-tui/src/notification.rs
@@ -69,7 +69,7 @@ impl Notification {
         let notif = Notification {
             message: message.to_string(),
             level,
-            ttl: 500,
+            ttl: 75,
         };
 
         sender.send(Event::Notification(notif))?;
diff --git a/oryx-tui/src/section.rs b/oryx-tui/src/section.rs
@@ -19,7 +19,7 @@ use ratatui::{
 };
 use stats::Stats;
 
-use crate::{app::AppResult, packet::AppPacket};
+use crate::{app::AppResult, event::Event, packet::AppPacket};
 
 #[derive(Debug, PartialEq)]
 pub enum FocusedSection {
@@ -118,7 +118,11 @@ impl Section {
         }
     }
 
-    pub fn handle_keys(&mut self, key_event: KeyEvent) -> AppResult<()> {
+    pub fn handle_keys(
+        &mut self,
+        key_event: KeyEvent,
+        notification_sender: kanal::Sender<Event>,
+    ) -> AppResult<()> {
         match key_event.code {
             KeyCode::Tab => match self.focused_section {
                 FocusedSection::Inspection => self.focused_section = FocusedSection::Stats,
@@ -136,7 +140,9 @@ impl Section {
 
             _ => match self.focused_section {
                 FocusedSection::Inspection => self.inspection.handle_keys(key_event),
-                FocusedSection::Firewall => self.firewall.handle_keys(key_event)?,
+                FocusedSection::Firewall => self
+                    .firewall
+                    .handle_keys(key_event, notification_sender.clone())?,
                 _ => {}
             },
         }
diff --git a/oryx-tui/src/section/firewall.rs b/oryx-tui/src/section/firewall.rs
@@ -11,7 +11,7 @@ use std::{net::IpAddr, num::ParseIntError, str::FromStr};
 use tui_input::{backend::crossterm::EventHandler, Input};
 use uuid;
 
-use crate::app::AppResult;
+use crate::{app::AppResult, notification::Notification};
 
 #[derive(Debug, Clone)]
 pub struct FirewallRule {
@@ -41,9 +41,9 @@ impl FromStr for BlockedPort {
     type Err = ParseIntError;
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         if s == "*" {
-            return Ok(BlockedPort::All);
+            Ok(BlockedPort::All)
         } else {
-            return Ok(BlockedPort::Single(u16::from_str(s)?));
+            Ok(BlockedPort::Single(u16::from_str(s)?))
         }
     }
 }
@@ -283,7 +283,11 @@ impl Firewall {
         self.rules.retain(|r| r.name != rule.name);
     }
 
-    pub fn handle_keys(&mut self, key_event: KeyEvent) -> AppResult<()> {
+    pub fn handle_keys(
+        &mut self,
+        key_event: KeyEvent,
+        sender: kanal::Sender<crate::event::Event>,
+    ) -> AppResult<()> {
         if let Some(user_input) = &mut self.user_input {
             match key_event.code {
                 KeyCode::Esc => {
@@ -296,14 +300,6 @@ impl Firewall {
 
                         if let Some(id) = user_input.id {
                             let rule = self.rules.iter_mut().find(|rule| rule.id == id).unwrap();
-
-                            if rule.enabled {
-                                // set disable notification on previous rule definition
-                                rule.enabled = false;
-                                self.ingress_sender.send(rule.clone())?;
-                            }
-
-                            // update rule with user input
                             rule.name = user_input.name.field.to_string();
                             rule.ip = IpAddr::from_str(user_input.ip.field.value()).unwrap();
                             rule.port =
@@ -360,7 +356,15 @@ impl Firewall {
                 KeyCode::Char('e') => {
                     if let Some(index) = self.state.selected() {
                         let rule = self.rules[index].clone();
-                        self.user_input = Some(rule.into());
+                        if rule.enabled {
+                            Notification::send(
+                                "Can not edit enabled rule",
+                                crate::notification::NotificationLevel::Warning,
+                                sender.clone(),
+                            )?;
+                        } else {
+                            self.user_input = Some(rule.into());
+                        }
                     }
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,9 @@ pub fn handle_key_events(`
`62`	`62`	`app.filter.handle_key_events(key_event, true);`
`63`	`63`	`}`
`64`	`64`	`ActivePopup::NewFirewallRule => {`
`65`		`- app.section.firewall.handle_keys(key_event)?;`
	`65`	`+ app.section`
	`66`	`+ .firewall`
	`67`	`+ .handle_keys(key_event, sender.clone())?;`
`66`	`68`	`app.is_editing = false;`
`67`	`69`	`}`
`68`	`70`	`_ => {}`
`@@ -78,7 +80,12 @@ pub fn handle_key_events(`
`78`	`80`	`}`
`79`	`81`	`}`
`80`	`82`	`ActivePopup::NewFirewallRule => {`
`81`		`- if app.section.firewall.handle_keys(key_event).is_ok() {`
	`83`	`+ if app`
	`84`	`+ .section`
	`85`	`+ .firewall`
	`86`	`+ .handle_keys(key_event, sender.clone())`
	`87`	`+ .is_ok()`
	`88`	`+ {`
`82`	`89`	`app.active_popup = None;`
`83`	`90`	`app.is_editing = false;`
`84`	`91`	`}`
`@@ -91,7 +98,9 @@ pub fn handle_key_events(`
`91`	`98`	`app.filter.handle_key_events(key_event, true);`
`92`	`99`	`}`
`93`	`100`	`ActivePopup::NewFirewallRule => {`
`94`		`- app.section.firewall.handle_keys(key_event)?;`
	`101`	`+ app.section`
	`102`	`+ .firewall`
	`103`	`+ .handle_keys(key_event, sender.clone())?;`
`95`	`104`	`}`
`96`	`105`	`_ => {}`
`97`	`106`	`},`
`@@ -106,7 +115,7 @@ pub fn handle_key_events(`
`106`	`115`	`_ => {}`
`107`	`116`	`}`
`108`	`117`
`109`		`- app.section.handle_keys(key_event)?;`
	`118`	`+ app.section.handle_keys(key_event, sender.clone())?;`
`110`	`119`	`return Ok(());`
`111`	`120`	`}`
`112`	`121`
`@@ -145,14 +154,14 @@ pub fn handle_key_events(`
`145`	`154`	`KeyCode::Char('/') => {`
`146`	`155`	`if app.section.focused_section == FocusedSection::Inspection {`
`147`	`156`	`app.is_editing = true;`
`148`		`- app.section.handle_keys(key_event)?;`
	`157`	`+ app.section.handle_keys(key_event, sender.clone())?;`
`149`	`158`	`}`
`150`	`159`	`}`
`151`	`160`
`152`	`161`	`KeyCode::Char('n') \| KeyCode::Char('e') => {`
`153`	`162`	`if app.section.focused_section == FocusedSection::Firewall {`
`154`	`163`	`app.is_editing = true;`
`155`		`- app.section.handle_keys(key_event)?;`
	`164`	`+ app.section.handle_keys(key_event, sender)?;`
`156`	`165`	`app.active_popup = Some(ActivePopup::NewFirewallRule);`
`157`	`166`	`}`
`158`	`167`	`}`
`@@ -187,7 +196,7 @@ pub fn handle_key_events(`
`187`	`196`	`}`
`188`	`197`	`}`
`189`	`198`	`_ => {`
`190`		`- app.section.handle_keys(key_event)?;`
	`199`	`+ app.section.handle_keys(key_event, sender.clone())?;`
`191`	`200`	`}`
`192`	`201`	`}`
`193`	`202`