Attachment 124832 Details for Bug 86442 – dbus-daemon test: exercise maximum replies per connection

[patch] dbus-daemon test: exercise maximum replies per connection

0011-dbus-daemon-test-exercise-maximum-replies-per-connec.patch (text/plain), 8.56 KB, created by Simon McVittie on 2016-07-01 12:22:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2016-07-01 12:22:29 UTC

Size: 8.56 KB

patch

obsolete

>From 3677be58cffa35f1324c4366f6fc6dddb37ecab5 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Fri, 1 Jul 2016 13:02:04 +0100
>Subject: [PATCH 11/13] dbus-daemon test: exercise maximum replies per
> connection
>
>This time we're doing so deliberately.
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=86442
>Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
>---
> test/Makefile.am                                   |   1 +
> .../max-replies-per-connection.conf.in             |  18 +++
> test/dbus-daemon.c                                 | 175 +++++++++++++++++++++
> 3 files changed, 194 insertions(+)
> create mode 100644 test/data/valid-config-files/max-replies-per-connection.conf.in
>
>diff --git a/test/Makefile.am b/test/Makefile.am
>index 23f26a9..dcbfa23 100644
>--- a/test/Makefile.am
>+++ b/test/Makefile.am
>@@ -313,6 +313,7 @@ in_data = \
> 	data/valid-config-files/incoming-limit.conf.in \
> 	data/valid-config-files/max-completed-connections.conf.in \
> 	data/valid-config-files/max-connections-per-user.conf.in \
>+	data/valid-config-files/max-replies-per-connection.conf.in \
> 	data/valid-config-files/multi-user.conf.in \
> 	data/valid-config-files/systemd-activation.conf.in \
> 	data/invalid-service-files-system/org.freedesktop.DBus.TestSuiteNoExec.service.in \
>diff --git a/test/data/valid-config-files/max-replies-per-connection.conf.in b/test/data/valid-config-files/max-replies-per-connection.conf.in
>new file mode 100644
>index 0000000..d4615ed
>--- /dev/null
>+++ b/test/data/valid-config-files/max-replies-per-connection.conf.in
>@@ -0,0 +1,18 @@
>+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
>+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
>+<busconfig>
>+  
>+  <type>session</type>
>+  <listen>@TEST_LISTEN@</listen>
>+
>+  <policy context="default">
>+    
>+    <allow send_destination="*" eavesdrop="true"/>
>+    
>+    <allow eavesdrop="true"/>
>+    
>+    <allow own="*"/>
>+  </policy>
>+
>+  <limit name="max_replies_per_connection">3</limit>
>+</busconfig>
>diff --git a/test/dbus-daemon.c b/test/dbus-daemon.c
>index d3fc61d..d25aa35 100644
>--- a/test/dbus-daemon.c
>+++ b/test/dbus-daemon.c
>@@ -83,7 +83,9 @@ typedef struct {
>     DBusConnection *left_conn;
> 
>     DBusConnection *right_conn;
>+    GQueue held_messages;
>     gboolean right_conn_echo;
>+    gboolean right_conn_hold;
>     gboolean wait_forever_called;
> 
>     gchar *tmp_runtime_dir;
>@@ -121,6 +123,21 @@ echo_filter (DBusConnection *connection,
>   return DBUS_HANDLER_RESULT_HANDLED;
> }
> 
>+static DBusHandlerResult
>+hold_filter (DBusConnection *connection,
>+    DBusMessage *message,
>+    void *user_data)
>+{
>+  Fixture *f = user_data;
>+
>+  if (dbus_message_get_type (message) != DBUS_MESSAGE_TYPE_METHOD_CALL)
>+    return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
>+
>+  g_queue_push_tail (&f->held_messages, dbus_message_ref (message));
>+
>+  return DBUS_HANDLER_RESULT_HANDLED;
>+}
>+
> typedef struct {
>     const char *bug_ref;
>     guint min_messages;
>@@ -187,6 +204,15 @@ add_echo_filter (Fixture *f)
> }
> 
> static void
>+add_hold_filter (Fixture *f)
>+{
>+  if (!dbus_connection_add_filter (f->right_conn, hold_filter, f, NULL))
>+    g_error ("OOM");
>+
>+  f->right_conn_hold = TRUE;
>+}
>+
>+static void
> pc_count (DBusPendingCall *pc,
>     void *data)
> {
>@@ -196,6 +222,17 @@ pc_count (DBusPendingCall *pc,
> }
> 
> static void
>+pc_enqueue (DBusPendingCall *pc,
>+            void *data)
>+{
>+  GQueue *q = data;
>+  DBusMessage *m = dbus_pending_call_steal_reply (pc);
>+
>+  g_test_message ("message of type %d", dbus_message_get_type (m));
>+  g_queue_push_tail (q, m);
>+}
>+
>+static void
> test_echo (Fixture *f,
>     gconstpointer context)
> {
>@@ -684,6 +721,127 @@ test_max_connections (Fixture *f,
> }
> 
> static void
>+test_max_replies_per_connection (Fixture *f,
>+    gconstpointer context)
>+{
>+  GQueue received = G_QUEUE_INIT;
>+  GQueue errors = G_QUEUE_INIT;
>+  DBusMessage *m;
>+  DBusPendingCall *pc;
>+  guint i;
>+  DBusError error = DBUS_ERROR_INIT;
>+
>+  add_hold_filter (f);
>+
>+  /* The configured limit is 3 replies per connection. */
>+  for (i = 0; i < 3; i++)
>+    {
>+      m = dbus_message_new_method_call (
>+          dbus_bus_get_unique_name (f->right_conn), "/",
>+          "com.example", "Spam");
>+
>+      if (m == NULL)
>+        g_error ("OOM");
>+
>+      if (!dbus_connection_send_with_reply (f->left_conn, m, &pc,
>+                                            DBUS_TIMEOUT_INFINITE) ||
>+          pc == NULL)
>+        g_error ("OOM");
>+
>+      if (dbus_pending_call_get_completed (pc))
>+        pc_enqueue (pc, &received);
>+      else if (!dbus_pending_call_set_notify (pc, pc_enqueue, &received,
>+            NULL))
>+        g_error ("OOM");
>+
>+      dbus_pending_call_unref (pc);
>+      dbus_message_unref (m);
>+    }
>+
>+  while (g_queue_get_length (&f->held_messages) < 3)
>+    test_main_context_iterate (f->ctx, TRUE);
>+
>+  g_assert_cmpuint (g_queue_get_length (&received), ==, 0);
>+  g_assert_cmpuint (g_queue_get_length (&errors), ==, 0);
>+
>+  /* Go a couple of messages over the limit. */
>+  for (i = 0; i < 2; i++)
>+    {
>+      m = dbus_message_new_method_call (
>+          dbus_bus_get_unique_name (f->right_conn), "/",
>+          "com.example", "Spam");
>+
>+      if (m == NULL)
>+        g_error ("OOM");
>+
>+      if (!dbus_connection_send_with_reply (f->left_conn, m, &pc,
>+                                            DBUS_TIMEOUT_INFINITE) ||
>+          pc == NULL)
>+        g_error ("OOM");
>+
>+      if (dbus_pending_call_get_completed (pc))
>+        pc_enqueue (pc, &errors);
>+      else if (!dbus_pending_call_set_notify (pc, pc_enqueue, &errors,
>+            NULL))
>+        g_error ("OOM");
>+
>+      dbus_pending_call_unref (pc);
>+      dbus_message_unref (m);
>+    }
>+
>+  /* Reply to the held messages. */
>+  for (m = g_queue_pop_head (&f->held_messages);
>+       m != NULL;
>+       m = g_queue_pop_head (&f->held_messages))
>+    {
>+      DBusMessage *reply = dbus_message_new_method_return (m);
>+
>+      if (reply == NULL)
>+        g_error ("OOM");
>+
>+      if (!dbus_connection_send (f->right_conn, reply, NULL))
>+        g_error ("OOM");
>+
>+      dbus_message_unref (reply);
>+    }
>+
>+  /* Wait for all 5 replies to come in. */
>+  while (g_queue_get_length (&received) + g_queue_get_length (&errors) < 5)
>+    test_main_context_iterate (f->ctx, TRUE);
>+
>+  /* The first three succeeded. */
>+  for (i = 0; i < 3; i++)
>+    {
>+      m = g_queue_pop_head (&received);
>+      g_assert (m != NULL);
>+
>+      if (dbus_set_error_from_message (&error, m))
>+        g_error ("Unexpected error: %s: %s", error.name, error.message);
>+
>+      dbus_message_unref (m);
>+    }
>+
>+  /* The last two failed. */
>+  for (i = 0; i < 2; i++)
>+    {
>+      m = g_queue_pop_head (&errors);
>+      g_assert (m != NULL);
>+
>+      if (!dbus_set_error_from_message (&error, m))
>+        g_error ("Unexpected success");
>+
>+      g_assert_cmpstr (error.name, ==, DBUS_ERROR_LIMITS_EXCEEDED);
>+      dbus_error_free (&error);
>+      dbus_message_unref (m);
>+    }
>+
>+  g_assert_cmpuint (g_queue_get_length (&received), ==, 0);
>+  g_assert_cmpuint (g_queue_get_length (&errors), ==, 0);
>+  g_queue_clear (&received);
>+  g_queue_clear (&errors);
>+}
>+
>+static void
> teardown (Fixture *f,
>     gconstpointer context G_GNUC_UNUSED)
> {
>@@ -705,6 +863,15 @@ teardown (Fixture *f,
>           f->right_conn_echo = FALSE;
>         }
> 
>+      if (f->right_conn_hold)
>+        {
>+          dbus_connection_remove_filter (f->right_conn, hold_filter, f);
>+          f->right_conn_hold = FALSE;
>+        }
>+
>+      g_queue_foreach (&f->held_messages, (GFunc) dbus_message_unref, NULL);
>+      g_queue_clear (&f->held_messages);
>+
>       dbus_connection_close (f->right_conn);
>       dbus_connection_unref (f->right_conn);
>       f->right_conn = NULL;
>@@ -768,6 +935,11 @@ static Config max_connections_per_user_config = {
>     SPECIFY_ADDRESS
> };
> 
>+static Config max_replies_per_connection_config = {
>+    NULL, 1, "valid-config-files/max-replies-per-connection.conf",
>+    SPECIFY_ADDRESS
>+};
>+
> int
> main (int argc,
>     char **argv)
>@@ -791,6 +963,9 @@ main (int argc,
>   g_test_add ("/limits/max-connections-per-user", Fixture,
>       &max_connections_per_user_config,
>       setup, test_max_connections, teardown);
>+  g_test_add ("/limits/max-replies-per-connection", Fixture,
>+      &max_replies_per_connection_config,
>+      setup, test_max_replies_per_connection, teardown);
> #ifdef DBUS_UNIX
>   /* We can't test this in loopback.c with the rest of unix:runtime=yes,
>    * because dbus_bus_get[_private] is the only way to use the default,
>-- 
>2.8.1
>

Actions: View | Splinter Review

Attachments on bug 86442: 109682 | 109683 | 109684 | 109685 | 109686 | 109687 | 109688 | 109689 | 124822 | 124823 | 124824 | 124825 | 124826 | 124827 | 124828 | 124829 | 124830 | 124831 | 124832 | 124833 | 124834 | 124838

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.