Skip to content

Refacto #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vimlinuz merged 14 commits into from
Feb 18, 2026
Merged

Refacto #32

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8cf63b0
dry
vimlinuz Feb 17, 2026
99f6cbd
mod
vimlinuz Feb 17, 2026
d196e52
removed redundent option as it as there by default
vimlinuz Feb 17, 2026
605baf6
update docs
vimlinuz Feb 17, 2026
045a30d
fix: typo
vimlinuz Feb 17, 2026
6f2d489
disconnection status returned
vimlinuz Feb 17, 2026
cd1b2d9
refacto: delete handling mappings
vimlinuz Feb 18, 2026
e02f6b8
refacto: handle delete confirmation key mappings
vimlinuz Feb 18, 2026
b706285
refacto: help handler key maps
vimlinuz Feb 18, 2026
0de8576
refacto: update the keys for saved connection handler
vimlinuz Feb 18, 2026
513e02b
refacto: update password handler key maps
vimlinuz Feb 18, 2026
3e14fe5
refacto: update ssid handler keymaps
vimlinuz Feb 18, 2026
7fe30d9
refacto: update status handler keymap
vimlinuz Feb 18, 2026
1a04e6c
fix: typo
vimlinuz Feb 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ All notable changes to this project will be documented in this file.

- Added a flag to indicate whether the app is scanning the networks or not.
- Changed the type of list that was send to the scan_networks function from main App `struct` to be `RwLock` wrapped type rather than Arc wrapped type.
- Removed the redundent key press kind.

@coderabbitai coderabbitai Bot Feb 17, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Typo: "redundent" → "redundant".

🧰 Tools
🪛 LanguageTool

[grammar] ~21-~21: Ensure spelling is correct
Context: ...er than Arc wrapped type. - Removed the redundent key press kind. ### Changed - Changed...

(QB_NEW_EN_ORTHOGRAPHY_ERROR_IDS_1)

🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In `@CHANGELOG.md` at line 21, Fix the typo in the CHANGELOG entry: replace the
phrase "Removed the redundent key press kind." with "Removed the redundant key
press kind." so the word "redundent" is corrected to "redundant" in the
CHANGELOG.md entry.


### Changed

Expand Down
69 changes: 13 additions & 56 deletions src/apps/core/delete_handler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ use super::App;
use crate::utils::delete_connection::delete_connection;
use crate::utils::scan::scan_networks;

