diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | bus/signals.c | 107 | ||||
| -rw-r--r-- | dbus/dbus-bus.c | 28 |
3 files changed, 79 insertions, 65 deletions
@@ -1,3 +1,10 @@ +2004-09-27 Olivier Andrieu <oliv__a@users.sourceforge.net> + + * bus/signals.c (bus_match_rule_parse): validate the components of + match rules (bug #1439). + + * dbus/dbus-bus.c (dbus_bus_add_match): add a missing OOM test. + 2004-09-24 Olivier Andrieu <oliv__a@users.sourceforge.net> * doc/dbus-specification.xml: document ServiceOwnerChanged @@ -58,7 +65,7 @@ 2004-09-04 Harald Fernengel <harry@kdevelop.org> - * qt/connection.*: Applied patch by Jérôme Lodewyck + * qt/connection.*: Applied patch by Jérôme Lodewyck <lodewyck@clipper.ens.fr> to integrate an existing connection into the Qt eventloop diff --git a/bus/signals.c b/bus/signals.c index f235c8c4..fc8e63da 100644 --- a/bus/signals.c +++ b/bus/signals.c @@ -575,7 +575,7 @@ tokenize_rule (const DBusString *rule_text, * as for the shell (to escape a literal single quote, use '\''). * * type='signal',sender='org.freedesktop.DBus',interface='org.freedesktop.DBus',member='Foo', - * path='/bar/foo',destination=':452345-34' + * path='/bar/foo',destination=':452345.34' * */ BusMatchRule* @@ -613,9 +613,14 @@ bus_match_rule_parse (DBusConnection *matches_go_to, i = 0; while (tokens[i].key != NULL) { + DBusString tmp_str; + int len; const char *key = tokens[i].key; const char *value = tokens[i].value; + _dbus_string_init_const (&tmp_str, value); + len = _dbus_string_get_length (&tmp_str); + if (strcmp (key, "type") == 0) { int t; @@ -629,6 +634,13 @@ bus_match_rule_parse (DBusConnection *matches_go_to, t = dbus_message_type_from_string (value); + if (t == DBUS_MESSAGE_TYPE_INVALID) + { + dbus_set_error (error, DBUS_ERROR_MATCH_RULE_INVALID, + "Invalid message type (%s) in match rule\n", value); + goto failed; + } + if (!bus_match_rule_set_message_type (rule, t)) { BUS_SET_OOM (error); @@ -644,6 +656,13 @@ bus_match_rule_parse (DBusConnection *matches_go_to, goto failed; } + if (!_dbus_string_validate_service (&tmp_str, 0, len)) + { + dbus_set_error (error, DBUS_ERROR_MATCH_RULE_INVALID, + "Sender service name '%s' is invalid\n", value); + goto failed; + } + if (!bus_match_rule_set_sender (rule, value)) { BUS_SET_OOM (error); @@ -659,6 +678,13 @@ bus_match_rule_parse (DBusConnection *matches_go_to, goto failed; } + if (!_dbus_string_validate_interface (&tmp_str, 0, len)) + { + dbus_set_error (error, DBUS_ERROR_MATCH_RULE_INVALID, + "Interface name '%s' is invalid\n", value); + goto failed; + } + if (!bus_match_rule_set_interface (rule, value)) { BUS_SET_OOM (error); @@ -674,6 +700,13 @@ bus_match_rule_parse (DBusConnection *matches_go_to, goto failed; } + if (!_dbus_string_validate_member (&tmp_str, 0, len)) + { + dbus_set_error (error, DBUS_ERROR_MATCH_RULE_INVALID, + "Member name '%s' is invalid\n", value); + goto failed; + } + if (!bus_match_rule_set_member (rule, value)) { BUS_SET_OOM (error); @@ -689,6 +722,13 @@ bus_match_rule_parse (DBusConnection *matches_go_to, goto failed; } + if (!_dbus_string_validate_path (&tmp_str, 0, len)) + { + dbus_set_error (error, DBUS_ERROR_MATCH_RULE_INVALID, + "Path '%s' is invalid\n", value); + goto failed; + } + if (!bus_match_rule_set_path (rule, value)) { BUS_SET_OOM (error); @@ -704,6 +744,13 @@ bus_match_rule_parse (DBusConnection *matches_go_to, goto failed; } + if (!_dbus_string_validate_service (&tmp_str, 0, len)) + { + dbus_set_error (error, DBUS_ERROR_MATCH_RULE_INVALID, + "Destination service name '%s' is invalid\n", value); + goto failed; + } + if (!bus_match_rule_set_destination (rule, value)) { BUS_SET_OOM (error); @@ -1273,7 +1320,7 @@ assert_large_rule (BusMatchRule *rule) _dbus_assert (strcmp (rule->sender, "org.freedesktop.DBusSender") == 0); _dbus_assert (strcmp (rule->member, "Foo") == 0); _dbus_assert (strcmp (rule->path, "/bar/foo") == 0); - _dbus_assert (strcmp (rule->destination, ":452345-34") == 0); + _dbus_assert (strcmp (rule->destination, ":452345.34") == 0); } static dbus_bool_t @@ -1281,7 +1328,7 @@ test_parsing (void *data) { BusMatchRule *rule; - rule = check_parse (TRUE, "type='signal',sender='org.freedesktop.DBusSender',interface='org.freedesktop.DBusInterface',member='Foo',path='/bar/foo',destination=':452345-34'"); + rule = check_parse (TRUE, "type='signal',sender='org.freedesktop.DBusSender',interface='org.freedesktop.DBusInterface',member='Foo',path='/bar/foo',destination=':452345.34'"); if (rule != NULL) { assert_large_rule (rule); @@ -1289,7 +1336,7 @@ test_parsing (void *data) } /* With extra whitespace and useless quotes */ - rule = check_parse (TRUE, " type='signal', \tsender='org.freedes''ktop.DBusSender', interface='org.freedesktop.DBusInterface''''', \tmember='Foo',path='/bar/foo',destination=':452345-34'''''"); + rule = check_parse (TRUE, " type='signal', \tsender='org.freedes''ktop.DBusSender', interface='org.freedesktop.DBusInterface''''', \tmember='Foo',path='/bar/foo',destination=':452345.34'''''"); if (rule != NULL) { assert_large_rule (rule); @@ -1323,6 +1370,14 @@ test_parsing (void *data) rule = check_parse (FALSE, "blah='signal'"); _dbus_assert (rule == NULL); + /* Reject broken valuess */ + rule = check_parse (FALSE, "type='chouin'"); + _dbus_assert (rule == NULL); + rule = check_parse (FALSE, "interface='abc@def++'"); + _dbus_assert (rule == NULL); + rule = check_parse (FALSE, "service='youpi'"); + _dbus_assert (rule == NULL); + /* Allow empty rule */ rule = check_parse (TRUE, ""); if (rule != NULL) @@ -1345,50 +1400,6 @@ test_parsing (void *data) rule = check_parse (FALSE, "type"); _dbus_assert (rule == NULL); - /* Empty string values are allowed at the moment */ - rule = check_parse (TRUE, "interface="); - if (rule != NULL) - { - _dbus_assert (rule->flags == BUS_MATCH_INTERFACE); - _dbus_assert (rule->interface); - _dbus_assert (strlen (rule->interface) == 0); - - bus_match_rule_unref (rule); - } - - /* Empty string expressed with quotes */ - rule = check_parse (TRUE, "interface=''"); - if (rule != NULL) - { - _dbus_assert (rule->flags == BUS_MATCH_INTERFACE); - _dbus_assert (rule->interface); - _dbus_assert (strlen (rule->interface) == 0); - - bus_match_rule_unref (rule); - } - - /* Check whitespace in a value */ - rule = check_parse (TRUE, "interface= "); - if (rule != NULL) - { - _dbus_assert (rule->flags == BUS_MATCH_INTERFACE); - _dbus_assert (rule->interface); - _dbus_assert (strcmp (rule->interface, " ") == 0); - - bus_match_rule_unref (rule); - } - - /* Check whitespace mixed with non-whitespace in a value */ - rule = check_parse (TRUE, "interface= foo "); - if (rule != NULL) - { - _dbus_assert (rule->flags == BUS_MATCH_INTERFACE); - _dbus_assert (rule->interface); - _dbus_assert (strcmp (rule->interface, " foo ") == 0); - - bus_match_rule_unref (rule); - } - return TRUE; } diff --git a/dbus/dbus-bus.c b/dbus/dbus-bus.c index ec8d7b6a..a310a6cd 100644 --- a/dbus/dbus-bus.c +++ b/dbus/dbus-bus.c @@ -338,7 +338,7 @@ dbus_bus_get (DBusBusType type, if (!init_connections_unlocked ()) { _DBUS_UNLOCK (bus); - dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); + _DBUS_SET_OOM (error); return NULL; } @@ -842,25 +842,15 @@ send_no_return_values (DBusConnection *connection, -1, error); if (reply == NULL) - { - _DBUS_ASSERT_ERROR_IS_SET (error); - return; - } - - if (dbus_set_error_from_message (error, reply)) - { - _DBUS_ASSERT_ERROR_IS_SET (error); - dbus_message_unref (reply); - return; - } - - dbus_message_unref (reply); + _DBUS_ASSERT_ERROR_IS_SET (error); + else + dbus_message_unref (reply); } else { /* Silently-fail nonblocking codepath */ - if (!dbus_connection_send (connection, msg, NULL)) - return; + dbus_message_set_no_reply (msg, TRUE); + dbus_connection_send (connection, msg, NULL); } } @@ -898,6 +888,12 @@ dbus_bus_add_match (DBusConnection *connection, DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS, "AddMatch"); + if (msg == NULL) + { + _DBUS_SET_OOM (error); + return; + } + if (!dbus_message_append_args (msg, DBUS_TYPE_STRING, rule, DBUS_TYPE_INVALID)) { |