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

cli: sanitize team config before setting it into property

Browse Source 
Replace '\r' and '\n' chareacter with a space in the configuration.
libteamdctl sends the config to team daemon using its usock interface that
separates parameters with '\n'.

Related: rh #1051517
This commit is contained in:
Jiří Klimeš
2014-03-05 13:59:17 +01:00
parent cf5e759978
commit 08ed6c5be2
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cli/src/common.c
View File

@@ -907,6 +907,17 @@ nmc_bond_validate_mode (const char *mode, GError **error)
return nmc_string_is_valid (mode, valid_modes, error); return nmc_string_is_valid (mode, valid_modes, error);
} }
/*
* nmc_team_check_config:
* @config: file name with team config, or raw team JSON config data
* @out_config: raw team JSON config data (with removed new-line characters)
* @error: location to store error, or %NUL
*
* Check team config from @config parameter and return the checked/sanitized
* config in @out_config.
*
* Returns: %TRUE if the config is valid, %FALSE if it is invalid
*/
gboolean gboolean
nmc_team_check_config (const char *config, char **out_config, GError **error) nmc_team_check_config (const char *config, char **out_config, GError **error)
{ {
@@ -936,7 +947,7 @@ nmc_team_check_config (const char *config, char **out_config, GError **error)
g_free (contents); g_free (contents);
return FALSE; return FALSE;
} }
*out_config = contents; *out_config = g_strdelimit (contents, "\r\n", ' ');
return TRUE; return TRUE;
} }