Attachment 119460 Details for Bug 92853 – Add a regression test for applying bus policy to broadcasts/unicasts

[patch] Add a regression test for applying bus policy to broadcasts/unicasts

0002-Add-a-regression-test-for-applying-bus-policy-to-bro.patch (text/plain), 11.26 KB, created by Simon McVittie on 2015-11-07 10:53:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2015-11-07 10:53:09 UTC

Size: 11.26 KB

patch

obsolete

>From 0c13151c2da40056ed1684fba81284c74af94506 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Wed, 21 Oct 2015 19:54:38 +0100
>Subject: [PATCH 2/2] Add a regression test for applying bus policy to
> broadcasts/unicasts
>
>This test-case is actually in the test for monitoring the bus,
>because it's easier to see what's going on there - the error reply
>to a rejected broadcast is not visible unless you are monitoring.
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=92853
>Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
>---
> test/data/valid-config-files/forbidding.conf.in |  10 ++
> test/monitor.c                                  | 198 +++++++++++++++++++++++-
> 2 files changed, 203 insertions(+), 5 deletions(-)
>
>diff --git a/test/data/valid-config-files/forbidding.conf.in b/test/data/valid-config-files/forbidding.conf.in
>index 6a674f8..d145613 100644
>--- a/test/data/valid-config-files/forbidding.conf.in
>+++ b/test/data/valid-config-files/forbidding.conf.in
>@@ -13,6 +13,16 @@
> 
>     
>     <deny send_interface="com.example.CannotSend"/>
>+
>+    <deny send_interface="com.example.CannotBroadcast" send_broadcast="true"/>
>+    <deny send_interface="com.example.CannotUnicast" send_broadcast="false"/>
>+
>+    
>+    <deny send_interface="com.example.CannotBroadcast2"/>
>+    <allow send_interface="com.example.CannotBroadcast2" send_broadcast="false"/>
>+    <deny send_interface="com.example.CannotUnicast2"/>
>+    <allow send_interface="com.example.CannotUnicast2" send_broadcast="true"/>
>+
>     <deny receive_interface="com.example.CannotReceive"/>
>   </policy>
> </busconfig>
>diff --git a/test/monitor.c b/test/monitor.c
>index ad4b195..4c3a8f9 100644
>--- a/test/monitor.c
>+++ b/test/monitor.c
>@@ -48,8 +48,10 @@ typedef struct {
>     DBusConnection *monitor;
>     DBusConnection *sender;
>     DBusConnection *recipient;
>+    gboolean recipient_enqueue_filter_added;
> 
>     GQueue monitored;
>+    GQueue received;
> 
>     const char *monitor_name;
>     const char *sender_name;
>@@ -360,7 +362,7 @@ monitor_filter (DBusConnection *connection,
> }
> 
> static DBusHandlerResult
>-recipient_filter (DBusConnection *connection,
>+recipient_check_filter (DBusConnection *connection,
>     DBusMessage *message,
>     void *user_data)
> {
>@@ -373,6 +375,27 @@ recipient_filter (DBusConnection *connection,
> }
> 
> static DBusHandlerResult
>+recipient_enqueue_filter (DBusConnection *connection,
>+    DBusMessage *message,
>+    void *user_data)
>+{
>+  Fixture *f = user_data;
>+
>+  if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS,
>+        "NameAcquired") ||
>+      dbus_message_is_signal (message, DBUS_INTERFACE_DBUS,
>+        "NameLost") ||
>+      dbus_message_is_signal (message, DBUS_INTERFACE_DBUS,
>+        "NameOwnerChanged"))
>+    {
>+      return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
>+    }
>+
>+  g_queue_push_tail (&f->received, dbus_message_ref (message));
>+  return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
>+}
>+
>+static DBusHandlerResult
> systemd_filter (DBusConnection *connection,
>     DBusMessage *message,
>     void *user_data)
>@@ -441,7 +464,8 @@ setup (Fixture *f,
>   if (!dbus_connection_add_filter (f->monitor, monitor_filter, f, NULL))
>     g_error ("OOM");
> 
>-  if (!dbus_connection_add_filter (f->recipient, recipient_filter, f, NULL))
>+  if (!dbus_connection_add_filter (f->recipient, recipient_check_filter,
>+        f, NULL))
>     g_error ("OOM");
> }
> 
>@@ -896,6 +920,11 @@ test_forbidden_broadcast (Fixture *f,
>   dbus_bus_add_match (f->recipient, "type='signal'", &f->e);
>   test_assert_no_error (&f->e);
> 
>+  if (!dbus_connection_add_filter (f->recipient, recipient_enqueue_filter,
>+        f, NULL))
>+    g_error ("OOM");
>+  f->recipient_enqueue_filter_added = TRUE;
>+
>   become_monitor (f);
> 
>   m = dbus_message_new_signal ("/foo", "com.example.CannotSend",
>@@ -913,7 +942,28 @@ test_forbidden_broadcast (Fixture *f,
>   dbus_connection_send (f->sender, m, NULL);
>   dbus_message_unref (m);
> 
>-  while (g_queue_get_length (&f->monitored) < 6)
>+  m = dbus_message_new_signal ("/foo", "com.example.CannotBroadcast",
>+      "CannotBroadcast");
>+  dbus_connection_send (f->sender, m, NULL);
>+  dbus_message_unref (m);
>+
>+  m = dbus_message_new_signal ("/foo", "com.example.CannotBroadcast2",
>+      "CannotBroadcast2");
>+  dbus_connection_send (f->sender, m, NULL);
>+  dbus_message_unref (m);
>+
>+  /* these two will go through: we use them as an indirect way to assert that
>+   * the recipient has not received anything earlier */
>+  m = dbus_message_new_signal ("/foo", "com.example.CannotUnicast",
>+      "CannotUnicast");
>+  dbus_connection_send (f->sender, m, NULL);
>+  dbus_message_unref (m);
>+  m = dbus_message_new_signal ("/foo", "com.example.CannotUnicast2",
>+      "CannotUnicast2");
>+  dbus_connection_send (f->sender, m, NULL);
>+  dbus_message_unref (m);
>+
>+  while (g_queue_get_length (&f->monitored) < 12)
>     test_main_context_iterate (f->ctx, TRUE);
> 
>   m = g_queue_pop_head (&f->monitored);
>@@ -947,6 +997,55 @@ test_forbidden_broadcast (Fixture *f,
>   dbus_message_unref (m);
> 
>   m = g_queue_pop_head (&f->monitored);
>+  assert_signal (m, f->sender_name, "/foo", "com.example.CannotBroadcast",
>+      "CannotBroadcast", "", NULL);
>+  dbus_message_unref (m);
>+
>+  m = g_queue_pop_head (&f->monitored);
>+  assert_error_reply (m, DBUS_SERVICE_DBUS, f->sender_name,
>+      DBUS_ERROR_ACCESS_DENIED);
>+  dbus_message_unref (m);
>+
>+  m = g_queue_pop_head (&f->monitored);
>+  assert_signal (m, f->sender_name, "/foo", "com.example.CannotBroadcast2",
>+      "CannotBroadcast2", "", NULL);
>+  dbus_message_unref (m);
>+
>+  m = g_queue_pop_head (&f->monitored);
>+  assert_error_reply (m, DBUS_SERVICE_DBUS, f->sender_name,
>+      DBUS_ERROR_ACCESS_DENIED);
>+  dbus_message_unref (m);
>+
>+  m = g_queue_pop_head (&f->monitored);
>+  assert_signal (m, f->sender_name, "/foo", "com.example.CannotUnicast",
>+      "CannotUnicast", "", NULL);
>+  dbus_message_unref (m);
>+
>+  m = g_queue_pop_head (&f->monitored);
>+  assert_signal (m, f->sender_name, "/foo", "com.example.CannotUnicast2",
>+      "CannotUnicast2", "", NULL);
>+  dbus_message_unref (m);
>+
>+  m = g_queue_pop_head (&f->monitored);
>+  g_assert (m == NULL);
>+
>+  /* the intended recipient only received the ones that were on the interface
>+   * where broadcasts are allowed */
>+
>+  while (g_queue_get_length (&f->received) < 2)
>+    test_main_context_iterate (f->ctx, TRUE);
>+
>+  m = g_queue_pop_head (&f->received);
>+  assert_signal (m, f->sender_name, "/foo", "com.example.CannotUnicast",
>+      "CannotUnicast", "", NULL);
>+  dbus_message_unref (m);
>+
>+  m = g_queue_pop_head (&f->received);
>+  assert_signal (m, f->sender_name, "/foo", "com.example.CannotUnicast2",
>+      "CannotUnicast2", "", NULL);
>+  dbus_message_unref (m);
>+
>+  m = g_queue_pop_head (&f->received);
>   g_assert (m == NULL);
> }
> 
>@@ -1012,6 +1111,11 @@ test_forbidden (Fixture *f,
> 
>   become_monitor (f);
> 
>+  if (!dbus_connection_add_filter (f->recipient, recipient_enqueue_filter,
>+        f, NULL))
>+    g_error ("OOM");
>+  f->recipient_enqueue_filter_added = TRUE;
>+
>   m = dbus_message_new_signal ("/foo", "com.example.CannotSend",
>       "UnicastSignal1");
>   if (!dbus_message_set_destination (m, f->recipient_name))
>@@ -1033,7 +1137,36 @@ test_forbidden (Fixture *f,
>   dbus_connection_send (f->sender, m, NULL);
>   dbus_message_unref (m);
> 
>-  while (g_queue_get_length (&f->monitored) < 6)
>+  m = dbus_message_new_signal ("/foo", "com.example.CannotUnicast",
>+      "CannotUnicast");
>+  if (!dbus_message_set_destination (m, f->recipient_name))
>+    g_error ("OOM");
>+  dbus_connection_send (f->sender, m, NULL);
>+  dbus_message_unref (m);
>+
>+  m = dbus_message_new_signal ("/foo", "com.example.CannotUnicast2",
>+      "CannotUnicast2");
>+  if (!dbus_message_set_destination (m, f->recipient_name))
>+    g_error ("OOM");
>+  dbus_connection_send (f->sender, m, NULL);
>+  dbus_message_unref (m);
>+
>+  /* these two will go through: we use them as an indirect way to assert that
>+   * the recipient has not received anything earlier */
>+  m = dbus_message_new_signal ("/foo", "com.example.CannotBroadcast",
>+      "CannotBroadcast");
>+  if (!dbus_message_set_destination (m, f->recipient_name))
>+    g_error ("OOM");
>+  dbus_connection_send (f->sender, m, NULL);
>+  dbus_message_unref (m);
>+  m = dbus_message_new_signal ("/foo", "com.example.CannotBroadcast2",
>+      "CannotBroadcast2");
>+  if (!dbus_message_set_destination (m, f->recipient_name))
>+    g_error ("OOM");
>+  dbus_connection_send (f->sender, m, NULL);
>+  dbus_message_unref (m);
>+
>+  while (g_queue_get_length (&f->monitored) < 12)
>     test_main_context_iterate (f->ctx, TRUE);
> 
>   m = g_queue_pop_head (&f->monitored);
>@@ -1067,6 +1200,55 @@ test_forbidden (Fixture *f,
>   dbus_message_unref (m);
> 
>   m = g_queue_pop_head (&f->monitored);
>+  assert_signal (m, f->sender_name, "/foo", "com.example.CannotUnicast",
>+      "CannotUnicast", "", f->recipient_name);
>+  dbus_message_unref (m);
>+
>+  m = g_queue_pop_head (&f->monitored);
>+  assert_error_reply (m, DBUS_SERVICE_DBUS, f->sender_name,
>+      DBUS_ERROR_ACCESS_DENIED);
>+  dbus_message_unref (m);
>+
>+  m = g_queue_pop_head (&f->monitored);
>+  assert_signal (m, f->sender_name, "/foo", "com.example.CannotUnicast2",
>+      "CannotUnicast2", "", f->recipient_name);
>+  dbus_message_unref (m);
>+
>+  m = g_queue_pop_head (&f->monitored);
>+  assert_error_reply (m, DBUS_SERVICE_DBUS, f->sender_name,
>+      DBUS_ERROR_ACCESS_DENIED);
>+  dbus_message_unref (m);
>+
>+  m = g_queue_pop_head (&f->monitored);
>+  assert_signal (m, f->sender_name, "/foo", "com.example.CannotBroadcast",
>+      "CannotBroadcast", "", f->recipient_name);
>+  dbus_message_unref (m);
>+
>+  m = g_queue_pop_head (&f->monitored);
>+  assert_signal (m, f->sender_name, "/foo", "com.example.CannotBroadcast2",
>+      "CannotBroadcast2", "", f->recipient_name);
>+  dbus_message_unref (m);
>+
>+  m = g_queue_pop_head (&f->monitored);
>+  g_assert (m == NULL);
>+
>+  /* the intended recipient only received the ones that were on the interface
>+   * where unicasts are allowed */
>+
>+  while (g_queue_get_length (&f->received) < 2)
>+    test_main_context_iterate (f->ctx, TRUE);
>+
>+  m = g_queue_pop_head (&f->received);
>+  assert_signal (m, f->sender_name, "/foo", "com.example.CannotBroadcast",
>+      "CannotBroadcast", "", f->recipient_name);
>+  dbus_message_unref (m);
>+
>+  m = g_queue_pop_head (&f->received);
>+  assert_signal (m, f->sender_name, "/foo", "com.example.CannotBroadcast2",
>+      "CannotBroadcast2", "", f->recipient_name);
>+  dbus_message_unref (m);
>+
>+  m = g_queue_pop_head (&f->received);
>   g_assert (m == NULL);
> }
> 
>@@ -1607,7 +1789,10 @@ teardown (Fixture *f,
> 
>   if (f->recipient != NULL)
>     {
>-      dbus_connection_remove_filter (f->recipient, recipient_filter, f);
>+      dbus_connection_remove_filter (f->recipient, recipient_check_filter, f);
>+      if (f->recipient_enqueue_filter_added)
>+        dbus_connection_remove_filter (f->recipient, recipient_enqueue_filter,
>+            f);
>       dbus_connection_close (f->recipient);
>       dbus_connection_unref (f->recipient);
>       f->recipient = NULL;
>@@ -1637,6 +1822,9 @@ teardown (Fixture *f,
>   g_queue_foreach (&f->monitored, (GFunc) dbus_message_unref, NULL);
>   g_queue_clear (&f->monitored);
> 
>+  g_queue_foreach (&f->received, (GFunc) dbus_message_unref, NULL);
>+  g_queue_clear (&f->received);
>+
>   g_free (f->address);
> }
> 
>-- 
>2.6.2
>

Actions: View | Splinter Review

Attachments on bug 92853: 119459 | 119460 | 131602 | 131603 | 131604 | 132757 | 132758 | 132759 | 132760 | 132761 | 132762 | 132763 | 132764 | 132765 | 132766 | 133096 | 133097

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.