colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wifi: mark WEP connections incompatible if supplicant lacks capability

Browse Source 
This allows us to reject activation of WEP profiles very early,
also providing a reasonable error code to the client:

  $ nmcli d wifi connect test
  Error: Failed to add/activate new connection: wpa_supplicant does not support WEP encryption
This commit is contained in:
Lubomir Rintel
2022-03-08 12:21:48 +01:00
parent 41d03a1b17
commit feee84aac4
1 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/core/devices/wifi/nm-device-wifi.c
View File

@@ -978,14 +978,16 @@ deactivate_reset_hw_addr(NMDevice *device)
static gboolean
check_connection_compatible(NMDevice *device, NMConnection *connection, GError **error)
{
NMDeviceWifi *self = NM_DEVICE_WIFI(device);
NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE(self);
NMSettingWireless *s_wireless;
const char *mac;
const char *const *mac_blacklist;
int i;
const char *mode;
const char *perm_hw_addr;
NMDeviceWifi *self = NM_DEVICE_WIFI(device);
NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE(self);
NMSettingWireless *s_wireless;
NMSettingWirelessSecurity *s_wsec;
const char *mac;
const char *const *mac_blacklist;
int i;
const char *mode;
const char *perm_hw_addr;
const char *key_mgmt;
if (!NM_DEVICE_CLASS(nm_device_wifi_parent_class)
->check_connection_compatible(device, connection, error))
@@ -1070,6 +1072,20 @@ check_connection_compatible(NMDevice *device, NMConnection *connection, GError *
}
}
s_wsec = nm_connection_get_setting_wireless_security(connection);
if (s_wsec) {
key_mgmt = nm_setting_wireless_security_get_key_mgmt(s_wsec);
if (nm_supplicant_interface_get_capability(priv->sup_iface, NM_SUPPL_CAP_TYPE_WEP)
== NM_TERNARY_FALSE
&& NM_IN_STRSET(key_mgmt, "ieee8021x", "none")) {
nm_utils_error_set_literal(error,
NM_UTILS_ERROR_CONNECTION_AVAILABLE_TEMPORARY,
"wpa_supplicant does not support WEP encryption");
return FALSE;
}
}
// FIXME: check channel/freq/band against bands the hardware supports
// FIXME: check encryption against device capabilities
// FIXME: check bitrate against device capabilities