Attachment 132778 Details for Bug 101848 – test: Exercise min_fds, max_fds

[patch] test: Exercise min_fds, max_fds

test-Exercise-minfds-maxfds.patch (text/plain), 7.05 KB, created by Simon McVittie on 2017-07-19 19:42:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2017-07-19 19:42:07 UTC

Size: 7.05 KB

patch

obsolete

>From 29bfc9abfbf2e3979142b2d6e39c361f45d66698 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <smcv@collabora.com>
>Date: Wed, 19 Jul 2017 19:43:09 +0100
>Subject: [PATCH] test: Exercise min_fds, max_fds
>
>Signed-off-by: Simon McVittie <smcv@collabora.com>
>---
> test/Makefile.am                               |   1 +
> test/data/valid-config-files/count-fds.conf.in |  22 ++++
> test/dbus-daemon.c                             | 148 +++++++++++++++++++++++++
> 3 files changed, 171 insertions(+)
> create mode 100644 test/data/valid-config-files/count-fds.conf.in
>
>diff --git a/test/Makefile.am b/test/Makefile.am
>index caaedf51..7f6362f3 100644
>--- a/test/Makefile.am
>+++ b/test/Makefile.am
>@@ -420,6 +420,7 @@ in_data = \
> 	data/systemd-activation/com.example.SystemdActivatable3.service.in \
> 	data/valid-config-files-system/debug-allow-all-fail.conf.in \
> 	data/valid-config-files-system/debug-allow-all-pass.conf.in \
>+	data/valid-config-files/count-fds.conf.in \
> 	data/valid-config-files/debug-allow-all-sha1.conf.in \
> 	data/valid-config-files/debug-allow-all.conf.in \
> 	data/valid-config-files/finite-timeout.conf.in \
>diff --git a/test/data/valid-config-files/count-fds.conf.in b/test/data/valid-config-files/count-fds.conf.in
>new file mode 100644
>index 00000000..f9ae3edc
>--- /dev/null
>+++ b/test/data/valid-config-files/count-fds.conf.in
>@@ -0,0 +1,22 @@
>+<!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="*"/>
>+    
>+    <deny send_path="/test/DenySendMax2" max_fds="2"/>
>+    <deny receive_path="/test/DenyReceiveMax3" max_fds="3"/>
>+    <deny send_path="/test/DenySendMin4" min_fds="4"/>
>+    <deny receive_path="/test/DenyReceiveMin5" min_fds="5"/>
>+  </policy>
>+
>+</busconfig>
>diff --git a/test/dbus-daemon.c b/test/dbus-daemon.c
>index 17405678..719640e9 100644
>--- a/test/dbus-daemon.c
>+++ b/test/dbus-daemon.c
>@@ -1048,6 +1048,147 @@ test_pending_fd_timeout (Fixture *f,
>   g_object_unref (socket);
> }
> 
>+typedef struct
>+{
>+  const gchar *path;
>+  guint n_fds;
>+  gboolean should_work;
>+} CountFdsVector;
>+
>+static const CountFdsVector count_fds_vectors[] =
>+{
>+  /* Deny sending if number of fds <= 2 */
>+  { "/test/DenySendMax2", 1, FALSE },
>+  { "/test/DenySendMax2", 2, FALSE },
>+  { "/test/DenySendMax2", 3, TRUE },
>+  { "/test/DenySendMax2", 4, TRUE },
>+
>+  /* Deny receiving if number of fds <= 3 */
>+  { "/test/DenyReceiveMax3", 2, FALSE },
>+  { "/test/DenyReceiveMax3", 3, FALSE },
>+  { "/test/DenyReceiveMax3", 4, TRUE },
>+  { "/test/DenyReceiveMax3", 5, TRUE },
>+
>+  /* Deny sending if number of fds >= 4 */
>+  { "/test/DenySendMin4", 2, TRUE },
>+  { "/test/DenySendMin4", 3, TRUE },
>+  { "/test/DenySendMin4", 4, FALSE },
>+  { "/test/DenySendMin4", 5, FALSE },
>+
>+  /* Deny receiving if number of fds >= 5 */
>+  { "/test/DenyReceiveMin5", 3, TRUE },
>+  { "/test/DenyReceiveMin5", 4, TRUE },
>+  { "/test/DenyReceiveMin5", 5, FALSE },
>+  { "/test/DenyReceiveMin5", 6, FALSE },
>+};
>+
>+static void
>+test_count_fds (Fixture *f,
>+    gconstpointer context)
>+{
>+  GQueue received = G_QUEUE_INIT;
>+  DBusMessage *m;
>+  DBusPendingCall *pc;
>+  guint i;
>+  DBusError error = DBUS_ERROR_INIT;
>+  const int stdin_fd = 0;
>+
>+  if (f->skip)
>+    return;
>+
>+  add_hold_filter (f);
>+
>+  for (i = 0; i < G_N_ELEMENTS (count_fds_vectors); i++)
>+    {
>+      const CountFdsVector *vector = &count_fds_vectors[i];
>+      guint j;
>+
>+      m = dbus_message_new_method_call (
>+          dbus_bus_get_unique_name (f->right_conn), vector->path,
>+          "com.example", "Spam");
>+
>+      if (m == NULL)
>+        g_error ("OOM");
>+
>+      for (j = 0; j < vector->n_fds; j++)
>+        {
>+          if (!dbus_message_append_args (m,
>+                                         DBUS_TYPE_UNIX_FD, &stdin_fd,
>+                                         DBUS_TYPE_INVALID))
>+            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);
>+
>+      if (vector->should_work)
>+        {
>+          DBusMessage *reply;
>+
>+          while (g_queue_get_length (&f->held_messages) < 1)
>+            test_main_context_iterate (f->ctx, TRUE);
>+
>+          g_assert_cmpint (g_queue_get_length (&f->held_messages), ==, 1);
>+
>+          m = g_queue_pop_head (&f->held_messages);
>+
>+          g_assert_cmpint (g_queue_get_length (&f->held_messages), ==, 0);
>+
>+          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);
>+          dbus_message_unref (m);
>+        }
>+
>+      while (g_queue_get_length (&received) < 1)
>+        test_main_context_iterate (f->ctx, TRUE);
>+
>+      g_assert_cmpint (g_queue_get_length (&received), ==, 1);
>+      m = g_queue_pop_head (&received);
>+      g_assert (m != NULL);
>+      g_assert_cmpint (g_queue_get_length (&received), ==, 0);
>+
>+      if (vector->should_work)
>+        {
>+          if (dbus_set_error_from_message (&error, m))
>+            g_error ("Unexpected error: %s: %s", error.name, error.message);
>+
>+          g_test_message ("Sending %u fds to %s was not denied, as expected",
>+                          vector->n_fds, vector->path);
>+        }
>+      else if (!dbus_set_error_from_message (&error, m))
>+        {
>+          g_error ("Unexpected success");
>+        }
>+      else
>+        {
>+          g_assert_cmpstr (error.name, ==, DBUS_ERROR_ACCESS_DENIED);
>+          dbus_error_free (&error);
>+          g_test_message ("Sending %u fds to %s was denied, as expected",
>+                          vector->n_fds, vector->path);
>+        }
>+
>+      dbus_message_unref (m);
>+    }
>+}
>+
> #endif
> 
> static void
>@@ -2010,6 +2151,11 @@ static Config pending_fd_timeout_config = {
>     NULL, 1, "valid-config-files/pending-fd-timeout.conf",
>     SPECIFY_ADDRESS
> };
>+
>+static Config count_fds_config = {
>+    NULL, 1, "valid-config-files/count-fds.conf",
>+    SPECIFY_ADDRESS
>+};
> #endif
> 
> int
>@@ -2076,6 +2222,8 @@ main (int argc,
>   g_test_add ("/limits/pending-fd-timeout", Fixture,
>       &pending_fd_timeout_config,
>       setup, test_pending_fd_timeout, teardown);
>+  g_test_add ("/policy/count-fds", Fixture, &count_fds_config,
>+      setup, test_count_fds, teardown);
> #endif
> 
> #ifdef DBUS_UNIX
>-- 
>2.13.3

Actions: View | Splinter Review

Attachments on bug 101848: 132777 | 132778

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.