luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-09-20 01:06:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3183-arg0-paths' into 'main'

Browse Source 
gdbusconnection: Support matching object paths with arg0 matching

Closes #3183

See merge request GNOME/glib!3720
This commit is contained in:
Philip Withnall 2023-11-29 10:09:45 +00:00
commit f6a1599e3c
4 changed files with 82 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gio/gdbusconnection.c
View File

@ -3867,16 +3867,22 @@ schedule_callbacks (GDBusConnection *connection,
const gchar *member; const gchar *member;
const gchar *path; const gchar *path;
const gchar *arg0; const gchar *arg0;
const gchar *arg0_path;
interface = NULL; interface = NULL;
member = NULL; member = NULL;
path = NULL; path = NULL;
arg0 = NULL; arg0 = NULL;
arg0_path = NULL;
interface = g_dbus_message_get_interface (message); interface = g_dbus_message_get_interface (message);
member = g_dbus_message_get_member (message); member = g_dbus_message_get_member (message);
path = g_dbus_message_get_path (message); path = g_dbus_message_get_path (message);
arg0 = g_dbus_message_get_arg0 (message); arg0 = g_dbus_message_get_arg0 (message);
arg0_path = g_dbus_message_get_arg0_path (message);
/* These two are mutually exclusive through the type system. */
g_assert (arg0 == NULL || arg0_path == NULL);
#if 0 #if 0
g_print ("In schedule_callbacks:\n" g_print ("In schedule_callbacks:\n"
@ -3910,17 +3916,15 @@ schedule_callbacks (GDBusConnection *connection,
if (signal_data->arg0 != NULL) if (signal_data->arg0 != NULL)
{ {
if (arg0 == NULL)
continue;
if (signal_data->flags & G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_NAMESPACE) if (signal_data->flags & G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_NAMESPACE)
{ {
if (!namespace_rule_matches (signal_data->arg0, arg0)) if (arg0 == NULL || !namespace_rule_matches (signal_data->arg0, arg0))
continue; continue;
} }
else if (signal_data->flags & G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_PATH) else if (signal_data->flags & G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_PATH)
{ {
if (!path_rule_matches (signal_data->arg0, arg0)) if ((arg0 == NULL || !path_rule_matches (signal_data->arg0, arg0)) &&
(arg0_path == NULL || !path_rule_matches (signal_data->arg0, arg0_path)))
continue; continue;
} }
else if (!g_str_equal (signal_data->arg0, arg0)) else if (!g_str_equal (signal_data->arg0, arg0))

59
gio/gdbusmessage.c
View File

@ -498,6 +498,7 @@ struct _GDBusMessage
guint32 serial; guint32 serial;
GHashTable *headers; GHashTable *headers;
GVariant *body; GVariant *body;
GVariant *arg0_cache; /* (nullable) (owned) */
#ifdef G_OS_UNIX #ifdef G_OS_UNIX
GUnixFDList *fd_list; GUnixFDList *fd_list;
#endif #endif
@ -520,6 +521,7 @@ g_dbus_message_finalize (GObject *object)
g_hash_table_unref (message->headers); g_hash_table_unref (message->headers);
if (message->body != NULL) if (message->body != NULL)
g_variant_unref (message->body); g_variant_unref (message->body);
g_clear_pointer (&message->arg0_cache, g_variant_unref);
#ifdef G_OS_UNIX #ifdef G_OS_UNIX
if (message->fd_list != NULL) if (message->fd_list != NULL)
g_object_unref (message->fd_list); g_object_unref (message->fd_list);
@ -1158,6 +1160,7 @@ g_dbus_message_set_body (GDBusMessage *message,
if (body == NULL) if (body == NULL)
{ {
message->body = NULL; message->body = NULL;
message->arg0_cache = NULL;
g_dbus_message_set_signature (message, NULL); g_dbus_message_set_signature (message, NULL);
} }
else else
@ -1168,6 +1171,12 @@ g_dbus_message_set_body (GDBusMessage *message,
message->body = g_variant_ref_sink (body); message->body = g_variant_ref_sink (body);
if (g_variant_is_of_type (message->body, G_VARIANT_TYPE_TUPLE) &&
g_variant_n_children (message->body) > 0)
message->arg0_cache = g_variant_get_child_value (message->body, 0);
else
message->arg0_cache = NULL;
type_string = g_variant_get_type_string (body); type_string = g_variant_get_type_string (body);
type_string_len = strlen (type_string); type_string_len = strlen (type_string);
g_assert (type_string_len >= 2); g_assert (type_string_len >= 2);
@ -2352,6 +2361,14 @@ g_dbus_message_new_from_blob (guchar *blob,
2, 2,
&local_error); &local_error);
g_variant_type_free (variant_type); g_variant_type_free (variant_type);
if (message->body != NULL &&
g_variant_is_of_type (message->body, G_VARIANT_TYPE_TUPLE) &&
g_variant_n_children (message->body) > 0)
message->arg0_cache = g_variant_get_child_value (message->body, 0);
else
message->arg0_cache = NULL;
if (message->body == NULL) if (message->body == NULL)
goto fail; goto fail;
} }
@ -3383,6 +3400,9 @@ g_dbus_message_set_signature (GDBusMessage *message,
* *
* Convenience to get the first item in the body of @message. * Convenience to get the first item in the body of @message.
* *
* See [method@Gio.DBusMessage.get_arg0_path] for returning object-path-typed
* arg0 values.
*
* Returns: (nullable): The string item or %NULL if the first item in the body of * Returns: (nullable): The string item or %NULL if the first item in the body of
* @message is not a string. * @message is not a string.
* *
@ -3391,22 +3411,38 @@ g_dbus_message_set_signature (GDBusMessage *message,
const gchar * const gchar *
g_dbus_message_get_arg0 (GDBusMessage *message) g_dbus_message_get_arg0 (GDBusMessage *message)
{ {
const gchar *ret;
g_return_val_if_fail (G_IS_DBUS_MESSAGE (message), NULL); g_return_val_if_fail (G_IS_DBUS_MESSAGE (message), NULL);
ret = NULL; if (message->arg0_cache != NULL &&
g_variant_is_of_type (message->arg0_cache, G_VARIANT_TYPE_STRING))
return g_variant_get_string (message->arg0_cache, NULL);
if (message->body != NULL && g_variant_is_of_type (message->body, G_VARIANT_TYPE_TUPLE)) return NULL;
{
GVariant *item;
item = g_variant_get_child_value (message->body, 0);
if (g_variant_is_of_type (item, G_VARIANT_TYPE_STRING))
ret = g_variant_get_string (item, NULL);
g_variant_unref (item);
} }
return ret; /**
* g_dbus_message_get_arg0_path:
* @message: A `GDBusMessage`.
*
* Convenience to get the first item in the body of @message.
*
* See [method@Gio.DBusMessage.get_arg0] for returning string-typed arg0 values.
*
* Returns: (nullable): The object path item or `NULL` if the first item in the
* body of @message is not an object path.
*
* Since: 2.80
*/
const gchar *
g_dbus_message_get_arg0_path (GDBusMessage *message)
{
g_return_val_if_fail (G_IS_DBUS_MESSAGE (message), NULL);
if (message->arg0_cache != NULL &&
g_variant_is_of_type (message->arg0_cache, G_VARIANT_TYPE_OBJECT_PATH))
return g_variant_get_string (message->arg0_cache, NULL);
return NULL;
} }
/* ---------------------------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------------------------- */
@ -3849,6 +3885,7 @@ g_dbus_message_copy (GDBusMessage *message,
* to just ref (as opposed to deep-copying) the GVariant instances * to just ref (as opposed to deep-copying) the GVariant instances
*/ */
ret->body = message->body != NULL ? g_variant_ref (message->body) : NULL; ret->body = message->body != NULL ? g_variant_ref (message->body) : NULL;
ret->arg0_cache = message->arg0_cache != NULL ? g_variant_ref (message->arg0_cache) : NULL;
g_hash_table_iter_init (&iter, message->headers); g_hash_table_iter_init (&iter, message->headers);
while (g_hash_table_iter_next (&iter, &header_key, (gpointer) &header_value)) while (g_hash_table_iter_next (&iter, &header_key, (gpointer) &header_value))
g_hash_table_insert (ret->headers, header_key, g_variant_ref (header_value)); g_hash_table_insert (ret->headers, header_key, g_variant_ref (header_value));

3
gio/gdbusmessage.h
View File

@ -176,7 +176,8 @@ void g_dbus_message_set_num_unix_fds (GDBusMessage
GIO_AVAILABLE_IN_ALL GIO_AVAILABLE_IN_ALL
const gchar *g_dbus_message_get_arg0 (GDBusMessage *message); const gchar *g_dbus_message_get_arg0 (GDBusMessage *message);
GIO_AVAILABLE_IN_2_80
const gchar *g_dbus_message_get_arg0_path (GDBusMessage *message);
GIO_AVAILABLE_IN_ALL GIO_AVAILABLE_IN_ALL
GDBusMessage *g_dbus_message_new_from_blob (guchar *blob, GDBusMessage *g_dbus_message_new_from_blob (guchar *blob,

37
gio/tests/gdbus-connection.c
View File

@ -742,6 +742,7 @@ test_match_rule (GDBusConnection *connection,
GDBusSignalFlags flags, GDBusSignalFlags flags,
gchar *arg0_rule, gchar *arg0_rule,
gchar *arg0, gchar *arg0,
const gchar *signal_type,
gboolean should_match) gboolean should_match)
{ {
guint subscription_ids[2]; guint subscription_ids[2];
@ -766,7 +767,7 @@ test_match_rule (GDBusConnection *connection,
g_dbus_connection_emit_signal (connection, g_dbus_connection_emit_signal (connection,
NULL, "/", "org.gtk.ExampleInterface", NULL, "/", "org.gtk.ExampleInterface",
"Foo", g_variant_new ("(s)", arg0), "Foo", g_variant_new (signal_type, arg0),
&error); &error);
g_assert_no_error (error); g_assert_no_error (error);
@ -793,22 +794,28 @@ test_connection_signal_match_rules (void)
session_bus_up (); session_bus_up ();
con = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL); con = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL);
test_match_rule (con, G_DBUS_SIGNAL_FLAGS_NONE, "foo", "foo", TRUE); test_match_rule (con, G_DBUS_SIGNAL_FLAGS_NONE, "foo", "foo", "(s)", TRUE);
test_match_rule (con, G_DBUS_SIGNAL_FLAGS_NONE, "foo", "bar", FALSE); test_match_rule (con, G_DBUS_SIGNAL_FLAGS_NONE, "foo", "bar", "(s)", FALSE);
test_match_rule (con, G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_NAMESPACE, "org.gtk", "", FALSE); test_match_rule (con, G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_NAMESPACE, "org.gtk", "", "(s)", FALSE);
test_match_rule (con, G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_NAMESPACE, "org.gtk", "org", FALSE); test_match_rule (con, G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_NAMESPACE, "org.gtk", "org", "(s)", FALSE);
test_match_rule (con, G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_NAMESPACE, "org.gtk", "org.gtk", TRUE); test_match_rule (con, G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_NAMESPACE, "org.gtk", "org.gtk", "(s)", TRUE);
test_match_rule (con, G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_NAMESPACE, "org.gtk", "org.gtk.Example", TRUE); test_match_rule (con, G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_NAMESPACE, "org.gtk", "org.gtk.Example", "(s)", TRUE);
test_match_rule (con, G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_NAMESPACE, "org.gtk", "org.gtk+", FALSE); test_match_rule (con, G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_NAMESPACE, "org.gtk", "org.gtk+", "(s)", FALSE);
test_match_rule (con, G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_PATH, "/", "/", TRUE); test_match_rule (con, G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_PATH, "/", "/", "(s)", TRUE);
test_match_rule (con, G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_PATH, "/", "", FALSE); test_match_rule (con, G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_PATH, "/", "", "(s)", FALSE);
test_match_rule (con, G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_PATH, "/org/gtk/Example", "/org/gtk/Example", TRUE); test_match_rule (con, G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_PATH, "/org/gtk/Example", "/org/gtk/Example", "(s)", TRUE);
test_match_rule (con, G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_PATH, "/org/gtk/", "/org/gtk/Example", TRUE); test_match_rule (con, G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_PATH, "/org/gtk/", "/org/gtk/Example", "(s)", TRUE);
test_match_rule (con, G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_PATH, "/org/gtk/Example", "/org/gtk/", TRUE); test_match_rule (con, G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_PATH, "/org/gtk/Example", "/org/gtk/", "(s)", TRUE);
test_match_rule (con, G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_PATH, "/org/gtk/Example", "/org/gtk", FALSE); test_match_rule (con, G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_PATH, "/org/gtk/Example", "/org/gtk", "(s)", FALSE);
test_match_rule (con, G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_PATH, "/org/gtk+", "/org/gtk", FALSE); test_match_rule (con, G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_PATH, "/org/gtk+", "/org/gtk", "(s)", FALSE);
test_match_rule (con, G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_PATH, "/", "/", "(o)", TRUE);
test_match_rule (con, G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_PATH, "/org/gtk/Example", "/org/gtk/Example", "(o)", TRUE);
test_match_rule (con, G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_PATH, "/org/gtk/", "/org/gtk/Example", "(o)", TRUE);
test_match_rule (con, G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_PATH, "/org/gtk/Example", "/org/gtk", "(o)", FALSE);
test_match_rule (con, G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_PATH, "/org/gtk+", "/org/gtk", "(o)", FALSE);
g_object_unref (con); g_object_unref (con);
session_bus_down (); session_bus_down ();