d2cf6fa75c
Use PolicyKit to authorize the system settings' AddConnection method
and the system settings connections' Update and Delete methods.
* libnm-glib/nm-settings.c (impl_exported_connection_update)
(impl_exported_connection_delete, nm_exported_connection_update)
(nm_exported_connection_delete): Return boolean and fill GError
to notify the callers of the reasons why it might have failed.
* libnm-glib/nm-dbus-settings-system.c
(nm_dbus_settings_system_add_connection): Return the error from dbus
call so that the callers can see why it failed.
* libnm-glib/nm-dbus-connection.c (update, delete): Update the
signatures.
* system-settings/src/nm-polkit-helpers.[ch]: Implement.
* system-settings/src/nm-sysconfig-connection.[ch]: Implement. New
abstract base class that checks PolicyKit permissions.
* system-settings/src/dbus-settings.c:
(impl_settings_add_connection): Check the policy before carring out
the request.
* system-settings/plugins/keyfile/nm-keyfile-connection.c:
Inherit from NMSysconfigConnection, check the policies before
allowing updating or removing.
* system-settings/plugins/ifcfg-suse/nm-suse-connection.c:
Inherit from NMSysconfigConnection.
* introspection/nm-exported-connection.xml: Annotate "Update" and
"Delete" methods with async flag so that the implementations can get
access to DBusGMethodInvocation.
* system-settings/src/dbus-settings.c
(settings_add_connection_check_privileges): Implement.
(impl_settings_add_connection): Check the privileges before adding a new
connection. Improve error reporting.
* introspection/nm-settings-system.xml: Make the 'AddConnection' method
async so that the implementation can access DBusGMethodInvocation.
* configure.in: Check for PolicyKit.
* policy/org.freedesktop.network-manager-settings.system.policy:
New file.
* policy/Makefile.am: Install the policy file.
* configure.in: Add 'policy' subdir.
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3646 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
113 lines
4.1 KiB
C
113 lines
4.1 KiB
C
/* -*- Mode: C; tab-width: 5; indent-tabs-mode: t; c-basic-offset: 5 -*- */
|
|
|
|
#ifndef __NM_SETTINGS_H__
|
|
#define __NM_SETTINGS_H__
|
|
|
|
#include <glib-object.h>
|
|
#include <dbus/dbus-glib.h>
|
|
|
|
#include <nm-connection.h>
|
|
|
|
G_BEGIN_DECLS
|
|
|
|
#define NM_SETTINGS_ERROR nm_settings_error_quark ()
|
|
GQuark nm_settings_error_quark (void);
|
|
|
|
#define NM_TYPE_EXPORTED_CONNECTION (nm_exported_connection_get_type ())
|
|
#define NM_EXPORTED_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_EXPORTED_CONNECTION, NMExportedConnection))
|
|
#define NM_EXPORTED_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_EXPORTED_CONNECTION, NMExportedConnectionClass))
|
|
#define NM_IS_EXPORTED_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_EXPORTED_CONNECTION))
|
|
#define NM_IS_EXPORTED_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_EXPORTED_CONNECTION))
|
|
#define NM_EXPORTED_CONNECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_EXPORTED_CONNECTION, NMExportedConnectionClass))
|
|
|
|
#define NM_EXPORTED_CONNECTION_CONNECTION "connection"
|
|
|
|
#define NM_EXPORTED_CONNECTION_DBUS_METHOD_INVOCATION "nm-exported-connection-dbus-method-invocation"
|
|
|
|
typedef struct {
|
|
GObject parent;
|
|
} NMExportedConnection;
|
|
|
|
typedef struct {
|
|
GObjectClass parent_class;
|
|
|
|
/* virtual methods */
|
|
const gchar *(* get_id) (NMExportedConnection *connection);
|
|
GHashTable * (* get_settings) (NMExportedConnection *connection);
|
|
void (* get_secrets) (NMExportedConnection *connection,
|
|
const gchar *setting_name,
|
|
const gchar **hints,
|
|
gboolean request_new,
|
|
DBusGMethodInvocation *context);
|
|
|
|
gboolean (*update) (NMExportedConnection *connection,
|
|
GHashTable *new_settings,
|
|
GError **err);
|
|
|
|
gboolean (*delete) (NMExportedConnection *connection,
|
|
GError **err);
|
|
|
|
/* signals */
|
|
void (* updated) (NMExportedConnection *connection, GHashTable *settings);
|
|
void (* removed) (NMExportedConnection *connection);
|
|
} NMExportedConnectionClass;
|
|
|
|
GType nm_exported_connection_get_type (void);
|
|
|
|
NMExportedConnection *nm_exported_connection_new (NMConnection *wrapped);
|
|
|
|
void nm_exported_connection_register_object (NMExportedConnection *connection,
|
|
NMConnectionScope scope,
|
|
DBusGConnection *dbus_connection);
|
|
|
|
NMConnection *nm_exported_connection_get_connection (NMExportedConnection *connection);
|
|
|
|
const char *nm_exported_connection_get_id (NMExportedConnection *connection);
|
|
|
|
gboolean nm_exported_connection_update (NMExportedConnection *connection,
|
|
GHashTable *new_settings,
|
|
GError **err);
|
|
|
|
gboolean nm_exported_connection_delete (NMExportedConnection *connection,
|
|
GError **err);
|
|
|
|
void nm_exported_connection_signal_updated (NMExportedConnection *connection,
|
|
GHashTable *new_settings);
|
|
|
|
void nm_exported_connection_signal_removed (NMExportedConnection *connection);
|
|
|
|
|
|
|
|
#define NM_TYPE_SETTINGS (nm_settings_get_type ())
|
|
#define NM_SETTINGS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTINGS, NMSettings))
|
|
#define NM_SETTINGS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTINGS, NMSettingsClass))
|
|
#define NM_IS_SETTINGS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTINGS))
|
|
#define NM_IS_SETTINGS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_SETTINGS))
|
|
#define NM_SETTINGS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTINGS, NMSettingsClass))
|
|
|
|
typedef struct {
|
|
GObject parent;
|
|
} NMSettings;
|
|
|
|
typedef struct {
|
|
GObjectClass parent_class;
|
|
|
|
/* virtual methods */
|
|
/* Returns a list of NMExportedConnections. Caller should free the list. */
|
|
GSList * (*list_connections) (NMSettings *settings);
|
|
|
|
/* signals */
|
|
void (* new_connection) (NMSettings *settings, NMExportedConnection *connection);
|
|
} NMSettingsClass;
|
|
|
|
GType nm_settings_get_type (void);
|
|
|
|
GSList *nm_settings_list_connections (NMSettings *settings);
|
|
|
|
void nm_settings_signal_new_connection (NMSettings *settings, NMExportedConnection *connection);
|
|
|
|
|
|
G_END_DECLS
|
|
|
|
#endif
|