From 48868fc9abb7cd5fc9a58d0ebe92b68c18c0be50 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 1 Jul 2016 13:17:23 +0100 Subject: [PATCH 13/13] dbus-daemon test: exercise max_names_per_connection limit Bug: https://bugs.freedesktop.org/show_bug.cgi?id=86442 Signed-off-by: Simon McVittie --- test/Makefile.am | 1 + .../max-names-per-connection.conf.in | 18 +++++++++ test/dbus-daemon.c | 44 ++++++++++++++++++++++ 3 files changed, 63 insertions(+) create mode 100644 test/data/valid-config-files/max-names-per-connection.conf.in diff --git a/test/Makefile.am b/test/Makefile.am index 616968b..e344e54 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -314,6 +314,7 @@ in_data = \ data/valid-config-files/max-completed-connections.conf.in \ data/valid-config-files/max-connections-per-user.conf.in \ data/valid-config-files/max-match-rules-per-connection.conf.in \ + data/valid-config-files/max-names-per-connection.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 \ diff --git a/test/data/valid-config-files/max-names-per-connection.conf.in b/test/data/valid-config-files/max-names-per-connection.conf.in new file mode 100644 index 0000000..186ed7b --- /dev/null +++ b/test/data/valid-config-files/max-names-per-connection.conf.in @@ -0,0 +1,18 @@ + + + + session + @TEST_LISTEN@ + + + + + + + + + + + 4 + diff --git a/test/dbus-daemon.c b/test/dbus-daemon.c index 57982eb..7ac12c6 100644 --- a/test/dbus-daemon.c +++ b/test/dbus-daemon.c @@ -866,6 +866,42 @@ test_max_match_rules_per_connection (Fixture *f, } static void +test_max_names_per_connection (Fixture *f, + gconstpointer context) +{ + DBusError error = DBUS_ERROR_INIT; + int ret; + + /* The limit in the configuration file is set to 4, but we only own 3 + * names here - remember that the unique name is a name too. */ + + ret = dbus_bus_request_name (f->left_conn, "com.example.C1", 0, &error); + test_assert_no_error (&error); + g_assert_cmpint (ret, ==, DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER); + + ret = dbus_bus_request_name (f->left_conn, "com.example.C2", 0, &error); + test_assert_no_error (&error); + g_assert_cmpint (ret, ==, DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER); + + ret = dbus_bus_request_name (f->left_conn, "com.example.C3", 0, &error); + test_assert_no_error (&error); + g_assert_cmpint (ret, ==, DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER); + + ret = dbus_bus_request_name (f->left_conn, "com.example.C4", 0, &error); + g_assert_cmpstr (error.name, ==, DBUS_ERROR_LIMITS_EXCEEDED); + dbus_error_free (&error); + g_assert_cmpint (ret, ==, -1); + + ret = dbus_bus_release_name (f->left_conn, "com.example.C3", &error); + test_assert_no_error (&error); + g_assert_cmpint (ret, ==, DBUS_RELEASE_NAME_REPLY_RELEASED); + + ret = dbus_bus_request_name (f->left_conn, "com.example.C4", 0, &error); + test_assert_no_error (&error); + g_assert_cmpint (ret, ==, DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER); +} + +static void teardown (Fixture *f, gconstpointer context G_GNUC_UNUSED) { @@ -969,6 +1005,11 @@ static Config max_match_rules_per_connection_config = { SPECIFY_ADDRESS }; +static Config max_names_per_connection_config = { + NULL, 1, "valid-config-files/max-names-per-connection.conf", + SPECIFY_ADDRESS +}; + int main (int argc, char **argv) @@ -998,6 +1039,9 @@ main (int argc, g_test_add ("/limits/max-match-rules-per-connection", Fixture, &max_match_rules_per_connection_config, setup, test_max_match_rules_per_connection, teardown); + g_test_add ("/limits/max-names-per-connection", Fixture, + &max_names_per_connection_config, + setup, test_max_names_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