fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-09 04:48:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

settings-connection: add audit support

Browse source
This commit is contained in:
Beniamino Galvani 2015-07-14 10:25:36 +02:00
parent 9ce005da34
commit 0d4dfe5007
1 changed files with 58 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
src/settings/nm-settings-connection.c
View file

@ -36,6 +36,7 @@
#include "nm-agent-manager.h" #include "nm-agent-manager.h"
#include "NetworkManagerUtils.h" #include "NetworkManagerUtils.h"
#include "nm-core-internal.h" #include "nm-core-internal.h"
#include "nm-audit-manager.h"
#include "gsystem-local-alloc.h" #include "gsystem-local-alloc.h"
#define SETTINGS_TIMESTAMPS_FILE NMSTATEDIR "/timestamps" #define SETTINGS_TIMESTAMPS_FILE NMSTATEDIR "/timestamps"
@ -1320,6 +1321,11 @@ typedef struct {
gboolean save_to_disk; gboolean save_to_disk;
} UpdateInfo; } UpdateInfo;
typedef struct {
DBusGMethodInvocation *context;
NMAuthSubject *subject;
} CallbackInfo;
static void static void
has_some_secrets_cb (NMSetting *setting, has_some_secrets_cb (NMSetting *setting,
const char *key, const char *key,
@ -1384,6 +1390,9 @@ update_complete (NMSettingsConnection *self,
else else
dbus_g_method_return (info->context); dbus_g_method_return (info->context);
nm_audit_log_connection_op (NM_AUDIT_OP_CONN_UPDATE, NM_CONNECTION (self), !error,
info->subject, error ? error->message : NULL);
g_clear_object (&info->subject); g_clear_object (&info->subject);
g_clear_object (&info->agent_mgr); g_clear_object (&info->agent_mgr);
g_clear_object (&info->new_settings); g_clear_object (&info->new_settings);
@ -1549,6 +1558,9 @@ impl_settings_connection_update_helper (NMSettingsConnection *self,
return; return;
error: error:
nm_audit_log_connection_op (NM_AUDIT_OP_CONN_UPDATE, NM_CONNECTION (self), FALSE, subject,
error->message);
g_clear_object (&tmp); g_clear_object (&tmp);
g_clear_object (&subject); g_clear_object (&subject);
@ -1590,12 +1602,16 @@ con_delete_cb (NMSettingsConnection *self,
GError *error, GError *error,
gpointer user_data) gpointer user_data)
{ {
DBusGMethodInvocation *context = user_data; CallbackInfo *info = user_data;
if (error) if (error)
dbus_g_method_return_error (context, error); dbus_g_method_return_error (info->context, error);
else else
dbus_g_method_return (context); dbus_g_method_return (info->context);
nm_audit_log_connection_op (NM_AUDIT_OP_CONN_DELETE, NM_CONNECTION (self),
!error, info->subject, error ? error->message : NULL);
g_free (info);
} }
static void static void
@ -1605,12 +1621,20 @@ delete_auth_cb (NMSettingsConnection *self,
GError *error, GError *error,
gpointer data) gpointer data)
{ {
CallbackInfo *info;
if (error) { if (error) {
nm_audit_log_connection_op (NM_AUDIT_OP_CONN_DELETE, NM_CONNECTION (self), FALSE, subject,
error->message);
dbus_g_method_return_error (context, error); dbus_g_method_return_error (context, error);
return; return;
} }
nm_settings_connection_delete (self, con_delete_cb, context); info = g_malloc0 (sizeof (*info));
info->context = context;
info->subject = subject;
nm_settings_connection_delete (self, con_delete_cb, info);
} }
static const char * static const char *
@ -1634,23 +1658,24 @@ static void
impl_settings_connection_delete (NMSettingsConnection *self, impl_settings_connection_delete (NMSettingsConnection *self,
DBusGMethodInvocation *context) DBusGMethodInvocation *context)
{ {
NMAuthSubject *subject; NMAuthSubject *subject = NULL;
GError *error = NULL; GError *error = NULL;
if (!check_writable (NM_CONNECTION (self), &error)) { if (!check_writable (NM_CONNECTION (self), &error))
dbus_g_method_return_error (context, error); goto out_err;
g_error_free (error);
return;
}
subject = _new_auth_subject (context, &error); subject = _new_auth_subject (context, &error);
if (subject) { if (subject) {
auth_start (self, context, subject, get_modify_permission_basic (self), delete_auth_cb, NULL); auth_start (self, context, subject, get_modify_permission_basic (self), delete_auth_cb, NULL);
g_object_unref (subject); g_object_unref (subject);
} else { } else
dbus_g_method_return_error (context, error); goto out_err;
g_error_free (error);
} return;
out_err:
dbus_g_method_return_error (context, error);
nm_audit_log_connection_op (NM_AUDIT_OP_CONN_DELETE, NM_CONNECTION (self), FALSE, subject, error->message);
g_error_free (error);
} }
/**************************************************************/ /**************************************************************/
@ -1754,12 +1779,16 @@ clear_secrets_cb (NMSettingsConnection *self,
GError *error, GError *error,
gpointer user_data) gpointer user_data)
{ {
DBusGMethodInvocation *context = (DBusGMethodInvocation *) user_data; CallbackInfo *info = user_data;
if (error) if (error)
dbus_g_method_return_error (context, error); dbus_g_method_return_error (info->context, error);
else else
dbus_g_method_return (context); dbus_g_method_return (info->context);
nm_audit_log_connection_op (NM_AUDIT_OP_CONN_CLEAR_SECRETS, NM_CONNECTION (self),
!error, info->subject, error ? error->message : NULL);
g_free (info);
} }
static void static void
@ -1770,10 +1799,13 @@ dbus_clear_secrets_auth_cb (NMSettingsConnection *self,
gpointer user_data) gpointer user_data)
{ {
NMSettingsConnectionPrivate *priv = NM_SETTINGS_CONNECTION_GET_PRIVATE (self); NMSettingsConnectionPrivate *priv = NM_SETTINGS_CONNECTION_GET_PRIVATE (self);
CallbackInfo *info;
if (error) if (error) {
dbus_g_method_return_error (context, error); dbus_g_method_return_error (context, error);
else { nm_audit_log_connection_op (NM_AUDIT_OP_CONN_CLEAR_SECRETS, NM_CONNECTION (self),
FALSE, subject, error->message);
} else {
/* Clear secrets in connection and caches */ /* Clear secrets in connection and caches */
nm_connection_clear_secrets (NM_CONNECTION (self)); nm_connection_clear_secrets (NM_CONNECTION (self));
if (priv->system_secrets) if (priv->system_secrets)
@ -1784,7 +1816,11 @@ dbus_clear_secrets_auth_cb (NMSettingsConnection *self,
/* Tell agents to remove secrets for this connection */ /* Tell agents to remove secrets for this connection */
nm_agent_manager_delete_secrets (priv->agent_mgr, NM_CONNECTION (self)); nm_agent_manager_delete_secrets (priv->agent_mgr, NM_CONNECTION (self));
nm_settings_connection_commit_changes (self, NM_SETTINGS_CONNECTION_COMMIT_REASON_NONE, clear_secrets_cb, context); info = g_malloc0 (sizeof (*info));
info->context = context;
info->subject = subject;
nm_settings_connection_commit_changes (self, NM_SETTINGS_CONNECTION_COMMIT_REASON_NONE, clear_secrets_cb, info);
} }
} }
@ -1806,6 +1842,8 @@ impl_settings_connection_clear_secrets (NMSettingsConnection *self,
g_object_unref (subject); g_object_unref (subject);
} else { } else {
dbus_g_method_return_error (context, error); dbus_g_method_return_error (context, error);
nm_audit_log_connection_op (NM_AUDIT_OP_CONN_CLEAR_SECRETS, NM_CONNECTION (self),
FALSE, NULL, error->message);
g_error_free (error); g_error_free (error);
} }
} }