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

keyfile: handle different connections with the same ID

Browse source 
Since keyfile uses the connection's ID as the filename by default,
we could run into a situation where two connections with the same
ID are visible to different users.  We don't want one connection
overwriting the other in that case, so we need to pick a new name
for one of them.  Append the connection's UUID to the end to
minimize the risk of further conflicts for that name.
This commit is contained in:
Dan Williams 2011-02-09 18:09:47 -06:00
parent eddc66e36d
commit 275e5c5e62
2 changed files with 30 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
system-settings/plugins/keyfile/nm-keyfile-connection.c
View file

@ -114,12 +114,11 @@ commit_changes (NMSettingsConnection *connection,
return;
}
if (g_strcmp0 (priv->path, path)) {
/* Update the filename if it changed */
/* Update the filename if it changed */
if (path) {
g_free (priv->path);
priv->path = path;
} else
g_free (path);
}
NM_SETTINGS_CONNECTION_CLASS (nm_keyfile_connection_parent_class)->commit_changes (connection,
callback,

32
system-settings/plugins/keyfile/writer.c
View file

@ -700,7 +700,7 @@ _internal_write_connection (NMConnection *connection,
char *data;
gsize len;
gboolean success = FALSE;
char *filename, *path;
char *filename = NULL, *path;
const char *id;
if (out_path)
@ -721,9 +721,28 @@ _internal_write_connection (NMConnection *connection,
filename = _writer_id_to_filename (id);
path = g_build_filename (keyfile_dir, filename, NULL);
g_free (filename);
/* If the file already exists */
/* If a file with this path already exists (but isn't the existing path
* of the connection) then we need another name. Multiple connections
* can have the same ID (ie if two connections with the same ID are visible
* to different users) but of course can't have the same path. Yeah,
* there's a race here, but there's not a lot we can do about it, and
* we shouldn't get more than one connection with the same UUID either.
*/
if (g_file_test (path, G_FILE_TEST_EXISTS) && (g_strcmp0 (path, existing_path) != 0)) {
/* A keyfile with this connection's ID already exists. Pick another name. */
g_free (path);
path = g_strdup_printf ("%s/%s-%s", keyfile_dir, filename, nm_connection_get_uuid (connection));
if (g_file_test (path, G_FILE_TEST_EXISTS)) {
/* Hmm, this is odd. Give up. */
g_set_error (error, KEYFILE_PLUGIN_ERROR, 0,
"%s.%d: could not find suitable keyfile file name (%s already used)",
__FILE__, __LINE__, path);
g_free (path);
goto out;
}
}
g_file_set_contents (path, data, len, error);
if (chown (path, owner_uid, owner_grp) < 0) {
@ -738,14 +757,17 @@ _internal_write_connection (NMConnection *connection,
__LINE__, path, errno);
unlink (path);
} else {
if (out_path)
*out_path = g_strdup (path);
if (out_path && g_strcmp0 (existing_path, path)) {
*out_path = path; /* pass path out to caller */
path = NULL;
}
success = TRUE;
}
}
g_free (path);
out:
g_free (filename);
g_free (data);
g_key_file_free (key_file);
return success;