diff options
author | Beniamino Galvani <bgalvani@redhat.com> | 2017-01-23 10:47:59 +0100 |
---|---|---|
committer | Beniamino Galvani <bgalvani@redhat.com> | 2017-02-02 13:58:06 +0100 |
commit | e3a81d32597b075816dad2d70eacc337c8f031b4 (patch) | |
tree | 3d59c3476710b902b7ee1e0fe9e66a068ef4980a | |
parent | 5e0d3c81c98c4001fbbfb4afadb9cb1ad0b48185 (diff) | |
download | network-manager-applet-e3a81d32597b075816dad2d70eacc337c8f031b4.tar.gz |
editor: wifi: warn user about unsupported properties
In the Wi-Fi page every time the user saves a connection we replace
the setting with a new one and fill in the properties according to the
UI. This is to ensure that not relevant properties get cleared.
The side effect is also that unsupported properties are not kept after
a save. Warn the user about the properties that will be cleared.
-rw-r--r-- | src/connection-editor/page-wifi-security.c | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/src/connection-editor/page-wifi-security.c b/src/connection-editor/page-wifi-security.c index 08d320a5..800eabf1 100644 --- a/src/connection-editor/page-wifi-security.c +++ b/src/connection-editor/page-wifi-security.c @@ -44,6 +44,52 @@ typedef struct { #define S_ADHOC_VALID_COLUMN 2 #define S_HOTSPOT_VALID_COLUMN 3 +static const char *known_wsec_props[] = { + NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, + NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX, + NM_SETTING_WIRELESS_SECURITY_AUTH_ALG, + NM_SETTING_WIRELESS_SECURITY_PROTO, + NM_SETTING_WIRELESS_SECURITY_PAIRWISE, + NM_SETTING_WIRELESS_SECURITY_GROUP, + NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME, + NM_SETTING_WIRELESS_SECURITY_WEP_KEY0, + NM_SETTING_WIRELESS_SECURITY_WEP_KEY1, + NM_SETTING_WIRELESS_SECURITY_WEP_KEY2, + NM_SETTING_WIRELESS_SECURITY_WEP_KEY3, + NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS, + NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE, + NM_SETTING_WIRELESS_SECURITY_PSK, + NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS, + NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD, + NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS, + NULL +}; + +static const char *known_8021x_props[] = { + NM_SETTING_802_1X_EAP, + NM_SETTING_802_1X_IDENTITY, + NM_SETTING_802_1X_ANONYMOUS_IDENTITY, + NM_SETTING_802_1X_PAC_FILE, + NM_SETTING_802_1X_CA_CERT, + NM_SETTING_802_1X_CA_PATH, + NM_SETTING_802_1X_CLIENT_CERT, + NM_SETTING_802_1X_PHASE1_PEAPVER, + NM_SETTING_802_1X_PHASE2_AUTH, + NM_SETTING_802_1X_PHASE2_AUTHEAP, + NM_SETTING_802_1X_PHASE2_CA_CERT, + NM_SETTING_802_1X_PHASE2_CA_PATH, + NM_SETTING_802_1X_PHASE2_CLIENT_CERT, + NM_SETTING_802_1X_PASSWORD, + NM_SETTING_802_1X_PASSWORD_FLAGS, + NM_SETTING_802_1X_PRIVATE_KEY, + NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD, + NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS, + NM_SETTING_802_1X_PHASE2_PRIVATE_KEY, + NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD, + NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS, + NULL +}; + static gboolean find_proto (NMSettingWirelessSecurity *sec, const char *item) { @@ -406,6 +452,7 @@ ce_page_wifi_security_new (NMConnectionEditor *editor, { CEPageWifiSecurity *self; NMSettingWireless *s_wireless; + NMSetting8021x *s_8021x; NMSettingWirelessSecurity *s_wsec = NULL; NMUtilsSecurityType default_type = NMU_SEC_NONE; @@ -431,6 +478,7 @@ ce_page_wifi_security_new (NMConnectionEditor *editor, CE_PAGE_WIFI_SECURITY_GET_PRIVATE (self)->group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); s_wsec = nm_connection_get_setting_wireless_security (connection); + s_8021x = nm_connection_get_setting_802_1x (connection); if (s_wsec) default_type = get_default_type_for_security (s_wsec); @@ -448,8 +496,11 @@ ce_page_wifi_security_new (NMConnectionEditor *editor, || default_type == NMU_SEC_WPA_ENTERPRISE || default_type == NMU_SEC_WPA2_ENTERPRISE) { *out_secrets_setting_name = NM_SETTING_802_1X_SETTING_NAME; + nm_connection_editor_check_unsupported_properties (editor, (NMSetting *) s_8021x, known_8021x_props); } + nm_connection_editor_check_unsupported_properties (editor, (NMSetting *) s_wsec, known_wsec_props); + g_signal_connect (self, "initialized", G_CALLBACK (finish_setup), NULL); return CE_PAGE (self); |