use crossterm::event::KeyEventKind::Press;
use crossterm::event::{self, Event, KeyCode, KeyEvent, poll};
use std::io;
use std::time::Duration;
Expand All @@ -27,69 +26,27 @@ impl App {
/// // let _ = app.handle_delete_confirmation();
/// ```
pub fn handle_delete_confirmation(&mut self) -> io::Result<()> {
if poll(Duration::from_micros(1))? {
match event::read()? {
Event::Key(KeyEvent {
code: KeyCode::Enter,
kind: Press,
..
}) => {
if poll(Duration::from_micros(1))?
&& let Event::Key(KeyEvent {
code, modifiers, ..
}) = event::read()?
{
match (code, modifiers) {
(KeyCode::Enter, _) | (KeyCode::Char('Y'), _) | (KeyCode::Char('y'), _) => {
self.delete_connection();
}
Event::Key(KeyEvent {
code: KeyCode::Char('Y'),
kind: Press,
..
}) => {
self.delete_connection();
}
Event::Key(KeyEvent {
code: KeyCode::Char('y'),
kind: Press,
..
}) => {
self.delete_connection();
}
Event::Key(KeyEvent {
code: KeyCode::Char('N'),
kind: Press,
..
}) => {
self.flags.show_delete_confirmation = false;
}
Event::Key(KeyEvent {
code: KeyCode::Char('n'),
kind: Press,
..
}) => {
(KeyCode::Char('N'), _)
| (KeyCode::Char('n'), _)
| (KeyCode::Esc, _)
| (KeyCode::Char('q'), _) => {
self.flags.show_delete_confirmation = false;
}
Event::Key(KeyEvent {
code: KeyCode::Char('c'),
kind: Press,
modifiers: event::KeyModifiers::CONTROL,
..
}) => {
(KeyCode::Char('c'), event::KeyModifiers::CONTROL) => {
self.exit();
}
Event::Key(KeyEvent {
code: KeyCode::Esc,
kind: Press,
..
}) => {
self.flags.show_delete_confirmation = false;
}
Event::Key(KeyEvent {
code: KeyCode::Char('q'),
kind: Press,
..
}) => {
self.flags.show_delete_confirmation = false;
}

_ => {}
}
};
}
Ok(())
}
/// Delete the currently selected connection and refresh the network list.
Expand Down
123 changes: 31 additions & 92 deletions src/apps/core/event_handlers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
use super::App;
use crate::utils::scan::scan_networks;

use crossterm::event::KeyEventKind::Press;
use crossterm::event::{self, Event, KeyCode, KeyEvent, KeyModifiers, poll};
use std::io;
use std::time::Duration;
Expand All @@ -27,120 +26,60 @@ impl App {
/// app.handle_events().unwrap();
/// ```
pub fn handle_events(&mut self) -> io::Result<()> {
if poll(Duration::from_micros(1))? {
match event::read()? {
Event::Key(KeyEvent {
code: KeyCode::Char('h'),
kind: Press,
..
}) => {
if poll(Duration::from_micros(1))?
&& let Event::Key(KeyEvent {
code, modifiers, ..
}) = event::read()?
{
match (code, modifiers) {
(KeyCode::Char('h'), _) => {
self.flags.show_help = true;
}

Event::Key(KeyEvent {
code: KeyCode::Char('?'),
kind: Press,
..
}) => {
(KeyCode::Char('?'), _) => {
self.flags.show_help = true;
}
Event::Key(KeyEvent {
code: KeyCode::Esc,
kind: Press,
..
}) => {
(KeyCode::Esc, _) => {
self.exit();
}
Event::Key(KeyEvent {
code: KeyCode::Char('c'),
modifiers: KeyModifiers::CONTROL,
kind: Press,
..
}) => {
(KeyCode::Char('c'), KeyModifiers::CONTROL) => {
self.exit();
}
Event::Key(KeyEvent {
code: KeyCode::Char('r'),
modifiers: KeyModifiers::CONTROL,
kind: Press,
..
}) => {
(KeyCode::Char('r'), KeyModifiers::CONTROL) => {
scan_networks(self.wifi_list.clone(), self.flags.is_scanning.clone());
}
Event::Key(KeyEvent {
code: KeyCode::Enter,
kind: Press,
..
}) => {
self.prepare_to_connect();
}
Event::Key(KeyEvent {
code: KeyCode::Char('o'),
kind: Press,
..
}) => {
(KeyCode::Char('o'), _) | (KeyCode::Enter, _) => {
self.prepare_to_connect();
}
Event::Key(KeyEvent {
code: KeyCode::Up,
kind: Press,
..
}) => {
(KeyCode::Up, _) | (KeyCode::Char('k'), _) => {
self.update_selected_network(-1);
}
Event::Key(KeyEvent {
code: KeyCode::Down,
kind: Press,
..
}) => {
(KeyCode::Down, _) | (KeyCode::Char('j'), _) => {
self.update_selected_network(1);
}
// vim style
Event::Key(KeyEvent {
code: KeyCode::Char('k'),
kind: Press,
..
}) => {
self.update_selected_network(-1);
}
Event::Key(KeyEvent {
code: KeyCode::Char('j'),
kind: Press,
..
}) => {
self.update_selected_network(1);
(KeyCode::Char('d'), _) => {
self.set_delete_confirmation();
}
Event::Key(KeyEvent {
code: KeyCode::Char('d'),
kind: Press,
..
}) => {
if self
.wifi_list
.read()
.expect("Wifi list lock poisoned while deleting")[self.selected]
.is_saved
{
self.flags.show_delete_confirmation = true;
}
}
Event::Key(KeyEvent {
code: KeyCode::Char('s'),
kind: Press,
..
}) => {
(KeyCode::Char('s'), _) => {
self.open_saved_list();
}
Event::Key(KeyEvent {
code: KeyCode::Char('x'),
kind: Press,
..
}) => {
(KeyCode::Char('x'), _) => {
self.disconnect();
}
_ => {}
};
}
}

Ok(())
}

fn set_delete_confirmation(&mut self) {
if self
.wifi_list
.read()
.expect("Wifi list lock poisoned while deleting")[self.selected]
.is_saved
{
self.flags.show_delete_confirmation = true;
}
}
Comment on lines +75 to +84

@coderabbitai coderabbitai Bot Feb 18, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

🧩 Analysis chain

🏁 Script executed:

rg -n 'self\.selected' --type rust -C 3

Repository: santoshxshrestha/nmtui

Length of output: 5479

🏁 Script executed:

# Also check for list length checks or boundary validations
rg -n 'wifi_list.*len\|selected.*<\|selected.*>=\|selected.*bounds' --type rust -C 2

Repository: santoshxshrestha/nmtui

Length of output: 48

🏁 Script executed:

# Look at the broader structure - find the struct definition and related methods
rg -n 'struct.*EventHandler\|selected.*:' --type rust -A 5 | head -100

Repository: santoshxshrestha/nmtui

Length of output: 48

🏁 Script executed:

# Find where wifi_list is written/cleared/updated
rg -n 'wifi_list.*write\|wifi_list.*clear\|wifi_list.*=\|refresh.*wifi' --type rust -B 2 -A 3

Repository: santoshxshrestha/nmtui

Length of output: 48

🏁 Script executed:

# Find set_delete_confirmation calls and delete-related flow
rg -n 'set_delete_confirmation\|delete_confirmation' --type rust -B 2 -A 2

Repository: santoshxshrestha/nmtui

Length of output: 48

🏁 Script executed:

# Check for any list length validation before direct indexing
rg -n 'if.*selected.*<\|selected.*>=\|len.*>.*selected' --type rust

Repository: santoshxshrestha/nmtui

Length of output: 48

🏁 Script executed:

# Look for refresh or update patterns more broadly
rg -n 'refresh\|update\|refresh_wifi' --type rust -B 1 -A 2

Repository: santoshxshrestha/nmtui

Length of output: 48

🏁 Script executed:

# Read the event_handlers.rs file to understand context
cat -n src/apps/core/event_handlers.rs | head -120

Repository: santoshxshrestha/nmtui

Length of output: 3550

🏁 Script executed:

# Search for event enum or what triggers delete confirmation
rg -n 'DeleteConfirm\|Delete.*Event\|Event::' --type rust -B 1 -A 1

Repository: santoshxshrestha/nmtui

Length of output: 48

🏁 Script executed:

# Find scan_networks implementation
rg -n 'fn scan_networks' --type rust -A 20

Repository: santoshxshrestha/nmtui

Length of output: 1316

🏁 Script executed:

# Look for where scan_networks updates the wifi_list
rg -n 'scan_networks\|wifi_list.write' --type rust -B 2 -A 3

Repository: santoshxshrestha/nmtui

Length of output: 48

🏁 Script executed:

# Get the full scan_networks function
cat -n src/utils/scan.rs | head -80

Repository: santoshxshrestha/nmtui

Length of output: 2599

🏁 Script executed:

# Look for where the wifi_list is actually written in scan_networks
rg -n 'wifi_list.write' --type rust -B 2 -A 5

Repository: santoshxshrestha/nmtui

Length of output: 944

Add bounds check to prevent panic if self.selected exceeds wifi_list length after rescan.

The vulnerable flow: user selects a network (e.g., index 5), rescans with Ctrl+R yielding fewer networks, then immediately presses 'd' without navigating. The set_delete_confirmation() method will panic on [self.selected] when the list is shorter.

Use .get(self.selected) to safely handle this:

Proposed fix 
    fn set_delete_confirmation(&mut self) {
-       if self
-           .wifi_list
-           .read()
-           .expect("Wifi list lock poisoned while deleting")[self.selected]
-           .is_saved
-       {
-           self.flags.show_delete_confirmation = true;
+       let list = self.wifi_list.read().expect("Wifi list lock poisoned while deleting");
+       if let Some(network) = list.get(self.selected) {
+           if network.is_saved {
+               self.flags.show_delete_confirmation = true;
+           }
        }
    }

Similar unsafe indexing exists in prepare_to_connect() and delete_handler.rs — consider applying the same defensive pattern there.

📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
fn set_delete_confirmation(&mut self) {
if self
.wifi_list
.read()
.expect("Wifi list lock poisoned while deleting")[self.selected]
.is_saved
{
self.flags.show_delete_confirmation = true;
}
}
fn set_delete_confirmation(&mut self) {
let list = self.wifi_list.read().expect("Wifi list lock poisoned while deleting");
if let Some(network) = list.get(self.selected) {
if network.is_saved {
self.flags.show_delete_confirmation = true;
}
}
}
🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In `@src/apps/core/event_handlers.rs` around lines 75 - 84, The current
set_delete_confirmation method unsafely indexes into wifi_list using
self.selected which can panic if the list was rescanned and is shorter; change
the access to use wifi_list.read().expect(...).get(self.selected) and
early-return if it is None, then check the is_saved flag on the Option's value
before setting flags.show_delete_confirmation; apply the same defensive pattern
(use .get(self.selected) + early return) in prepare_to_connect and the delete
handler functions in delete_handler.rs to prevent similar out-of-bounds panics.

}
39 changes: 11 additions & 28 deletions src/apps/core/help_handlers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,39 +20,22 @@ impl App {
/// app.handle_help().unwrap();
/// ```
pub fn handle_help(&mut self) -> io::Result<()> {
if poll(Duration::from_micros(1))? {
match event::read()? {
Event::Key(KeyEvent {
code: event::KeyCode::Esc,
kind: event::KeyEventKind::Press,
..
}) => {
if poll(Duration::from_micros(1))?
&& let Event::Key(KeyEvent {
code, modifiers, ..
}) = event::read()?
{
match (code, modifiers) {
(event::KeyCode::Esc, _)
| (event::KeyCode::Enter, _)
| (event::KeyCode::Char('q'), _) => {
self.close_help();
}
Event::Key(KeyEvent {
code: event::KeyCode::Enter,
kind: event::KeyEventKind::Press,
..
}) => {
self.close_help();
}
Event::Key(KeyEvent {
code: event::KeyCode::Char('q'),
kind: event::KeyEventKind::Press,
..
}) => {
self.close_help();
}
Event::Key(KeyEvent {
code: event::KeyCode::Char('c'),
kind: event::KeyEventKind::Press,
modifiers: event::KeyModifiers::CONTROL,
..
}) => {
(event::KeyCode::Char('c'), event::KeyModifiers::CONTROL) => {
self.exit();
}
_ => {}
};
}
}
Ok(())
}
Expand Down
Loading
Loading