luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-01 21:33:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1912-gdbus-peer-test' into 'master'

Browse Source 
tests: Isolate directories in gdbus-peer test

Closes #1912

See merge request GNOME/glib!1192
This commit is contained in:
Simon McVittie 2019-10-29 08:37:22 +00:00
commit 4e8d058828
2 changed files with 54 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gio/gdbusauthmechanismsha1.c
View File

@ -48,6 +48,7 @@ struct _GDBusAuthMechanismSha1Private
gboolean is_client; gboolean is_client;
gboolean is_server; gboolean is_server;
GDBusAuthMechanismState state; GDBusAuthMechanismState state;
gchar *reject_reason; /* non-NULL iff (state == G_DBUS_AUTH_MECHANISM_STATE_REJECTED) */
/* used on the client side */ /* used on the client side */
gchar *to_send; gchar *to_send;
@ -101,6 +102,7 @@ _g_dbus_auth_mechanism_sha1_finalize (GObject *object)
{ {
GDBusAuthMechanismSha1 *mechanism = G_DBUS_AUTH_MECHANISM_SHA1 (object); GDBusAuthMechanismSha1 *mechanism = G_DBUS_AUTH_MECHANISM_SHA1 (object);
g_free (mechanism->priv->reject_reason);
g_free (mechanism->priv->to_send); g_free (mechanism->priv->to_send);
g_free (mechanism->priv->cookie); g_free (mechanism->priv->cookie);
@ -290,7 +292,7 @@ ensure_keyring_directory (GError **error)
goto out; goto out;
} }
if (g_mkdir (path, 0700) != 0) if (g_mkdir_with_parents (path, 0700) != 0)
{ {
int errsv = errno; int errsv = errno;
g_set_error (error, g_set_error (error,
@ -963,7 +965,8 @@ mechanism_server_data_receive (GDBusAuthMechanism *mechanism,
tokens = g_strsplit (data, " ", 0); tokens = g_strsplit (data, " ", 0);
if (g_strv_length (tokens) != 2) if (g_strv_length (tokens) != 2)
{ {
g_warning ("Malformed data '%s'", data); g_free (m->priv->reject_reason);
m->priv->reject_reason = g_strdup_printf ("Malformed data '%s'", data);
m->priv->state = G_DBUS_AUTH_MECHANISM_STATE_REJECTED; m->priv->state = G_DBUS_AUTH_MECHANISM_STATE_REJECTED;
goto out; goto out;
} }
@ -979,6 +982,8 @@ mechanism_server_data_receive (GDBusAuthMechanism *mechanism,
} }
else else
{ {
g_free (m->priv->reject_reason);
m->priv->reject_reason = g_strdup_printf ("SHA-1 mismatch");
m->priv->state = G_DBUS_AUTH_MECHANISM_STATE_REJECTED; m->priv->state = G_DBUS_AUTH_MECHANISM_STATE_REJECTED;
} }
@ -1014,7 +1019,8 @@ mechanism_server_data_send (GDBusAuthMechanism *mechanism,
&m->priv->cookie, &m->priv->cookie,
&error)) &error))
{ {
g_warning ("Error adding entry to keyring: %s", error->message); g_free (m->priv->reject_reason);
m->priv->reject_reason = g_strdup_printf ("Error adding entry to keyring: %s", error->message);
g_error_free (error); g_error_free (error);
m->priv->state = G_DBUS_AUTH_MECHANISM_STATE_REJECTED; m->priv->state = G_DBUS_AUTH_MECHANISM_STATE_REJECTED;
goto out; goto out;
@ -1042,10 +1048,7 @@ mechanism_server_get_reject_reason (GDBusAuthMechanism *mechanism)
g_return_val_if_fail (m->priv->is_server && !m->priv->is_client, NULL); g_return_val_if_fail (m->priv->is_server && !m->priv->is_client, NULL);
g_return_val_if_fail (m->priv->state == G_DBUS_AUTH_MECHANISM_STATE_REJECTED, NULL); g_return_val_if_fail (m->priv->state == G_DBUS_AUTH_MECHANISM_STATE_REJECTED, NULL);
/* can never end up here because we are never in the REJECTED state */ return g_strdup (m->priv->reject_reason);
g_assert_not_reached ();
return NULL;
} }
static void static void
@ -1128,7 +1131,8 @@ mechanism_client_data_receive (GDBusAuthMechanism *mechanism,
tokens = g_strsplit (data, " ", 0); tokens = g_strsplit (data, " ", 0);
if (g_strv_length (tokens) != 3) if (g_strv_length (tokens) != 3)
{ {
g_warning ("Malformed data '%s'", data); g_free (m->priv->reject_reason);
m->priv->reject_reason = g_strdup_printf ("Malformed data '%s'", data);
m->priv->state = G_DBUS_AUTH_MECHANISM_STATE_REJECTED; m->priv->state = G_DBUS_AUTH_MECHANISM_STATE_REJECTED;
goto out; goto out;
} }
@ -1137,7 +1141,8 @@ mechanism_client_data_receive (GDBusAuthMechanism *mechanism,
cookie_id = g_ascii_strtoll (tokens[1], &endp, 10); cookie_id = g_ascii_strtoll (tokens[1], &endp, 10);
if (*endp != '\0') if (*endp != '\0')
{ {
g_warning ("Malformed cookie_id '%s'", tokens[1]); g_free (m->priv->reject_reason);
m->priv->reject_reason = g_strdup_printf ("Malformed cookie_id '%s'", tokens[1]);
m->priv->state = G_DBUS_AUTH_MECHANISM_STATE_REJECTED; m->priv->state = G_DBUS_AUTH_MECHANISM_STATE_REJECTED;
goto out; goto out;
} }
@ -1147,7 +1152,8 @@ mechanism_client_data_receive (GDBusAuthMechanism *mechanism,
cookie = keyring_lookup_entry (cookie_context, cookie_id, &error); cookie = keyring_lookup_entry (cookie_context, cookie_id, &error);
if (cookie == NULL) if (cookie == NULL)
{ {
g_warning ("Problems looking up entry in keyring: %s", error->message); g_free (m->priv->reject_reason);
m->priv->reject_reason = g_strdup_printf ("Problems looking up entry in keyring: %s", error->message);
g_error_free (error); g_error_free (error);
m->priv->state = G_DBUS_AUTH_MECHANISM_STATE_REJECTED; m->priv->state = G_DBUS_AUTH_MECHANISM_STATE_REJECTED;
goto out; goto out;

45
gio/tests/gdbus-peer.c
View File

@ -1033,6 +1033,9 @@ do_test_peer (void)
static void static void
test_peer (void) test_peer (void)
{ {
test_guid = g_dbus_generate_guid ();
loop = g_main_loop_new (NULL, FALSE);
/* Run this test multiple times using different address formats to ensure /* Run this test multiple times using different address formats to ensure
* they all work. * they all work.
*/ */
@ -1049,6 +1052,9 @@ test_peer (void)
do_test_peer (); do_test_peer ();
teardown_test_address (); teardown_test_address ();
#endif #endif
g_main_loop_unref (loop);
g_free (test_guid);
} }
/* ---------------------------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------------------------- */
@ -1064,6 +1070,9 @@ test_peer_signals (void)
g_test_bug ("https://gitlab.gnome.org/GNOME/glib/issues/1620"); g_test_bug ("https://gitlab.gnome.org/GNOME/glib/issues/1620");
test_guid = g_dbus_generate_guid ();
loop = g_main_loop_new (NULL, FALSE);
setup_test_address (); setup_test_address ();
memset (&data, '\0', sizeof (PeerData)); memset (&data, '\0', sizeof (PeerData));
data.current_connections = g_ptr_array_new_with_free_func (g_object_unref); data.current_connections = g_ptr_array_new_with_free_func (g_object_unref);
@ -1119,6 +1128,9 @@ test_peer_signals (void)
g_thread_join (service_thread); g_thread_join (service_thread);
teardown_test_address (); teardown_test_address ();
g_main_loop_unref (loop);
g_free (test_guid);
} }
/* ---------------------------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------------------------- */
@ -1260,6 +1272,9 @@ delayed_message_processing (void)
GThread *service_thread; GThread *service_thread;
guint n; guint n;
test_guid = g_dbus_generate_guid ();
loop = g_main_loop_new (NULL, FALSE);
setup_test_address (); setup_test_address ();
data = g_new0 (DmpData, 1); data = g_new0 (DmpData, 1);
@ -1307,6 +1322,9 @@ delayed_message_processing (void)
g_thread_join (service_thread); g_thread_join (service_thread);
dmp_data_free (data); dmp_data_free (data);
teardown_test_address (); teardown_test_address ();
g_main_loop_unref (loop);
g_free (test_guid);
} }
/* ---------------------------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------------------------- */
@ -1405,6 +1423,9 @@ test_nonce_tcp (void)
gboolean res; gboolean res;
const gchar *address; const gchar *address;
test_guid = g_dbus_generate_guid ();
loop = g_main_loop_new (NULL, FALSE);
memset (&data, '\0', sizeof (PeerData)); memset (&data, '\0', sizeof (PeerData));
data.current_connections = g_ptr_array_new_with_free_func (g_object_unref); data.current_connections = g_ptr_array_new_with_free_func (g_object_unref);
@ -1512,6 +1533,9 @@ test_nonce_tcp (void)
g_thread_join (service_thread); g_thread_join (service_thread);
g_ptr_array_unref (data.current_connections); g_ptr_array_unref (data.current_connections);
g_main_loop_unref (loop);
g_free (test_guid);
} }
static void static void
@ -1596,6 +1620,9 @@ test_tcp_anonymous (void)
GDBusConnection *connection; GDBusConnection *connection;
GError *error; GError *error;
test_guid = g_dbus_generate_guid ();
loop = g_main_loop_new (NULL, FALSE);
seen_connection = FALSE; seen_connection = FALSE;
service_thread = g_thread_new ("tcp-anon-service", service_thread = g_thread_new ("tcp-anon-service",
tcp_anonymous_service_thread_func, tcp_anonymous_service_thread_func,
@ -1623,6 +1650,9 @@ test_tcp_anonymous (void)
server = NULL; server = NULL;
g_thread_join (service_thread); g_thread_join (service_thread);
g_main_loop_unref (loop);
g_free (test_guid);
} }
/* ---------------------------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------------------------- */
@ -1767,6 +1797,9 @@ codegen_test_peer (void)
GVariant *value; GVariant *value;
const gchar *s; const gchar *s;
test_guid = g_dbus_generate_guid ();
loop = g_main_loop_new (NULL, FALSE);
setup_test_address (); setup_test_address ();
/* bring up a server - we run the server in a different thread to avoid deadlocks */ /* bring up a server - we run the server in a different thread to avoid deadlocks */
@ -1874,6 +1907,9 @@ codegen_test_peer (void)
g_thread_join (service_thread); g_thread_join (service_thread);
teardown_test_address (); teardown_test_address ();
g_main_loop_unref (loop);
g_free (test_guid);
} }
/* ---------------------------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------------------------- */
@ -1886,17 +1922,12 @@ main (int argc,
gint ret; gint ret;
GDBusNodeInfo *introspection_data = NULL; GDBusNodeInfo *introspection_data = NULL;
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL);
introspection_data = g_dbus_node_info_new_for_xml (test_interface_introspection_xml, NULL); introspection_data = g_dbus_node_info_new_for_xml (test_interface_introspection_xml, NULL);
g_assert (introspection_data != NULL); g_assert (introspection_data != NULL);
test_interface_introspection_data = introspection_data->interfaces[0]; test_interface_introspection_data = introspection_data->interfaces[0];
test_guid = g_dbus_generate_guid ();
/* all the tests rely on a shared main loop */
loop = g_main_loop_new (NULL, FALSE);
g_test_add_func ("/gdbus/peer-to-peer", test_peer); g_test_add_func ("/gdbus/peer-to-peer", test_peer);
g_test_add_func ("/gdbus/peer-to-peer/signals", test_peer_signals); g_test_add_func ("/gdbus/peer-to-peer/signals", test_peer_signals);
g_test_add_func ("/gdbus/delayed-message-processing", delayed_message_processing); g_test_add_func ("/gdbus/delayed-message-processing", delayed_message_processing);
@ -1908,8 +1939,6 @@ main (int argc,
ret = g_test_run (); ret = g_test_run ();
g_main_loop_unref (loop);
g_free (test_guid);
g_dbus_node_info_unref (introspection_data); g_dbus_node_info_unref (introspection_data);
return ret; return ret;