X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd%2Fsd-bus%2Fbus-objects.c;h=6162d12c1d38854776a9c8a2f47078d89044843a;hb=412c18f10c9df3f0a02358d8c0e707ed2e5fa186;hp=3a2de6520ea9e7c2e1914b8e9fbae458a6d91577;hpb=630a4d9ea7298fb4a494662cbb4871069143ff56;p=elogind.git diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c index 3a2de6520..6162d12c1 100644 --- a/src/libsystemd/sd-bus/bus-objects.c +++ b/src/libsystemd/sd-bus/bus-objects.c @@ -225,7 +225,7 @@ static int get_child_nodes( assert(n); assert(_s); - s = set_new(string_hash_func, string_compare_func); + s = set_new(&string_hash_ops); if (!s) return -ENOMEM; @@ -617,6 +617,9 @@ static int property_get_set_callbacks_run( return r; } else { + const char *signature = NULL; + char type = 0; + if (c->vtable->type != _SD_BUS_VTABLE_WRITABLE_PROPERTY) return sd_bus_reply_method_errorf(m, SD_BUS_ERROR_PROPERTY_READ_ONLY, "Property '%s' is not writable.", c->member); @@ -628,6 +631,13 @@ static int property_get_set_callbacks_run( c->last_iteration = bus->iteration_counter; + r = sd_bus_message_peek_type(m, &type, &signature); + if (r < 0) + return r; + + if (type != 'v' || !streq(strempty(signature), strempty(c->vtable->x.property.signature))) + return sd_bus_reply_method_errorf(m, SD_BUS_ERROR_INVALID_ARGS, "Incorrect parameters for property '%s', expected '%s', got '%s'.", c->member, strempty(c->vtable->x.property.signature), strempty(signature)); + r = sd_bus_message_enter_container(m, 'v', c->vtable->x.property.signature); if (r < 0) return r; @@ -820,20 +830,7 @@ static int property_get_all_callbacks_run( return 1; } -static bool bus_node_with_object_manager(sd_bus *bus, struct node *n) { - assert(bus); - assert(n); - - if (n->object_managers) - return true; - - if (n->parent) - return bus_node_with_object_manager(bus, n->parent); - - return false; -} - -static bool bus_node_exists( +static int bus_node_exists( sd_bus *bus, struct node *n, const char *path, @@ -841,6 +838,7 @@ static bool bus_node_exists( struct node_vtable *c; struct node_callback *k; + int r; assert(bus); assert(n); @@ -849,11 +847,14 @@ static bool bus_node_exists( /* Tests if there's anything attached directly to this node * for the specified path */ + if (!require_fallback && (n->enumerators || n->object_managers)) + return true; + LIST_FOREACH(callbacks, k, n->callbacks) { if (require_fallback && !k->is_fallback) continue; - return true; + return 1; } LIST_FOREACH(vtables, c, n->vtables) { @@ -862,13 +863,14 @@ static bool bus_node_exists( if (require_fallback && !c->is_fallback) continue; - if (node_vtable_get_userdata(bus, path, c, NULL, &error) > 0) - return true; + r = node_vtable_get_userdata(bus, path, c, NULL, &error); + if (r != 0) + return r; if (bus->nodes_modified) - return false; + return 0; } - return !require_fallback && (n->enumerators || n->object_managers); + return 0; } static int process_introspect( @@ -902,7 +904,7 @@ static int process_introspect( if (r < 0) return r; - r = introspect_write_default_interfaces(&intro, bus_node_with_object_manager(bus, n)); + r = introspect_write_default_interfaces(&intro, !require_fallback && n->object_managers); if (r < 0) return r; @@ -951,12 +953,12 @@ static int process_introspect( /* Nothing?, let's see if we exist at all, and if not * refuse to do anything */ r = bus_node_exists(bus, n, m->path, require_fallback); - if (r < 0) - return r; - if (bus->nodes_modified) - return 0; - if (r == 0) + if (r <= 0) + goto finish; + if (bus->nodes_modified) { + r = 0; goto finish; + } } *found_object = true; @@ -1142,7 +1144,8 @@ static int process_get_managed_objects( _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; _cleanup_set_free_free_ Set *s = NULL; - bool empty; + Iterator i; + char *path; int r; assert(bus); @@ -1150,7 +1153,11 @@ static int process_get_managed_objects( assert(n); assert(found_object); - if (!bus_node_with_object_manager(bus, n)) + /* Spec says, GetManagedObjects() is only implemented on the root of a + * sub-tree. Therefore, we require a registered object-manager on + * exactly the queried path, otherwise, we refuse to respond. */ + + if (require_fallback || !n->object_managers) return 0; r = get_child_nodes(bus, m->path, n, &s, &error); @@ -1167,42 +1174,13 @@ static int process_get_managed_objects( if (r < 0) return r; - empty = set_isempty(s); - if (empty) { - struct node_vtable *c; - - /* Hmm, so we have no children? Then let's check - * whether we exist at all, i.e. whether at least one - * vtable exists. */ - - LIST_FOREACH(vtables, c, n->vtables) { - - if (require_fallback && !c->is_fallback) - continue; - - if (r < 0) - return r; - if (r == 0) - continue; - - empty = false; - break; - } + SET_FOREACH(path, s, i) { + r = object_manager_serialize_path_and_fallbacks(bus, reply, path, &error); + if (r < 0) + return r; - if (empty) + if (bus->nodes_modified) return 0; - } else { - Iterator i; - char *path; - - SET_FOREACH(path, s, i) { - r = object_manager_serialize_path_and_fallbacks(bus, reply, path, &error); - if (r < 0) - return r; - - if (bus->nodes_modified) - return 0; - } } r = sd_bus_message_close_container(reply); @@ -1330,6 +1308,8 @@ static int object_find_and_run( r = bus_node_exists(bus, n, m->path, require_fallback); if (r < 0) return r; + if (bus->nodes_modified) + return 0; if (r > 0) *found_object = true; } @@ -1420,7 +1400,7 @@ static struct node *bus_node_allocate(sd_bus *bus, const char *path) { if (n) return n; - r = hashmap_ensure_allocated(&bus->nodes, string_hash_func, string_compare_func); + r = hashmap_ensure_allocated(&bus->nodes, &string_hash_ops); if (r < 0) return NULL; @@ -1590,6 +1570,11 @@ static int vtable_member_compare_func(const void *a, const void *b) { return strcmp(x->member, y->member); } +static const struct hash_ops vtable_member_hash_ops = { + .hash = vtable_member_hash_func, + .compare = vtable_member_compare_func +}; + static int add_object_vtable_internal( sd_bus *bus, sd_bus_slot **slot, @@ -1618,11 +1603,11 @@ static int add_object_vtable_internal( !streq(interface, "org.freedesktop.DBus.Peer") && !streq(interface, "org.freedesktop.DBus.ObjectManager"), -EINVAL); - r = hashmap_ensure_allocated(&bus->vtable_methods, vtable_member_hash_func, vtable_member_compare_func); + r = hashmap_ensure_allocated(&bus->vtable_methods, &vtable_member_hash_ops); if (r < 0) return r; - r = hashmap_ensure_allocated(&bus->vtable_properties, vtable_member_hash_func, vtable_member_compare_func); + r = hashmap_ensure_allocated(&bus->vtable_properties, &vtable_member_hash_ops); if (r < 0) return r; @@ -1707,6 +1692,11 @@ static int add_object_vtable_internal( goto fail; } + if (v->flags & SD_BUS_VTABLE_PROPERTY_CONST) { + r = -EINVAL; + goto fail; + } + /* Fall through */ case _SD_BUS_VTABLE_PROPERTY: {