fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-28 15:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ifcfg-rh: merge branch 'bg/ifcfg-rh-wep-key-type-rh1518177'

Browse source 
https://bugzilla.redhat.com/show_bug.cgi?id=1518177
(cherry picked from commit 16f3946ee7)
This commit is contained in:
Beniamino Galvani 2017-12-04 16:02:17 +01:00
commit f5e34b4051
4 changed files with 90 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libnm-core/nm-setting-wireless-security.c
View file

@ -1814,10 +1814,11 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting
**/
/* ---ifcfg-rh---
* property: wep-key-type
* variable: KEY<i> or KEY_PASSPHRASE<i>(+)
* variable: KEY<i> or KEY_PASSPHRASE<i>(+); KEY_TYPE(+)
* description: KEY is used for "key" type (10 or 26 hexadecimal characters,
* or 5 or 13 character string prefixed with "s:"). KEY_PASSPHRASE is used
* for WEP passphrases.
* for WEP passphrases. KEY_TYPE specifies the key type and can be either
* 'key' or 'passphrase'. KEY_TYPE is redundant and can be omitted.
* example: KEY1=s:ahoj, KEY1=0a1c45bc02, KEY_PASSPHRASE1=mysupersecretkey
* ---end---
*/

131
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
View file

@ -2336,54 +2336,39 @@ add_one_wep_key (shvarFile *ifcfg,
NMSettingWirelessSecurity *s_wsec,
GError **error)
{
char *key = NULL;
char *value = NULL;
gboolean success = FALSE;
gs_free char *value_free = NULL;
const char *value;
const char *key = NULL;
g_return_val_if_fail (ifcfg != NULL, FALSE);
g_return_val_if_fail (shvar_key != NULL, FALSE);
g_return_val_if_fail (key_idx <= 3, FALSE);
g_return_val_if_fail (s_wsec != NULL, FALSE);
value = svGetValueStr_cp (ifcfg, shvar_key);
value = svGetValueStr (ifcfg, shvar_key, &value_free);
if (!value)
return TRUE;
/* Validate keys */
if (passphrase) {
if (strlen (value) && strlen (value) < 64) {
key = g_strdup (value);
g_object_set (G_OBJECT (s_wsec),
NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE,
NM_WEP_KEY_TYPE_PASSPHRASE,
NULL);
}
if (value[0] && strlen (value) < 64)
key = value;
} else {
if (strlen (value) == 10 || strlen (value) == 26) {
if (NM_IN_SET (strlen (value), 10, 26)) {
/* Hexadecimal WEP key */
char *p = value;
while (*p) {
if (!g_ascii_isxdigit (*p)) {
g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION,
"Invalid hexadecimal WEP key.");
goto out;
}
p++;
if (NM_STRCHAR_ANY (value, ch, !g_ascii_isxdigit (ch))) {
g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION,
"Invalid hexadecimal WEP key.");
return FALSE;
}
key = g_strdup (value);
key = value;
} else if ( !strncmp (value, "s:", 2)
&& (strlen (value) == 7 || strlen (value) == 15)) {
&& NM_IN_SET (strlen (value), 7, 15)) {
/* ASCII key */
char *p = value + 2;
while (*p) {
if (!g_ascii_isprint ((int) (*p))) {
g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION,
"Invalid ASCII WEP key.");
goto out;
}
p++;
if (NM_STRCHAR_ANY (value + 2, ch, !g_ascii_isprint (ch))) {
g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION,
"Invalid ASCII WEP key.");
return FALSE;
}
/* Remove 's:' prefix.
@ -2392,51 +2377,50 @@ add_one_wep_key (shvarFile *ifcfg,
* before passing to wpa_supplicant, this prevents two unnecessary conversions. And mainly,
* ASCII WEP key doesn't change to HEX WEP key in UI, which could confuse users.
*/
key = g_strdup (value + 2);
key = value + 2;
}
}
if (key) {
nm_setting_wireless_security_set_wep_key (s_wsec, key_idx, key);
g_free (key);
success = TRUE;
} else {
if (!key) {
g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION,
"Invalid WEP key length.");
return FALSE;
}
out:
g_free (value);
return success;
nm_setting_wireless_security_set_wep_key (s_wsec, key_idx, key);
return TRUE;
}
static gboolean
read_wep_keys (shvarFile *ifcfg,
NMWepKeyType key_type,
guint8 def_idx,
NMSettingWirelessSecurity *s_wsec,
GError **error)
{
/* Try hex/ascii keys first */
if (!add_one_wep_key (ifcfg, "KEY1", 0, FALSE, s_wsec, error))
return FALSE;
if (!add_one_wep_key (ifcfg, "KEY2", 1, FALSE, s_wsec, error))
return FALSE;
if (!add_one_wep_key (ifcfg, "KEY3", 2, FALSE, s_wsec, error))
return FALSE;
if (!add_one_wep_key (ifcfg, "KEY4", 3, FALSE, s_wsec, error))
return FALSE;
if (!add_one_wep_key (ifcfg, "KEY", def_idx, FALSE, s_wsec, error))
return FALSE;
if (key_type != NM_WEP_KEY_TYPE_PASSPHRASE) {
if (!add_one_wep_key (ifcfg, "KEY1", 0, FALSE, s_wsec, error))
return FALSE;
if (!add_one_wep_key (ifcfg, "KEY2", 1, FALSE, s_wsec, error))
return FALSE;
if (!add_one_wep_key (ifcfg, "KEY3", 2, FALSE, s_wsec, error))
return FALSE;
if (!add_one_wep_key (ifcfg, "KEY4", 3, FALSE, s_wsec, error))
return FALSE;
if (!add_one_wep_key (ifcfg, "KEY", def_idx, FALSE, s_wsec, error))
return FALSE;
}
/* And then passphrases */
if (!add_one_wep_key (ifcfg, "KEY_PASSPHRASE1", 0, TRUE, s_wsec, error))
return FALSE;
if (!add_one_wep_key (ifcfg, "KEY_PASSPHRASE2", 1, TRUE, s_wsec, error))
return FALSE;
if (!add_one_wep_key (ifcfg, "KEY_PASSPHRASE3", 2, TRUE, s_wsec, error))
return FALSE;
if (!add_one_wep_key (ifcfg, "KEY_PASSPHRASE4", 3, TRUE, s_wsec, error))
return FALSE;
if (key_type != NM_WEP_KEY_TYPE_KEY) {
if (!add_one_wep_key (ifcfg, "KEY_PASSPHRASE1", 0, TRUE, s_wsec, error))
return FALSE;
if (!add_one_wep_key (ifcfg, "KEY_PASSPHRASE2", 1, TRUE, s_wsec, error))
return FALSE;
if (!add_one_wep_key (ifcfg, "KEY_PASSPHRASE3", 2, TRUE, s_wsec, error))
return FALSE;
if (!add_one_wep_key (ifcfg, "KEY_PASSPHRASE4", 3, TRUE, s_wsec, error))
return FALSE;
}
return TRUE;
}
@ -2501,19 +2485,40 @@ make_wep_setting (shvarFile *ifcfg,
/* Read keys in the ifcfg file if they are system-owned */
if (key_flags == NM_SETTING_SECRET_FLAG_NONE) {
if (!read_wep_keys (ifcfg, default_key_idx, s_wsec, error))
NMWepKeyType key_type;
const char *v;
gs_free char *to_free = NULL;
v = svGetValueStr (ifcfg, "KEY_TYPE", &to_free);
if (!v)
key_type = NM_WEP_KEY_TYPE_UNKNOWN;
else if (nm_streq (v, "key"))
key_type = NM_WEP_KEY_TYPE_KEY;
else if (nm_streq (v, "passphrase"))
key_type = NM_WEP_KEY_TYPE_PASSPHRASE;
else {
g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION,
"Invalid KEY_TYPE value '%s'", v);
return FALSE;
}
if (!read_wep_keys (ifcfg, key_type, default_key_idx, s_wsec, error))
return NULL;
/* Try to get keys from the "shadow" key file */
keys_ifcfg = utils_get_keys_ifcfg (file, FALSE);
if (keys_ifcfg) {
if (!read_wep_keys (keys_ifcfg, default_key_idx, s_wsec, error)) {
if (!read_wep_keys (keys_ifcfg, key_type, default_key_idx, s_wsec, error)) {
svCloseFile (keys_ifcfg);
return NULL;
}
svCloseFile (keys_ifcfg);
g_assert (error == NULL || *error == NULL);
}
g_object_set (G_OBJECT (s_wsec),
NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE, key_type,
NULL);
}
value = svGetValueStr_cp (ifcfg, "SECURITYMODE");

19
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
View file

@ -662,12 +662,26 @@ write_wireless_security_setting (NMConnection *connection,
/* And write the new ones out */
if (wep) {
NMWepKeyType key_type;
const char *key_type_str = NULL;
/* Default WEP TX key index */
svSetValueInt64 (ifcfg, "DEFAULTKEY", nm_setting_wireless_security_get_wep_tx_keyidx(s_wsec) + 1);
for (i = 0; i < 4; i++) {
NMWepKeyType key_type;
key_type = nm_setting_wireless_security_get_wep_key_type (s_wsec);
switch (key_type) {
case NM_WEP_KEY_TYPE_KEY:
key_type_str = "key";
break;
case NM_WEP_KEY_TYPE_PASSPHRASE:
key_type_str = "passphrase";
break;
case NM_WEP_KEY_TYPE_UNKNOWN:
break;
}
svSetValue (ifcfg, "KEY_TYPE", key_type_str);
for (i = 0; i < 4; i++) {
key = nm_setting_wireless_security_get_wep_key (s_wsec, i);
if (key) {
gs_free char *ascii_key = NULL;
@ -678,7 +692,6 @@ write_wireless_security_setting (NMConnection *connection,
* are some passphrases that are indistinguishable from WEP hex
* keys.
*/
key_type = nm_setting_wireless_security_get_wep_key_type (s_wsec);
if (key_type == NM_WEP_KEY_TYPE_UNKNOWN) {
if (nm_utils_wep_key_valid (key, NM_WEP_KEY_TYPE_KEY))
key_type = NM_WEP_KEY_TYPE_KEY;

4
src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
View file

@ -2686,7 +2686,7 @@ test_read_wifi_wep_passphrase (void)
g_assert (s_wsec);
g_assert_cmpstr (nm_setting_wireless_security_get_key_mgmt (s_wsec), ==, "none");
g_assert_cmpint (nm_setting_wireless_security_get_wep_tx_keyidx (s_wsec), ==, 0);
g_assert_cmpint (nm_setting_wireless_security_get_wep_key_type (s_wsec), ==, NM_WEP_KEY_TYPE_PASSPHRASE);
g_assert_cmpint (nm_setting_wireless_security_get_wep_key_type (s_wsec), ==, NM_WEP_KEY_TYPE_UNKNOWN);
g_assert_cmpstr (nm_setting_wireless_security_get_wep_key (s_wsec, 0), ==, "foobar222blahblah");
g_assert (!nm_setting_wireless_security_get_wep_key (s_wsec, 1));
g_assert (!nm_setting_wireless_security_get_wep_key (s_wsec, 2));
@ -5758,6 +5758,7 @@ test_write_wifi_wep_40_ascii (void)
g_object_set (s_wsec,
NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "none",
NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX, 2,
NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE, NM_WEP_KEY_TYPE_KEY,
NM_SETTING_WIRELESS_SECURITY_AUTH_ALG, "shared",
NULL);
nm_setting_wireless_security_set_wep_key (s_wsec, 0, "lorem");
@ -5845,6 +5846,7 @@ test_write_wifi_wep_104_ascii (void)
g_object_set (s_wsec,
NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "none",
NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX, 0,
NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE, NM_WEP_KEY_TYPE_UNKNOWN,
NM_SETTING_WIRELESS_SECURITY_AUTH_ALG, "open",
NULL);
nm_setting_wireless_security_set_wep_key (s_wsec, 0, "LoremIpsumSit");