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

ifcfg-rh: don't check for errors reading team settings in ifcfg-rh

Browse source 
We have nm_setting_verify() for a purpose.

The checks that ifcfg-rh reader does are either

  - redundant (and thus unnecessary)

  - wrong (and thus we cannot read valid settings)

  - should belong to libnm's nm_setting_verify().

NMSettingTeam/NMSettingTeamPort are already very libraral and don't do
almost any strict validation. Previously, ifcfg reader would be even more
liberal. If there is totally invalid data in the profile, reading the profile
should fail.
This commit is contained in:
Thomas Haller 2019-05-13 11:40:43 +02:00
parent 966e0db8d7
commit d31622a63e
3 changed files with 25 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
po/POTFILES.in
View file

@ -173,3 +173,4 @@ src/nm-logging.c
src/nm-manager.c
src/settings/plugins/ibft/nms-ibft-plugin.c
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c

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

@ -4862,62 +4862,27 @@ bond_connection_from_ifcfg (const char *file,
return connection;
}
/* Check 'error' for errors. Missing config (NULL return value) is a valid case. */
static char *
read_team_config (shvarFile *ifcfg, const char *key, GError **error)
{
gs_free_error GError *local_error = NULL;
gs_free char *value = NULL;
size_t l;
value = svGetValueStr_cp (ifcfg, key);
if (!value)
return NULL;
l = strlen (value);
if (l > 1*1024*1024) {
g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION,
"%s too long (size %zd)", key, l);
return NULL;
}
if (!nm_utils_is_json_object (value, &local_error)) {
PARSE_WARNING ("ignoring invalid team configuration: %s", local_error->message);
return NULL;
}
return g_steal_pointer (&value);
}
static NMSetting *
make_team_setting (shvarFile *ifcfg,
const char *file,
GError **error)
{
NMSettingTeam *s_team;
char *value;
GError *local_err = NULL;
NMSetting *s_team;
gs_free char *value_device = NULL;
gs_free char *value = NULL;
value = svGetValueStr_cp (ifcfg, "DEVICE");
if (!value) {
if (!svGetValueStr (ifcfg, "DEVICE", &value_device)) {
g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION,
"mandatory DEVICE keyword missing");
return NULL;
}
g_free (value);
value = read_team_config (ifcfg, "TEAM_CONFIG", &local_err);
if (local_err) {
g_propagate_error (error, local_err);
return NULL;
}
s_team = NM_SETTING_TEAM (nm_setting_team_new ());
g_object_set (s_team, NM_SETTING_TEAM_CONFIG, value, NULL);
g_free (value);
return (NMSetting *) s_team;
s_team = nm_setting_team_new ();
g_object_set (s_team,
NM_SETTING_TEAM_CONFIG,
svGetValue (ifcfg, "TEAM_CONFIG", &value),
NULL);
return s_team;
}
static NMConnection *
@ -5276,20 +5241,18 @@ make_bridge_port_setting (shvarFile *ifcfg)
static NMSetting *
make_team_port_setting (shvarFile *ifcfg)
{
NMSetting *s_port = NULL;
char *value;
GError *error = NULL;
NMSetting *s_port;
gs_free char *value = NULL;
value = read_team_config (ifcfg, "TEAM_PORT_CONFIG", &error);
if (value) {
s_port = nm_setting_team_port_new ();
g_object_set (s_port, NM_SETTING_TEAM_PORT_CONFIG, value, NULL);
g_free (value);
} else if (error) {
PARSE_WARNING ("%s", error->message);
g_error_free (error);
}
value = svGetValueStr_cp (ifcfg, "TEAM_PORT_CONFIG");
if (!value)
return NULL;
s_port = nm_setting_team_port_new ();
g_object_set (s_port,
NM_SETTING_TEAM_PORT_CONFIG,
value,
NULL);
return s_port;
}
@ -5902,12 +5865,10 @@ connection_from_file_full (const char *filename,
if (s_match)
nm_connection_add_setting (connection, s_match);
/* Bridge port? */
s_port = make_bridge_port_setting (main_ifcfg);
if (s_port)
nm_connection_add_setting (connection, s_port);
/* Team port? */
s_port = make_team_port_setting (main_ifcfg);
if (s_port)
nm_connection_add_setting (connection, s_port);

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

@ -8938,25 +8938,12 @@ static void
test_read_team_master_invalid (gconstpointer user_data)
{
const char *const PATH_NAME = user_data;
NMConnection *connection;
NMSettingConnection *s_con;
NMSettingTeam *s_team;
gs_free_error GError *error = NULL;
NMTST_EXPECT_NM_WARN ("*ignoring invalid team configuration*");
connection = _connection_from_file (PATH_NAME, NULL, TYPE_ETHERNET, NULL);
g_test_assert_expected_messages ();
_connection_from_file_fail (PATH_NAME, NULL, TYPE_ETHERNET, &error);
g_assert_cmpstr (nm_connection_get_interface_name (connection), ==, "team0");
s_con = nm_connection_get_setting_connection (connection);
g_assert (s_con);
g_assert_cmpstr (nm_setting_connection_get_connection_type (s_con), ==, NM_SETTING_TEAM_SETTING_NAME);
s_team = nm_connection_get_setting_team (connection);
g_assert (s_team);
g_assert (nm_setting_team_get_config (s_team) == NULL);
g_object_unref (connection);
g_assert_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY);
g_assert (strstr (error->message, "JSON"));
}
static void