X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fbus-message.c;h=5e355127b0cb119f460738c1c9c346a5a3114b97;hp=1a50226b01292debae278ce0df43598625f3ad2e;hb=f7e2bd5a8070ba86cba6bcbf7d1c9a8173d846d4;hpb=f959af205add314dbe90f588723eabdc177956ed diff --git a/src/libsystemd-bus/bus-message.c b/src/libsystemd-bus/bus-message.c index 1a50226b0..5e355127b 100644 --- a/src/libsystemd-bus/bus-message.c +++ b/src/libsystemd-bus/bus-message.c @@ -34,6 +34,7 @@ #include "bus-internal.h" #include "bus-type.h" #include "bus-signature.h" +#include "bus-gvariant.h" static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored); @@ -104,8 +105,10 @@ static void message_reset_containers(sd_bus_message *m) { assert(m); - for (i = 0; i < m->n_containers; i++) + for (i = 0; i < m->n_containers; i++) { free(m->containers[i].signature); + free(m->containers[i].offsets); + } free(m->containers); m->containers = NULL; @@ -129,7 +132,7 @@ static void message_free(sd_bus_message *m) { uint64_t off; off = (uint8_t *)m->kdbus - (uint8_t *)m->bus->kdbus_buffer; - ioctl(m->bus->input_fd, KDBUS_CMD_MSG_RELEASE, &off); + ioctl(m->bus->input_fd, KDBUS_CMD_FREE, &off); } if (m->bus) @@ -143,27 +146,22 @@ static void message_free(sd_bus_message *m) { if (m->iovec != m->iovec_fixed) free(m->iovec); - free(m->cmdline_array); - message_reset_containers(m); free(m->root_container.signature); + free(m->root_container.offsets); free(m->peeked_signature); - free(m->unit); - free(m->user_unit); - free(m->session); + bus_creds_done(&m->creds); free(m); } -static void *message_extend_fields(sd_bus_message *m, size_t align, size_t sz) { +static void *message_extend_fields(sd_bus_message *m, size_t align, size_t sz, bool add_offset) { void *op, *np; size_t old_size, new_size, start; assert(m); - - if (m->poisoned) - return NULL; + assert_return(!m->poisoned, NULL); old_size = sizeof(struct bus_header) + m->header->fields_size; start = ALIGN_TO(old_size, align); @@ -209,6 +207,13 @@ static void *message_extend_fields(sd_bus_message *m, size_t align, size_t sz) { m->free_header = true; + if (add_offset) { + if (m->n_header_offsets >= ELEMENTSOF(m->header_offsets)) + goto poison; + + m->header_offsets[m->n_header_offsets++] = new_size - sizeof(struct bus_header); + } + return (uint8_t*) np + start; poison: @@ -228,25 +233,48 @@ static int message_append_field_string( assert(m); + /* dbus1 doesn't allow strings over 32bit, let's enforce this + * globally, to not risk convertability */ l = strlen(s); if (l > (size_t) (uint32_t) -1) return -EINVAL; - /* field id byte + signature length + signature 's' + NUL + string length + string + NUL */ - p = message_extend_fields(m, 8, 4 + 4 + l + 1); - if (!p) - return -ENOMEM; + /* Signature "(yv)" where the variant contains "s" */ + + if (BUS_MESSAGE_IS_GVARIANT(m)) { - p[0] = h; - p[1] = 1; - p[2] = type; - p[3] = 0; + /* (field id byte + 7x padding, ((string + NUL) + NUL + signature string 's') */ + p = message_extend_fields(m, 8, 1 + 7 + l + 1 + 1 + 1, true); + if (!p) + return -ENOMEM; - ((uint32_t*) p)[1] = l; - memcpy(p + 8, s, l + 1); + p[0] = h; + memset(p+1, 0, 7); + memcpy(p+8, s, l); + p[8+l] = 0; + p[8+l+1] = 0; + p[8+l+2] = type; - if (ret) - *ret = (char*) p + 8; + if (ret) + *ret = (char*) p + 8; + + } else { + /* (field id byte + (signature length + signature 's' + NUL) + (string length + string + NUL)) */ + p = message_extend_fields(m, 8, 4 + 4 + l + 1, false); + if (!p) + return -ENOMEM; + + p[0] = h; + p[1] = 1; + p[2] = type; + p[3] = 0; + + ((uint32_t*) p)[1] = l; + memcpy(p + 8, s, l + 1); + + if (ret) + *ret = (char*) p + 8; + } return 0; } @@ -262,24 +290,33 @@ static int message_append_field_signature( assert(m); + /* dbus1 doesn't allow signatures over 32bit, let's enforce + * this globally, to not risk convertability */ l = strlen(s); if (l > 255) return -EINVAL; - /* field id byte + signature length + signature 'g' + NUL + string length + string + NUL */ - p = message_extend_fields(m, 8, 4 + 1 + l + 1); - if (!p) - return -ENOMEM; + /* Signature "(yv)" where the variant contains "g" */ + + if (BUS_MESSAGE_IS_GVARIANT(m)) + /* For gvariant the serialization is the same as for normal strings */ + return message_append_field_string(m, h, 'g', s, ret); + else { + /* (field id byte + (signature length + signature 'g' + NUL) + (string length + string + NUL)) */ + p = message_extend_fields(m, 8, 4 + 1 + l + 1, false); + if (!p) + return -ENOMEM; - p[0] = h; - p[1] = 1; - p[2] = SD_BUS_TYPE_SIGNATURE; - p[3] = 0; - p[4] = l; - memcpy(p + 5, s, l + 1); + p[0] = h; + p[1] = 1; + p[2] = SD_BUS_TYPE_SIGNATURE; + p[3] = 0; + p[4] = l; + memcpy(p + 5, s, l + 1); - if (ret) - *ret = (const char*) p + 5; + if (ret) + *ret = (const char*) p + 5; + } return 0; } @@ -289,22 +326,37 @@ static int message_append_field_uint32(sd_bus_message *m, uint8_t h, uint32_t x) assert(m); - /* field id byte + signature length + signature 'u' + NUL + value */ - p = message_extend_fields(m, 8, 4 + 4); - if (!p) - return -ENOMEM; + if (BUS_MESSAGE_IS_GVARIANT(m)) { + /* (field id byte + 7x padding + ((value + NUL + signature string 'u') */ + + p = message_extend_fields(m, 8, 1 + 7 + 4 + 1 + 1, true); + if (!p) + return -ENOMEM; - p[0] = h; - p[1] = 1; - p[2] = SD_BUS_TYPE_UINT32; - p[3] = 0; + p[0] = h; + memset(p+1, 0, 7); + *((uint32_t*) (p + 8)) = x; + p[12] = 0; + p[13] = 'u'; + } else { + /* (field id byte + (signature length + signature 'u' + NUL) + value) */ + p = message_extend_fields(m, 8, 4 + 4, false); + if (!p) + return -ENOMEM; - ((uint32_t*) p)[1] = x; + p[0] = h; + p[1] = 1; + p[2] = SD_BUS_TYPE_UINT32; + p[3] = 0; + + ((uint32_t*) p)[1] = x; + } return 0; } int bus_message_from_header( + sd_bus *bus, void *buffer, size_t length, int *fds, @@ -326,7 +378,8 @@ int bus_message_from_header( return -EBADMSG; h = buffer; - if (h->version != 1) + if (h->version != 1 && + h->version != 2) return -EBADMSG; if (h->serial == 0) @@ -335,8 +388,8 @@ int bus_message_from_header( if (h->type == _SD_BUS_MESSAGE_TYPE_INVALID) return -EBADMSG; - if (h->endian != SD_BUS_LITTLE_ENDIAN && - h->endian != SD_BUS_BIG_ENDIAN) + if (h->endian != BUS_LITTLE_ENDIAN && + h->endian != BUS_BIG_ENDIAN) return -EBADMSG; a = ALIGN(sizeof(sd_bus_message)) + ALIGN(extra); @@ -357,22 +410,28 @@ int bus_message_from_header( m->n_fds = n_fds; if (ucred) { - m->uid = ucred->uid; - m->pid = ucred->pid; - m->gid = ucred->gid; - m->uid_valid = m->gid_valid = true; + m->creds.uid = ucred->uid; + m->creds.pid = ucred->pid; + m->creds.gid = ucred->gid; + m->creds.mask |= SD_BUS_CREDS_UID | SD_BUS_CREDS_PID | SD_BUS_CREDS_GID; } if (label) { - m->label = (char*) m + ALIGN(sizeof(sd_bus_message)) + ALIGN(extra); - memcpy(m->label, label, label_sz + 1); + m->creds.label = (char*) m + ALIGN(sizeof(sd_bus_message)) + ALIGN(extra); + memcpy(m->creds.label, label, label_sz + 1); + + m->creds.mask |= SD_BUS_CREDS_SELINUX_CONTEXT; } + if (bus) + m->bus = sd_bus_ref(bus); + *ret = m; return 0; } int bus_message_from_malloc( + sd_bus *bus, void *buffer, size_t length, int *fds, @@ -382,9 +441,10 @@ int bus_message_from_malloc( sd_bus_message **ret) { sd_bus_message *m; + size_t sz; int r; - r = bus_message_from_header(buffer, length, fds, n_fds, ucred, label, 0, &m); + r = bus_message_from_header(bus, buffer, length, fds, n_fds, ucred, label, 0, &m); if (r < 0) return r; @@ -393,11 +453,14 @@ int bus_message_from_malloc( goto fail; } - m->n_body_parts = 1; - m->body.data = (uint8_t*) buffer + sizeof(struct bus_header) + ALIGN8(BUS_MESSAGE_FIELDS_SIZE(m)); - m->body.size = length - sizeof(struct bus_header) - ALIGN8(BUS_MESSAGE_FIELDS_SIZE(m)); - m->body.sealed = true; - m->body.memfd = -1; + sz = length - sizeof(struct bus_header) - ALIGN8(BUS_MESSAGE_FIELDS_SIZE(m)); + if (sz > 0) { + m->n_body_parts = 1; + m->body.data = (uint8_t*) buffer + sizeof(struct bus_header) + ALIGN8(BUS_MESSAGE_FIELDS_SIZE(m)); + m->body.size = sz; + m->body.sealed = true; + m->body.memfd = -1; + } m->n_iovec = 1; m->iovec = m->iovec_fixed; @@ -429,10 +492,11 @@ static sd_bus_message *message_new(sd_bus *bus, uint8_t type) { m->n_ref = 1; m->header = (struct bus_header*) ((uint8_t*) m + ALIGN(sizeof(struct sd_bus_message))); - m->header->endian = SD_BUS_NATIVE_ENDIAN; + m->header->endian = BUS_NATIVE_ENDIAN; m->header->type = type; m->header->version = bus ? bus->message_version : 1; m->allow_fds = !bus || bus->can_fds || (bus->state != BUS_HELLO && bus->state != BUS_RUNNING); + m->root_container.need_offsets = BUS_MESSAGE_IS_GVARIANT(m); if (bus) m->bus = sd_bus_ref(bus); @@ -460,15 +524,15 @@ _public_ int sd_bus_message_new_signal( if (!t) return -ENOMEM; - t->header->flags |= SD_BUS_MESSAGE_NO_REPLY_EXPECTED; + t->header->flags |= BUS_MESSAGE_NO_REPLY_EXPECTED; - r = message_append_field_string(t, SD_BUS_MESSAGE_HEADER_PATH, SD_BUS_TYPE_OBJECT_PATH, path, &t->path); + r = message_append_field_string(t, BUS_MESSAGE_HEADER_PATH, SD_BUS_TYPE_OBJECT_PATH, path, &t->path); if (r < 0) goto fail; - r = message_append_field_string(t, SD_BUS_MESSAGE_HEADER_INTERFACE, SD_BUS_TYPE_STRING, interface, &t->interface); + r = message_append_field_string(t, BUS_MESSAGE_HEADER_INTERFACE, SD_BUS_TYPE_STRING, interface, &t->interface); if (r < 0) goto fail; - r = message_append_field_string(t, SD_BUS_MESSAGE_HEADER_MEMBER, SD_BUS_TYPE_STRING, member, &t->member); + r = message_append_field_string(t, BUS_MESSAGE_HEADER_MEMBER, SD_BUS_TYPE_STRING, member, &t->member); if (r < 0) goto fail; @@ -502,21 +566,21 @@ _public_ int sd_bus_message_new_method_call( if (!t) return -ENOMEM; - r = message_append_field_string(t, SD_BUS_MESSAGE_HEADER_PATH, SD_BUS_TYPE_OBJECT_PATH, path, &t->path); + r = message_append_field_string(t, BUS_MESSAGE_HEADER_PATH, SD_BUS_TYPE_OBJECT_PATH, path, &t->path); if (r < 0) goto fail; - r = message_append_field_string(t, SD_BUS_MESSAGE_HEADER_MEMBER, SD_BUS_TYPE_STRING, member, &t->member); + r = message_append_field_string(t, BUS_MESSAGE_HEADER_MEMBER, SD_BUS_TYPE_STRING, member, &t->member); if (r < 0) goto fail; if (interface) { - r = message_append_field_string(t, SD_BUS_MESSAGE_HEADER_INTERFACE, SD_BUS_TYPE_STRING, interface, &t->interface); + r = message_append_field_string(t, BUS_MESSAGE_HEADER_INTERFACE, SD_BUS_TYPE_STRING, interface, &t->interface); if (r < 0) goto fail; } if (destination) { - r = message_append_field_string(t, SD_BUS_MESSAGE_HEADER_DESTINATION, SD_BUS_TYPE_STRING, destination, &t->destination); + r = message_append_field_string(t, BUS_MESSAGE_HEADER_DESTINATION, SD_BUS_TYPE_STRING, destination, &t->destination); if (r < 0) goto fail; } @@ -530,7 +594,6 @@ fail: } static int message_new_reply( - sd_bus *bus, sd_bus_message *call, uint8_t type, sd_bus_message **m) { @@ -538,30 +601,31 @@ static int message_new_reply( sd_bus_message *t; int r; - assert_return(!bus || bus->state != BUS_UNSET, -ENOTCONN); assert_return(call, -EINVAL); assert_return(call->sealed, -EPERM); assert_return(call->header->type == SD_BUS_MESSAGE_METHOD_CALL, -EINVAL); + assert_return(!call->bus || call->bus->state != BUS_UNSET, -ENOTCONN); assert_return(m, -EINVAL); - t = message_new(bus, type); + t = message_new(call->bus, type); if (!t) return -ENOMEM; - t->header->flags |= SD_BUS_MESSAGE_NO_REPLY_EXPECTED; + t->header->flags |= BUS_MESSAGE_NO_REPLY_EXPECTED; t->reply_serial = BUS_MESSAGE_SERIAL(call); - r = message_append_field_uint32(t, SD_BUS_MESSAGE_HEADER_REPLY_SERIAL, t->reply_serial); + r = message_append_field_uint32(t, BUS_MESSAGE_HEADER_REPLY_SERIAL, t->reply_serial); if (r < 0) goto fail; if (call->sender) { - r = message_append_field_string(t, SD_BUS_MESSAGE_HEADER_DESTINATION, SD_BUS_TYPE_STRING, call->sender, &t->destination); + r = message_append_field_string(t, BUS_MESSAGE_HEADER_DESTINATION, SD_BUS_TYPE_STRING, call->sender, &t->destination); if (r < 0) goto fail; } - t->dont_send = !!(call->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED); + t->dont_send = !!(call->header->flags & BUS_MESSAGE_NO_REPLY_EXPECTED); + t->enforced_reply_signature = call->enforced_reply_signature; *m = t; return 0; @@ -572,15 +636,13 @@ fail: } _public_ int sd_bus_message_new_method_return( - sd_bus *bus, sd_bus_message *call, sd_bus_message **m) { - return message_new_reply(bus, call, SD_BUS_MESSAGE_METHOD_RETURN, m); + return message_new_reply(call, SD_BUS_MESSAGE_METHOD_RETURN, m); } _public_ int sd_bus_message_new_method_error( - sd_bus *bus, sd_bus_message *call, const sd_bus_error *e, sd_bus_message **m) { @@ -591,11 +653,11 @@ _public_ int sd_bus_message_new_method_error( assert_return(sd_bus_error_is_set(e), -EINVAL); assert_return(m, -EINVAL); - r = message_new_reply(bus, call, SD_BUS_MESSAGE_METHOD_ERROR, &t); + r = message_new_reply(call, SD_BUS_MESSAGE_METHOD_ERROR, &t); if (r < 0) return r; - r = message_append_field_string(t, SD_BUS_MESSAGE_HEADER_ERROR_NAME, SD_BUS_TYPE_STRING, e->name, &t->error.name); + r = message_append_field_string(t, BUS_MESSAGE_HEADER_ERROR_NAME, SD_BUS_TYPE_STRING, e->name, &t->error.name); if (r < 0) goto fail; @@ -605,6 +667,8 @@ _public_ int sd_bus_message_new_method_error( goto fail; } + t->error._need_free = -1; + *m = t; return 0; @@ -614,7 +678,6 @@ fail: } _public_ int sd_bus_message_new_method_errorf( - sd_bus *bus, sd_bus_message *call, sd_bus_message **m, const char *name, @@ -623,23 +686,18 @@ _public_ int sd_bus_message_new_method_errorf( _cleanup_free_ sd_bus_error error = SD_BUS_ERROR_NULL; va_list ap; - int r; assert_return(name, -EINVAL); assert_return(m, -EINVAL); va_start(ap, format); - r = bus_error_setfv(&error, name, format, ap); + bus_error_setfv(&error, name, format, ap); va_end(ap); - if (r < 0) - return r; - - return sd_bus_message_new_method_error(bus, call, &error, m); + return sd_bus_message_new_method_error(call, &error, m); } _public_ int sd_bus_message_new_method_errno( - sd_bus *bus, sd_bus_message *call, int error, const sd_bus_error *p, @@ -648,15 +706,14 @@ _public_ int sd_bus_message_new_method_errno( _cleanup_free_ sd_bus_error berror = SD_BUS_ERROR_NULL; if (sd_bus_error_is_set(p)) - return sd_bus_message_new_method_error(bus, call, p, m); + return sd_bus_message_new_method_error(call, p, m); sd_bus_error_set_errno(&berror, error); - return sd_bus_message_new_method_error(bus, call, &berror, m); + return sd_bus_message_new_method_error(call, &berror, m); } _public_ int sd_bus_message_new_method_errnof( - sd_bus *bus, sd_bus_message *call, sd_bus_message **m, int error, @@ -665,16 +722,12 @@ _public_ int sd_bus_message_new_method_errnof( _cleanup_free_ sd_bus_error berror = SD_BUS_ERROR_NULL; va_list ap; - int r; va_start(ap, format); - r = bus_error_set_errnofv(&berror, error, format, ap); + bus_error_set_errnofv(&berror, error, format, ap); va_end(ap); - if (r < 0) - return r; - - return sd_bus_message_new_method_error(bus, call, &berror, m); + return sd_bus_message_new_method_error(call, &berror, m); } int bus_message_new_synthetic_error( @@ -693,20 +746,20 @@ int bus_message_new_synthetic_error( if (!t) return -ENOMEM; - t->header->flags |= SD_BUS_MESSAGE_NO_REPLY_EXPECTED; + t->header->flags |= BUS_MESSAGE_NO_REPLY_EXPECTED; t->reply_serial = serial; - r = message_append_field_uint32(t, SD_BUS_MESSAGE_HEADER_REPLY_SERIAL, t->reply_serial); + r = message_append_field_uint32(t, BUS_MESSAGE_HEADER_REPLY_SERIAL, t->reply_serial); if (r < 0) goto fail; if (bus && bus->unique_name) { - r = message_append_field_string(t, SD_BUS_MESSAGE_HEADER_DESTINATION, SD_BUS_TYPE_STRING, bus->unique_name, &t->destination); + r = message_append_field_string(t, BUS_MESSAGE_HEADER_DESTINATION, SD_BUS_TYPE_STRING, bus->unique_name, &t->destination); if (r < 0) goto fail; } - r = message_append_field_string(t, SD_BUS_MESSAGE_HEADER_ERROR_NAME, SD_BUS_TYPE_STRING, e->name, &t->error.name); + r = message_append_field_string(t, BUS_MESSAGE_HEADER_ERROR_NAME, SD_BUS_TYPE_STRING, e->name, &t->error.name); if (r < 0) goto fail; @@ -716,6 +769,8 @@ int bus_message_new_synthetic_error( goto fail; } + t->error._need_free = -1; + *m = t; return 0; @@ -774,7 +829,13 @@ _public_ int sd_bus_message_get_reply_serial(sd_bus_message *m, uint64_t *serial _public_ int sd_bus_message_get_no_reply(sd_bus_message *m) { assert_return(m, -EINVAL); - return m->header->type == SD_BUS_MESSAGE_METHOD_CALL ? !!(m->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED) : 0; + return m->header->type == SD_BUS_MESSAGE_METHOD_CALL ? !!(m->header->flags & BUS_MESSAGE_NO_REPLY_EXPECTED) : 0; +} + +_public_ int sd_bus_message_get_no_auto_start(sd_bus_message *m) { + assert_return(m, -EINVAL); + + return !!(m->header->flags & BUS_MESSAGE_NO_AUTO_START); } _public_ const char *sd_bus_message_get_path(sd_bus_message *m) { @@ -814,63 +875,10 @@ _public_ const sd_bus_error *sd_bus_message_get_error(sd_bus_message *m) { return &m->error; } -_public_ int sd_bus_message_get_uid(sd_bus_message *m, uid_t *uid) { - assert_return(m, -EINVAL); - assert_return(uid, -EINVAL); - assert_return(m->uid_valid, -ESRCH); - - *uid = m->uid; - return 0; -} - -_public_ int sd_bus_message_get_gid(sd_bus_message *m, gid_t *gid) { - assert_return(m, -EINVAL); - assert_return(gid, -EINVAL); - assert_return(m->gid_valid, -ESRCH); - - *gid = m->gid; - return 0; -} - -_public_ int sd_bus_message_get_pid(sd_bus_message *m, pid_t *pid) { - assert_return(m, -EINVAL); - assert_return(pid, -EINVAL); - assert_return(m->pid > 0, -ESRCH); - - *pid = m->pid; - return 0; -} - -_public_ int sd_bus_message_get_tid(sd_bus_message *m, pid_t *tid) { - assert_return(m, -EINVAL); - assert_return(tid, -EINVAL); - assert_return(m->tid > 0, -ESRCH); - - *tid = m->tid; - return 0; -} - -_public_ int sd_bus_message_get_pid_starttime(sd_bus_message *m, uint64_t *usec) { - assert_return(m, -EINVAL); - assert_return(usec, -EINVAL); - assert_return(m->pid_starttime > 0, -ESRCH); - - *usec = m->pid_starttime; - return 0; -} - -_public_ int sd_bus_message_get_selinux_context(sd_bus_message *m, const char **ret) { - assert_return(m, -EINVAL); - assert_return(m->label, -ESRCH); - - *ret = m->label; - return 0; -} - _public_ int sd_bus_message_get_monotonic_timestamp(sd_bus_message *m, uint64_t *usec) { assert_return(m, -EINVAL); assert_return(usec, -EINVAL); - assert_return(m->monotonic > 0, -ESRCH); + assert_return(m->monotonic > 0, -ENODATA); *usec = m->monotonic; return 0; @@ -879,166 +887,19 @@ _public_ int sd_bus_message_get_monotonic_timestamp(sd_bus_message *m, uint64_t _public_ int sd_bus_message_get_realtime_timestamp(sd_bus_message *m, uint64_t *usec) { assert_return(m, -EINVAL); assert_return(usec, -EINVAL); - assert_return(m->realtime > 0, -ESRCH); + assert_return(m->realtime > 0, -ENODATA); *usec = m->realtime; return 0; } -_public_ int sd_bus_message_get_comm(sd_bus_message *m, const char **ret) { - assert_return(m, -EINVAL); - assert_return(ret, -EINVAL); - assert_return(m->comm, -ESRCH); - - *ret = m->comm; - return 0; -} - -_public_ int sd_bus_message_get_tid_comm(sd_bus_message *m, const char **ret) { - assert_return(m, -EINVAL); - assert_return(ret, -EINVAL); - assert_return(m->tid_comm, -ESRCH); - - *ret = m->tid_comm; - return 0; -} - -_public_ int sd_bus_message_get_exe(sd_bus_message *m, const char **ret) { - assert_return(m, -EINVAL); - assert_return(ret, -EINVAL); - assert_return(m->exe, -ESRCH); - - *ret = m->exe; - return 0; -} - -_public_ int sd_bus_message_get_cgroup(sd_bus_message *m, const char **ret) { - assert_return(m, -EINVAL); - assert_return(ret, -EINVAL); - assert_return(m->cgroup, -ESRCH); - - *ret = m->cgroup; - return 0; -} - -_public_ int sd_bus_message_get_unit(sd_bus_message *m, const char **ret) { - int r; - - assert_return(m, -EINVAL); - assert_return(ret, -EINVAL); - assert_return(m->cgroup, -ESRCH); - - if (!m->unit) { - r = cg_path_get_unit(m->cgroup, &m->unit); - if (r < 0) - return r; - } - - *ret = m->unit; - return 0; -} - -_public_ int sd_bus_message_get_user_unit(sd_bus_message *m, const char **ret) { - int r; - - assert_return(m, -EINVAL); - assert_return(ret, -EINVAL); - assert_return(m->cgroup, -ESRCH); - - if (!m->user_unit) { - r = cg_path_get_user_unit(m->cgroup, &m->user_unit); - if (r < 0) - return r; - } - - *ret = m->user_unit; - return 0; -} - -_public_ int sd_bus_message_get_session(sd_bus_message *m, const char **ret) { - int r; - - assert_return(m, -EINVAL); - assert_return(ret, -EINVAL); - assert_return(m->cgroup, -ESRCH); - - if (!m->session) { - r = cg_path_get_session(m->cgroup, &m->session); - if (r < 0) - return r; - } - - *ret = m->session; - return 0; -} - -_public_ int sd_bus_message_get_owner_uid(sd_bus_message *m, uid_t *uid) { - assert_return(m, -EINVAL); - assert_return(uid, -EINVAL); - assert_return(m->cgroup, -ESRCH); - - return cg_path_get_owner_uid(m->cgroup, uid); -} - -_public_ int sd_bus_message_get_cmdline(sd_bus_message *m, char ***cmdline) { - size_t n, i; - const char *p; - bool first; - - assert_return(m, -EINVAL); - assert_return(m->cmdline, -ESRCH); - - for (p = m->cmdline, n = 0; p < m->cmdline + m->cmdline_length; p++) - if (*p == 0) - n++; - - m->cmdline_array = new(char*, n + 1); - if (!m->cmdline_array) - return -ENOMEM; - - for (p = m->cmdline, i = 0, first = true; p < m->cmdline + m->cmdline_length; p++) { - if (first) - m->cmdline_array[i++] = (char*) p; - - first = *p == 0; - } - - m->cmdline_array[i] = NULL; - *cmdline = m->cmdline_array; - - return 0; -} - -_public_ int sd_bus_message_get_audit_sessionid(sd_bus_message *m, uint32_t *sessionid) { - assert_return(m, -EINVAL); - assert_return(sessionid, -EINVAL); - assert_return(m->audit, -ESRCH); - - *sessionid = m->audit->sessionid; - return 0; -} - -_public_ int sd_bus_message_get_audit_loginuid(sd_bus_message *m, uid_t *uid) { - assert_return(m, -EINVAL); - assert_return(uid, -EINVAL); - assert_return(m->audit, -ESRCH); - - *uid = m->audit->loginuid; - return 0; -} - -_public_ int sd_bus_message_has_effective_cap(sd_bus_message *m, int capability) { - unsigned sz; - - assert_return(m, -EINVAL); - assert_return(capability < 0, -EINVAL); - assert_return(!m->capability, -ESRCH); +_public_ sd_bus_creds *sd_bus_message_get_creds(sd_bus_message *m) { + assert_return(m, NULL); - sz = m->capability_size / 4; - if ((unsigned) capability >= sz*8) - return 0; + if (m->creds.mask == 0) + return NULL; - return !!(m->capability[2 * sz + (capability / 8)] & (1 << (capability % 8))); + return &m->creds; } _public_ int sd_bus_message_is_signal(sd_bus_message *m, @@ -1093,9 +954,21 @@ _public_ int sd_bus_message_set_no_reply(sd_bus_message *m, int b) { assert_return(m->header->type == SD_BUS_MESSAGE_METHOD_CALL, -EPERM); if (b) - m->header->flags |= SD_BUS_MESSAGE_NO_REPLY_EXPECTED; + m->header->flags |= BUS_MESSAGE_NO_REPLY_EXPECTED; + else + m->header->flags &= ~BUS_MESSAGE_NO_REPLY_EXPECTED; + + return 0; +} + +_public_ int sd_bus_message_set_no_auto_start(sd_bus_message *m, int b) { + assert_return(m, -EINVAL); + assert_return(!m->sealed, -EPERM); + + if (b) + m->header->flags |= BUS_MESSAGE_NO_AUTO_START; else - m->header->flags &= ~SD_BUS_MESSAGE_NO_REPLY_EXPECTED; + m->header->flags &= ~BUS_MESSAGE_NO_AUTO_START; return 0; } @@ -1114,9 +987,7 @@ struct bus_body_part *message_append_part(sd_bus_message *m) { struct bus_body_part *part; assert(m); - - if (m->poisoned) - return NULL; + assert_return(!m->poisoned, NULL); if (m->n_body_parts <= 0) { part = &m->body; @@ -1218,6 +1089,27 @@ static int part_make_space( return 0; } +static int message_add_offset(sd_bus_message *m, size_t offset) { + struct bus_container *c; + + assert(m); + assert(BUS_MESSAGE_IS_GVARIANT(m)); + + /* Add offset to current container, unless this is the first + * item in it, which will have the 0 offset, which we can + * ignore. */ + c = message_get_container(m); + + if (!c->need_offsets) + return 0; + + if (!GREEDY_REALLOC(c->offsets, c->n_offsets_allocated, c->n_offsets + 1)) + return -ENOMEM; + + c->offsets[c->n_offsets++] = offset; + return 0; +} + static void message_extend_containers(sd_bus_message *m, size_t expand) { struct bus_container *c; @@ -1227,24 +1119,22 @@ static void message_extend_containers(sd_bus_message *m, size_t expand) { return; /* Update counters */ - for (c = m->containers; c < m->containers + m->n_containers; c++) + for (c = m->containers; c < m->containers + m->n_containers; c++) { + if (c->array_size) *c->array_size += expand; + } } -static void *message_extend_body(sd_bus_message *m, size_t align, size_t sz) { - struct bus_body_part *part = NULL; - size_t start_body, end_body, padding, start_part, end_part, added; - bool add_new_part; +static void *message_extend_body(sd_bus_message *m, size_t align, size_t sz, bool add_offset) { + size_t start_body, end_body, padding, added; void *p; int r; assert(m); assert(align > 0); assert(!m->sealed); - - if (m->poisoned) - return NULL; + assert_return(!m->poisoned, NULL); start_body = ALIGN_TO((size_t) m->header->body_size, align); end_body = start_body + sz; @@ -1258,69 +1148,110 @@ static void *message_extend_body(sd_bus_message *m, size_t align, size_t sz) { return NULL; } - add_new_part = - m->n_body_parts <= 0 || - m->body_end->sealed || - padding != ALIGN_TO(m->body_end->size, align) - m->body_end->size; + if (added > 0) { + struct bus_body_part *part = NULL; + bool add_new_part; + + add_new_part = + m->n_body_parts <= 0 || + m->body_end->sealed || + padding != ALIGN_TO(m->body_end->size, align) - m->body_end->size; + + if (add_new_part) { + if (padding > 0) { + part = message_append_part(m); + if (!part) + return NULL; + + part_zero(part, padding); + } - if (add_new_part) { - if (padding > 0) { part = message_append_part(m); if (!part) return NULL; - part_zero(part, padding); + r = part_make_space(m, part, sz, &p); + if (r < 0) + return NULL; + } else { + struct bus_container *c; + void *op; + size_t os, start_part, end_part; + + part = m->body_end; + op = part->data; + os = part->size; + + start_part = ALIGN_TO(part->size, align); + end_part = start_part + sz; + + r = part_make_space(m, part, end_part, &p); + if (r < 0) + return NULL; + + if (padding > 0) { + memset(p, 0, padding); + p = (uint8_t*) p + padding; + } + + /* Readjust pointers */ + for (c = m->containers; c < m->containers + m->n_containers; c++) + c->array_size = adjust_pointer(c->array_size, op, os, part->data); + + m->error.message = (const char*) adjust_pointer(m->error.message, op, os, part->data); } + } else + /* Return something that is not NULL and is aligned */ + p = (uint8_t *) NULL + align; - part = message_append_part(m); - if (!part) - return NULL; + m->header->body_size = end_body; + message_extend_containers(m, added); - r = part_make_space(m, part, sz, &p); - if (r < 0) + if (add_offset) { + r = message_add_offset(m, end_body); + if (r < 0) { + m->poisoned = true; return NULL; - } else { - struct bus_container *c; - void *op; - size_t os; + } + } + + return p; +} - part = m->body_end; - op = part->data; - os = part->size; +static int message_push_fd(sd_bus_message *m, int fd) { + int *f, copy; - start_part = ALIGN_TO(part->size, align); - end_part = start_part + sz; + assert(m); - r = part_make_space(m, part, end_part, &p); - if (r < 0) - return NULL; + if (fd < 0) + return -EINVAL; - if (padding > 0) { - memset(p, 0, padding); - p = (uint8_t*) p + padding; - } + if (!m->allow_fds) + return -ENOTSUP; - /* Readjust pointers */ - for (c = m->containers; c < m->containers + m->n_containers; c++) - c->array_size = adjust_pointer(c->array_size, op, os, part->data); + copy = fcntl(fd, F_DUPFD_CLOEXEC, 3); + if (copy < 0) + return -errno; - m->error.message = (const char*) adjust_pointer(m->error.message, op, os, part->data); + f = realloc(m->fds, sizeof(int) * (m->n_fds + 1)); + if (!f) { + m->poisoned = true; + close_nointr_nofail(copy); + return -ENOMEM; } - m->header->body_size = end_body; - message_extend_containers(m, added); + m->fds = f; + m->fds[m->n_fds] = copy; + m->free_fds = true; - return p; + return copy; } int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored) { + _cleanup_close_ int fd = -1; struct bus_container *c; ssize_t align, sz; - uint32_t k; void *a; - int fd = -1; - uint32_t fdi = 0; - int r; assert_return(m, -EINVAL); assert_return(!m->sealed, -EPERM); @@ -1348,157 +1279,170 @@ int message_append_basic(sd_bus_message *m, char type, const void *p, const void } } - switch (type) { + if (BUS_MESSAGE_IS_GVARIANT(m)) { + uint8_t u8; + uint32_t u32; - case SD_BUS_TYPE_STRING: - /* To make things easy we'll serialize a NULL string - * into the empty string */ - p = strempty(p); + switch (type) { - /* Fall through... */ - case SD_BUS_TYPE_OBJECT_PATH: + case SD_BUS_TYPE_SIGNATURE: + case SD_BUS_TYPE_STRING: + p = strempty(p); - if (!p) { - r = -EINVAL; - goto fail; - } + /* Fall through... */ + case SD_BUS_TYPE_OBJECT_PATH: + if (!p) + return -EINVAL; - align = 4; - sz = 4 + strlen(p) + 1; - break; + align = 1; + sz = strlen(p) + 1; + break; - case SD_BUS_TYPE_SIGNATURE: + case SD_BUS_TYPE_BOOLEAN: - if (!p) { - r = -EINVAL; - goto fail; - } + u8 = p && *(int*) p; + p = &u8; - align = 1; - sz = 1 + strlen(p) + 1; - break; + align = sz = 1; + break; - case SD_BUS_TYPE_BOOLEAN: + case SD_BUS_TYPE_UNIX_FD: - if (!p) { - r = -EINVAL; - goto fail; - } + if (!p) + return -EINVAL; - align = sz = 4; + fd = message_push_fd(m, *(int*) p); + if (fd < 0) + return fd; - assert_cc(sizeof(int) == sizeof(uint32_t)); - memcpy(&k, p, 4); - k = !!k; - p = &k; - break; + u32 = m->n_fds; + p = &u32; - case SD_BUS_TYPE_UNIX_FD: { - int z, *f; + align = sz = 4; + break; - if (!p) { - r = -EINVAL; - goto fail; + default: + align = bus_gvariant_get_alignment(CHAR_TO_STR(type)); + sz = bus_gvariant_get_size(CHAR_TO_STR(type)); + break; } - if (!m->allow_fds) { - r = -ENOTSUP; - goto fail; - } + assert(align > 0); + assert(sz > 0); - align = sz = 4; + a = message_extend_body(m, align, sz, true); + if (!a) + return -ENOMEM; - z = *(int*) p; - if (z < 0) { - r = -EINVAL; - goto fail; - } + memcpy(a, p, sz); - fd = fcntl(z, F_DUPFD_CLOEXEC, 3); - if (fd < 0) { - r = -errno; - goto fail; - } + if (stored) + *stored = (const uint8_t*) a; - f = realloc(m->fds, sizeof(int) * (m->n_fds + 1)); - if (!f) { - m->poisoned = true; - r = -ENOMEM; - goto fail; - } + } else { + uint32_t u32; - fdi = m->n_fds; - f[fdi] = fd; - m->fds = f; - m->free_fds = true; - break; - } + switch (type) { - default: - if (!p) { - r = -EINVAL; - goto fail; - } + case SD_BUS_TYPE_STRING: + /* To make things easy we'll serialize a NULL string + * into the empty string */ + p = strempty(p); - align = bus_type_get_alignment(type); - sz = bus_type_get_size(type); - break; - } + /* Fall through... */ + case SD_BUS_TYPE_OBJECT_PATH: - assert(align > 0); - assert(sz > 0); + if (!p) + return -EINVAL; - a = message_extend_body(m, align, sz); - if (!a) { - r = -ENOMEM; - goto fail; - } + align = 4; + sz = 4 + strlen(p) + 1; + break; - if (type == SD_BUS_TYPE_STRING || type == SD_BUS_TYPE_OBJECT_PATH) { - *(uint32_t*) a = sz - 5; - memcpy((uint8_t*) a + 4, p, sz - 4); + case SD_BUS_TYPE_SIGNATURE: - if (stored) - *stored = (const uint8_t*) a + 4; + p = strempty(p); - } else if (type == SD_BUS_TYPE_SIGNATURE) { - *(uint8_t*) a = sz - 1; - memcpy((uint8_t*) a + 1, p, sz - 1); + align = 1; + sz = 1 + strlen(p) + 1; + break; - if (stored) - *stored = (const uint8_t*) a + 1; - } else if (type == SD_BUS_TYPE_UNIX_FD) { - *(uint32_t*) a = fdi; + case SD_BUS_TYPE_BOOLEAN: - if (stored) - *stored = a; + u32 = p && *(int*) p; + p = &u32; - m->n_fds ++; + align = sz = 4; + break; - } else { - memcpy(a, p, sz); + case SD_BUS_TYPE_UNIX_FD: - if (stored) - *stored = a; + if (!p) + return -EINVAL; + + fd = message_push_fd(m, *(int*) p); + if (fd < 0) + return fd; + + u32 = m->n_fds; + p = &u32; + + align = sz = 4; + break; + + default: + align = bus_type_get_alignment(type); + sz = bus_type_get_size(type); + break; + } + + assert(align > 0); + assert(sz > 0); + + a = message_extend_body(m, align, sz, false); + if (!a) + return -ENOMEM; + + if (type == SD_BUS_TYPE_STRING || type == SD_BUS_TYPE_OBJECT_PATH) { + *(uint32_t*) a = sz - 5; + memcpy((uint8_t*) a + 4, p, sz - 4); + + if (stored) + *stored = (const uint8_t*) a + 4; + + } else if (type == SD_BUS_TYPE_SIGNATURE) { + *(uint8_t*) a = sz - 1; + memcpy((uint8_t*) a + 1, p, sz - 1); + + if (stored) + *stored = (const uint8_t*) a + 1; + } else { + memcpy(a, p, sz); + + if (stored) + *stored = a; + } } + if (type == SD_BUS_TYPE_UNIX_FD) + m->n_fds ++; + if (c->enclosing != SD_BUS_TYPE_ARRAY) c->index++; + fd = -1; return 0; - -fail: - if (fd >= 0) - close_nointr_nofail(fd); - - return r; } _public_ int sd_bus_message_append_basic(sd_bus_message *m, char type, const void *p) { return message_append_basic(m, type, p, NULL); } -_public_ int sd_bus_message_append_string_space(sd_bus_message *m, size_t size, char **s) { +_public_ int sd_bus_message_append_string_space( + sd_bus_message *m, + size_t size, + char **s) { + struct bus_container *c; void *a; @@ -1528,12 +1472,20 @@ _public_ int sd_bus_message_append_string_space(sd_bus_message *m, size_t size, } } - a = message_extend_body(m, 4, 4 + size + 1); - if (!a) - return -ENOMEM; + if (BUS_MESSAGE_IS_GVARIANT(m)) { + a = message_extend_body(m, 1, size + 1, true); + if (!a) + return -ENOMEM; - *(uint32_t*) a = size; - *s = (char*) a + 4; + *s = a; + } else { + a = message_extend_body(m, 4, 4 + size + 1, false); + if (!a) + return -ENOMEM; + + *(uint32_t*) a = size; + *s = (char*) a + 4; + } (*s)[size] = 0; @@ -1543,30 +1495,61 @@ _public_ int sd_bus_message_append_string_space(sd_bus_message *m, size_t size, return 0; } +_public_ int sd_bus_message_append_string_iovec( + sd_bus_message *m, + const struct iovec *iov, + unsigned n) { + + size_t size; + unsigned i; + char *p; + int r; + + assert_return(m, -EINVAL); + assert_return(!m->sealed, -EPERM); + assert_return(iov || n == 0, -EINVAL); + assert_return(!m->poisoned, -ESTALE); + + size = IOVEC_TOTAL_SIZE(iov, n); + + r = sd_bus_message_append_string_space(m, size, &p); + if (r < 0) + return r; + + for (i = 0; i < n; i++) { + + if (iov[i].iov_base) + memcpy(p, iov[i].iov_base, iov[i].iov_len); + else + memset(p, ' ', iov[i].iov_len); + + p += iov[i].iov_len; + } + + return 0; +} + static int bus_message_open_array( sd_bus_message *m, struct bus_container *c, const char *contents, - uint32_t **array_size) { + uint32_t **array_size, + size_t *begin, + bool *need_offsets) { unsigned nindex; - void *a, *op; - int alignment; - size_t os; - struct bus_body_part *o; + int alignment, r; assert(m); assert(c); assert(contents); assert(array_size); + assert(begin); + assert(need_offsets); if (!signature_is_single(contents, true)) return -EINVAL; - alignment = bus_type_get_alignment(contents[0]); - if (alignment < 0) - return alignment; - if (c->signature && c->signature[c->index]) { /* Verify the existing signature */ @@ -1595,27 +1578,53 @@ static int bus_message_open_array( nindex = e - c->signature; } - a = message_extend_body(m, 4, 4); - if (!a) - return -ENOMEM; + if (BUS_MESSAGE_IS_GVARIANT(m)) { + alignment = bus_gvariant_get_alignment(contents); + if (alignment < 0) + return alignment; - o = m->body_end; - op = m->body_end->data; - os = m->body_end->size; + /* Add alignment padding and add to offset list */ + if (!message_extend_body(m, alignment, 0, false)) + return -ENOMEM; - /* Add alignment between size and first element */ - if (!message_extend_body(m, alignment, 0)) - return -ENOMEM; + r = bus_gvariant_is_fixed_size(contents); + if (r < 0) + return r; + + *begin = m->header->body_size; + *need_offsets = r == 0; + } else { + void *a, *op; + size_t os; + struct bus_body_part *o; + + alignment = bus_type_get_alignment(contents[0]); + if (alignment < 0) + return alignment; + + a = message_extend_body(m, 4, 4, false); + if (!a) + return -ENOMEM; + + o = m->body_end; + op = m->body_end->data; + os = m->body_end->size; + + /* Add alignment between size and first element */ + if (!message_extend_body(m, alignment, 0, false)) + return -ENOMEM; + + /* location of array size might have changed so let's readjust a */ + if (o == m->body_end) + a = adjust_pointer(a, op, os, m->body_end->data); + + *(uint32_t*) a = 0; + *array_size = a; + } if (c->enclosing != SD_BUS_TYPE_ARRAY) c->index = nindex; - /* location of array size might have changed so let's readjust a */ - if (o == m->body_end) - a = adjust_pointer(a, op, os, m->body_end->data); - - *(uint32_t*) a = 0; - *array_size = a; return 0; } @@ -1624,9 +1633,6 @@ static int bus_message_open_variant( struct bus_container *c, const char *contents) { - size_t l; - void *a; - assert(m); assert(c); assert(contents); @@ -1655,13 +1661,24 @@ static int bus_message_open_variant( } } - l = strlen(contents); - a = message_extend_body(m, 1, 1 + l + 1); - if (!a) - return -ENOMEM; + if (BUS_MESSAGE_IS_GVARIANT(m)) { + /* Variants are always aligned to 8 */ - *(uint8_t*) a = l; - memcpy((uint8_t*) a + 1, contents, l + 1); + if (!message_extend_body(m, 8, 0, false)) + return -ENOMEM; + + } else { + size_t l; + void *a; + + l = strlen(contents); + a = message_extend_body(m, 1, 1 + l + 1, false); + if (!a) + return -ENOMEM; + + *(uint8_t*) a = l; + memcpy((uint8_t*) a + 1, contents, l + 1); + } if (c->enclosing != SD_BUS_TYPE_ARRAY) c->index++; @@ -1672,13 +1689,18 @@ static int bus_message_open_variant( static int bus_message_open_struct( sd_bus_message *m, struct bus_container *c, - const char *contents) { + const char *contents, + size_t *begin, + bool *need_offsets) { size_t nindex; + int r; assert(m); assert(c); assert(contents); + assert(begin); + assert(need_offsets); if (!signature_is_valid(contents, false)) return -EINVAL; @@ -1709,9 +1731,27 @@ static int bus_message_open_struct( nindex = e - c->signature; } - /* Align contents to 8 byte boundary */ - if (!message_extend_body(m, 8, 0)) - return -ENOMEM; + if (BUS_MESSAGE_IS_GVARIANT(m)) { + int alignment; + + alignment = bus_gvariant_get_alignment(contents); + if (alignment < 0) + return alignment; + + if (!message_extend_body(m, alignment, 0, false)) + return -ENOMEM; + + r = bus_gvariant_is_fixed_size(contents); + if (r < 0) + return r; + + *begin = m->header->body_size; + *need_offsets = r == 0; + } else { + /* Align contents to 8 byte boundary */ + if (!message_extend_body(m, 8, 0, false)) + return -ENOMEM; + } if (c->enclosing != SD_BUS_TYPE_ARRAY) c->index = nindex; @@ -1722,13 +1762,17 @@ static int bus_message_open_struct( static int bus_message_open_dict_entry( sd_bus_message *m, struct bus_container *c, - const char *contents) { + const char *contents, + size_t *begin, + bool *need_offsets) { - size_t nindex; + int r; assert(m); assert(c); assert(contents); + assert(begin); + assert(need_offsets); if (!signature_is_pair(contents)) return -EINVAL; @@ -1745,17 +1789,30 @@ static int bus_message_open_dict_entry( !startswith(c->signature + c->index + 1, contents) || c->signature[c->index + 1 + l] != SD_BUS_TYPE_DICT_ENTRY_END) return -ENXIO; - - nindex = c->index + 1 + l + 1; } else return -ENXIO; - /* Align contents to 8 byte boundary */ - if (!message_extend_body(m, 8, 0)) - return -ENOMEM; + if (BUS_MESSAGE_IS_GVARIANT(m)) { + int alignment; - if (c->enclosing != SD_BUS_TYPE_ARRAY) - c->index = nindex; + alignment = bus_gvariant_get_alignment(contents); + if (alignment < 0) + return alignment; + + if (!message_extend_body(m, alignment, 0, false)) + return -ENOMEM; + + r = bus_gvariant_is_fixed_size(contents); + if (r < 0) + return r; + + *begin = m->header->body_size; + *need_offsets = r == 0; + } else { + /* Align contents to 8 byte boundary */ + if (!message_extend_body(m, 8, 0, false)) + return -ENOMEM; + } return 0; } @@ -1768,7 +1825,8 @@ _public_ int sd_bus_message_open_container( struct bus_container *c, *w; uint32_t *array_size = NULL; char *signature; - size_t before; + size_t before, begin; + bool need_offsets = false; int r; assert_return(m, -EINVAL); @@ -1799,13 +1857,13 @@ _public_ int sd_bus_message_open_container( before = m->header->body_size; if (type == SD_BUS_TYPE_ARRAY) - r = bus_message_open_array(m, c, contents, &array_size); + r = bus_message_open_array(m, c, contents, &array_size, &begin, &need_offsets); else if (type == SD_BUS_TYPE_VARIANT) r = bus_message_open_variant(m, c, contents); else if (type == SD_BUS_TYPE_STRUCT) - r = bus_message_open_struct(m, c, contents); + r = bus_message_open_struct(m, c, contents, &begin, &need_offsets); else if (type == SD_BUS_TYPE_DICT_ENTRY) - r = bus_message_open_dict_entry(m, c, contents); + r = bus_message_open_dict_entry(m, c, contents, &begin, &need_offsets); else r = -EINVAL; @@ -1821,13 +1879,230 @@ _public_ int sd_bus_message_open_container( w->index = 0; w->array_size = array_size; w->before = before; - w->begin = m->rindex; + w->begin = begin; + w->n_offsets = w->n_offsets_allocated = 0; + w->offsets = NULL; + w->need_offsets = need_offsets; + + return 0; +} + +static size_t determine_word_size(size_t sz, size_t extra) { + if (sz + extra <= 0xFF) + return 1; + else if (sz + extra*2 <= 0xFFFF) + return 2; + else if (sz + extra*4 <= 0xFFFFFFFF) + return 4; + else + return 8; +} + +static size_t read_word_le(void *p, size_t sz) { + union { + uint16_t u16; + uint32_t u32; + uint64_t u64; + } x; + + assert(p); + + if (sz == 1) + return *(uint8_t*) p; + + memcpy(&x, p, sz); + + if (sz == 2) + return le16toh(x.u16); + else if (sz == 4) + return le32toh(x.u32); + else if (sz == 4) + return le64toh(x.u64); + + assert_not_reached("unknown word width"); +} + +static void write_word_le(void *p, size_t sz, size_t value) { + union { + uint16_t u16; + uint32_t u32; + uint64_t u64; + } x; + + assert(p); + assert(sz == 8 || (value < (1ULL << (sz*8)))); + + if (sz == 1) { + *(uint8_t*) p = value; + return; + } else if (sz == 2) + x.u16 = htole16((uint16_t) value); + else if (sz == 4) + x.u32 = htole32((uint32_t) value); + else if (sz == 8) + x.u64 = htole64((uint64_t) value); + else + assert_not_reached("unknown word width"); + + memcpy(p, &x, sz); +} + +static int bus_message_close_array(sd_bus_message *m, struct bus_container *c) { + + assert(m); + assert(c); + + if (!BUS_MESSAGE_IS_GVARIANT(m)) + return 0; + + if (c->need_offsets) { + size_t payload, sz, i; + uint8_t *a; + + /* Variable-width arrays */ + + payload = c->n_offsets > 0 ? c->offsets[c->n_offsets-1] - c->begin : 0; + sz = determine_word_size(payload, c->n_offsets); + + a = message_extend_body(m, 1, sz * c->n_offsets, true); + if (!a) + return -ENOMEM; + + for (i = 0; i < c->n_offsets; i++) + write_word_le(a + sz*i, sz, c->offsets[i] - c->begin); + } else { + void *a; + + /* Fixed-width or empty arrays */ + + a = message_extend_body(m, 1, 0, true); /* let's add offset to parent */ + if (!a) + return -ENOMEM; + } + + return 0; +} + +static int bus_message_close_variant(sd_bus_message *m, struct bus_container *c) { + uint8_t *a; + size_t l; + + assert(m); + assert(c); + + if (!BUS_MESSAGE_IS_GVARIANT(m)) + return 0; + + l = strlen(c->signature); + + a = message_extend_body(m, 1, 1 + l, true); + if (!a) + return -ENOMEM; + + a[0] = 0; + memcpy(a+1, c->signature, l); + + return 0; +} + +static int bus_message_close_struct(sd_bus_message *m, struct bus_container *c, bool add_offset) { + size_t n_variable = 0; + unsigned i = 0; + const char *p; + uint8_t *a; + int r; + + assert(m); + assert(c); + + if (!BUS_MESSAGE_IS_GVARIANT(m)) + return 0; + + p = strempty(c->signature); + while (*p != 0) { + size_t n; + + r = signature_element_length(p, &n); + if (r < 0) + return r; + else { + char t[n+1]; + + memcpy(t, p, n); + t[n] = 0; + + r = bus_gvariant_is_fixed_size(t); + if (r < 0) + return r; + } + + assert(i <= c->n_offsets); + + /* We need to add an offset for each item that has a + * variable size and that is not the last one in the + * list */ + if (r == 0 && p[n] != 0) + n_variable++; + + i++; + p += n; + } + + assert(i == c->n_offsets); + + if (n_variable <= 0) { + a = message_extend_body(m, 1, 0, add_offset); + if (!a) + return -ENOMEM; + } else { + size_t sz; + unsigned j; + + assert(c->offsets[c->n_offsets-1] == m->header->body_size); + + sz = determine_word_size(m->header->body_size - c->begin, n_variable); + + a = message_extend_body(m, 1, sz * n_variable, add_offset); + if (!a) + return -ENOMEM; + + p = strempty(c->signature); + for (i = 0, j = 0; i < c->n_offsets; i++) { + unsigned k; + size_t n; + + r = signature_element_length(p, &n); + if (r < 0) + return r; + else { + char t[n+1]; + + memcpy(t, p, n); + t[n] = 0; + + p += n; + + r = bus_gvariant_is_fixed_size(t); + if (r < 0) + return r; + if (r > 0 || p[0] == 0) + continue; + } + + k = n_variable - 1 - j; + + write_word_le(a + k * sz, sz, c->offsets[i] - c->begin); + + j++; + } + } return 0; } _public_ int sd_bus_message_close_container(sd_bus_message *m) { struct bus_container *c; + int r; assert_return(m, -EINVAL); assert_return(!m->sealed, -EPERM); @@ -1835,14 +2110,26 @@ _public_ int sd_bus_message_close_container(sd_bus_message *m) { assert_return(!m->poisoned, -ESTALE); c = message_get_container(m); + if (c->enclosing != SD_BUS_TYPE_ARRAY) if (c->signature && c->signature[c->index] != 0) return -EINVAL; - free(c->signature); m->n_containers--; - return 0; + if (c->enclosing == SD_BUS_TYPE_ARRAY) + r = bus_message_close_array(m, c); + else if (c->enclosing == SD_BUS_TYPE_VARIANT) + r = bus_message_close_variant(m, c); + else if (c->enclosing == SD_BUS_TYPE_STRUCT || c->enclosing == SD_BUS_TYPE_DICT_ENTRY) + r = bus_message_close_struct(m, c, true); + else + assert_not_reached("Unknown container type"); + + free(c->signature); + free(c->offsets); + + return r; } typedef struct { @@ -2078,7 +2365,7 @@ int bus_message_append_ap( return r; } - return 0; + return 1; } _public_ int sd_bus_message_append(sd_bus_message *m, const char *types, ...) { @@ -2097,20 +2384,24 @@ _public_ int sd_bus_message_append(sd_bus_message *m, const char *types, ...) { return r; } -_public_ int sd_bus_message_append_array_space(sd_bus_message *m, - char type, - size_t size, - void **ptr) { +_public_ int sd_bus_message_append_array_space( + sd_bus_message *m, + char type, + size_t size, + void **ptr) { + ssize_t align, sz; void *a; int r; assert_return(m, -EINVAL); assert_return(!m->sealed, -EPERM); - assert_return(bus_type_is_trivial(type), -EINVAL); + assert_return(bus_type_is_trivial(type) && type != SD_BUS_TYPE_BOOLEAN, -EINVAL); assert_return(ptr || size == 0, -EINVAL); assert_return(!m->poisoned, -ESTALE); + /* alignment and size of the trivial types (except bool) is + * identical for gvariant and dbus1 marshalling */ align = bus_type_get_alignment(type); sz = bus_type_get_size(type); @@ -2124,7 +2415,7 @@ _public_ int sd_bus_message_append_array_space(sd_bus_message *m, if (r < 0) return r; - a = message_extend_body(m, align, size); + a = message_extend_body(m, align, size, false); if (!a) return -ENOMEM; @@ -2159,6 +2450,42 @@ _public_ int sd_bus_message_append_array(sd_bus_message *m, return 0; } +_public_ int sd_bus_message_append_array_iovec( + sd_bus_message *m, + char type, + const struct iovec *iov, + unsigned n) { + + size_t size; + unsigned i; + void *p; + int r; + + assert_return(m, -EINVAL); + assert_return(!m->sealed, -EPERM); + assert_return(bus_type_is_trivial(type), -EINVAL); + assert_return(iov || n == 0, -EINVAL); + assert_return(!m->poisoned, -ESTALE); + + size = IOVEC_TOTAL_SIZE(iov, n); + + r = sd_bus_message_append_array_space(m, type, size, &p); + if (r < 0) + return r; + + for (i = 0; i < n; i++) { + + if (iov[i].iov_base) + memcpy(p, iov[i].iov_base, iov[i].iov_len); + else + memset(p, 0, iov[i].iov_len); + + p = (uint8_t*) p + iov[i].iov_len; + } + + return 0; +} + _public_ int sd_bus_message_append_array_memfd(sd_bus_message *m, char type, sd_memfd *memfd) { @@ -2208,7 +2535,7 @@ _public_ int sd_bus_message_append_array_memfd(sd_bus_message *m, if (r < 0) return r; - a = message_extend_body(m, align, 0); + a = message_extend_body(m, align, 0, false); if (!a) return -ENOMEM; @@ -2221,8 +2548,8 @@ _public_ int sd_bus_message_append_array_memfd(sd_bus_message *m, part->size = size; copy_fd = -1; - message_extend_containers(m, size); m->header->body_size += size; + message_extend_containers(m, size); return sd_bus_message_close_container(m); } @@ -2279,11 +2606,13 @@ _public_ int sd_bus_message_append_string_memfd(sd_bus_message *m, sd_memfd *mem } } - a = message_extend_body(m, 4, 4); - if (!a) - return -ENOMEM; - - *(uint32_t*) a = size - 1; + if (!BUS_MESSAGE_IS_GVARIANT(m)) { + a = message_extend_body(m, 4, 4, false); + if (!a) + return -ENOMEM; + + *(uint32_t*) a = size - 1; + } part = message_append_part(m); if (!part) @@ -2294,8 +2623,16 @@ _public_ int sd_bus_message_append_string_memfd(sd_bus_message *m, sd_memfd *mem part->size = size; copy_fd = -1; - message_extend_containers(m, size); m->header->body_size += size; + message_extend_containers(m, size); + + if (BUS_MESSAGE_IS_GVARIANT(m)) { + r = message_add_offset(m, m->header->body_size); + if (r < 0) { + m->poisoned = true; + return -ENOMEM; + } + } if (c->enclosing != SD_BUS_TYPE_ARRAY) c->index++; @@ -2324,6 +2661,112 @@ _public_ int sd_bus_message_append_strv(sd_bus_message *m, char **l) { return sd_bus_message_close_container(m); } +static int bus_message_close_header(sd_bus_message *m) { + uint8_t *a; + size_t sz, i; + + assert(m); + + if (!BUS_MESSAGE_IS_GVARIANT(m)) + return 0; + + if (m->n_header_offsets < 1) + return 0; + + assert(m->header->fields_size == m->header_offsets[m->n_header_offsets-1]); + + sz = determine_word_size(m->header->fields_size, m->n_header_offsets); + + a = message_extend_fields(m, 1, sz * m->n_header_offsets, false); + if (!a) + return -ENOMEM; + + for (i = 0; i < m->n_header_offsets; i++) + write_word_le(a + sz*i, sz, m->header_offsets[i]); + + return 0; +} + +int bus_message_seal(sd_bus_message *m, uint64_t serial) { + struct bus_body_part *part; + size_t l, a; + unsigned i; + int r; + + assert(m); + + if (m->sealed) + return -EPERM; + + if (m->n_containers > 0) + return -EBADMSG; + + if (m->poisoned) + return -ESTALE; + + /* In vtables the return signature of method calls is listed, + * let's check if they match if this is a response */ + if (m->header->type == SD_BUS_MESSAGE_METHOD_RETURN && + m->enforced_reply_signature && + !streq(strempty(m->root_container.signature), m->enforced_reply_signature)) + return -ENOMSG; + + /* If gvariant marshalling is used we need to close the body structure */ + r = bus_message_close_struct(m, &m->root_container, false); + if (r < 0) + return r; + + /* If there's a non-trivial signature set, then add it in here */ + if (!isempty(m->root_container.signature)) { + r = message_append_field_signature(m, BUS_MESSAGE_HEADER_SIGNATURE, m->root_container.signature, NULL); + if (r < 0) + return r; + } + + if (m->n_fds > 0) { + r = message_append_field_uint32(m, BUS_MESSAGE_HEADER_UNIX_FDS, m->n_fds); + if (r < 0) + return r; + } + + r = bus_message_close_header(m); + if (r < 0) + return r; + + m->header->serial = serial; + + /* Add padding at the end of the fields part, since we know + * the body needs to start at an 8 byte alignment. We made + * sure we allocated enough space for this, so all we need to + * do here is to zero it out. */ + l = BUS_MESSAGE_FIELDS_SIZE(m); + a = ALIGN8(l) - l; + if (a > 0) + memset((uint8_t*) BUS_MESSAGE_FIELDS(m) + l, 0, a); + + /* If this is something we can send as memfd, then let's seal + the memfd now. Note that we can send memfds as payload only + for directed messages, and not for broadcasts. */ + if (m->destination && m->bus && m->bus->use_memfd) { + MESSAGE_FOREACH_PART(part, i, m) + if (part->memfd >= 0 && !part->sealed && (part->size > MEMFD_MIN_SIZE || m->bus->use_memfd < 0)) { + bus_body_part_unmap(part); + + if (ioctl(part->memfd, KDBUS_CMD_MEMFD_SEAL_SET, 1) >= 0) + part->sealed = true; + } + } + + m->root_container.end = BUS_MESSAGE_BODY_SIZE(m); + m->root_container.index = 0; + m->root_container.offset_index = 0; + m->root_container.item_size = m->root_container.n_offsets > 0 ? m->root_container.offsets[0] : 0; + + m->sealed = true; + + return 0; +} + int bus_body_part_map(struct bus_body_part *part) { void *p; size_t psz; @@ -2424,10 +2867,15 @@ static bool message_end_of_array(sd_bus_message *m, size_t index) { assert(m); c = message_get_container(m); - if (!c->array_size) + if (c->enclosing != SD_BUS_TYPE_ARRAY) return false; - return index >= c->begin + BUS_MESSAGE_BSWAP32(m, *c->array_size); + if (BUS_MESSAGE_IS_GVARIANT(m)) + return index >= c->end; + else { + assert(c->array_size); + return index >= c->begin + BUS_MESSAGE_BSWAP32(m, *c->array_size); + } } _public_ int sd_bus_message_at_end(sd_bus_message *m, int complete) { @@ -2487,6 +2935,92 @@ static struct bus_body_part* find_part(sd_bus_message *m, size_t index, size_t s return NULL; } +static int container_next_item(sd_bus_message *m, struct bus_container *c, size_t *rindex) { + int r; + + assert(m); + assert(c); + assert(rindex); + + if (!BUS_MESSAGE_IS_GVARIANT(m)) + return 0; + + if (c->enclosing == SD_BUS_TYPE_ARRAY) { + int sz; + + sz = bus_gvariant_get_size(c->signature); + if (sz < 0) { + int alignment; + + if (c->offset_index+1 >= c->n_offsets) + goto end; + + /* Variable-size array */ + + alignment = bus_gvariant_get_alignment(c->signature); + assert(alignment > 0); + + *rindex = ALIGN_TO(c->offsets[c->offset_index], alignment); + c->item_size = c->offsets[c->offset_index+1] - *rindex; + } else { + + if (c->offset_index+1 >= (c->end-c->begin)/sz) + goto end; + + /* Fixed-size array */ + *rindex = c->begin + (c->offset_index+1) * sz; + c->item_size = sz; + } + + c->offset_index++; + + } else if (c->enclosing == 0 || + c->enclosing == SD_BUS_TYPE_STRUCT || + c->enclosing == SD_BUS_TYPE_DICT_ENTRY) { + + int alignment; + size_t n, j; + + if (c->offset_index+1 >= c->n_offsets) + goto end; + + r = signature_element_length(c->signature + c->index, &n); + if (r < 0) + return r; + + r = signature_element_length(c->signature + c->index + n, &j); + if (r < 0) + return r; + else { + char t[j+1]; + memcpy(t, c->signature + c->index + n, j); + t[j] = 0; + + alignment = bus_gvariant_get_alignment(t); + } + + assert(alignment > 0); + + *rindex = ALIGN_TO(c->offsets[c->offset_index], alignment); + c->item_size = c->offsets[c->offset_index+1] - *rindex; + + c->offset_index++; + + } else if (c->enclosing == SD_BUS_TYPE_VARIANT) + goto end; + else + assert_not_reached("Unknown container type"); + + return 0; + +end: + /* Reached the end */ + *rindex = c->end; + c->item_size = 0; + return 0; +} + + static int message_peek_body( sd_bus_message *m, size_t *rindex, @@ -2502,9 +3036,6 @@ static int message_peek_body( assert(rindex); assert(align > 0); - if (message_end_of_array(m, *rindex)) - return 0; - start = ALIGN_TO((size_t) *rindex, align); padding = start - *rindex; end = start + nbytes; @@ -2524,7 +3055,7 @@ static int message_peek_body( } part = find_part(m, start, nbytes, (void**) &q); - if (!part || !q) + if (!part || (nbytes > 0 && !q)) return -EBADMSG; *rindex = end; @@ -2532,7 +3063,7 @@ static int message_peek_body( if (ret) *ret = q; - return 1; + return 0; } static bool validate_nul(const char *s, size_t l) { @@ -2585,6 +3116,7 @@ static bool validate_object_path(const char *s, size_t l) { _public_ int sd_bus_message_read_basic(sd_bus_message *m, char type, void *p) { struct bus_container *c; + size_t rindex; void *q; int r; @@ -2602,132 +3134,205 @@ _public_ int sd_bus_message_read_basic(sd_bus_message *m, char type, void *p) { if (c->signature[c->index] != type) return -ENXIO; - switch (type) { + rindex = m->rindex; - case SD_BUS_TYPE_STRING: - case SD_BUS_TYPE_OBJECT_PATH: { - uint32_t l; - size_t rindex; + if (BUS_MESSAGE_IS_GVARIANT(m)) { - rindex = m->rindex; - r = message_peek_body(m, &rindex, 4, 4, &q); - if (r <= 0) - return r; + if (IN_SET(type, SD_BUS_TYPE_STRING, SD_BUS_TYPE_OBJECT_PATH, SD_BUS_TYPE_SIGNATURE)) { + bool ok; - l = BUS_MESSAGE_BSWAP32(m, *(uint32_t*) q); - r = message_peek_body(m, &rindex, 1, l+1, &q); - if (r < 0) - return r; - if (r == 0) - return -EBADMSG; + r = message_peek_body(m, &rindex, 1, c->item_size, &q); + if (r < 0) + return r; + + if (type == SD_BUS_TYPE_STRING) + ok = validate_string(q, c->item_size-1); + else if (type == SD_BUS_TYPE_OBJECT_PATH) + ok = validate_object_path(q, c->item_size-1); + else + ok = validate_signature(q, c->item_size-1); - if (type == SD_BUS_TYPE_OBJECT_PATH) { - if (!validate_object_path(q, l)) + if (!ok) return -EBADMSG; + + if (p) + *(const char**) p = q; } else { - if (!validate_string(q, l)) + int sz, align; + + sz = bus_gvariant_get_size(CHAR_TO_STR(type)); + assert(sz > 0); + if ((size_t) sz != c->item_size) return -EBADMSG; - } - m->rindex = rindex; - if (p) - *(const char**) p = q; + align = bus_gvariant_get_alignment(CHAR_TO_STR(type)); + assert(align > 0); - break; - } + r = message_peek_body(m, &rindex, align, c->item_size, &q); + if (r < 0) + return r; - case SD_BUS_TYPE_SIGNATURE: { - uint8_t l; - size_t rindex; + switch (type) { - rindex = m->rindex; - r = message_peek_body(m, &rindex, 1, 1, &q); - if (r <= 0) - return r; + case SD_BUS_TYPE_BYTE: + if (p) + *(uint8_t*) p = *(uint8_t*) q; + break; - l = *(uint8_t*) q; - r = message_peek_body(m, &rindex, 1, l+1, &q); - if (r < 0) - return r; - if (r == 0) - return -EBADMSG; + case SD_BUS_TYPE_BOOLEAN: + if (p) + *(int*) p = !!*(uint8_t*) q; + break; - if (!validate_signature(q, l)) - return -EBADMSG; + case SD_BUS_TYPE_INT16: + case SD_BUS_TYPE_UINT16: + if (p) + *(uint16_t*) p = BUS_MESSAGE_BSWAP16(m, *(uint16_t*) q); + break; + + case SD_BUS_TYPE_INT32: + case SD_BUS_TYPE_UINT32: + if (p) + *(uint32_t*) p = BUS_MESSAGE_BSWAP32(m, *(uint32_t*) q); + break; - m->rindex = rindex; + case SD_BUS_TYPE_INT64: + case SD_BUS_TYPE_UINT64: + case SD_BUS_TYPE_DOUBLE: + if (p) + *(uint64_t*) p = BUS_MESSAGE_BSWAP64(m, *(uint64_t*) q); + break; - if (p) - *(const char**) p = q; - break; - } + case SD_BUS_TYPE_UNIX_FD: { + uint32_t j; - default: { - ssize_t sz, align; - size_t rindex; + j = BUS_MESSAGE_BSWAP32(m, *(uint32_t*) q); + if (j >= m->n_fds) + return -EBADMSG; - align = bus_type_get_alignment(type); - sz = bus_type_get_size(type); - assert(align > 0 && sz > 0); + if (p) + *(int*) p = m->fds[j]; - rindex = m->rindex; - r = message_peek_body(m, &rindex, align, sz, &q); - if (r <= 0) + break; + } + + default: + assert_not_reached("unexpected type"); + } + } + + r = container_next_item(m, c, &rindex); + if (r < 0) return r; + } else { - switch (type) { + rindex = m->rindex; - case SD_BUS_TYPE_BYTE: - if (p) - *(uint8_t*) p = *(uint8_t*) q; - break; + if (IN_SET(type, SD_BUS_TYPE_STRING, SD_BUS_TYPE_OBJECT_PATH)) { + uint32_t l; + bool ok; - case SD_BUS_TYPE_BOOLEAN: - if (p) - *(int*) p = !!*(uint32_t*) q; - break; + r = message_peek_body(m, &rindex, 4, 4, &q); + if (r < 0) + return r; - case SD_BUS_TYPE_INT16: - case SD_BUS_TYPE_UINT16: - if (p) - *(uint16_t*) p = BUS_MESSAGE_BSWAP16(m, *(uint16_t*) q); - break; + l = BUS_MESSAGE_BSWAP32(m, *(uint32_t*) q); + r = message_peek_body(m, &rindex, 1, l+1, &q); + if (r < 0) + return r; + + if (type == SD_BUS_TYPE_OBJECT_PATH) + ok = validate_object_path(q, l); + else + ok = validate_string(q, l); + if (!ok) + return -EBADMSG; - case SD_BUS_TYPE_INT32: - case SD_BUS_TYPE_UINT32: if (p) - *(uint32_t*) p = BUS_MESSAGE_BSWAP32(m, *(uint32_t*) q); - break; + *(const char**) p = q; + + } else if (type == SD_BUS_TYPE_SIGNATURE) { + uint8_t l; + + r = message_peek_body(m, &rindex, 1, 1, &q); + if (r < 0) + return r; + + l = *(uint8_t*) q; + r = message_peek_body(m, &rindex, 1, l+1, &q); + if (r < 0) + return r; + + if (!validate_signature(q, l)) + return -EBADMSG; - case SD_BUS_TYPE_INT64: - case SD_BUS_TYPE_UINT64: - case SD_BUS_TYPE_DOUBLE: if (p) - *(uint64_t*) p = BUS_MESSAGE_BSWAP64(m, *(uint64_t*) q); - break; + *(const char**) p = q; - case SD_BUS_TYPE_UNIX_FD: { - uint32_t j; + } else { + ssize_t sz, align; + + align = bus_type_get_alignment(type); + assert(align > 0); + + sz = bus_type_get_size(type); + assert(sz > 0); + + r = message_peek_body(m, &rindex, align, sz, &q); + if (r < 0) + return r; + + switch (type) { + + case SD_BUS_TYPE_BYTE: + if (p) + *(uint8_t*) p = *(uint8_t*) q; + break; + + case SD_BUS_TYPE_BOOLEAN: + if (p) + *(int*) p = !!*(uint32_t*) q; + break; + + case SD_BUS_TYPE_INT16: + case SD_BUS_TYPE_UINT16: + if (p) + *(uint16_t*) p = BUS_MESSAGE_BSWAP16(m, *(uint16_t*) q); + break; + + case SD_BUS_TYPE_INT32: + case SD_BUS_TYPE_UINT32: + if (p) + *(uint32_t*) p = BUS_MESSAGE_BSWAP32(m, *(uint32_t*) q); + break; - j = BUS_MESSAGE_BSWAP32(m, *(uint32_t*) q); - if (j >= m->n_fds) - return -EBADMSG; + case SD_BUS_TYPE_INT64: + case SD_BUS_TYPE_UINT64: + case SD_BUS_TYPE_DOUBLE: + if (p) + *(uint64_t*) p = BUS_MESSAGE_BSWAP64(m, *(uint64_t*) q); + break; - if (p) - *(int*) p = m->fds[j]; - break; - } + case SD_BUS_TYPE_UNIX_FD: { + uint32_t j; - default: - assert_not_reached("Unknown basic type..."); - } + j = BUS_MESSAGE_BSWAP32(m, *(uint32_t*) q); + if (j >= m->n_fds) + return -EBADMSG; - m->rindex = rindex; + if (p) + *(int*) p = m->fds[j]; + break; + } - break; - } + default: + assert_not_reached("Unknown basic type..."); + } + } } + m->rindex = rindex; + if (c->enclosing != SD_BUS_TYPE_ARRAY) c->index++; @@ -2738,7 +3343,10 @@ static int bus_message_enter_array( sd_bus_message *m, struct bus_container *c, const char *contents, - uint32_t **array_size) { + uint32_t **array_size, + size_t *item_size, + size_t **offsets, + size_t *n_offsets) { size_t rindex; void *q; @@ -2748,16 +3356,15 @@ static int bus_message_enter_array( assert(c); assert(contents); assert(array_size); + assert(item_size); + assert(offsets); + assert(n_offsets); if (!signature_is_single(contents, true)) return -EINVAL; - alignment = bus_type_get_alignment(contents[0]); - if (alignment < 0) - return alignment; - if (!c->signature || c->signature[c->index] == 0) - return 0; + return -ENXIO; if (c->signature[c->index] != SD_BUS_TYPE_ARRAY) return -ENXIO; @@ -2766,25 +3373,90 @@ static int bus_message_enter_array( return -ENXIO; rindex = m->rindex; - r = message_peek_body(m, &rindex, 4, 4, &q); - if (r <= 0) - return r; - if (BUS_MESSAGE_BSWAP32(m, *(uint32_t*) q) > BUS_ARRAY_MAX_SIZE) - return -EBADMSG; + if (!BUS_MESSAGE_IS_GVARIANT(m)) { + /* dbus1 */ - r = message_peek_body(m, &rindex, alignment, 0, NULL); - if (r < 0) - return r; - if (r == 0) - return -EBADMSG; + r = message_peek_body(m, &rindex, 4, 4, &q); + if (r < 0) + return r; - if (c->enclosing != SD_BUS_TYPE_ARRAY) - c->index += 1 + strlen(contents); + if (BUS_MESSAGE_BSWAP32(m, *(uint32_t*) q) > BUS_ARRAY_MAX_SIZE) + return -EBADMSG; + + alignment = bus_type_get_alignment(contents[0]); + if (alignment < 0) + return alignment; + + r = message_peek_body(m, &rindex, alignment, 0, NULL); + if (r < 0) + return r; + + *array_size = (uint32_t*) q; + + } else if (c->item_size <= 0) { + + /* gvariant: empty array */ + *item_size = 0; + *offsets = NULL; + *n_offsets = 0; + + } else if (bus_gvariant_is_fixed_size(contents)) { + + /* gvariant: fixed length array */ + *item_size = bus_gvariant_get_size(contents); + *offsets = NULL; + *n_offsets = 0; + + } else { + size_t where, p = 0, framing, sz; + unsigned i; + + /* gvariant: variable length array */ + sz = determine_word_size(c->item_size, 0); + + where = rindex + c->item_size - sz; + r = message_peek_body(m, &where, 1, sz, &q); + if (r < 0) + return r; + + framing = read_word_le(q, sz); + if (framing > c->item_size - sz) + return -EBADMSG; + if ((c->item_size - framing) % sz != 0) + return -EBADMSG; + + *n_offsets = (c->item_size - framing) / sz; + + where = rindex + framing; + r = message_peek_body(m, &where, 1, *n_offsets * sz, &q); + if (r < 0) + return r; + + *offsets = new(size_t, *n_offsets); + if (!*offsets) + return -ENOMEM; + + for (i = 0; i < *n_offsets; i++) { + size_t x; + + x = read_word_le((uint8_t*) q + i * sz, sz); + if (x > c->item_size - sz) + return -EBADMSG; + if (x < p) + return -EBADMSG; + + (*offsets)[i] = rindex + x; + p = x; + } + + *item_size = (*offsets)[0] - rindex; + } m->rindex = rindex; - *array_size = (uint32_t*) q; + if (c->enclosing != SD_BUS_TYPE_ARRAY) + c->index += 1 + strlen(contents); return 1; } @@ -2792,7 +3464,8 @@ static int bus_message_enter_array( static int bus_message_enter_variant( sd_bus_message *m, struct bus_container *c, - const char *contents) { + const char *contents, + size_t *item_size) { size_t rindex; uint8_t l; @@ -2802,6 +3475,7 @@ static int bus_message_enter_variant( assert(m); assert(c); assert(contents); + assert(item_size); if (!signature_is_single(contents, false)) return -EINVAL; @@ -2810,41 +3484,239 @@ static int bus_message_enter_variant( return -EINVAL; if (!c->signature || c->signature[c->index] == 0) - return 0; + return -ENXIO; if (c->signature[c->index] != SD_BUS_TYPE_VARIANT) return -ENXIO; rindex = m->rindex; - r = message_peek_body(m, &rindex, 1, 1, &q); - if (r <= 0) - return r; - l = *(uint8_t*) q; - r = message_peek_body(m, &rindex, 1, l+1, &q); - if (r < 0) - return r; - if (r == 0) - return -EBADMSG; + if (BUS_MESSAGE_IS_GVARIANT(m)) { + size_t k, where; - if (!validate_signature(q, l)) - return -EBADMSG; + k = strlen(contents); + if (1+k > c->item_size) + return -EBADMSG; - if (!streq(q, contents)) - return -ENXIO; + where = rindex + c->item_size - (1+k); + r = message_peek_body(m, &where, 1, 1+k, &q); + if (r < 0) + return r; - if (c->enclosing != SD_BUS_TYPE_ARRAY) - c->index++; + if (*(char*) q != 0) + return -EBADMSG; + + if (memcmp((uint8_t*) q+1, contents, k)) + return -ENXIO; + + *item_size = c->item_size - (1+k); + + } else { + r = message_peek_body(m, &rindex, 1, 1, &q); + if (r < 0) + return r; + + l = *(uint8_t*) q; + r = message_peek_body(m, &rindex, 1, l+1, &q); + if (r < 0) + return r; + + if (!validate_signature(q, l)) + return -EBADMSG; + + if (!streq(q, contents)) + return -ENXIO; + } m->rindex = rindex; + if (c->enclosing != SD_BUS_TYPE_ARRAY) + c->index++; + return 1; } +static int build_struct_offsets( + sd_bus_message *m, + const char *signature, + size_t size, + size_t *item_size, + size_t **offsets, + size_t *n_offsets) { + + unsigned n_variable = 0, n_total = 0, v; + size_t previous = 0, where; + const char *p; + size_t sz; + void *q; + int r; + + assert(m); + assert(item_size); + assert(offsets); + assert(n_offsets); + + if (isempty(signature)) { + *item_size = 0; + *offsets = NULL; + *n_offsets = 0; + return 0; + } + + sz = determine_word_size(size, 0); + if (sz <= 0) + return -EBADMSG; + + /* First, loop over signature and count variable elements and + * elements in general. We use this to know how large the + * offset array is at the end of the structure. Note that + * GVariant only stores offsets for all variable size elements + * that are not the last item. */ + + p = signature; + while (*p != 0) { + size_t n; + + r = signature_element_length(p, &n); + if (r < 0) + return r; + else { + char t[n+1]; + + memcpy(t, p, n); + t[n] = 0; + + r = bus_gvariant_is_fixed_size(t); + } + + if (r < 0) + return r; + if (r == 0 && p[n] != 0) /* except the last item */ + n_variable ++; + n_total++; + + p += n; + } + + if (size < n_variable * sz) + return -EBADMSG; + + where = m->rindex + size - (n_variable * sz); + r = message_peek_body(m, &where, 1, n_variable * sz, &q); + if (r < 0) + return r; + + v = n_variable; + + *offsets = new(size_t, n_total); + if (!*offsets) + return -ENOMEM; + + *n_offsets = 0; + + /* Second, loop again and build an offset table */ + p = signature; + while (*p != 0) { + size_t n, offset; + int k; + + r = signature_element_length(p, &n); + if (r < 0) + return r; + else { + char t[n+1]; + + memcpy(t, p, n); + t[n] = 0; + + k = bus_gvariant_get_size(t); + if (k < 0) { + size_t x; + + /* variable size */ + if (v > 0) { + v--; + + x = read_word_le((uint8_t*) q + v*sz, sz); + if (x >= size) + return -EBADMSG; + if (m->rindex + x < previous) + return -EBADMSG; + } else + /* The last item's end + * is determined from + * the start of the + * offset array */ + x = size - (n_variable * sz); + + offset = m->rindex + x; + + } else { + size_t align; + + /* fixed size */ + align = bus_gvariant_get_alignment(t); + assert(align > 0); + + offset = (*n_offsets == 0 ? m->rindex : ALIGN_TO((*offsets)[*n_offsets-1], align)) + k; + } + } + + previous = (*offsets)[(*n_offsets)++] = offset; + p += n; + } + + assert(v == 0); + assert(*n_offsets == n_total); + + *item_size = (*offsets)[0] - m->rindex; + return 0; +} + +static int enter_struct_or_dict_entry( + sd_bus_message *m, + struct bus_container *c, + const char *contents, + size_t *item_size, + size_t **offsets, + size_t *n_offsets) { + + int r; + + assert(m); + assert(c); + assert(contents); + assert(item_size); + assert(offsets); + assert(n_offsets); + + if (!BUS_MESSAGE_IS_GVARIANT(m)) { + + /* dbus1 */ + r = message_peek_body(m, &m->rindex, 8, 0, NULL); + if (r < 0) + return r; + + } else if (c->item_size <= 0) { + + /* gvariant empty struct */ + *item_size = 0; + *offsets = NULL; + *n_offsets = 0; + } else + /* gvariant with contents */ + return build_struct_offsets(m, contents, c->item_size, item_size, offsets, n_offsets); + + return 0; +} + static int bus_message_enter_struct( sd_bus_message *m, struct bus_container *c, - const char *contents) { + const char *contents, + size_t *item_size, + size_t **offsets, + size_t *n_offsets) { size_t l; int r; @@ -2852,12 +3724,15 @@ static int bus_message_enter_struct( assert(m); assert(c); assert(contents); + assert(item_size); + assert(offsets); + assert(n_offsets); if (!signature_is_valid(contents, false)) return -EINVAL; if (!c->signature || c->signature[c->index] == 0) - return 0; + return -ENXIO; l = strlen(contents); @@ -2866,8 +3741,8 @@ static int bus_message_enter_struct( c->signature[c->index + 1 + l] != SD_BUS_TYPE_STRUCT_END) return -ENXIO; - r = message_peek_body(m, &m->rindex, 8, 0, NULL); - if (r <= 0) + r = enter_struct_or_dict_entry(m, c, contents, item_size, offsets, n_offsets); + if (r < 0) return r; if (c->enclosing != SD_BUS_TYPE_ARRAY) @@ -2879,7 +3754,10 @@ static int bus_message_enter_struct( static int bus_message_enter_dict_entry( sd_bus_message *m, struct bus_container *c, - const char *contents) { + const char *contents, + size_t *item_size, + size_t **offsets, + size_t *n_offsets) { size_t l; int r; @@ -2904,8 +3782,8 @@ static int bus_message_enter_dict_entry( c->signature[c->index + 1 + l] != SD_BUS_TYPE_DICT_ENTRY_END) return -ENXIO; - r = message_peek_body(m, &m->rindex, 8, 0, NULL); - if (r <= 0) + r = enter_struct_or_dict_entry(m, c, contents, item_size, offsets, n_offsets); + if (r < 0) return r; if (c->enclosing != SD_BUS_TYPE_ARRAY) @@ -2921,6 +3799,8 @@ _public_ int sd_bus_message_enter_container(sd_bus_message *m, uint32_t *array_size = NULL; char *signature; size_t before; + size_t *offsets = NULL; + size_t n_offsets = 0, item_size = 0; int r; assert_return(m, -EINVAL); @@ -2933,7 +3813,7 @@ _public_ int sd_bus_message_enter_container(sd_bus_message *m, /* Allow entering into anonymous containers */ r = sd_bus_message_peek_type(m, &tt, &cc); - if (r <= 0) + if (r < 0) return r; if (type != 0 && type != tt) @@ -2986,18 +3866,19 @@ _public_ int sd_bus_message_enter_container(sd_bus_message *m, before = m->rindex; if (type == SD_BUS_TYPE_ARRAY) - r = bus_message_enter_array(m, c, contents, &array_size); + r = bus_message_enter_array(m, c, contents, &array_size, &item_size, &offsets, &n_offsets); else if (type == SD_BUS_TYPE_VARIANT) - r = bus_message_enter_variant(m, c, contents); + r = bus_message_enter_variant(m, c, contents, &item_size); else if (type == SD_BUS_TYPE_STRUCT) - r = bus_message_enter_struct(m, c, contents); + r = bus_message_enter_struct(m, c, contents, &item_size, &offsets, &n_offsets); else if (type == SD_BUS_TYPE_DICT_ENTRY) - r = bus_message_enter_dict_entry(m, c, contents); + r = bus_message_enter_dict_entry(m, c, contents, &item_size, &offsets, &n_offsets); else r = -EINVAL; if (r <= 0) { free(signature); + free(offsets); return r; } @@ -3006,36 +3887,61 @@ _public_ int sd_bus_message_enter_container(sd_bus_message *m, w->enclosing = type; w->signature = signature; w->index = 0; - w->array_size = array_size; + w->before = before; w->begin = m->rindex; + w->end = m->rindex + c->item_size; + + w->array_size = array_size; + w->item_size = item_size; + w->offsets = offsets; + w->n_offsets = n_offsets; + w->offset_index = 0; return 1; } _public_ int sd_bus_message_exit_container(sd_bus_message *m) { struct bus_container *c; + unsigned saved; + int r; assert_return(m, -EINVAL); assert_return(m->sealed, -EPERM); assert_return(m->n_containers > 0, -ENXIO); c = message_get_container(m); - if (c->enclosing == SD_BUS_TYPE_ARRAY) { + + if (c->enclosing != SD_BUS_TYPE_ARRAY) { + if (c->signature && c->signature[c->index] != 0) + return -EBUSY; + } + + if (BUS_MESSAGE_IS_GVARIANT(m)) { + if (m->rindex < c->end) + return -EBUSY; + + } else if (c->enclosing == SD_BUS_TYPE_ARRAY) { uint32_t l; l = BUS_MESSAGE_BSWAP32(m, *c->array_size); if (c->begin + l != m->rindex) return -EBUSY; - - } else { - if (c->signature && c->signature[c->index] != 0) - return -EBUSY; } free(c->signature); + free(c->offsets); m->n_containers--; + c = message_get_container(m); + + saved = c->index; + c->index = c->saved_index; + r = container_next_item(m, c, &m->rindex); + c->index = saved; + if (r < 0) + return r; + return 1; } @@ -3054,6 +3960,7 @@ static void message_quit_container(sd_bus_message *m) { /* Free container */ free(c->signature); + free(c->offsets); m->n_containers--; /* Correct index of new top-level container */ @@ -3142,27 +4049,62 @@ _public_ int sd_bus_message_peek_type(sd_bus_message *m, char *type, const char if (c->signature[c->index] == SD_BUS_TYPE_VARIANT) { if (contents) { - size_t rindex, l; void *q; - rindex = m->rindex; - r = message_peek_body(m, &rindex, 1, 1, &q); - if (r < 0) - return r; - if (r == 0) - goto eof; + if (BUS_MESSAGE_IS_GVARIANT(m)) { + size_t k; - l = *(uint8_t*) q; - r = message_peek_body(m, &rindex, 1, l+1, &q); - if (r < 0) - return r; - if (r == 0) - return -EBADMSG; + if (c->item_size < 2) + return -EBADMSG; - if (!validate_signature(q, l)) - return -EBADMSG; + /* Look for the NUL delimiter that + separates the payload from the + signature. Since the body might be + in a different part that then the + signature we map byte by byte. */ + + for (k = 2; k <= c->item_size; k++) { + size_t where; + + where = m->rindex + c->item_size - k; + r = message_peek_body(m, &where, 1, k, &q); + if (r < 0) + return r; + + if (*(char*) q == 0) + break; + } + + if (k > c->item_size) + return -EBADMSG; + + free(m->peeked_signature); + m->peeked_signature = strndup((char*) q + 1, k - 1); + if (!m->peeked_signature) + return -ENOMEM; + + if (!signature_is_valid(m->peeked_signature, true)) + return -EBADMSG; + + *contents = m->peeked_signature; + } else { + size_t rindex, l; + + rindex = m->rindex; + r = message_peek_body(m, &rindex, 1, 1, &q); + if (r < 0) + return r; + + l = *(uint8_t*) q; + r = message_peek_body(m, &rindex, 1, l+1, &q); + if (r < 0) + return r; + + if (!validate_signature(q, l)) + return -EBADMSG; - *contents = q; + *contents = q; + } } if (type) @@ -3190,18 +4132,22 @@ _public_ int sd_bus_message_rewind(sd_bus_message *m, int complete) { if (complete) { message_reset_containers(m); m->rindex = 0; - m->root_container.index = 0; c = message_get_container(m); } else { c = message_get_container(m); + c->offset_index = 0; c->index = 0; m->rindex = c->begin; } + c->offset_index = 0; + c->item_size = c->n_offsets > 0 ? c->offsets[0] : c->end; + return !isempty(c->signature); } + static int message_read_ap( sd_bus_message *m, const char *types, @@ -3574,16 +4520,25 @@ _public_ int sd_bus_message_read_array(sd_bus_message *m, assert_return(size, -EINVAL); assert_return(!BUS_MESSAGE_NEED_BSWAP(m), -ENOTSUP); - align = bus_type_get_alignment(type); - if (align < 0) - return align; - r = sd_bus_message_enter_container(m, SD_BUS_TYPE_ARRAY, CHAR_TO_STR(type)); if (r <= 0) return r; - c = message_get_container(m); - sz = BUS_MESSAGE_BSWAP32(m, *c->array_size); + c = message_get_container(m); + + if (BUS_MESSAGE_IS_GVARIANT(m)) { + align = bus_gvariant_get_alignment(CHAR_TO_STR(type)); + if (align < 0) + return align; + + sz = c->end - c->begin; + } else { + align = bus_type_get_alignment(type); + if (align < 0) + return align; + + sz = BUS_MESSAGE_BSWAP32(m, *c->array_size); + } if (sz == 0) /* Zero length array, let's return some aligned @@ -3593,10 +4548,6 @@ _public_ int sd_bus_message_read_array(sd_bus_message *m, r = message_peek_body(m, &m->rindex, align, sz, &p); if (r < 0) goto fail; - if (r == 0) { - r = -EBADMSG; - goto fail; - } } r = sd_bus_message_exit_container(m); @@ -3630,6 +4581,7 @@ static int message_peek_fields( static int message_peek_field_uint32( sd_bus_message *m, size_t *ri, + size_t item_size, uint32_t *ret) { int r; @@ -3638,6 +4590,11 @@ static int message_peek_field_uint32( assert(m); assert(ri); + if (BUS_MESSAGE_IS_GVARIANT(m) && item_size != 4) + return -EBADMSG; + + /* identical for gvariant and dbus1 */ + r = message_peek_fields(m, ri, 4, 4, &q); if (r < 0) return r; @@ -3652,6 +4609,7 @@ static int message_peek_field_string( sd_bus_message *m, bool (*validate)(const char *p), size_t *ri, + size_t item_size, const char **ret) { uint32_t l; @@ -3661,13 +4619,25 @@ static int message_peek_field_string( assert(m); assert(ri); - r = message_peek_field_uint32(m, ri, &l); - if (r < 0) - return r; + if (BUS_MESSAGE_IS_GVARIANT(m)) { - r = message_peek_fields(m, ri, 1, l+1, &q); - if (r < 0) - return r; + if (item_size <= 0) + return -EBADMSG; + + r = message_peek_fields(m, ri, 1, item_size, &q); + if (r < 0) + return r; + + l = item_size - 1; + } else { + r = message_peek_field_uint32(m, ri, 4, &l); + if (r < 0) + return r; + + r = message_peek_fields(m, ri, 1, l+1, &q); + if (r < 0) + return r; + } if (validate) { if (!validate_nul(q, l)) @@ -3689,6 +4659,7 @@ static int message_peek_field_string( static int message_peek_field_signature( sd_bus_message *m, size_t *ri, + size_t item_size, const char **ret) { size_t l; @@ -3698,14 +4669,26 @@ static int message_peek_field_signature( assert(m); assert(ri); - r = message_peek_fields(m, ri, 1, 1, &q); - if (r < 0) - return r; + if (BUS_MESSAGE_IS_GVARIANT(m)) { - l = *(uint8_t*) q; - r = message_peek_fields(m, ri, 1, l+1, &q); - if (r < 0) - return r; + if (item_size <= 0) + return -EBADMSG; + + r = message_peek_fields(m, ri, 1, item_size, &q); + if (r < 0) + return r; + + l = item_size - 1; + } else { + r = message_peek_fields(m, ri, 1, 1, &q); + if (r < 0) + return r; + + l = *(uint8_t*) q; + r = message_peek_fields(m, ri, 1, l+1, &q); + if (r < 0) + return r; + } if (!validate_signature(q, l)) return -EBADMSG; @@ -3728,6 +4711,7 @@ static int message_skip_fields( assert(m); assert(ri); assert(signature); + assert(!BUS_MESSAGE_IS_GVARIANT(m)); original_index = *ri; @@ -3745,7 +4729,7 @@ static int message_skip_fields( if (t == SD_BUS_TYPE_STRING) { - r = message_peek_field_string(m, NULL, ri, NULL); + r = message_peek_field_string(m, NULL, ri, 0, NULL); if (r < 0) return r; @@ -3753,7 +4737,7 @@ static int message_skip_fields( } else if (t == SD_BUS_TYPE_OBJECT_PATH) { - r = message_peek_field_string(m, object_path_is_valid, ri, NULL); + r = message_peek_field_string(m, object_path_is_valid, ri, 0, NULL); if (r < 0) return r; @@ -3761,7 +4745,7 @@ static int message_skip_fields( } else if (t == SD_BUS_TYPE_SIGNATURE) { - r = message_peek_field_signature(m, ri, NULL); + r = message_peek_field_signature(m, ri, 0, NULL); if (r < 0) return r; @@ -3799,7 +4783,7 @@ static int message_skip_fields( if (alignment < 0) return alignment; - r = message_peek_field_uint32(m, ri, &nas); + r = message_peek_field_uint32(m, ri, 0, &nas); if (r < 0) return r; if (nas > BUS_ARRAY_MAX_SIZE) @@ -3819,7 +4803,7 @@ static int message_skip_fields( } else if (t == SD_BUS_TYPE_VARIANT) { const char *s; - r = message_peek_field_signature(m, ri, &s); + r = message_peek_field_signature(m, ri, 0, &s); if (r < 0) return r; @@ -3857,26 +4841,98 @@ int bus_message_parse_fields(sd_bus_message *m) { size_t ri; int r; uint32_t unix_fds = 0; + void *offsets = NULL; + unsigned n_offsets = 0; + size_t sz = 0; + unsigned i = 0; assert(m); - for (ri = 0; ri < BUS_MESSAGE_FIELDS_SIZE(m); ) { + if (BUS_MESSAGE_IS_GVARIANT(m)) { + void *q; + + sz = determine_word_size(BUS_MESSAGE_FIELDS_SIZE(m), 0); + if (sz > 0) { + size_t framing; + + ri = BUS_MESSAGE_FIELDS_SIZE(m) - sz; + r = message_peek_fields(m, &ri, 1, sz, &q); + if (r < 0) + return r; + + framing = read_word_le(q, sz); + if (framing >= BUS_MESSAGE_FIELDS_SIZE(m) - sz) + return -EBADMSG; + if ((BUS_MESSAGE_FIELDS_SIZE(m) - framing) % sz != 0) + return -EBADMSG; + + ri = framing; + r = message_peek_fields(m, &ri, 1, BUS_MESSAGE_FIELDS_SIZE(m) - framing, &offsets); + if (r < 0) + return r; + + n_offsets = (BUS_MESSAGE_FIELDS_SIZE(m) - framing) / sz; + } + } + + ri = 0; + while (ri < BUS_MESSAGE_FIELDS_SIZE(m)) { + _cleanup_free_ char *sig = NULL; const char *signature; uint8_t *header; + size_t item_size = (size_t) -1; + + if (BUS_MESSAGE_IS_GVARIANT(m)) { + if (i >= n_offsets) + break; + + if (i == 0) + ri = 0; + else + ri = ALIGN_TO(read_word_le((uint8_t*) offsets + (i-1)*sz, sz), 8); + } r = message_peek_fields(m, &ri, 8, 1, (void**) &header); if (r < 0) return r; - r = message_peek_field_signature(m, &ri, &signature); - if (r < 0) - return r; + if (BUS_MESSAGE_IS_GVARIANT(m)) { + size_t where, end; + char *b; + void *q; + + end = read_word_le((uint8_t*) offsets + i*sz, sz); + + if (end < ri) + return -EBADMSG; + + where = ri = ALIGN_TO(ri, 8); + item_size = end - ri; + r = message_peek_fields(m, &where, 1, item_size, &q); + if (r < 0) + return r; + + b = memrchr(q, 0, item_size); + if (!b) + return -EBADMSG; + + sig = strndup(b+1, item_size - (b+1-(char*) q)); + if (!sig) + return -ENOMEM; + + signature = sig; + item_size = b - (char*) q; + } else { + r = message_peek_field_signature(m, &ri, 0, &signature); + if (r < 0) + return r; + } switch (*header) { - case _SD_BUS_MESSAGE_HEADER_INVALID: + case _BUS_MESSAGE_HEADER_INVALID: return -EBADMSG; - case SD_BUS_MESSAGE_HEADER_PATH: + case BUS_MESSAGE_HEADER_PATH: if (m->path) return -EBADMSG; @@ -3884,10 +4940,10 @@ int bus_message_parse_fields(sd_bus_message *m) { if (!streq(signature, "o")) return -EBADMSG; - r = message_peek_field_string(m, object_path_is_valid, &ri, &m->path); + r = message_peek_field_string(m, object_path_is_valid, &ri, item_size, &m->path); break; - case SD_BUS_MESSAGE_HEADER_INTERFACE: + case BUS_MESSAGE_HEADER_INTERFACE: if (m->interface) return -EBADMSG; @@ -3895,10 +4951,10 @@ int bus_message_parse_fields(sd_bus_message *m) { if (!streq(signature, "s")) return -EBADMSG; - r = message_peek_field_string(m, interface_name_is_valid, &ri, &m->interface); + r = message_peek_field_string(m, interface_name_is_valid, &ri, item_size, &m->interface); break; - case SD_BUS_MESSAGE_HEADER_MEMBER: + case BUS_MESSAGE_HEADER_MEMBER: if (m->member) return -EBADMSG; @@ -3906,10 +4962,10 @@ int bus_message_parse_fields(sd_bus_message *m) { if (!streq(signature, "s")) return -EBADMSG; - r = message_peek_field_string(m, member_name_is_valid, &ri, &m->member); + r = message_peek_field_string(m, member_name_is_valid, &ri, item_size, &m->member); break; - case SD_BUS_MESSAGE_HEADER_ERROR_NAME: + case BUS_MESSAGE_HEADER_ERROR_NAME: if (m->error.name) return -EBADMSG; @@ -3917,10 +4973,13 @@ int bus_message_parse_fields(sd_bus_message *m) { if (!streq(signature, "s")) return -EBADMSG; - r = message_peek_field_string(m, error_name_is_valid, &ri, &m->error.name); + r = message_peek_field_string(m, error_name_is_valid, &ri, item_size, &m->error.name); + if (r >= 0) + m->error._need_free = -1; + break; - case SD_BUS_MESSAGE_HEADER_DESTINATION: + case BUS_MESSAGE_HEADER_DESTINATION: if (m->destination) return -EBADMSG; @@ -3928,10 +4987,10 @@ int bus_message_parse_fields(sd_bus_message *m) { if (!streq(signature, "s")) return -EBADMSG; - r = message_peek_field_string(m, sender_name_is_valid, &ri, &m->destination); + r = message_peek_field_string(m, service_name_is_valid, &ri, item_size, &m->destination); break; - case SD_BUS_MESSAGE_HEADER_SENDER: + case BUS_MESSAGE_HEADER_SENDER: if (m->sender) return -EBADMSG; @@ -3939,11 +4998,17 @@ int bus_message_parse_fields(sd_bus_message *m) { if (!streq(signature, "s")) return -EBADMSG; - r = message_peek_field_string(m, sender_name_is_valid, &ri, &m->sender); + r = message_peek_field_string(m, service_name_is_valid, &ri, item_size, &m->sender); + + if (r >= 0 && m->sender[0] == ':' && m->bus && m->bus->bus_client && !m->bus->is_kernel) { + m->creds.unique_name = (char*) m->sender; + m->creds.mask |= SD_BUS_CREDS_UNIQUE_NAME & m->bus->creds_mask; + } + break; - case SD_BUS_MESSAGE_HEADER_SIGNATURE: { + case BUS_MESSAGE_HEADER_SIGNATURE: { const char *s; char *c; @@ -3953,7 +5018,7 @@ int bus_message_parse_fields(sd_bus_message *m) { if (!streq(signature, "g")) return -EBADMSG; - r = message_peek_field_signature(m, &ri, &s); + r = message_peek_field_signature(m, &ri, item_size, &s); if (r < 0) return r; @@ -3966,14 +5031,14 @@ int bus_message_parse_fields(sd_bus_message *m) { break; } - case SD_BUS_MESSAGE_HEADER_REPLY_SERIAL: + case BUS_MESSAGE_HEADER_REPLY_SERIAL: if (m->reply_serial != 0) return -EBADMSG; if (!streq(signature, "u")) return -EBADMSG; - r = message_peek_field_uint32(m, &ri, &m->reply_serial); + r = message_peek_field_uint32(m, &ri, item_size, &m->reply_serial); if (r < 0) return r; @@ -3982,14 +5047,14 @@ int bus_message_parse_fields(sd_bus_message *m) { break; - case SD_BUS_MESSAGE_HEADER_UNIX_FDS: + case BUS_MESSAGE_HEADER_UNIX_FDS: if (unix_fds != 0) return -EBADMSG; if (!streq(signature, "u")) return -EBADMSG; - r = message_peek_field_uint32(m, &ri, &unix_fds); + r = message_peek_field_uint32(m, &ri, item_size, &unix_fds); if (r < 0) return -EBADMSG; @@ -3999,19 +5064,19 @@ int bus_message_parse_fields(sd_bus_message *m) { break; default: - r = message_skip_fields(m, &ri, (uint32_t) -1, (const char **) &signature); + if (!BUS_MESSAGE_IS_GVARIANT(m)) + r = message_skip_fields(m, &ri, (uint32_t) -1, (const char **) &signature); } if (r < 0) return r; + + i++; } if (m->n_fds != unix_fds) return -EBADMSG; - if (isempty(m->root_container.signature) != (BUS_MESSAGE_BODY_SIZE(m) == 0)) - return -EBADMSG; - switch (m->header->type) { case SD_BUS_MESSAGE_SIGNAL: @@ -4039,67 +5104,23 @@ int bus_message_parse_fields(sd_bus_message *m) { break; } - /* Try to read the error message, but if we can't it's a non-issue */ - if (m->header->type == SD_BUS_MESSAGE_METHOD_ERROR) - sd_bus_message_read(m, "s", &m->error.message); - - return 0; -} - -int bus_message_seal(sd_bus_message *m, uint64_t serial) { - struct bus_body_part *part; - size_t l, a; - unsigned i; - int r; - - assert(m); - - if (m->sealed) - return -EPERM; - - if (m->n_containers > 0) - return -EBADMSG; - - if (m->poisoned) - return -ESTALE; - - /* If there's a non-trivial signature set, then add it in here */ - if (!isempty(m->root_container.signature)) { - r = message_append_field_signature(m, SD_BUS_MESSAGE_HEADER_SIGNATURE, m->root_container.signature, NULL); - if (r < 0) - return r; - } + m->root_container.end = BUS_MESSAGE_BODY_SIZE(m); - if (m->n_fds > 0) { - r = message_append_field_uint32(m, SD_BUS_MESSAGE_HEADER_UNIX_FDS, m->n_fds); + if (BUS_MESSAGE_IS_GVARIANT(m)) { + r = build_struct_offsets( + m, + m->root_container.signature, + BUS_MESSAGE_BODY_SIZE(m), + &m->root_container.item_size, + &m->root_container.offsets, + &m->root_container.n_offsets); if (r < 0) return r; } - /* Add padding at the end of the fields part, since we know - * the body needs to start at an 8 byte alignment. We made - * sure we allocated enough space for this, so all we need to - * do here is to zero it out. */ - l = BUS_MESSAGE_FIELDS_SIZE(m); - a = ALIGN8(l) - l; - if (a > 0) - memset((uint8_t*) BUS_MESSAGE_FIELDS(m) + l, 0, a); - - /* If this is something we can send as memfd, then let's seal - the memfd now. Note that we can send memfds as payload only - for directed messages, and not for broadcasts. */ - if (m->destination && m->bus && m->bus->use_memfd) { - MESSAGE_FOREACH_PART(part, i, m) - if (part->memfd >= 0 && !part->sealed && (part->size > MEMFD_MIN_SIZE || m->bus->use_memfd < 0)) { - bus_body_part_unmap(part); - - if (ioctl(part->memfd, KDBUS_CMD_MEMFD_SEAL_SET, 1) >= 0) - part->sealed = true; - } - } - - m->header->serial = serial; - m->sealed = true; + /* Try to read the error message, but if we can't it's a non-issue */ + if (m->header->type == SD_BUS_MESSAGE_METHOD_ERROR) + sd_bus_message_read(m, "s", &m->error.message); return 0; } @@ -4110,273 +5131,7 @@ _public_ int sd_bus_message_set_destination(sd_bus_message *m, const char *desti assert_return(!m->sealed, -EPERM); assert_return(!m->destination, -EEXIST); - return message_append_field_string(m, SD_BUS_MESSAGE_HEADER_DESTINATION, SD_BUS_TYPE_STRING, destination, &m->destination); -} - -int bus_message_dump(sd_bus_message *m, FILE *f, bool with_header) { - const char *u = NULL, *uu = NULL, *s = NULL; - char **cmdline = NULL; - unsigned level = 1; - int r; - uid_t owner, audit_loginuid; - uint32_t audit_sessionid; - - assert(m); - - if (!f) - f = stdout; - - if (with_header) { - fprintf(f, - "Message %p\n" - "\tn_ref=%u\n" - "\tendian=%c\n" - "\ttype=%i\n" - "\tflags=%u\n" - "\tversion=%u\n" - "\tserial=%u\n" - "\tfields_size=%u\n" - "\tbody_size=%u\n" - "\tpath=%s\n" - "\tinterface=%s\n" - "\tmember=%s\n" - "\tdestination=%s\n" - "\tsender=%s\n" - "\tsignature=%s\n" - "\treply_serial=%u\n" - "\tsealed=%s\n" - "\tn_body_parts=%u\n", - m, - m->n_ref, - m->header->endian, - m->header->type, - m->header->flags, - m->header->version, - BUS_MESSAGE_SERIAL(m), - BUS_MESSAGE_FIELDS_SIZE(m), - BUS_MESSAGE_BODY_SIZE(m), - strna(m->path), - strna(m->interface), - strna(m->member), - strna(m->destination), - strna(m->sender), - strna(m->root_container.signature), - m->reply_serial, - yes_no(m->sealed), - m->n_body_parts); - - if (sd_bus_error_is_set(&m->error)) - fprintf(f, - "\terror.name=%s\n" - "\terror.message=%s\n", - strna(m->error.name), - strna(m->error.message)); - - if (m->pid != 0) - fprintf(f, "\tpid=%lu\n", (unsigned long) m->pid); - if (m->tid != 0) - fprintf(f, "\ttid=%lu\n", (unsigned long) m->tid); - if (m->uid_valid) - fprintf(f, "\tuid=%lu\n", (unsigned long) m->uid); - if (m->gid_valid) - fprintf(f, "\tgid=%lu\n", (unsigned long) m->gid); - if (m->pid_starttime != 0) - fprintf(f, "\tpid_starttime=%llu\n", (unsigned long long) m->pid_starttime); - if (m->monotonic != 0) - fprintf(f, "\tmonotonic=%llu\n", (unsigned long long) m->monotonic); - if (m->realtime != 0) - fprintf(f, "\trealtime=%llu\n", (unsigned long long) m->realtime); - if (m->exe) - fprintf(f, "\texe=[%s]\n", m->exe); - if (m->comm) - fprintf(f, "\tcomm=[%s]\n", m->comm); - if (m->tid_comm) - fprintf(f, "\ttid_comm=[%s]\n", m->tid_comm); - if (m->label) - fprintf(f, "\tlabel=[%s]\n", m->label); - if (m->cgroup) - fprintf(f, "\tcgroup=[%s]\n", m->cgroup); - - sd_bus_message_get_unit(m, &u); - if (u) - fprintf(f, "\tunit=[%s]\n", u); - sd_bus_message_get_user_unit(m, &uu); - if (uu) - fprintf(f, "\tuser_unit=[%s]\n", uu); - sd_bus_message_get_session(m, &s); - if (s) - fprintf(f, "\tsession=[%s]\n", s); - if (sd_bus_message_get_owner_uid(m, &owner) >= 0) - fprintf(f, "\towner_uid=%lu\n", (unsigned long) owner); - if (sd_bus_message_get_audit_loginuid(m, &audit_loginuid) >= 0) - fprintf(f, "\taudit_loginuid=%lu\n", (unsigned long) audit_loginuid); - if (sd_bus_message_get_audit_sessionid(m, &audit_sessionid) >= 0) - fprintf(f, "\taudit_sessionid=%lu\n", (unsigned long) audit_sessionid); - - r = sd_bus_message_has_effective_cap(m, 5); - if (r >= 0) - fprintf(f, "\tCAP_KILL=%s\n", yes_no(r)); - - if (sd_bus_message_get_cmdline(m, &cmdline) >= 0) { - char **c; - - fputs("\tcmdline=[", f); - STRV_FOREACH(c, cmdline) { - if (c != cmdline) - fputc(' ', f); - - fputs(*c, f); - } - - fputs("]\n", f); - } - } - - r = sd_bus_message_rewind(m, true); - if (r < 0) { - log_error("Failed to rewind: %s", strerror(-r)); - return r; - } - - fprintf(f, "MESSAGE \"%s\" {\n", strempty(m->root_container.signature)); - - for(;;) { - _cleanup_free_ char *prefix = NULL; - const char *contents = NULL; - char type; - union { - uint8_t u8; - uint16_t u16; - int16_t s16; - uint32_t u32; - int32_t s32; - uint64_t u64; - int64_t s64; - double d64; - const char *string; - int i; - } basic; - - r = sd_bus_message_peek_type(m, &type, &contents); - if (r < 0) { - log_error("Failed to peek type: %s", strerror(-r)); - return r; - } - - if (r == 0) { - if (level <= 1) - break; - - r = sd_bus_message_exit_container(m); - if (r < 0) { - log_error("Failed to exit container: %s", strerror(-r)); - return r; - } - - level--; - - prefix = strrep("\t", level); - if (!prefix) - return log_oom(); - - fprintf(f, "%s};\n", prefix); - continue; - } - - prefix = strrep("\t", level); - if (!prefix) - return log_oom(); - - if (bus_type_is_container(type) > 0) { - r = sd_bus_message_enter_container(m, type, contents); - if (r < 0) { - log_error("Failed to enter container: %s", strerror(-r)); - return r; - } - - if (type == SD_BUS_TYPE_ARRAY) - fprintf(f, "%sARRAY \"%s\" {\n", prefix, contents); - else if (type == SD_BUS_TYPE_VARIANT) - fprintf(f, "%sVARIANT \"%s\" {\n", prefix, contents); - else if (type == SD_BUS_TYPE_STRUCT) - fprintf(f, "%sSTRUCT \"%s\" {\n", prefix, contents); - else if (type == SD_BUS_TYPE_DICT_ENTRY) - fprintf(f, "%sDICT_ENTRY \"%s\" {\n", prefix, contents); - - level ++; - - continue; - } - - r = sd_bus_message_read_basic(m, type, &basic); - if (r < 0) { - log_error("Failed to get basic: %s", strerror(-r)); - return r; - } - - assert(r > 0); - - switch (type) { - - case SD_BUS_TYPE_BYTE: - fprintf(f, "%sBYTE %u;\n", prefix, basic.u8); - break; - - case SD_BUS_TYPE_BOOLEAN: - fprintf(f, "%sBOOLEAN %s;\n", prefix, yes_no(basic.i)); - break; - - case SD_BUS_TYPE_INT16: - fprintf(f, "%sINT16 %i;\n", prefix, basic.s16); - break; - - case SD_BUS_TYPE_UINT16: - fprintf(f, "%sUINT16 %u;\n", prefix, basic.u16); - break; - - case SD_BUS_TYPE_INT32: - fprintf(f, "%sINT32 %i;\n", prefix, basic.s32); - break; - - case SD_BUS_TYPE_UINT32: - fprintf(f, "%sUINT32 %u;\n", prefix, basic.u32); - break; - - case SD_BUS_TYPE_INT64: - fprintf(f, "%sINT64 %lli;\n", prefix, (long long) basic.s64); - break; - - case SD_BUS_TYPE_UINT64: - fprintf(f, "%sUINT64 %llu;\n", prefix, (unsigned long long) basic.u64); - break; - - case SD_BUS_TYPE_DOUBLE: - fprintf(f, "%sDOUBLE %g;\n", prefix, basic.d64); - break; - - case SD_BUS_TYPE_STRING: - fprintf(f, "%sSTRING \"%s\";\n", prefix, basic.string); - break; - - case SD_BUS_TYPE_OBJECT_PATH: - fprintf(f, "%sOBJECT_PATH \"%s\";\n", prefix, basic.string); - break; - - case SD_BUS_TYPE_SIGNATURE: - fprintf(f, "%sSIGNATURE \"%s\";\n", prefix, basic.string); - break; - - case SD_BUS_TYPE_UNIX_FD: - fprintf(f, "%sUNIX_FD %i;\n", prefix, basic.i); - break; - - default: - assert_not_reached("Unknown basic type."); - } - } - - fprintf(f, "};\n"); - return 0; + return message_append_field_string(m, BUS_MESSAGE_HEADER_DESTINATION, SD_BUS_TYPE_STRING, destination, &m->destination); } int bus_message_get_blob(sd_bus_message *m, void **buffer, size_t *sz) { @@ -4497,7 +5252,7 @@ bool bus_header_is_complete(struct bus_header *h, size_t size) { return false; full = sizeof(struct bus_header) + - (h->endian == SD_BUS_NATIVE_ENDIAN ? h->fields_size : bswap_32(h->fields_size)); + (h->endian == BUS_NATIVE_ENDIAN ? h->fields_size : bswap_32(h->fields_size)); return size >= full; } @@ -4508,10 +5263,10 @@ int bus_header_message_size(struct bus_header *h, size_t *sum) { assert(h); assert(sum); - if (h->endian == SD_BUS_NATIVE_ENDIAN) { + if (h->endian == BUS_NATIVE_ENDIAN) { fs = h->fields_size; bs = h->body_size; - } else if (h->endian == SD_BUS_REVERSE_ENDIAN) { + } else if (h->endian == BUS_REVERSE_ENDIAN) { fs = bswap_32(h->fields_size); bs = bswap_32(h->body_size); } else @@ -4536,7 +5291,7 @@ _public_ const char* sd_bus_message_get_signature(sd_bus_message *m, int complet assert_return(m, NULL); c = complete ? &m->root_container : message_get_container(m); - return c->signature ?: ""; + return strempty(c->signature); } _public_ int sd_bus_message_copy(sd_bus_message *m, sd_bus_message *source, int all) { @@ -4642,3 +5397,9 @@ _public_ int sd_bus_message_verify_type(sd_bus_message *m, char type, const char return 1; } + +_public_ sd_bus *sd_bus_message_get_bus(sd_bus_message *m) { + assert_return(m, NULL); + + return m->bus; +}