diff options
| author | Lennart Poettering <lennart@poettering.net> | 2013-11-25 22:32:18 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-11-25 22:32:18 +0100 |
| commit | 0fc5ab9057def462a74af6ab374fb30213a2dbc0 (patch) | |
| tree | 96289fb504d66f7945272d6790755f7827bc2108 | |
| parent | e14c280244fc07a19d0acab2f08c9f783458af34 (diff) | |
bus: properly return errors to client if invalid parameters are passed to built-in methods
| -rw-r--r-- | src/libsystemd-bus/bus-objects.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/libsystemd-bus/bus-objects.c b/src/libsystemd-bus/bus-objects.c index 659f7cec83..05a62f4a3e 100644 --- a/src/libsystemd-bus/bus-objects.c +++ b/src/libsystemd-bus/bus-objects.c @@ -1122,7 +1122,7 @@ static int object_find_and_run( r = sd_bus_message_read(m, "ss", &vtable_key.interface, &vtable_key.member); if (r < 0) - return r; + return sd_bus_reply_method_errorf(m, SD_BUS_ERROR_INVALID_ARGS, "Expected interface and member parameters"); v = hashmap_get(bus->vtable_properties, &vtable_key); if (v) { @@ -1140,7 +1140,7 @@ static int object_find_and_run( r = sd_bus_message_read(m, "s", &iface); if (r < 0) - return r; + return sd_bus_reply_method_errorf(m, SD_BUS_ERROR_INVALID_ARGS, "Expected interface parameter"); if (iface[0] == 0) iface = NULL; @@ -1152,12 +1152,18 @@ static int object_find_and_run( } else if (sd_bus_message_is_method_call(m, "org.freedesktop.DBus.Introspectable", "Introspect")) { + if (!isempty(sd_bus_message_get_signature(m, true))) + return sd_bus_reply_method_errorf(m, SD_BUS_ERROR_INVALID_ARGS, "Expected no parameters"); + r = process_introspect(bus, m, n, require_fallback, found_object); if (r != 0) return r; } else if (sd_bus_message_is_method_call(m, "org.freedesktop.DBus.ObjectManager", "GetManagedObjects")) { + if (!isempty(sd_bus_message_get_signature(m, true))) + return sd_bus_reply_method_errorf(m, SD_BUS_ERROR_INVALID_ARGS, "Expected no parameters"); + r = process_get_managed_objects(bus, m, n, require_fallback, found_object); if (r != 0) return r; |