mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-15 04:24:32 +00:00
a247281168
* libnm-util/nm-connection.h libnm-util/nm-connection.c - (nm_connection_need_secrets): add argument to return hints * src/nm-device-802-11-wireless.c - (link_timeout_cb, supplicant_connection_timeout_cb, real_act_stage2_config, real_act_stage4_ip_config_timeout): handle nm_connection_need_secrets() change git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3072 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
545 lines
14 KiB
C
545 lines
14 KiB
C
/* -*- Mode: C; tab-width: 5; indent-tabs-mode: t; c-basic-offset: 5 -*- */
|
|
|
|
#include <glib-object.h>
|
|
#include <dbus/dbus-glib.h>
|
|
#include <string.h>
|
|
#include "nm-connection.h"
|
|
#include "nm-utils.h"
|
|
|
|
#include "nm-setting-connection.h"
|
|
#include "nm-setting-ip4-config.h"
|
|
#include "nm-setting-ppp.h"
|
|
#include "nm-setting-wired.h"
|
|
#include "nm-setting-wireless.h"
|
|
#include "nm-setting-wireless-security.h"
|
|
#include "nm-setting-vpn.h"
|
|
#include "nm-setting-vpn-properties.h"
|
|
|
|
typedef struct {
|
|
GHashTable *settings;
|
|
} NMConnectionPrivate;
|
|
|
|
#define NM_CONNECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_CONNECTION, NMConnectionPrivate))
|
|
|
|
G_DEFINE_TYPE (NMConnection, nm_connection, G_TYPE_OBJECT)
|
|
|
|
enum {
|
|
SECRETS_UPDATED,
|
|
|
|
LAST_SIGNAL
|
|
};
|
|
|
|
static guint signals[LAST_SIGNAL] = { 0 };
|
|
|
|
static GHashTable *registered_settings = NULL;
|
|
|
|
static void
|
|
register_default_settings (void)
|
|
{
|
|
int i;
|
|
const struct {
|
|
const char *name;
|
|
GType type;
|
|
} default_map[] = {
|
|
{ NM_SETTING_CONNECTION_SETTING_NAME, NM_TYPE_SETTING_CONNECTION },
|
|
{ NM_SETTING_WIRED_SETTING_NAME, NM_TYPE_SETTING_WIRED },
|
|
{ NM_SETTING_WIRELESS_SETTING_NAME, NM_TYPE_SETTING_WIRELESS },
|
|
{ NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_TYPE_SETTING_IP4_CONFIG },
|
|
{ NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, NM_TYPE_SETTING_WIRELESS_SECURITY },
|
|
{ NM_SETTING_PPP_SETTING_NAME, NM_TYPE_SETTING_PPP },
|
|
{ NM_SETTING_VPN_SETTING_NAME, NM_TYPE_SETTING_VPN },
|
|
{ NM_SETTING_VPN_PROPERTIES_SETTING_NAME, NM_TYPE_SETTING_VPN_PROPERTIES },
|
|
{ NULL }
|
|
};
|
|
|
|
nm_utils_register_value_transformations ();
|
|
|
|
for (i = 0; default_map[i].name; i++)
|
|
nm_setting_register (default_map[i].name, default_map[i].type);
|
|
}
|
|
|
|
void
|
|
nm_setting_register (const char *name, GType type)
|
|
{
|
|
g_return_if_fail (name != NULL);
|
|
g_return_if_fail (G_TYPE_IS_INSTANTIATABLE (type));
|
|
|
|
if (!registered_settings)
|
|
registered_settings = g_hash_table_new_full (g_str_hash, g_str_equal,
|
|
(GDestroyNotify) g_free,
|
|
(GDestroyNotify) g_free);
|
|
|
|
if (g_hash_table_lookup (registered_settings, name))
|
|
g_warning ("Already have a creator function for '%s', overriding", name);
|
|
|
|
g_hash_table_insert (registered_settings, g_strdup (name), g_strdup (g_type_name (type)));
|
|
}
|
|
|
|
void
|
|
nm_setting_unregister (const char *name)
|
|
{
|
|
if (registered_settings)
|
|
g_hash_table_remove (registered_settings, name);
|
|
}
|
|
|
|
static GType
|
|
nm_connection_lookup_setting_type (const char *name)
|
|
{
|
|
char *type_name;
|
|
GType type;
|
|
|
|
type_name = (char *) g_hash_table_lookup (registered_settings, name);
|
|
if (type_name) {
|
|
type = g_type_from_name (type_name);
|
|
if (!type)
|
|
g_warning ("Can not get type for '%s'.", type_name);
|
|
} else {
|
|
type = 0;
|
|
g_warning ("Unknown setting '%s'", name);
|
|
}
|
|
|
|
return type;
|
|
}
|
|
|
|
NMSetting *
|
|
nm_connection_create_setting (const char *name)
|
|
{
|
|
GType type;
|
|
NMSetting *setting = NULL;
|
|
|
|
g_return_val_if_fail (name != NULL, NULL);
|
|
|
|
type = nm_connection_lookup_setting_type (name);
|
|
if (type)
|
|
setting = (NMSetting *) g_object_new (type, NULL);
|
|
|
|
return setting;
|
|
}
|
|
|
|
static void
|
|
parse_one_setting (gpointer key, gpointer value, gpointer user_data)
|
|
{
|
|
NMConnection *connection = (NMConnection *) user_data;
|
|
GType type;
|
|
NMSetting *setting = NULL;
|
|
|
|
type = nm_connection_lookup_setting_type ((char *) key);
|
|
if (type)
|
|
setting = nm_setting_from_hash (type, (GHashTable *) value);
|
|
if (setting)
|
|
nm_connection_add_setting (connection, setting);
|
|
}
|
|
|
|
void
|
|
nm_connection_add_setting (NMConnection *connection, NMSetting *setting)
|
|
{
|
|
g_return_if_fail (NM_IS_CONNECTION (connection));
|
|
g_return_if_fail (NM_IS_SETTING (setting));
|
|
|
|
g_hash_table_insert (NM_CONNECTION_GET_PRIVATE (connection)->settings,
|
|
g_strdup (G_OBJECT_TYPE_NAME (setting)), setting);
|
|
}
|
|
|
|
NMSetting *
|
|
nm_connection_get_setting (NMConnection *connection, GType type)
|
|
{
|
|
g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
|
|
g_return_val_if_fail (g_type_is_a (type, NM_TYPE_SETTING), NULL);
|
|
|
|
return (NMSetting *) g_hash_table_lookup (NM_CONNECTION_GET_PRIVATE (connection)->settings,
|
|
g_type_name (type));
|
|
}
|
|
|
|
NMSetting *
|
|
nm_connection_get_setting_by_name (NMConnection *connection, const char *name)
|
|
{
|
|
GType type;
|
|
|
|
g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
|
|
g_return_val_if_fail (name != NULL, NULL);
|
|
|
|
type = nm_connection_lookup_setting_type (name);
|
|
|
|
return type ? nm_connection_get_setting (connection, type) : NULL;
|
|
}
|
|
|
|
gboolean
|
|
nm_connection_replace_settings (NMConnection *connection,
|
|
GHashTable *new_settings)
|
|
{
|
|
g_return_val_if_fail (NM_IS_CONNECTION (connection), FALSE);
|
|
g_return_val_if_fail (new_settings != NULL, FALSE);
|
|
|
|
g_hash_table_remove_all (NM_CONNECTION_GET_PRIVATE (connection)->settings);
|
|
g_hash_table_foreach (new_settings, parse_one_setting, connection);
|
|
|
|
if (!nm_connection_verify (connection)) {
|
|
g_warning ("Settings invalid.");
|
|
return FALSE;
|
|
}
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
typedef struct {
|
|
NMConnection *other;
|
|
gboolean failed;
|
|
} CompareConnectionInfo;
|
|
|
|
static void
|
|
compare_one_setting (gpointer key, gpointer value, gpointer user_data)
|
|
{
|
|
NMSetting *setting = (NMSetting *) value;
|
|
CompareConnectionInfo *info = (CompareConnectionInfo *) user_data;
|
|
NMSetting *other_setting;
|
|
|
|
if (info->failed)
|
|
return;
|
|
|
|
other_setting = nm_connection_get_setting (info->other, G_OBJECT_TYPE (setting));
|
|
if (other_setting)
|
|
info->failed = nm_setting_compare (setting, other_setting) ? FALSE : TRUE;
|
|
else
|
|
info->failed = TRUE;
|
|
}
|
|
|
|
gboolean
|
|
nm_connection_compare (NMConnection *connection, NMConnection *other)
|
|
{
|
|
NMConnectionPrivate *priv;
|
|
CompareConnectionInfo info = { other, FALSE };
|
|
|
|
if (!connection && !other)
|
|
return TRUE;
|
|
|
|
if (!connection || !other)
|
|
return FALSE;
|
|
|
|
priv = NM_CONNECTION_GET_PRIVATE (connection);
|
|
g_hash_table_foreach (priv->settings, compare_one_setting, &info);
|
|
if (info.failed == FALSE) {
|
|
/* compare A to B, then if that is the same compare B to A to ensure
|
|
* that keys that are in B but not A will make the comparison fail.
|
|
*/
|
|
info.failed = FALSE;
|
|
info.other = connection;
|
|
priv = NM_CONNECTION_GET_PRIVATE (other);
|
|
g_hash_table_foreach (priv->settings, compare_one_setting, &info);
|
|
}
|
|
|
|
return info.failed ? FALSE : TRUE;
|
|
}
|
|
|
|
typedef struct {
|
|
gboolean success;
|
|
GSList *all_settings;
|
|
} VerifySettingsInfo;
|
|
|
|
static void
|
|
verify_one_setting (gpointer data, gpointer user_data)
|
|
{
|
|
NMSetting *setting = NM_SETTING (data);
|
|
VerifySettingsInfo *info = (VerifySettingsInfo *) user_data;
|
|
|
|
if (info->success)
|
|
info->success = nm_setting_verify (setting, info->all_settings);
|
|
}
|
|
|
|
static void
|
|
hash_values_to_slist (gpointer key, gpointer value, gpointer user_data)
|
|
{
|
|
GSList **list = (GSList **) user_data;
|
|
|
|
*list = g_slist_prepend (*list, value);
|
|
}
|
|
|
|
gboolean
|
|
nm_connection_verify (NMConnection *connection)
|
|
{
|
|
NMConnectionPrivate *priv;
|
|
NMSetting *connection_setting;
|
|
VerifySettingsInfo info;
|
|
|
|
g_return_val_if_fail (NM_IS_CONNECTION (connection), FALSE);
|
|
|
|
priv = NM_CONNECTION_GET_PRIVATE (connection);
|
|
|
|
/* First, make sure there's at least 'connection' setting */
|
|
connection_setting = nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION);
|
|
if (!connection_setting) {
|
|
g_warning ("'connection' setting not present.");
|
|
return FALSE;
|
|
}
|
|
|
|
/* Now, run the verify function of each setting */
|
|
info.success = TRUE;
|
|
info.all_settings = NULL;
|
|
g_hash_table_foreach (priv->settings, hash_values_to_slist, &info.all_settings);
|
|
|
|
g_slist_foreach (info.all_settings, verify_one_setting, &info);
|
|
g_slist_free (info.all_settings);
|
|
|
|
return info.success;
|
|
}
|
|
|
|
void
|
|
nm_connection_update_secrets (NMConnection *connection,
|
|
const char *setting_name,
|
|
GHashTable *secrets)
|
|
{
|
|
NMSetting *setting;
|
|
|
|
g_return_if_fail (NM_IS_CONNECTION (connection));
|
|
g_return_if_fail (setting_name != NULL);
|
|
g_return_if_fail (secrets != NULL);
|
|
|
|
setting = nm_connection_get_setting (connection, nm_connection_lookup_setting_type (setting_name));
|
|
if (!setting) {
|
|
g_warning ("Unhandled settings object for secrets update.");
|
|
return;
|
|
}
|
|
|
|
nm_setting_update_secrets (setting, secrets);
|
|
g_signal_emit (connection, signals[SECRETS_UPDATED], 0, setting_name);
|
|
}
|
|
|
|
typedef struct NeedSecretsInfo {
|
|
GPtrArray *secrets;
|
|
NMSetting *setting;
|
|
} NeedSecretsInfo;
|
|
|
|
static void
|
|
need_secrets_check (gpointer key, gpointer data, gpointer user_data)
|
|
{
|
|
NMSetting *setting = NM_SETTING (data);
|
|
NeedSecretsInfo *info = (NeedSecretsInfo *) user_data;
|
|
|
|
// FIXME: allow more than one setting to say it needs secrets
|
|
if (info->secrets)
|
|
return;
|
|
|
|
info->secrets = nm_setting_need_secrets (setting);
|
|
if (info->secrets)
|
|
info->setting = setting;
|
|
}
|
|
|
|
const char *
|
|
nm_connection_need_secrets (NMConnection *connection,
|
|
GPtrArray **hints)
|
|
{
|
|
NMConnectionPrivate *priv;
|
|
NeedSecretsInfo info = { NULL, NULL };
|
|
|
|
g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
|
|
|
|
priv = NM_CONNECTION_GET_PRIVATE (connection);
|
|
g_hash_table_foreach (priv->settings, need_secrets_check, &info);
|
|
|
|
// FIXME: do something with requested secrets rather than asking for
|
|
// all of them. Maybe make info.secrets a hash table mapping
|
|
// settings name :: [list of secrets key names].
|
|
if (info.secrets) {
|
|
if (hints)
|
|
*hints = info.secrets;
|
|
else
|
|
g_ptr_array_free (info.secrets, TRUE);
|
|
|
|
return nm_setting_get_name (info.setting);
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
static void
|
|
clear_setting_secrets (gpointer key, gpointer data, gpointer user_data)
|
|
{
|
|
nm_setting_clear_secrets (NM_SETTING (data));
|
|
}
|
|
|
|
void
|
|
nm_connection_clear_secrets (NMConnection *connection)
|
|
{
|
|
NMConnectionPrivate *priv;
|
|
|
|
g_return_if_fail (NM_IS_CONNECTION (connection));
|
|
|
|
priv = NM_CONNECTION_GET_PRIVATE (connection);
|
|
g_hash_table_foreach (priv->settings, clear_setting_secrets, NULL);
|
|
}
|
|
|
|
static void
|
|
add_one_setting_to_hash (gpointer key, gpointer data, gpointer user_data)
|
|
{
|
|
NMSetting *setting = (NMSetting *) data;
|
|
GHashTable *connection_hash = (GHashTable *) user_data;
|
|
GHashTable *setting_hash;
|
|
|
|
g_return_if_fail (setting != NULL);
|
|
g_return_if_fail (connection_hash != NULL);
|
|
|
|
setting_hash = nm_setting_to_hash (setting);
|
|
if (setting_hash)
|
|
g_hash_table_insert (connection_hash,
|
|
g_strdup (setting->name),
|
|
setting_hash);
|
|
}
|
|
|
|
GHashTable *
|
|
nm_connection_to_hash (NMConnection *connection)
|
|
{
|
|
NMConnectionPrivate *priv;
|
|
GHashTable *connection_hash;
|
|
|
|
g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
|
|
|
|
connection_hash = g_hash_table_new_full (g_str_hash, g_str_equal,
|
|
g_free, (GDestroyNotify) g_hash_table_destroy);
|
|
|
|
priv = NM_CONNECTION_GET_PRIVATE (connection);
|
|
g_hash_table_foreach (priv->settings, add_one_setting_to_hash, connection_hash);
|
|
|
|
/* Don't send empty hashes */
|
|
if (g_hash_table_size (connection_hash) < 1) {
|
|
g_hash_table_destroy (connection_hash);
|
|
connection_hash = NULL;
|
|
}
|
|
|
|
return connection_hash;
|
|
}
|
|
|
|
typedef struct ForEachValueInfo {
|
|
NMSettingValueIterFn func;
|
|
gpointer user_data;
|
|
} ForEachValueInfo;
|
|
|
|
static void
|
|
for_each_setting (gpointer key, gpointer value, gpointer user_data)
|
|
{
|
|
ForEachValueInfo *info = (ForEachValueInfo *) user_data;
|
|
|
|
nm_setting_enumerate_values (NM_SETTING (value), info->func, info->user_data);
|
|
}
|
|
|
|
void
|
|
nm_connection_for_each_setting_value (NMConnection *connection,
|
|
NMSettingValueIterFn func,
|
|
gpointer user_data)
|
|
{
|
|
NMConnectionPrivate *priv;
|
|
ForEachValueInfo *info;
|
|
|
|
g_return_if_fail (NM_IS_CONNECTION (connection));
|
|
g_return_if_fail (func != NULL);
|
|
|
|
priv = NM_CONNECTION_GET_PRIVATE (connection);
|
|
|
|
info = g_slice_new0 (ForEachValueInfo);
|
|
if (!info) {
|
|
g_warning ("Not enough memory to enumerate values.");
|
|
return;
|
|
}
|
|
info->func = func;
|
|
info->user_data = user_data;
|
|
|
|
g_hash_table_foreach (priv->settings, for_each_setting, info);
|
|
|
|
g_slice_free (ForEachValueInfo, info);
|
|
}
|
|
|
|
static void
|
|
dump_setting (gpointer key, gpointer value, gpointer user_data)
|
|
{
|
|
char *str;
|
|
|
|
str = nm_setting_to_string (NM_SETTING (value));
|
|
g_print ("%s\n", str);
|
|
g_free (str);
|
|
}
|
|
|
|
void
|
|
nm_connection_dump (NMConnection *connection)
|
|
{
|
|
GHashTable *hash;
|
|
|
|
g_return_if_fail (NM_IS_CONNECTION (connection));
|
|
|
|
g_hash_table_foreach (NM_CONNECTION_GET_PRIVATE (connection)->settings, dump_setting, NULL);
|
|
}
|
|
|
|
NMConnection *
|
|
nm_connection_new (void)
|
|
{
|
|
GObject *object;
|
|
|
|
if (!registered_settings)
|
|
register_default_settings ();
|
|
|
|
object = g_object_new (NM_TYPE_CONNECTION, NULL);
|
|
|
|
return NM_CONNECTION (object);
|
|
}
|
|
|
|
NMConnection *
|
|
nm_connection_new_from_hash (GHashTable *hash)
|
|
{
|
|
NMConnection *connection;
|
|
NMConnectionPrivate *priv;
|
|
|
|
g_return_val_if_fail (hash != NULL, NULL);
|
|
|
|
connection = nm_connection_new ();
|
|
g_hash_table_foreach (hash, parse_one_setting, connection);
|
|
|
|
priv = NM_CONNECTION_GET_PRIVATE (connection);
|
|
|
|
if (!nm_connection_verify (connection)) {
|
|
g_object_unref (connection);
|
|
return NULL;
|
|
}
|
|
|
|
return connection;
|
|
}
|
|
|
|
static void
|
|
nm_connection_init (NMConnection *connection)
|
|
{
|
|
NMConnectionPrivate *priv = NM_CONNECTION_GET_PRIVATE (connection);
|
|
|
|
priv->settings = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
|
|
}
|
|
|
|
static void
|
|
finalize (GObject *object)
|
|
{
|
|
NMConnection *connection = NM_CONNECTION (object);
|
|
NMConnectionPrivate *priv = NM_CONNECTION_GET_PRIVATE (connection);
|
|
|
|
g_hash_table_destroy (priv->settings);
|
|
priv->settings = NULL;
|
|
|
|
G_OBJECT_CLASS (nm_connection_parent_class)->finalize (object);
|
|
}
|
|
|
|
static void
|
|
nm_connection_class_init (NMConnectionClass *klass)
|
|
{
|
|
GObjectClass *object_class = G_OBJECT_CLASS (klass);
|
|
|
|
g_type_class_add_private (klass, sizeof (NMConnectionPrivate));
|
|
|
|
/* virtual methods */
|
|
object_class->finalize = finalize;
|
|
|
|
/* Signals */
|
|
signals[SECRETS_UPDATED] =
|
|
g_signal_new ("secrets-updated",
|
|
G_OBJECT_CLASS_TYPE (object_class),
|
|
G_SIGNAL_RUN_FIRST,
|
|
G_STRUCT_OFFSET (NMConnectionClass, secrets_updated),
|
|
NULL, NULL,
|
|
g_cclosure_marshal_VOID__STRING,
|
|
G_TYPE_NONE, 1,
|
|
G_TYPE_STRING);
|
|
}
|
|
|