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

iwd: For 8021x networks verify they're IWD Known Networks

Browse Source 
Verify that an 8021x network is preprovisioned on IWD side before
declaring a connection as "available" or "compatible".

Also move the Infrastrucure mode check and the Hidden SSID check in
check_connection_available earlier because even if a compatible AP is
available and the connection can be used with wpa_supplicant, it can't
be used with IWD at this time.
This commit is contained in:
Andrew Zaborowski
2017-12-15 15:38:32 +01:00
committed by Thomas Haller
parent 228508a88c
commit a6c3ffd62e
1 changed files with 42 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/devices/wifi/nm-device-iwd.c
View File

@@ -493,6 +493,13 @@ check_connection_compatible (NMDevice *device, NMConnection *connection)
if (g_strcmp0 (mode, NM_SETTING_WIRELESS_MODE_INFRA) != 0)
return FALSE;
/* 8021x networks can only be used if they've been provisioned on the IWD side and
* thus are Known Networks.
*/
if (get_connection_iwd_security (connection) == NM_IWD_NETWORK_SECURITY_8021X)
if (!is_connection_known_network (connection))
return FALSE;
return TRUE;
}
@@ -517,6 +524,22 @@ check_connection_available (NMDevice *device,
s_wifi = nm_connection_get_setting_wireless (connection);
g_return_val_if_fail (s_wifi, FALSE);
/* Only Infrastrusture mode at this time */
mode = nm_setting_wireless_get_mode (s_wifi);
if (g_strcmp0 (mode, NM_SETTING_WIRELESS_MODE_INFRA) != 0)
return FALSE;
/* Hidden SSIDs not supported yet */
if (nm_setting_wireless_get_hidden (s_wifi))
return FALSE;
/* 8021x networks can only be used if they've been provisioned on the IWD side and
* thus are Known Networks.
*/
if (get_connection_iwd_security (connection) == NM_IWD_NETWORK_SECURITY_8021X)
if (!is_connection_known_network (connection))
return FALSE;
/* a connection that is available for a certain @specific_object, MUST
* also be available in general (without @specific_object). */
@@ -527,15 +550,6 @@ check_connection_available (NMDevice *device,
return ap ? nm_wifi_ap_check_compatible (ap, connection) : FALSE;
}
/* Only Infrastrusture mode at this time */
mode = nm_setting_wireless_get_mode (s_wifi);
if (g_strcmp0 (mode, NM_SETTING_WIRELESS_MODE_INFRA) != 0)
return FALSE;
/* Hidden SSIDs not supported yet */
if (nm_setting_wireless_get_hidden (s_wifi))
return FALSE;
if (NM_FLAGS_HAS (flags, _NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST_IGNORE_AP))
return TRUE;
@@ -653,6 +667,18 @@ complete_connection (NMDevice *device,
if (tmp_ssid)
g_byte_array_unref (tmp_ssid);
/* 8021x networks can only be used if they've been provisioned on the IWD side and
* thus are Known Networks.
*/
if (get_connection_iwd_security (connection) == NM_IWD_NETWORK_SECURITY_8021X)
if (!is_connection_known_network (connection)) {
g_set_error_literal (error,
NM_CONNECTION_ERROR,
NM_DEVICE_ERROR_INVALID_CONNECTION,
"This 8021x network has not been provisioned on this machine");
return FALSE;
}
perm_hw_addr = nm_device_get_permanent_hw_address (device);
if (perm_hw_addr) {
setting_mac = nm_setting_wireless_get_mac_address (s_wifi);
@@ -727,6 +753,13 @@ can_auto_connect (NMDevice *device,
return FALSE;
}
/* 8021x networks can only be used if they've been provisioned on the IWD side and
* thus are Known Networks.
*/
if (get_connection_iwd_security (connection) == NM_IWD_NETWORK_SECURITY_8021X)
if (!is_connection_known_network (connection))
return FALSE;
ap = nm_wifi_aps_find_first_compatible (priv->aps, connection, FALSE);
if (ap) {
/* All good; connection is usable */