luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-12-10 18:43:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

GDBusAuthObserver: Add a way to control what authentication mechanisms to use

Browse Source 
This is related to https://bugzilla.gnome.org/show_bug.cgi?id=673943
but also useful in a lot of other contexts.
This commit is contained in:
David Zeuthen
2012-04-11 23:30:48 -04:00
parent bb7f3e0cbd
commit ce81bd87c5
7 changed files with 97 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
gio/gdbusauth.c
View File

@@ -194,17 +194,22 @@ mechanism_free (Mechanism *m)
}
static void
add_mechanism (GDBusAuth *auth,
GType mechanism_type)
add_mechanism (GDBusAuth *auth,
GDBusAuthObserver *observer,
GType mechanism_type)
{
Mechanism *m;
const gchar *name;
m = g_new0 (Mechanism, 1);
m->name = _g_dbus_auth_mechanism_get_name (mechanism_type);
m->priority = _g_dbus_auth_mechanism_get_priority (mechanism_type);
m->gtype = mechanism_type;
auth->priv->available_mechanisms = g_list_prepend (auth->priv->available_mechanisms, m);
name = _g_dbus_auth_mechanism_get_name (mechanism_type);
if (g_dbus_auth_observer_allow_mechanism (observer, name))
{
Mechanism *m;
m = g_new0 (Mechanism, 1);
m->name = name;
m->priority = _g_dbus_auth_mechanism_get_priority (mechanism_type);
m->gtype = mechanism_type;
auth->priv->available_mechanisms = g_list_prepend (auth->priv->available_mechanisms, m);
}
}
static gint
@@ -223,10 +228,16 @@ _g_dbus_auth_init (GDBusAuth *auth)
{
auth->priv = G_TYPE_INSTANCE_GET_PRIVATE (auth, G_TYPE_DBUS_AUTH, GDBusAuthPrivate);
}
static void
_g_dbus_auth_add_mechs (GDBusAuth *auth,
GDBusAuthObserver *observer)
{
/* TODO: trawl extension points */
add_mechanism (auth, G_TYPE_DBUS_AUTH_MECHANISM_ANON);
add_mechanism (auth, G_TYPE_DBUS_AUTH_MECHANISM_SHA1);
add_mechanism (auth, G_TYPE_DBUS_AUTH_MECHANISM_EXTERNAL);
add_mechanism (auth, observer, G_TYPE_DBUS_AUTH_MECHANISM_ANON);
add_mechanism (auth, observer, G_TYPE_DBUS_AUTH_MECHANISM_SHA1);
add_mechanism (auth, observer, G_TYPE_DBUS_AUTH_MECHANISM_EXTERNAL);
auth->priv->available_mechanisms = g_list_sort (auth->priv->available_mechanisms,
(GCompareFunc) mech_compare_func);
@@ -576,6 +587,7 @@ typedef enum
gchar *
_g_dbus_auth_run_client (GDBusAuth *auth,
GDBusAuthObserver *observer,
GDBusCapabilityFlags offered_capabilities,
GDBusCapabilityFlags *out_negotiated_capabilities,
GCancellable *cancellable,
@@ -596,6 +608,8 @@ _g_dbus_auth_run_client (GDBusAuth *auth,
debug_print ("CLIENT: initiating");
_g_dbus_auth_add_mechs (auth, observer);
ret_guid = NULL;
supported_auth_mechs = NULL;
attempted_auth_mechs = g_ptr_array_new ();
@@ -962,6 +976,8 @@ _g_dbus_auth_run_server (GDBusAuth *auth,
debug_print ("SERVER: initiating");
_g_dbus_auth_add_mechs (auth, observer);
ret = FALSE;
dis = NULL;
dos = NULL;