Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ env_logger = "0.11"
strum = { version = "0.27.2", features = ["derive"] }
strum_macros = "0.27"
libc = "0.2"
hex = "0.4.3"

[profile.release]
strip = true
Expand Down
1 change: 1 addition & 0 deletions Release.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
## TBA

- Show all the configured networks
- Encode network names correctly

## 0.5.0 - 2025-11-21

Expand Down
10 changes: 10 additions & 0 deletions src/mode/station/auth/entreprise.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,16 @@ fn pad_string(input: &str, length: usize) -> String {
}
}

fn iwd_network_name(name: &str) -> String {
match name
.chars()
.all(|c| c.is_ascii_alphanumeric() || c == '-' || c == '_' || c == ' ')
{
true => name.to_string(),
false => format!("={}", hex::encode(name)),
}
}

#[derive(Debug, Clone, Default)]
struct UserInputField {
field: Input,
Expand Down
3 changes: 2 additions & 1 deletion src/mode/station/auth/entreprise/peap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use ratatui::{

use tui_input::backend::crossterm::EventHandler;

use crate::mode::station::auth::entreprise::{ERROR_PADDING, UserInputField};
use crate::mode::station::auth::entreprise::{ERROR_PADDING, UserInputField, iwd_network_name};

fn pad_string(input: &str, length: usize) -> String {
let current_length = input.chars().count();
Expand Down Expand Up @@ -182,6 +182,7 @@ impl PEAP {

pub fn apply(&mut self, network_name: &str) -> Result<()> {
self.validate()?;
let network_name = iwd_network_name(network_name);
let mut file = OpenOptions::new()
.write(true)
.read(true)
Expand Down
4 changes: 2 additions & 2 deletions src/mode/station/auth/entreprise/pwd.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use ratatui::{

use tui_input::{Input, backend::crossterm::EventHandler};

use crate::mode::station::auth::entreprise::ERROR_PADDING;
use crate::mode::station::auth::entreprise::{ERROR_PADDING, iwd_network_name};

fn pad_string(input: &str, length: usize) -> String {
let current_length = input.chars().count();
Expand Down Expand Up @@ -101,7 +101,7 @@ impl PWD {

pub fn apply(&mut self, network_name: &str) -> Result<()> {
self.validate()?;

let network_name = iwd_network_name(network_name);
let mut file = OpenOptions::new()
.write(true)
.read(true)
Expand Down
3 changes: 2 additions & 1 deletion src/mode/station/auth/entreprise/tls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use ratatui::{

use tui_input::{Input, backend::crossterm::EventHandler};

use crate::mode::station::auth::entreprise::ERROR_PADDING;
use crate::mode::station::auth::entreprise::{ERROR_PADDING, iwd_network_name};

fn pad_string(input: &str, length: usize) -> String {
let current_length = input.chars().count();
Expand Down Expand Up @@ -165,6 +165,7 @@ impl TLS {

pub fn apply(&mut self, network_name: &str) -> Result<()> {
self.validate()?;
let network_name = iwd_network_name(network_name);
let mut file = OpenOptions::new()
.write(true)
.read(true)
Expand Down
5 changes: 4 additions & 1 deletion src/mode/station/auth/entreprise/ttls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ use ratatui::{

use tui_input::backend::crossterm::EventHandler;

use crate::mode::station::auth::entreprise::{ERROR_PADDING, UserInputField, pad_string};
use crate::mode::station::auth::entreprise::{
ERROR_PADDING, UserInputField, iwd_network_name, pad_string,
};

#[derive(Debug, Clone, PartialEq, Default, strum_macros::Display)]
enum Phase2Method {
Expand Down Expand Up @@ -175,6 +177,7 @@ impl TTLS {

pub fn apply(&mut self, network_name: &str) -> Result<()> {
self.validate()?;
let network_name = iwd_network_name(network_name);
let mut file = OpenOptions::new()
.write(true)
.read(true)
Expand Down