Skip to content

Fix crash on captive portal Wi-Fi by ensuring NMConnection is fully initialized #354

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
stsdc merged 2 commits into from
Nov 23, 2025
Merged

Fix crash on captive portal Wi-Fi by ensuring NMConnection is fully initialized #354

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ae663a
Fix crash on captive portal Wi-Fi by ensuring NMConnection is fully i…
barunespadhy Nov 16, 2025
7adda81
Removed redundant if condition
barunespadhy Nov 23, 2025
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
23 changes: 12 additions & 11 deletions src/Widgets/WifiInterface.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,15 +264,22 @@ public class Network.WifiInterface : Network.WidgetNMInterface {
}

var flags = i.ap.get_wpa_flags () | i.ap.get_rsn_flags ();
var is_secured = true;
var is_secured = flags != NM.@80211ApSecurityFlags.NONE;

var connection = NM.SimpleConnection.new ();

if (flags != NM.@80211ApSecurityFlags.NONE) {
var s_con = new NM.SettingConnection ();
s_con.uuid = NM.Utils.uuid_generate ();
connection.add_setting (s_con);
// Always create a proper connection and wireless setting for libnma
var s_con = new NM.SettingConnection ();
s_con.uuid = NM.Utils.uuid_generate ();
s_con.id = NM.Utils.ssid_to_utf8 (i.ap.get_ssid ().get_data ());
s_con.type = NM.SettingWireless.SETTING_NAME;
connection.add_setting (s_con);

var s_wifi = new NM.SettingWireless ();
s_wifi.ssid = i.ap.get_ssid ();
connection.add_setting (s_wifi);

if (is_secured) {
if (NM.@80211ApSecurityFlags.KEY_MGMT_OWE in flags ||
NM.@80211ApSecurityFlags.KEY_MGMT_OWE_TM in flags) {
var s_wsec = new NM.SettingWirelessSecurity ();
Expand All @@ -286,10 +293,6 @@ public class Network.WifiInterface : Network.WidgetNMInterface {
connection.add_setting (s_wsec);
}

var s_wifi = new NM.SettingWireless ();
s_wifi.ssid = i.ap.get_ssid ();
connection.add_setting (s_wifi);

// If the AP is WPA[2]-Enterprise then we need to set up a minimal 802.1x setting before
// prompting the user to configure the authentication, otherwise, the dialog works out
// what sort of credentials to prompt for automatically
Expand All @@ -303,9 +306,7 @@ public class Network.WifiInterface : Network.WidgetNMInterface {
s_8021x.phase2_auth = "mschapv2";
connection.add_setting (s_8021x);
}
}

if (is_secured) {
// In theory, we could just activate normal WEP/WPA connections without spawning a WifiDialog
// and NM would create its own dialog, but Mutter's focus stealing prevention often hides it
// so we spawn our own
Expand Down