a525ceb802
* libnm-glib/nm-settings.c libnm-glib/nm-settings.h - Rename the "get_secrets" virtual function "service_get_secrets" to clarify when it's used; NMExportedConnetion is a base-class for both the client and service side, which is sort of confusing, and get_secrets only makes sense on the service side. * libnm-glib/nm-dbus-connection.c - (get_secrets): remove, unused, and clients need to do extra work to get secrets anyway since the call can block on the remote side * system-settings/plugins/ifupdown/nm-ifupdown-connection.c system-settings/plugins/keyfile/nm-keyfile-connection.c - Fix up for get_secrets -> service_get_secrets git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@4192 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
488 lines
13 KiB
C
488 lines
13 KiB
C
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
|
|
|
|
#include <NetworkManager.h>
|
|
#include <nm-utils.h>
|
|
#include <nm-setting-connection.h>
|
|
#include "nm-settings.h"
|
|
#include "nm-dbus-glib-types.h"
|
|
|
|
|
|
/**
|
|
* nm_settings_error_quark:
|
|
*
|
|
* Setting error quark.
|
|
*
|
|
* Returns: the setting error quark
|
|
**/
|
|
GQuark
|
|
nm_settings_error_quark (void)
|
|
{
|
|
static GQuark quark;
|
|
|
|
if (G_UNLIKELY (!quark))
|
|
quark = g_quark_from_static_string ("nm-settings-error-quark");
|
|
return quark;
|
|
}
|
|
|
|
/*
|
|
* NMSettings implementation
|
|
*/
|
|
|
|
static gboolean impl_settings_list_connections (NMSettings *settings, GPtrArray **connections, GError **error);
|
|
|
|
#include "nm-settings-glue.h"
|
|
|
|
#define SETTINGS_CLASS(o) (NM_SETTINGS_CLASS (G_OBJECT_GET_CLASS (o)))
|
|
|
|
G_DEFINE_TYPE (NMSettings, nm_settings, G_TYPE_OBJECT)
|
|
|
|
enum {
|
|
S_NEW_CONNECTION,
|
|
|
|
S_LAST_SIGNAL
|
|
};
|
|
|
|
static guint settings_signals[S_LAST_SIGNAL] = { 0 };
|
|
|
|
static gboolean
|
|
impl_settings_list_connections (NMSettings *settings, GPtrArray **connections, GError **error)
|
|
{
|
|
GSList *list, *iter;
|
|
|
|
g_return_val_if_fail (NM_IS_SETTINGS (settings), FALSE);
|
|
|
|
list = nm_settings_list_connections (settings);
|
|
|
|
*connections = g_ptr_array_new ();
|
|
for (iter = list; iter; iter = iter->next) {
|
|
NMConnection *connection = nm_exported_connection_get_connection (NM_EXPORTED_CONNECTION (iter->data));
|
|
|
|
g_ptr_array_add (*connections, g_strdup (nm_connection_get_path (connection)));
|
|
}
|
|
|
|
g_slist_free (list);
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
static void
|
|
nm_settings_init (NMSettings *settings)
|
|
{
|
|
}
|
|
|
|
static void
|
|
nm_settings_finalize (GObject *object)
|
|
{
|
|
G_OBJECT_CLASS (nm_settings_parent_class)->finalize (object);
|
|
}
|
|
|
|
static void
|
|
nm_settings_class_init (NMSettingsClass *settings_class)
|
|
{
|
|
GObjectClass *object_class = G_OBJECT_CLASS (settings_class);
|
|
|
|
/* virtual methods */
|
|
object_class->finalize = nm_settings_finalize;
|
|
|
|
settings_class->list_connections = NULL;
|
|
|
|
/* signals */
|
|
|
|
/**
|
|
* NMSettings::new-connection:
|
|
* @setting: the setting that received the signal
|
|
* @connection: the new #NMExportedConnection
|
|
*
|
|
* Notifies that a new exported connection is added.
|
|
**/
|
|
settings_signals[S_NEW_CONNECTION] =
|
|
g_signal_new ("new-connection",
|
|
G_OBJECT_CLASS_TYPE (object_class),
|
|
G_SIGNAL_RUN_FIRST,
|
|
G_STRUCT_OFFSET (NMSettingsClass, new_connection),
|
|
NULL, NULL,
|
|
g_cclosure_marshal_VOID__OBJECT,
|
|
G_TYPE_NONE, 1,
|
|
G_TYPE_OBJECT);
|
|
|
|
dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (settings_class),
|
|
&dbus_glib_nm_settings_object_info);
|
|
}
|
|
|
|
/**
|
|
* nm_settings_list_connections:
|
|
* @settings:
|
|
*
|
|
* Lists all the available connections.
|
|
*
|
|
* Returns: the #GSList containing #NMExportedConnection<!-- -->s
|
|
**/
|
|
GSList *
|
|
nm_settings_list_connections (NMSettings *settings)
|
|
{
|
|
GSList *list = NULL;
|
|
|
|
g_return_val_if_fail (NM_IS_SETTINGS (settings), NULL);
|
|
|
|
if (SETTINGS_CLASS (settings)->list_connections)
|
|
list = SETTINGS_CLASS (settings)->list_connections (settings);
|
|
else
|
|
g_warning ("Missing implementation for Settings::list_connections.");
|
|
|
|
return list;
|
|
}
|
|
|
|
void
|
|
nm_settings_signal_new_connection (NMSettings *settings, NMExportedConnection *connection)
|
|
{
|
|
g_return_if_fail (NM_IS_SETTINGS (settings));
|
|
g_return_if_fail (NM_IS_EXPORTED_CONNECTION (connection));
|
|
|
|
g_signal_emit (settings, settings_signals[S_NEW_CONNECTION], 0, connection);
|
|
}
|
|
|
|
/*
|
|
* NMExportedConnection implementation
|
|
*/
|
|
|
|
static gboolean impl_exported_connection_get_settings (NMExportedConnection *connection,
|
|
GHashTable **settings,
|
|
GError **error);
|
|
|
|
static gboolean impl_exported_connection_update (NMExportedConnection *connection,
|
|
GHashTable *new_settings,
|
|
DBusGMethodInvocation *context);
|
|
|
|
static gboolean impl_exported_connection_delete (NMExportedConnection *connection,
|
|
DBusGMethodInvocation *context);
|
|
|
|
static void impl_exported_connection_get_secrets (NMExportedConnection *connection,
|
|
const gchar *setting_name,
|
|
const gchar **hints,
|
|
gboolean request_new,
|
|
DBusGMethodInvocation *context);
|
|
|
|
#include "nm-exported-connection-glue.h"
|
|
|
|
#define EXPORTED_CONNECTION_CLASS(o) (NM_EXPORTED_CONNECTION_CLASS (G_OBJECT_GET_CLASS (o)))
|
|
|
|
G_DEFINE_TYPE (NMExportedConnection, nm_exported_connection, G_TYPE_OBJECT)
|
|
|
|
enum {
|
|
EC_UPDATED,
|
|
EC_REMOVED,
|
|
|
|
EC_LAST_SIGNAL
|
|
};
|
|
|
|
static guint connection_signals[EC_LAST_SIGNAL] = { 0 };
|
|
|
|
enum {
|
|
PROP_0,
|
|
PROP_CONNECTION,
|
|
|
|
LAST_PROP
|
|
};
|
|
|
|
typedef struct {
|
|
NMConnection *wrapped;
|
|
} NMExportedConnectionPrivate;
|
|
|
|
#define NM_EXPORTED_CONNECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
|
|
NM_TYPE_EXPORTED_CONNECTION, \
|
|
NMExportedConnectionPrivate))
|
|
|
|
NMExportedConnection *
|
|
nm_exported_connection_new (NMConnection *wrapped)
|
|
{
|
|
g_return_val_if_fail (NM_IS_CONNECTION (wrapped), NULL);
|
|
|
|
return (NMExportedConnection *) g_object_new (NM_TYPE_EXPORTED_CONNECTION,
|
|
NM_EXPORTED_CONNECTION_CONNECTION, wrapped,
|
|
NULL);
|
|
}
|
|
|
|
static gboolean
|
|
impl_exported_connection_get_settings (NMExportedConnection *connection,
|
|
GHashTable **settings,
|
|
GError **error)
|
|
{
|
|
NMExportedConnectionPrivate *priv;
|
|
|
|
g_return_val_if_fail (NM_IS_EXPORTED_CONNECTION (connection), FALSE);
|
|
|
|
priv = NM_EXPORTED_CONNECTION_GET_PRIVATE (connection);
|
|
|
|
if (!EXPORTED_CONNECTION_CLASS (connection)->get_settings)
|
|
*settings = nm_connection_to_hash (priv->wrapped);
|
|
else
|
|
*settings = EXPORTED_CONNECTION_CLASS (connection)->get_settings (connection);
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
static gboolean
|
|
impl_exported_connection_update (NMExportedConnection *connection,
|
|
GHashTable *new_settings,
|
|
DBusGMethodInvocation *context)
|
|
{
|
|
GError *err = NULL;
|
|
gboolean success;
|
|
|
|
/* A hack to share the DBusGMethodInvocation with the possible overriders of connection::delete */
|
|
g_object_set_data (G_OBJECT (connection), NM_EXPORTED_CONNECTION_DBUS_METHOD_INVOCATION, context);
|
|
success = nm_exported_connection_update (connection, new_settings, &err);
|
|
g_object_set_data (G_OBJECT (connection), NM_EXPORTED_CONNECTION_DBUS_METHOD_INVOCATION, NULL);
|
|
|
|
if (success) {
|
|
dbus_g_method_return (context);
|
|
} else {
|
|
dbus_g_method_return_error (context, err);
|
|
g_error_free (err);
|
|
}
|
|
|
|
return success;
|
|
}
|
|
|
|
static gboolean
|
|
impl_exported_connection_delete (NMExportedConnection *connection,
|
|
DBusGMethodInvocation *context)
|
|
{
|
|
GError *err = NULL;
|
|
gboolean success;
|
|
|
|
/* A hack to share the DBusGMethodInvocation with the possible overriders of connection::delete */
|
|
g_object_set_data (G_OBJECT (connection), NM_EXPORTED_CONNECTION_DBUS_METHOD_INVOCATION, context);
|
|
success = nm_exported_connection_delete (connection, &err);
|
|
g_object_set_data (G_OBJECT (connection), NM_EXPORTED_CONNECTION_DBUS_METHOD_INVOCATION, NULL);
|
|
|
|
if (success) {
|
|
dbus_g_method_return (context);
|
|
} else {
|
|
dbus_g_method_return_error (context, err);
|
|
g_error_free (err);
|
|
}
|
|
|
|
return success;
|
|
}
|
|
|
|
static void
|
|
impl_exported_connection_get_secrets (NMExportedConnection *connection,
|
|
const gchar *setting_name,
|
|
const gchar **hints,
|
|
gboolean request_new,
|
|
DBusGMethodInvocation *context)
|
|
{
|
|
GError *error = NULL;
|
|
|
|
if (!NM_IS_EXPORTED_CONNECTION (connection)) {
|
|
g_set_error (&error, NM_SETTINGS_ERROR, 1,
|
|
"%s.%d - Invalid connection in ConnectionSettings::GetSecrets.",
|
|
__FILE__, __LINE__);
|
|
dbus_g_method_return_error (context, error);
|
|
g_error_free (error);
|
|
return;
|
|
}
|
|
|
|
if (!EXPORTED_CONNECTION_CLASS (connection)->service_get_secrets) {
|
|
g_set_error (&error, NM_SETTINGS_ERROR, 1,
|
|
"%s.%d - Missing implementation for ConnectionSettings::GetSecrets.",
|
|
__FILE__, __LINE__);
|
|
dbus_g_method_return_error (context, error);
|
|
g_error_free (error);
|
|
return;
|
|
}
|
|
|
|
EXPORTED_CONNECTION_CLASS (connection)->service_get_secrets (connection, setting_name, hints, request_new, context);
|
|
}
|
|
|
|
static void
|
|
nm_exported_connection_init (NMExportedConnection *connection)
|
|
{
|
|
}
|
|
|
|
static void
|
|
set_property (GObject *object, guint prop_id,
|
|
const GValue *value, GParamSpec *pspec)
|
|
{
|
|
GObject *connection;
|
|
NMExportedConnectionPrivate *priv = NM_EXPORTED_CONNECTION_GET_PRIVATE (object);
|
|
|
|
switch (prop_id) {
|
|
case PROP_CONNECTION:
|
|
if (priv->wrapped) {
|
|
g_object_unref (priv->wrapped);
|
|
priv->wrapped = NULL;
|
|
}
|
|
|
|
connection = g_value_dup_object (value);
|
|
if (connection)
|
|
priv->wrapped = NM_CONNECTION (connection);
|
|
break;
|
|
default:
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
break;
|
|
}
|
|
}
|
|
|
|
static void
|
|
get_property (GObject *object, guint prop_id,
|
|
GValue *value, GParamSpec *pspec)
|
|
{
|
|
NMExportedConnection *exported = NM_EXPORTED_CONNECTION (object);
|
|
|
|
switch (prop_id) {
|
|
case PROP_CONNECTION:
|
|
g_value_set_object (value, nm_exported_connection_get_connection (exported));
|
|
break;
|
|
default:
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
break;
|
|
}
|
|
}
|
|
|
|
static void
|
|
nm_exported_connection_dispose (GObject *object)
|
|
{
|
|
NMExportedConnectionPrivate *priv = NM_EXPORTED_CONNECTION_GET_PRIVATE (object);
|
|
|
|
if (priv->wrapped) {
|
|
g_object_unref (priv->wrapped);
|
|
priv->wrapped = NULL;
|
|
}
|
|
|
|
G_OBJECT_CLASS (nm_exported_connection_parent_class)->dispose (object);
|
|
}
|
|
|
|
static void
|
|
nm_exported_connection_class_init (NMExportedConnectionClass *exported_connection_class)
|
|
{
|
|
GObjectClass *object_class = G_OBJECT_CLASS (exported_connection_class);
|
|
|
|
g_type_class_add_private (object_class, sizeof (NMExportedConnectionPrivate));
|
|
|
|
/* virtual methods */
|
|
object_class->set_property = set_property;
|
|
object_class->get_property = get_property;
|
|
object_class->dispose = nm_exported_connection_dispose;
|
|
|
|
/* Properties */
|
|
g_object_class_install_property
|
|
(object_class, PROP_CONNECTION,
|
|
g_param_spec_object (NM_EXPORTED_CONNECTION_CONNECTION,
|
|
"Connection",
|
|
"Wrapped connection",
|
|
NM_TYPE_CONNECTION,
|
|
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
|
|
|
|
/* signals */
|
|
connection_signals[EC_UPDATED] =
|
|
g_signal_new ("updated",
|
|
G_OBJECT_CLASS_TYPE (object_class),
|
|
G_SIGNAL_RUN_FIRST,
|
|
G_STRUCT_OFFSET (NMExportedConnectionClass, updated),
|
|
NULL, NULL,
|
|
g_cclosure_marshal_VOID__BOXED,
|
|
G_TYPE_NONE, 1,
|
|
DBUS_TYPE_G_MAP_OF_MAP_OF_VARIANT);
|
|
|
|
connection_signals[EC_REMOVED] =
|
|
g_signal_new ("removed",
|
|
G_OBJECT_CLASS_TYPE (object_class),
|
|
G_SIGNAL_RUN_FIRST,
|
|
G_STRUCT_OFFSET (NMExportedConnectionClass, removed),
|
|
NULL, NULL,
|
|
g_cclosure_marshal_VOID__VOID,
|
|
G_TYPE_NONE, 0);
|
|
|
|
dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (exported_connection_class),
|
|
&dbus_glib_nm_exported_connection_object_info);
|
|
}
|
|
|
|
NMConnection *
|
|
nm_exported_connection_get_connection (NMExportedConnection *connection)
|
|
{
|
|
g_return_val_if_fail (NM_IS_EXPORTED_CONNECTION (connection), NULL);
|
|
|
|
return NM_EXPORTED_CONNECTION_GET_PRIVATE (connection)->wrapped;
|
|
}
|
|
|
|
void
|
|
nm_exported_connection_register_object (NMExportedConnection *connection,
|
|
NMConnectionScope scope,
|
|
DBusGConnection *dbus_connection)
|
|
{
|
|
NMExportedConnectionPrivate *priv;
|
|
static guint32 ec_counter = 0;
|
|
char *path;
|
|
|
|
g_return_if_fail (NM_IS_EXPORTED_CONNECTION (connection));
|
|
g_return_if_fail (dbus_connection != NULL);
|
|
|
|
priv = NM_EXPORTED_CONNECTION_GET_PRIVATE (connection);
|
|
/* Don't allow the connection to be exported twice */
|
|
g_return_if_fail (nm_connection_get_path (priv->wrapped) == NULL);
|
|
|
|
path = g_strdup_printf ("%s/%u", NM_DBUS_PATH_SETTINGS, ec_counter++);
|
|
nm_connection_set_path (priv->wrapped, path);
|
|
nm_connection_set_scope (priv->wrapped, scope);
|
|
|
|
dbus_g_connection_register_g_object (dbus_connection,
|
|
path,
|
|
G_OBJECT (connection));
|
|
g_free (path);
|
|
}
|
|
|
|
gboolean
|
|
nm_exported_connection_update (NMExportedConnection *connection,
|
|
GHashTable *new_settings,
|
|
GError **err)
|
|
{
|
|
gboolean success = TRUE;
|
|
|
|
g_return_val_if_fail (NM_IS_EXPORTED_CONNECTION (connection), FALSE);
|
|
g_return_val_if_fail (new_settings != NULL, FALSE);
|
|
|
|
if (EXPORTED_CONNECTION_CLASS (connection)->update)
|
|
success = EXPORTED_CONNECTION_CLASS (connection)->update (connection, new_settings, err);
|
|
|
|
if (success) {
|
|
nm_connection_replace_settings (NM_EXPORTED_CONNECTION_GET_PRIVATE (connection)->wrapped, new_settings);
|
|
nm_exported_connection_signal_updated (connection, new_settings);
|
|
}
|
|
|
|
return success;
|
|
}
|
|
|
|
gboolean
|
|
nm_exported_connection_delete (NMExportedConnection *connection, GError **err)
|
|
{
|
|
gboolean success = TRUE;
|
|
|
|
g_return_val_if_fail (NM_IS_EXPORTED_CONNECTION (connection), FALSE);
|
|
|
|
if (EXPORTED_CONNECTION_CLASS (connection)->delete)
|
|
success = EXPORTED_CONNECTION_CLASS (connection)->delete (connection, err);
|
|
|
|
if (success)
|
|
nm_exported_connection_signal_removed (connection);
|
|
|
|
return success;
|
|
}
|
|
|
|
void
|
|
nm_exported_connection_signal_updated (NMExportedConnection *connection, GHashTable *settings)
|
|
{
|
|
g_return_if_fail (NM_IS_EXPORTED_CONNECTION (connection));
|
|
|
|
g_signal_emit (connection, connection_signals[EC_UPDATED], 0, settings);
|
|
}
|
|
|
|
void
|
|
nm_exported_connection_signal_removed (NMExportedConnection *connection)
|
|
{
|
|
g_return_if_fail (NM_IS_EXPORTED_CONNECTION (connection));
|
|
|
|
g_signal_emit (connection, connection_signals[EC_REMOVED], 0);
|
|
}
|