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

config: avoid conflicts of /run config dir with other directories

Browse Source 
The user can configure the configuration paths via command line
arguments. If the user configures /var/run/NetworkManager/conf.d
as --system-config-dir or --config-dir, avoid using it as run-config
directory.

Yes, this doesn't catch

  NetworkManager --config-dir=/etc/NetworkManager/conf.d \
          --system-config-dir=/etc/NetworkManager/conf.d/
This commit is contained in:
Thomas Haller
2016-10-23 12:36:06 +02:00
parent 3248b387a2
commit b8b47babd2
1 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/nm-config.c
View File

@@ -959,6 +959,7 @@ read_entire_config (const NMConfigCmdLineOptions *cli,
gs_unref_ptrarray GPtrArray *run_confs = NULL; gs_unref_ptrarray GPtrArray *run_confs = NULL;
guint i; guint i;
gs_free char *o_config_main_file = NULL; gs_free char *o_config_main_file = NULL;
const char *run_config_dir = "";
g_return_val_if_fail (config_dir, NULL); g_return_val_if_fail (config_dir, NULL);
g_return_val_if_fail (system_config_dir, NULL); g_return_val_if_fail (system_config_dir, NULL);
@@ -966,17 +967,22 @@ read_entire_config (const NMConfigCmdLineOptions *cli,
g_return_val_if_fail (!out_config_description || !*out_config_description, NULL); g_return_val_if_fail (!out_config_description || !*out_config_description, NULL);
g_return_val_if_fail (!error || !*error, FALSE); g_return_val_if_fail (!error || !*error, FALSE);
if ( (""RUN_CONFIG_DIR)[0] == '/'
&& !nm_streq (RUN_CONFIG_DIR, system_config_dir)
&& !nm_streq (RUN_CONFIG_DIR, config_dir))
run_config_dir = RUN_CONFIG_DIR;
/* create a default configuration file. */ /* create a default configuration file. */
keyfile = nm_config_create_keyfile (); keyfile = nm_config_create_keyfile ();
system_confs = _get_config_dir_files (system_config_dir); system_confs = _get_config_dir_files (system_config_dir);
confs = _get_config_dir_files (config_dir); confs = _get_config_dir_files (config_dir);
run_confs = _get_config_dir_files (RUN_CONFIG_DIR); run_confs = _get_config_dir_files (run_config_dir);
for (i = 0; i < system_confs->len; ) { for (i = 0; i < system_confs->len; ) {
const char *filename = system_confs->pdata[i]; const char *filename = system_confs->pdata[i];
/* if a same named file exists in config_dir or RUN_CONFIG_DIR, skip it. */ /* if a same named file exists in config_dir or run_config_dir, skip it. */
if (_nm_utils_strv_find_first ((char **) confs->pdata, confs->len, filename) >= 0 || if (_nm_utils_strv_find_first ((char **) confs->pdata, confs->len, filename) >= 0 ||
_nm_utils_strv_find_first ((char **) run_confs->pdata, run_confs->len, filename) >= 0) { _nm_utils_strv_find_first ((char **) run_confs->pdata, run_confs->len, filename) >= 0) {
g_ptr_array_remove_index (system_confs, i); g_ptr_array_remove_index (system_confs, i);
@@ -997,7 +1003,7 @@ read_entire_config (const NMConfigCmdLineOptions *cli,
continue; continue;
} }
if (!read_config (keyfile, FALSE, RUN_CONFIG_DIR, filename, error)) if (!read_config (keyfile, FALSE, run_config_dir, filename, error))
return NULL; return NULL;
i++; i++;
} }
@@ -2250,31 +2256,24 @@ init_sync (GInitable *initable, GCancellable *cancellable, GError **error)
char *config_description = NULL; char *config_description = NULL;
gs_strfreev char **no_auto_default = NULL; gs_strfreev char **no_auto_default = NULL;
gboolean intern_config_needs_rewrite; gboolean intern_config_needs_rewrite;
const char *s;
if (priv->config_dir) { if (priv->config_dir) {
/* Object is already initialized. */ /* Object is already initialized. */
if (priv->config_data) if (priv->config_data)
return TRUE; return TRUE;
g_set_error (error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_NOT_FOUND, "unspecified error"); g_set_error (error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_NOT_FOUND, "unspecified error");
return FALSE; g_return_val_if_reached (FALSE);
} }
if (priv->cli.config_dir) s = priv->cli.config_dir ?: ""DEFAULT_CONFIG_DIR;
priv->config_dir = g_strdup (priv->cli.config_dir); priv->config_dir = g_strdup (s[0] == '/' ? s : "");
else
priv->config_dir = g_strdup (DEFAULT_CONFIG_DIR);
if (priv->cli.system_config_dir) s = priv->cli.system_config_dir ?: ""DEFAULT_SYSTEM_CONFIG_DIR;
priv->system_config_dir = g_strdup (priv->cli.system_config_dir); if ( s[0] != '/'
else || nm_streq (s, priv->config_dir))
priv->system_config_dir = g_strdup (DEFAULT_SYSTEM_CONFIG_DIR); s = "";
priv->system_config_dir = g_strdup (s);
if (strcmp (priv->config_dir, priv->system_config_dir) == 0) {
/* having the same directory twice makes no sense. In that case, clear
* @system_config_dir. */
g_free (priv->system_config_dir);
priv->system_config_dir = g_strdup ("");
}
if (priv->cli.intern_config_file) if (priv->cli.intern_config_file)
priv->intern_config_file = g_strdup (priv->cli.intern_config_file); priv->intern_config_file = g_strdup (priv->cli.intern_config_file);