X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fsd-bus.c;h=6eab4a5469cc44d4c71c401696594e5b643e3bd8;hp=09ea01b951545283b365740d54f9d84affb7fde1;hb=a7e3212d89d5aefee67de79c1e7eaccf2f5645ac;hpb=20902f3ec8b9d3f8949b15dbd961d3eeb37e9b7b diff --git a/src/libsystemd-bus/sd-bus.c b/src/libsystemd-bus/sd-bus.c index 09ea01b95..6eab4a546 100644 --- a/src/libsystemd-bus/sd-bus.c +++ b/src/libsystemd-bus/sd-bus.c @@ -29,16 +29,19 @@ #include "util.h" #include "macro.h" +#include "strv.h" #include "sd-bus.h" #include "bus-internal.h" #include "bus-message.h" #include "bus-type.h" +#include "bus-socket.h" static int bus_poll(sd_bus *bus, bool need_more, uint64_t timeout_usec); static void bus_free(sd_bus *b) { struct filter_callback *f; + struct object_callback *c; unsigned i; assert(b); @@ -51,6 +54,12 @@ static void bus_free(sd_bus *b) { free(b->auth_uid); free(b->address); + free(b->exec_path); + strv_free(b->exec_argv); + + close_many(b->fds, b->n_fds); + free(b->fds); + for (i = 0; i < b->rqueue_size; i++) sd_bus_message_unref(b->rqueue[i]); free(b->rqueue); @@ -67,36 +76,132 @@ static void bus_free(sd_bus *b) { free(f); } + while ((c = hashmap_steal_first(b->object_callbacks))) { + free(c->path); + free(c); + } + + hashmap_free(b->object_callbacks); + free(b); } -static sd_bus* bus_new(void) { +int sd_bus_new(sd_bus **ret) { sd_bus *r; + if (!ret) + return -EINVAL; + r = new0(sd_bus, 1); if (!r) - return NULL; + return -ENOMEM; r->n_ref = 1; r->fd = -1; r->message_version = 1; + r->negotiate_fds = true; /* We guarantee that wqueue always has space for at least one * entry */ r->wqueue = new(sd_bus_message*, 1); if (!r->wqueue) { free(r); - return NULL; + return -ENOMEM; } - return r; -}; + *ret = r; + return 0; +} + +int sd_bus_set_address(sd_bus *bus, const char *address) { + char *a; + + if (!bus) + return -EINVAL; + if (bus->state != BUS_UNSET) + return -EPERM; + if (!address) + return -EINVAL; + + a = strdup(address); + if (!a) + return -ENOMEM; + + free(bus->address); + bus->address = a; + + return 0; +} + +int sd_bus_set_fd(sd_bus *bus, int fd) { + if (!bus) + return -EINVAL; + if (bus->state != BUS_UNSET) + return -EPERM; + if (fd < 0) + return -EINVAL; + + bus->fd = fd; + return 0; +} + +int sd_bus_set_exec(sd_bus *bus, const char *path, char *const argv[]) { + char *p, **a; + + if (!bus) + return -EINVAL; + if (bus->state != BUS_UNSET) + return -EPERM; + if (!path) + return -EINVAL; + if (strv_isempty(argv)) + return -EINVAL; + + p = strdup(path); + if (!p) + return -ENOMEM; + + a = strv_copy(argv); + if (!a) { + free(p); + return -ENOMEM; + } + + free(bus->exec_path); + strv_free(bus->exec_argv); + + bus->exec_path = p; + bus->exec_argv = a; + + return 0; +} + +int sd_bus_set_hello(sd_bus *bus, int b) { + if (!bus) + return -EINVAL; + if (bus->state != BUS_UNSET) + return -EPERM; + + bus->send_hello = !!b; + return 0; +} + +int sd_bus_set_negotiate_fds(sd_bus *bus, int b) { + if (!bus) + return -EINVAL; + if (bus->state != BUS_UNSET) + return -EPERM; + + bus->negotiate_fds = !!b; + return 0; +} static int hello_callback(sd_bus *bus, int error, sd_bus_message *reply, void *userdata) { const char *s; int r; assert(bus); + assert(bus->state == BUS_HELLO); if (error != 0) return -error; @@ -125,6 +230,9 @@ static int bus_send_hello(sd_bus *bus) { assert(bus); + if (!bus->send_hello) + return 0; + r = sd_bus_message_new_method_call( bus, "org.freedesktop.DBus", @@ -139,14 +247,13 @@ static int bus_send_hello(sd_bus *bus) { if (r < 0) return r; - bus->sent_hello = true; return r; } -static int bus_start_running(sd_bus *bus) { +int bus_start_running(sd_bus *bus) { assert(bus); - if (bus->sent_hello) { + if (bus->send_hello) { bus->state = BUS_HELLO; return 1; } @@ -162,21 +269,24 @@ static int parse_address_key(const char **p, const char *key, char **value) { assert(p); assert(*p); - assert(key); assert(value); - l = strlen(key); - if (strncmp(*p, key, l) != 0) - return 0; + if (key) { + l = strlen(key); + if (strncmp(*p, key, l) != 0) + return 0; - if ((*p)[l] != '=') - return 0; + if ((*p)[l] != '=') + return 0; - if (*value) - return -EINVAL; + if (*value) + return -EINVAL; + + a = *p + l + 1; + } else + a = *p; - a = *p + l + 1; - while (*a != ',' && *a != 0) { + while (*a != ';' && *a != ',' && *a != 0) { char c, *t; if (*a == '%') { @@ -222,7 +332,10 @@ static int parse_address_key(const char **p, const char *key, char **value) { a++; *p = a; + + free(*value); *value = r; + return 1; } @@ -236,366 +349,385 @@ static void skip_address_key(const char **p) { (*p) ++; } -static int bus_parse_next_address(sd_bus *b) { - const char *a, *p; - _cleanup_free_ char *guid = NULL; +static int parse_unix_address(sd_bus *b, const char **p, char **guid) { + _cleanup_free_ char *path = NULL, *abstract = NULL; + size_t l; int r; assert(b); + assert(p); + assert(*p); + assert(guid); - if (!b->address) - return 0; - if (b->address[b->address_index] == 0) - return 0; + while (**p != 0 && **p != ';') { + r = parse_address_key(p, "guid", guid); + if (r < 0) + return r; + else if (r > 0) + continue; - a = b->address + b->address_index; + r = parse_address_key(p, "path", &path); + if (r < 0) + return r; + else if (r > 0) + continue; - zero(b->sockaddr); - b->sockaddr_size = 0; - b->peer = SD_ID128_NULL; + r = parse_address_key(p, "abstract", &abstract); + if (r < 0) + return r; + else if (r > 0) + continue; - if (startswith(a, "unix:")) { - _cleanup_free_ char *path = NULL, *abstract = NULL; + skip_address_key(p); + } - p = a + 5; - while (*p != 0) { - r = parse_address_key(&p, "guid", &guid); - if (r < 0) - return r; - else if (r > 0) - continue; + if (!path && !abstract) + return -EINVAL; - r = parse_address_key(&p, "path", &path); - if (r < 0) - return r; - else if (r > 0) - continue; + if (path && abstract) + return -EINVAL; - r = parse_address_key(&p, "abstract", &abstract); - if (r < 0) - return r; - else if (r > 0) - continue; + if (path) { + l = strlen(path); + if (l > sizeof(b->sockaddr.un.sun_path)) + return -E2BIG; - skip_address_key(&p); - } + b->sockaddr.un.sun_family = AF_UNIX; + strncpy(b->sockaddr.un.sun_path, path, sizeof(b->sockaddr.un.sun_path)); + b->sockaddr_size = offsetof(struct sockaddr_un, sun_path) + l; + } else if (abstract) { + l = strlen(abstract); + if (l > sizeof(b->sockaddr.un.sun_path) - 1) + return -E2BIG; - if (!path && !abstract) - return -EINVAL; + b->sockaddr.un.sun_family = AF_UNIX; + b->sockaddr.un.sun_path[0] = 0; + strncpy(b->sockaddr.un.sun_path+1, abstract, sizeof(b->sockaddr.un.sun_path)-1); + b->sockaddr_size = offsetof(struct sockaddr_un, sun_path) + 1 + l; + } - if (path && abstract) - return -EINVAL; + return 0; +} - if (path) { - size_t l; +static int parse_tcp_address(sd_bus *b, const char **p, char **guid) { + _cleanup_free_ char *host = NULL, *port = NULL, *family = NULL; + struct addrinfo hints, *result; + int r; - l = strlen(path); - if (l > sizeof(b->sockaddr.un.sun_path)) - return -E2BIG; + assert(b); + assert(p); + assert(*p); + assert(guid); - b->sockaddr.un.sun_family = AF_UNIX; - strncpy(b->sockaddr.un.sun_path, path, sizeof(b->sockaddr.un.sun_path)); - b->sockaddr_size = offsetof(struct sockaddr_un, sun_path) + l; - } else if (abstract) { - size_t l; + while (**p != 0 && **p != ';') { + r = parse_address_key(p, "guid", guid); + if (r < 0) + return r; + else if (r > 0) + continue; - l = strlen(abstract); - if (l > sizeof(b->sockaddr.un.sun_path) - 1) - return -E2BIG; + r = parse_address_key(p, "host", &host); + if (r < 0) + return r; + else if (r > 0) + continue; - b->sockaddr.un.sun_family = AF_UNIX; - b->sockaddr.un.sun_path[0] = 0; - strncpy(b->sockaddr.un.sun_path+1, abstract, sizeof(b->sockaddr.un.sun_path)-1); - b->sockaddr_size = offsetof(struct sockaddr_un, sun_path) + 1 + l; - } + r = parse_address_key(p, "port", &port); + if (r < 0) + return r; + else if (r > 0) + continue; - } else if (startswith(a, "tcp:")) { - _cleanup_free_ char *host = NULL, *port = NULL, *family = NULL; - struct addrinfo hints, *result; + r = parse_address_key(p, "family", &family); + if (r < 0) + return r; + else if (r > 0) + continue; - p = a + 4; - while (*p != 0) { - r = parse_address_key(&p, "guid", &guid); - if (r < 0) - return r; - else if (r > 0) - continue; + skip_address_key(p); + } - r = parse_address_key(&p, "host", &host); - if (r < 0) - return r; - else if (r > 0) - continue; + if (!host || !port) + return -EINVAL; - r = parse_address_key(&p, "port", &port); - if (r < 0) - return r; - else if (r > 0) - continue; + zero(hints); + hints.ai_socktype = SOCK_STREAM; + hints.ai_flags = AI_ADDRCONFIG; - r = parse_address_key(&p, "family", &family); - if (r < 0) - return r; - else if (r > 0) - continue; + if (family) { + if (streq(family, "ipv4")) + hints.ai_family = AF_INET; + else if (streq(family, "ipv6")) + hints.ai_family = AF_INET6; + else + return -EINVAL; + } - skip_address_key(&p); - } + r = getaddrinfo(host, port, &hints, &result); + if (r == EAI_SYSTEM) + return -errno; + else if (r != 0) + return -EADDRNOTAVAIL; - if (!host || !port) - return -EINVAL; + memcpy(&b->sockaddr, result->ai_addr, result->ai_addrlen); + b->sockaddr_size = result->ai_addrlen; - zero(hints); - hints.ai_socktype = SOCK_STREAM; - hints.ai_flags = AI_ADDRCONFIG; - - if (family) { - if (streq(family, "ipv4")) - hints.ai_family = AF_INET; - else if (streq(family, "ipv6")) - hints.ai_family = AF_INET6; - else - return -EINVAL; - } + freeaddrinfo(result); - r = getaddrinfo(host, port, &hints, &result); - if (r == EAI_SYSTEM) - return -errno; - else if (r != 0) - return -EADDRNOTAVAIL; + return 0; +} - memcpy(&b->sockaddr, result->ai_addr, result->ai_addrlen); - b->sockaddr_size = result->ai_addrlen; +static int parse_exec_address(sd_bus *b, const char **p, char **guid) { + char *path = NULL; + unsigned n_argv = 0, j; + char **argv = NULL; + int r; - freeaddrinfo(result); - } + assert(b); + assert(p); + assert(*p); + assert(guid); - if (guid) { - r = sd_id128_from_string(guid, &b->peer); + while (**p != 0 && **p != ';') { + r = parse_address_key(p, "guid", guid); if (r < 0) - return r; - } + goto fail; + else if (r > 0) + continue; - b->address_index = p - b->address; - return 1; -} + r = parse_address_key(p, "path", &path); + if (r < 0) + goto fail; + else if (r > 0) + continue; -static void iovec_advance(struct iovec *iov, unsigned *idx, size_t size) { + if (startswith(*p, "argv")) { + unsigned ul; - while (size > 0) { - struct iovec *i = iov + *idx; + errno = 0; + ul = strtoul(*p + 4, (char**) p, 10); + if (errno != 0 || **p != '=' || ul > 256) { + r = -EINVAL; + goto fail; + } - if (i->iov_len > size) { - i->iov_base = (uint8_t*) i->iov_base + size; - i->iov_len -= size; - return; - } + (*p) ++; - size -= i->iov_len; + if (ul >= n_argv) { + char **x; + + x = realloc(argv, sizeof(char*) * (ul + 2)); + if (!x) { + r = -ENOMEM; + goto fail; + } - i->iov_base = NULL; - i->iov_len = 0; + memset(x + n_argv, 0, sizeof(char*) * (ul - n_argv + 2)); - (*idx) ++; + argv = x; + n_argv = ul + 1; + } + + r = parse_address_key(p, NULL, argv + ul); + if (r < 0) + goto fail; + + continue; + } + + skip_address_key(p); } -} -static int bus_write_auth(sd_bus *b) { - struct msghdr mh; - ssize_t k; + if (!path) + goto fail; - assert(b); - assert(b->state == BUS_AUTHENTICATING); + /* Make sure there are no holes in the array, with the + * exception of argv[0] */ + for (j = 1; j < n_argv; j++) + if (!argv[j]) { + r = -EINVAL; + goto fail; + } - if (b->auth_index >= ELEMENTSOF(b->auth_iovec)) - return 0; + if (argv && argv[0] == NULL) { + argv[0] = strdup(path); + if (!argv[0]) { + r = -ENOMEM; + goto fail; + } + } - if (b->auth_timeout == 0) - b->auth_timeout = now(CLOCK_MONOTONIC) + BUS_DEFAULT_TIMEOUT; + b->exec_path = path; + b->exec_argv = argv; + return 0; - zero(mh); - mh.msg_iov = b->auth_iovec + b->auth_index; - mh.msg_iovlen = ELEMENTSOF(b->auth_iovec) - b->auth_index; +fail: + for (j = 0; j < n_argv; j++) + free(argv[j]); - k = sendmsg(b->fd, &mh, MSG_DONTWAIT|MSG_NOSIGNAL); - if (k < 0) - return errno == EAGAIN ? 0 : -errno; + free(argv); + free(path); + return r; +} - iovec_advance(b->auth_iovec, &b->auth_index, (size_t) k); +static void bus_reset_parsed_address(sd_bus *b) { + assert(b); - return 1; + zero(b->sockaddr); + b->sockaddr_size = 0; + strv_free(b->exec_argv); + free(b->exec_path); + b->exec_path = NULL; + b->exec_argv = NULL; + b->peer = SD_ID128_NULL; } -static int bus_auth_verify(sd_bus *b) { - char *e, *f; - sd_id128_t peer; - unsigned i; +static int bus_parse_next_address(sd_bus *b) { + _cleanup_free_ char *guid = NULL; + const char *a; int r; - /* We expect two response lines: "OK", "AGREE_UNIX_FD", and - * that's it */ + assert(b); - e = memmem(b->rbuffer, b->rbuffer_size, "\r\n", 2); - if (!e) + if (!b->address) return 0; - - f = memmem(e + 2, b->rbuffer_size - (e - (char*) b->rbuffer) - 2, "\r\n", 2); - if (!f) + if (b->address[b->address_index] == 0) return 0; - if (e - (char*) b->rbuffer != 3 + 32) - return -EPERM; + bus_reset_parsed_address(b); - if (memcmp(b->rbuffer, "OK ", 3)) - return -EPERM; + a = b->address + b->address_index; - for (i = 0; i < 32; i += 2) { - int x, y; + while (*a != 0) { - x = unhexchar(((char*) b->rbuffer)[3 + i]); - y = unhexchar(((char*) b->rbuffer)[3 + i + 1]); + if (*a == ';') { + a++; + continue; + } - if (x < 0 || y < 0) - return -EINVAL; + if (startswith(a, "unix:")) { + a += 5; - peer.bytes[i/2] = ((uint8_t) x << 4 | (uint8_t) y); - } + r = parse_unix_address(b, &a, &guid); + if (r < 0) + return r; + break; - if (!sd_id128_equal(b->peer, SD_ID128_NULL) && - !sd_id128_equal(b->peer, peer)) - return -EPERM; + } else if (startswith(a, "tcp:")) { + + a += 4; + r = parse_tcp_address(b, &a, &guid); + if (r < 0) + return r; - b->peer = peer; + break; - b->can_fds = - (f - e == sizeof("\r\nAGREE_UNIX_FD") - 1) && - memcmp(e + 2, "AGREE_UNIX_FD", sizeof("AGREE_UNIX_FD") - 1) == 0; + } else if (startswith(a, "unixexec:")) { - b->rbuffer_size -= (f + 2 - (char*) b->rbuffer); - memmove(b->rbuffer, f + 2, b->rbuffer_size); + a += 9; + r = parse_exec_address(b, &a, &guid); + if (r < 0) + return r; - r = bus_start_running(b); - if (r < 0) - return r; + break; + + } + + a = strchr(a, ';'); + if (!a) + return 0; + } + + if (guid) { + r = sd_id128_from_string(guid, &b->peer); + if (r < 0) + return r; + } + b->address_index = a - b->address; return 1; } -static int bus_read_auth(sd_bus *b) { - struct msghdr mh; - struct iovec iov; - size_t n; - ssize_t k; +static int bus_start_address(sd_bus *b) { int r; - void *p; assert(b); - r = bus_auth_verify(b); - if (r != 0) - return r; - - n = MAX(3 + 32 + 2 + sizeof("AGREE_UNIX_FD") - 1 + 2, b->rbuffer_size * 2); - - if (n > BUS_AUTH_SIZE_MAX) - n = BUS_AUTH_SIZE_MAX; + for (;;) { + if (b->fd >= 0) { + close_nointr_nofail(b->fd); + b->fd = -1; + } - if (b->rbuffer_size >= n) - return -ENOBUFS; + if (b->sockaddr.sa.sa_family != AF_UNSPEC) { - p = realloc(b->rbuffer, n); - if (!p) - return -ENOMEM; + r = bus_socket_connect(b); + if (r >= 0) + return r; - b->rbuffer = p; + b->last_connect_error = -r; - zero(iov); - iov.iov_base = (uint8_t*) b->rbuffer + b->rbuffer_size; - iov.iov_len = n - b->rbuffer_size; + } else if (b->exec_path) { - zero(mh); - mh.msg_iov = &iov; - mh.msg_iovlen = 1; + r = bus_socket_exec(b); + if (r >= 0) + return r; - k = recvmsg(b->fd, &mh, MSG_DONTWAIT|MSG_NOSIGNAL); - if (k < 0) - return errno == EAGAIN ? 0 : -errno; + b->last_connect_error = -r; + } - b->rbuffer_size += k; + r = bus_parse_next_address(b); + if (r < 0) + return r; + if (r == 0) + return b->last_connect_error ? -b->last_connect_error : -ECONNREFUSED; + } +} - r = bus_auth_verify(b); - if (r != 0) - return r; +int bus_next_address(sd_bus *b) { + assert(b); - return 1; + bus_reset_parsed_address(b); + return bus_start_address(b); } -static int bus_start_auth(sd_bus *b) { - static const char auth_prefix[] = "\0AUTH EXTERNAL "; - static const char auth_suffix[] = "\r\nNEGOTIATE_UNIX_FD\r\nBEGIN\r\n"; - - char text[20 + 1]; /* enough space for a 64bit integer plus NUL */ - size_t l; +static int bus_start_fd(sd_bus *b) { + int r; assert(b); - b->state = BUS_AUTHENTICATING; - - snprintf(text, sizeof(text), "%llu", (unsigned long long) geteuid()); - char_array_0(text); - - l = strlen(text); - b->auth_uid = hexmem(text, l); - if (!b->auth_uid) - return -ENOMEM; + r = fd_nonblock(b->fd, true); + if (r < 0) + return r; - b->auth_iovec[0].iov_base = (void*) auth_prefix; - b->auth_iovec[0].iov_len = sizeof(auth_prefix) -1; - b->auth_iovec[1].iov_base = (void*) b->auth_uid; - b->auth_iovec[1].iov_len = l * 2; - b->auth_iovec[2].iov_base = (void*) auth_suffix; - b->auth_iovec[2].iov_len = sizeof(auth_suffix) -1; - b->auth_size = sizeof(auth_prefix) - 1 + l * 2 + sizeof(auth_suffix) - 1; + r = fd_cloexec(b->fd, true); + if (r < 0) + return r; - return bus_write_auth(b); + return bus_socket_take_fd(b); } -static int bus_start_connect(sd_bus *b) { +int sd_bus_start(sd_bus *bus) { int r; - assert(b); - assert(b->fd < 0); - - for (;;) { - if (b->sockaddr.sa.sa_family == AF_UNSPEC) { - r = bus_parse_next_address(b); - if (r < 0) - return r; - if (r == 0) - return b->last_connect_error ? -b->last_connect_error : -ECONNREFUSED; - } + if (!bus) + return -EINVAL; + if (bus->state != BUS_UNSET) + return -EPERM; - b->fd = socket(b->sockaddr.sa.sa_family, SOCK_STREAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0); - if (b->fd < 0) { - b->last_connect_error = errno; - zero(b->sockaddr); - continue; - } + bus->state = BUS_OPENING; - r = connect(b->fd, &b->sockaddr.sa, b->sockaddr_size); - if (r < 0) { - if (errno == EINPROGRESS) - return 1; + if (bus->fd >= 0) + r = bus_start_fd(bus); + else if (bus->address) + r = bus_start_address(bus); + else + return -EINVAL; - b->last_connect_error = errno; - close_nointr_nofail(b->fd); - b->fd = -1; - zero(b->sockaddr); - continue; - } + if (r < 0) + return r; - return bus_start_auth(b); - } + return bus_send_hello(bus); } int sd_bus_open_system(sd_bus **ret) { @@ -606,35 +738,33 @@ int sd_bus_open_system(sd_bus **ret) { if (!ret) return -EINVAL; + r = sd_bus_new(&b); + if (r < 0) + return r; + e = getenv("DBUS_SYSTEM_BUS_ADDRESS"); if (e) { - r = sd_bus_open_address(e, &b); + r = sd_bus_set_address(b, e); if (r < 0) - return r; + goto fail; } else { - b = bus_new(); - if (!b) - return -ENOMEM; - b->sockaddr.un.sun_family = AF_UNIX; strncpy(b->sockaddr.un.sun_path, "/run/dbus/system_bus_socket", sizeof(b->sockaddr.un.sun_path)); b->sockaddr_size = offsetof(struct sockaddr_un, sun_path) + sizeof("/run/dbus/system_bus_socket") - 1; - - r = bus_start_connect(b); - if (r < 0) { - bus_free(b); - return r; - } } - r = bus_send_hello(b); - if (r < 0) { - sd_bus_unref(b); - return r; - } + b->send_hello = true; + + r = sd_bus_start(b); + if (r < 0) + goto fail; *ret = b; return 0; + +fail: + bus_free(b); + return r; } int sd_bus_open_user(sd_bus **ret) { @@ -646,99 +776,45 @@ int sd_bus_open_user(sd_bus **ret) { if (!ret) return -EINVAL; + r = sd_bus_new(&b); + if (r < 0) + return r; + e = getenv("DBUS_SESSION_BUS_ADDRESS"); if (e) { - r = sd_bus_open_address(e, &b); + r = sd_bus_set_address(b, e); if (r < 0) - return r; + goto fail; } else { e = getenv("XDG_RUNTIME_DIR"); - if (!e) - return -ENOENT; + if (!e) { + r = -ENOENT; + goto fail; + } l = strlen(e); - if (l + 4 > sizeof(b->sockaddr.un.sun_path)) - return -E2BIG; - - b = bus_new(); - if (!b) - return -ENOMEM; + if (l + 4 > sizeof(b->sockaddr.un.sun_path)) { + r = -E2BIG; + goto fail; + } b->sockaddr.un.sun_family = AF_UNIX; memcpy(mempcpy(b->sockaddr.un.sun_path, e, l), "/bus", 4); b->sockaddr_size = offsetof(struct sockaddr_un, sun_path) + l + 4; - - r = bus_start_connect(b); - if (r < 0) { - bus_free(b); - return r; - } } - r = bus_send_hello(b); - if (r < 0) { - sd_bus_unref(b); - return r; - } + b->send_hello = true; - *ret = b; - return 0; -} - -int sd_bus_open_address(const char *address, sd_bus **ret) { - sd_bus *b; - int r; - - if (!address) - return -EINVAL; - if (!ret) - return -EINVAL; - - b = bus_new(); - if (!b) - return -ENOMEM; - - b->address = strdup(address); - if (!b->address) { - bus_free(b); - return -ENOMEM; - } - - r = bus_start_connect(b); - if (r < 0) { - bus_free(b); - return r; - } + r = sd_bus_start(b); + if (r < 0) + goto fail; *ret = b; return 0; -} - -int sd_bus_open_fd(int fd, sd_bus **ret) { - sd_bus *b; - int r; - - if (fd < 0) - return -EINVAL; - if (!ret) - return -EINVAL; - - b = bus_new(); - if (!b) - return -ENOMEM; - - b->fd = fd; - fd_nonblock(b->fd, true); - fd_cloexec(b->fd, true); - - r = bus_start_auth(b); - if (r < 0) { - bus_free(b); - return r; - } - *ret = b; - return 0; +fail: + bus_free(b); + return r; } void sd_bus_close(sd_bus *bus) { @@ -778,7 +854,7 @@ int sd_bus_is_open(sd_bus *bus) { if (!bus) return -EINVAL; - return bus->fd >= 0; + return bus->state != BUS_UNSET && bus->fd >= 0; } int sd_bus_can_send(sd_bus *bus, char type) { @@ -786,8 +862,13 @@ int sd_bus_can_send(sd_bus *bus, char type) { if (!bus) return -EINVAL; + if (bus->fd < 0) + return -ENOTCONN; if (type == SD_BUS_TYPE_UNIX_FD) { + if (!bus->negotiate_fds) + return 0; + r = bus_ensure_running(bus); if (r < 0) return r; @@ -806,190 +887,24 @@ int sd_bus_get_peer(sd_bus *bus, sd_id128_t *peer) { if (!peer) return -EINVAL; - r = bus_ensure_running(bus); - if (r < 0) - return r; - - *peer = bus->peer; - return 0; -} - -static int bus_seal_message(sd_bus *b, sd_bus_message *m) { - assert(m); - - if (m->header->version > b->message_version) - return -EPERM; - - if (m->sealed) - return 0; - - return bus_message_seal(m, ++b->serial); -} - -static int message_write(sd_bus *bus, sd_bus_message *m, size_t *idx) { - struct msghdr mh; - struct iovec *iov; - ssize_t k; - size_t n; - unsigned j; - - assert(bus); - assert(m); - assert(idx); - assert(bus->state == BUS_RUNNING || bus->state == BUS_HELLO); - - if (*idx >= m->size) - return 0; - - n = m->n_iovec * sizeof(struct iovec); - iov = alloca(n); - memcpy(iov, m->iovec, n); - - j = 0; - iovec_advance(iov, &j, *idx); - - zero(mh); - mh.msg_iov = iov; - mh.msg_iovlen = m->n_iovec; - - k = sendmsg(bus->fd, &mh, MSG_DONTWAIT|MSG_NOSIGNAL); - if (k < 0) - return errno == EAGAIN ? 0 : -errno; - - *idx += (size_t) k; - return 1; -} - -static int message_read_need(sd_bus *bus, size_t *need) { - uint32_t a, b; - uint8_t e; - uint64_t sum; - - assert(bus); - assert(need); - assert(bus->state == BUS_RUNNING || bus->state == BUS_HELLO); - - if (bus->rbuffer_size < sizeof(struct bus_header)) { - *need = sizeof(struct bus_header) + 8; - - /* Minimum message size: - * - * Header + - * - * Method Call: +2 string headers - * Signal: +3 string headers - * Method Error: +1 string headers - * +1 uint32 headers - * Method Reply: +1 uint32 headers - * - * A string header is at least 9 bytes - * A uint32 header is at least 8 bytes - * - * Hence the minimum message size of a valid message - * is header + 8 bytes */ - - return 0; - } - - a = ((const uint32_t*) bus->rbuffer)[1]; - b = ((const uint32_t*) bus->rbuffer)[3]; - - e = ((const uint8_t*) bus->rbuffer)[0]; - if (e == SD_BUS_LITTLE_ENDIAN) { - a = le32toh(a); - b = le32toh(b); - } else if (e == SD_BUS_BIG_ENDIAN) { - a = be32toh(a); - b = be32toh(b); - } else - return -EBADMSG; - - sum = (uint64_t) sizeof(struct bus_header) + (uint64_t) ALIGN_TO(b, 8) + (uint64_t) a; - if (sum >= BUS_MESSAGE_SIZE_MAX) - return -ENOBUFS; - - *need = (size_t) sum; - return 0; -} - -static int message_make(sd_bus *bus, size_t size, sd_bus_message **m) { - sd_bus_message *t; - void *b = NULL; - int r; - - assert(bus); - assert(m); - assert(bus->rbuffer_size >= size); - assert(bus->state == BUS_RUNNING || bus->state == BUS_HELLO); - - if (bus->rbuffer_size > size) { - b = memdup((const uint8_t*) bus->rbuffer + size, bus->rbuffer_size - size); - if (!b) { - free(t); - return -ENOMEM; - } - } - - r = bus_message_from_malloc(bus->rbuffer, size, &t); - if (r < 0) { - free(b); - return r; - } - - bus->rbuffer = b; - bus->rbuffer_size -= size; - - *m = t; - return 1; -} - -static int message_read(sd_bus *bus, sd_bus_message **m) { - struct msghdr mh; - struct iovec iov; - ssize_t k; - size_t need; - int r; - void *b; - - assert(bus); - assert(m); - assert(bus->state == BUS_RUNNING || bus->state == BUS_HELLO); - - r = message_read_need(bus, &need); + r = bus_ensure_running(bus); if (r < 0) return r; - if (bus->rbuffer_size >= need) - return message_make(bus, need, m); - - b = realloc(bus->rbuffer, need); - if (!b) - return -ENOMEM; - - bus->rbuffer = b; - - zero(iov); - iov.iov_base = (uint8_t*) bus->rbuffer + bus->rbuffer_size; - iov.iov_len = need - bus->rbuffer_size; - - zero(mh); - mh.msg_iov = &iov; - mh.msg_iovlen = 1; - - k = recvmsg(bus->fd, &mh, MSG_DONTWAIT|MSG_NOSIGNAL); - if (k < 0) - return errno == EAGAIN ? 0 : -errno; + *peer = bus->peer; + return 0; +} - bus->rbuffer_size += k; +static int bus_seal_message(sd_bus *b, sd_bus_message *m) { + assert(m); - r = message_read_need(bus, &need); - if (r < 0) - return r; + if (m->header->version > b->message_version) + return -EPERM; - if (bus->rbuffer_size >= need) - return message_make(bus, need, m); + if (m->sealed) + return 0; - return 1; + return bus_message_seal(m, ++b->serial); } static int dispatch_wqueue(sd_bus *bus) { @@ -1003,7 +918,7 @@ static int dispatch_wqueue(sd_bus *bus) { while (bus->wqueue_size > 0) { - r = message_write(bus, bus->wqueue[0], &bus->windex); + r = bus_socket_write_message(bus, bus->wqueue[0], &bus->windex); if (r < 0) { sd_bus_close(bus); return r; @@ -1055,7 +970,7 @@ static int dispatch_rqueue(sd_bus *bus, sd_bus_message **m) { /* Try to read a new message */ do { - r = message_read(bus, &z); + r = bus_socket_read_message(bus, &z); if (r < 0) { sd_bus_close(bus); return r; @@ -1075,11 +990,21 @@ int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *serial) { if (!bus) return -EINVAL; + if (bus->state == BUS_UNSET) + return -ENOTCONN; if (bus->fd < 0) return -ENOTCONN; if (!m) return -EINVAL; + if (m->n_fds > 0) { + r = sd_bus_can_send(bus, SD_BUS_TYPE_UNIX_FD); + if (r < 0) + return r; + if (r == 0) + return -ENOTSUP; + } + /* If the serial number isn't kept, then we know that no reply * is expected */ if (!serial && !m->sealed) @@ -1097,7 +1022,7 @@ int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *serial) { if ((bus->state == BUS_RUNNING || bus->state == BUS_HELLO) && bus->wqueue_size <= 0) { size_t idx = 0; - r = message_write(bus, m, &idx); + r = bus_socket_write_message(bus, m, &idx); if (r < 0) { sd_bus_close(bus); return r; @@ -1174,6 +1099,8 @@ int sd_bus_send_with_reply( if (!bus) return -EINVAL; + if (bus->state == BUS_UNSET) + return -ENOTCONN; if (bus->fd < 0) return -ENOTCONN; if (!m) @@ -1256,6 +1183,11 @@ int bus_ensure_running(sd_bus *bus) { assert(bus); + if (bus->fd < 0) + return -ENOTCONN; + if (bus->state == BUS_UNSET) + return -ENOTCONN; + if (bus->state == BUS_RUNNING) return 1; @@ -1290,6 +1222,8 @@ int sd_bus_send_with_reply_and_block( return -EINVAL; if (bus->fd < 0) return -ENOTCONN; + if (bus->state == BUS_UNSET) + return -ENOTCONN; if (!m) return -EINVAL; if (m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_CALL) @@ -1330,7 +1264,7 @@ int sd_bus_send_with_reply_and_block( room = true; } - r = message_read(bus, &incoming); + r = bus_socket_read_message(bus, &incoming); if (r < 0) return r; if (incoming) { @@ -1408,6 +1342,8 @@ int sd_bus_get_events(sd_bus *bus) { if (!bus) return -EINVAL; + if (bus->state == BUS_UNSET) + return -ENOTCONN; if (bus->fd < 0) return -ENOTCONN; @@ -1437,6 +1373,8 @@ int sd_bus_get_timeout(sd_bus *bus, uint64_t *timeout_usec) { return -EINVAL; if (!timeout_usec) return -EINVAL; + if (bus->state == BUS_UNSET) + return -ENOTCONN; if (bus->fd < 0) return -ENOTCONN; @@ -1457,7 +1395,6 @@ int sd_bus_get_timeout(sd_bus *bus, uint64_t *timeout_usec) { } static int process_timeout(sd_bus *bus) { - _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; struct reply_callback *c; usec_t n; int r; @@ -1481,6 +1418,43 @@ static int process_timeout(sd_bus *bus) { return r < 0 ? r : 1; } +static int process_reply(sd_bus *bus, sd_bus_message *m) { + struct reply_callback *c; + int r; + + assert(bus); + assert(m); + + if (m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_RETURN && + m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_ERROR) + return 0; + + c = hashmap_remove(bus->reply_callbacks, &m->reply_serial); + if (!c) + return 0; + + if (c->timeout != 0) + prioq_remove(bus->reply_callbacks_prioq, c, &c->prioq_idx); + + r = c->callback(bus, 0, m, c->userdata); + free(c); + + return r; +} + +static int process_filter(sd_bus *bus, sd_bus_message *m) { + struct filter_callback *l; + int r; + + LIST_FOREACH(callbacks, l, bus->filter_callbacks) { + r = l->callback(bus, 0, m, l->userdata); + if (r != 0) + return r; + } + + return 0; +} + static int process_builtin(sd_bus *bus, sd_bus_message *m) { _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; int r; @@ -1532,155 +1506,189 @@ static int process_builtin(sd_bus *bus, sd_bus_message *m) { return 1; } -static int process_message(sd_bus *bus, sd_bus_message *m) { - struct filter_callback *l; +static int process_object(sd_bus *bus, sd_bus_message *m) { + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_INIT; + _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; + struct object_callback *c; + char *p; int r; + bool found = false; assert(bus); assert(m); - if (m->header->type == SD_BUS_MESSAGE_TYPE_METHOD_RETURN || m->header->type == SD_BUS_MESSAGE_TYPE_METHOD_ERROR) { - struct reply_callback *c; + if (m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_CALL) + return 0; + + if (hashmap_isempty(bus->object_callbacks)) + return 0; - c = hashmap_remove(bus->reply_callbacks, &m->reply_serial); - if (c) { - if (c->timeout != 0) - prioq_remove(bus->reply_callbacks_prioq, c, &c->prioq_idx); + c = hashmap_get(bus->object_callbacks, m->path); + if (c) { + r = c->callback(bus, 0, m, c->userdata); + if (r != 0) + return r; - r = c->callback(bus, 0, m, c->userdata); - free(c); + found = true; + } + + /* Look for fallback prefixes */ + p = strdupa(m->path); + for (;;) { + char *e; + + e = strrchr(p, '/'); + if (e == p || !e) + break; + *e = 0; + + c = hashmap_get(bus->object_callbacks, p); + if (c && c->is_fallback) { + r = c->callback(bus, 0, m, c->userdata); if (r != 0) return r; + + found = true; } } - LIST_FOREACH(callbacks, l, bus->filter_callbacks) { - r = l->callback(bus, 0, m, l->userdata); - if (r != 0) - return r; - } + if (!found) + return 0; + + sd_bus_error_set(&error, + "org.freedesktop.DBus.Error.UnknownMethod", + "Unknown method '%s' or interface '%s'.", m->member, m->interface); + + r = sd_bus_message_new_method_error(bus, m, &error, &reply); + if (r < 0) + return r; + + r = sd_bus_send(bus, reply, NULL); + if (r < 0) + return r; - return process_builtin(bus, m); + return 1; } -int sd_bus_process(sd_bus *bus, sd_bus_message **ret) { +static int process_message(sd_bus *bus, sd_bus_message *m) { int r; - /* Returns 0 when we didn't do anything. This should cause the - * caller to invoke sd_bus_wait() before returning the next - * time. Returns > 0 when we did something, which possibly - * means *ret is filled in with an unprocessed message. */ - - if (!bus) - return -EINVAL; - if (bus->fd < 0) - return -ENOTCONN; + assert(bus); + assert(m); - if (bus->state == BUS_OPENING) { - struct pollfd p; + r = process_reply(bus, m); + if (r != 0) + return r; - zero(p); - p.fd = bus->fd; - p.events = POLLOUT; + r = process_filter(bus, m); + if (r != 0) + return r; - r = poll(&p, 1, 0); - if (r < 0) - return -errno; + r = process_builtin(bus, m); + if (r != 0) + return r; - if (p.revents & (POLLOUT|POLLERR|POLLHUP)) { - int error = 0; - socklen_t slen = sizeof(error); + return process_object(bus, m); +} - r = getsockopt(bus->fd, SOL_SOCKET, SO_ERROR, &error, &slen); - if (r < 0) - bus->last_connect_error = errno; - else if (error != 0) - bus->last_connect_error = error; - else if (p.revents & (POLLERR|POLLHUP)) - bus->last_connect_error = ECONNREFUSED; - else { - r = bus_start_auth(bus); - goto null_message; - } +static int process_running(sd_bus *bus, sd_bus_message **ret) { + _cleanup_bus_message_unref_ sd_bus_message *m = NULL; + int r; - /* Try next address */ - r = bus_start_connect(bus); - goto null_message; - } + assert(bus); + assert(bus->state == BUS_RUNNING || bus->state == BUS_HELLO); - r = 0; + r = process_timeout(bus); + if (r != 0) goto null_message; - } else if (bus->state == BUS_AUTHENTICATING) { - - if (now(CLOCK_MONOTONIC) >= bus->auth_timeout) - return -ETIMEDOUT; + r = dispatch_wqueue(bus); + if (r != 0) + goto null_message; - r = bus_write_auth(bus); - if (r != 0) - goto null_message; + r = dispatch_rqueue(bus, &m); + if (r < 0) + return r; + if (!m) + goto null_message; - r = bus_read_auth(bus); + r = process_message(bus, m); + if (r != 0) goto null_message; - } else if (bus->state == BUS_RUNNING || bus->state == BUS_HELLO) { - _cleanup_bus_message_unref_ sd_bus_message *m = NULL; - int k; + if (ret) { + *ret = m; + m = NULL; + return 1; + } - r = process_timeout(bus); - if (r != 0) - goto null_message; + if (m->header->type == SD_BUS_MESSAGE_TYPE_METHOD_CALL) { + _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_INIT; - r = dispatch_wqueue(bus); - if (r != 0) - goto null_message; + sd_bus_error_set(&error, "org.freedesktop.DBus.Error.UnknownObject", "Unknown object '%s'.", m->path); - k = r; - r = dispatch_rqueue(bus, &m); + r = sd_bus_message_new_method_error(bus, m, &error, &reply); if (r < 0) return r; - if (!m) { - if (r == 0) - r = k; - goto null_message; - } - r = process_message(bus, m); - if (r != 0) - goto null_message; + r = sd_bus_send(bus, reply, NULL); + if (r < 0) + return r; + } - if (ret) { - *ret = m; - m = NULL; - return 1; - } + return 1; - if (m->header->type == SD_BUS_MESSAGE_TYPE_METHOD_CALL) { - _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; - _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_INIT; +null_message: + if (r >= 0 && ret) + *ret = NULL; - sd_bus_error_set(&error, "org.freedesktop.DBus.Error.UnknownObject", "Unknown object '%s'.", m->path); + return r; +} - r = sd_bus_message_new_method_error(bus, m, &error, &reply); - if (r < 0) - return r; +int sd_bus_process(sd_bus *bus, sd_bus_message **ret) { + int r; - r = sd_bus_send(bus, reply, NULL); - if (r < 0) - return r; - } + /* Returns 0 when we didn't do anything. This should cause the + * caller to invoke sd_bus_wait() before returning the next + * time. Returns > 0 when we did something, which possibly + * means *ret is filled in with an unprocessed message. */ - return 1; - } + if (!bus) + return -EINVAL; + if (bus->fd < 0) + return -ENOTCONN; - assert_not_reached("Unknown state"); + switch (bus->state) { -null_message: - if (r >= 0 && ret) - *ret = NULL; + case BUS_UNSET: + return -ENOTCONN; - return r; + case BUS_OPENING: + r = bus_socket_process_opening(bus); + if (r < 0) + return r; + if (ret) + *ret = NULL; + return r; + + case BUS_AUTHENTICATING: + + r = bus_socket_process_authenticating(bus); + if (r < 0) + return r; + if (ret) + *ret = NULL; + return r; + + case BUS_RUNNING: + case BUS_HELLO: + + return process_running(bus, ret); + } + + assert_not_reached("Unknown state"); } static int bus_poll(sd_bus *bus, bool need_more, uint64_t timeout_usec) { @@ -1730,6 +1738,8 @@ int sd_bus_wait(sd_bus *bus, uint64_t timeout_usec) { if (!bus) return -EINVAL; + if (bus->state == BUS_UNSET) + return -ENOTCONN; if (bus->fd < 0) return -ENOTCONN; if (bus->rqueue_size > 0) @@ -1743,6 +1753,8 @@ int sd_bus_flush(sd_bus *bus) { if (!bus) return -EINVAL; + if (bus->state == BUS_UNSET) + return -ENOTCONN; if (bus->fd < 0) return -ENOTCONN; @@ -1803,3 +1815,95 @@ int sd_bus_remove_filter(sd_bus *bus, sd_message_handler_t callback, void *userd return 0; } + +static int bus_add_object( + sd_bus *bus, + bool fallback, + const char *path, + sd_message_handler_t callback, + void *userdata) { + + struct object_callback *c; + int r; + + if (!bus) + return -EINVAL; + if (!path) + return -EINVAL; + if (!callback) + return -EINVAL; + + r = hashmap_ensure_allocated(&bus->object_callbacks, string_hash_func, string_compare_func); + if (r < 0) + return r; + + c = new(struct object_callback, 1); + if (!c) + return -ENOMEM; + + c->path = strdup(path); + if (!path) { + free(c); + return -ENOMEM; + } + + c->callback = callback; + c->userdata = userdata; + c->is_fallback = fallback; + + r = hashmap_put(bus->object_callbacks, c->path, c); + if (r < 0) { + free(c->path); + free(c); + return r; + } + + return 0; +} + +static int bus_remove_object( + sd_bus *bus, + bool fallback, + const char *path, + sd_message_handler_t callback, + void *userdata) { + + struct object_callback *c; + + if (!bus) + return -EINVAL; + if (!path) + return -EINVAL; + if (!callback) + return -EINVAL; + + c = hashmap_get(bus->object_callbacks, path); + if (!c) + return 0; + + if (c->callback != callback || c->userdata != userdata || c->is_fallback != fallback) + return 0; + + assert_se(c == hashmap_remove(bus->object_callbacks, c->path)); + + free(c->path); + free(c); + + return 1; +} + +int sd_bus_add_object(sd_bus *bus, const char *path, sd_message_handler_t callback, void *userdata) { + return bus_add_object(bus, false, path, callback, userdata); +} + +int sd_bus_remove_object(sd_bus *bus, const char *path, sd_message_handler_t callback, void *userdata) { + return bus_remove_object(bus, false, path, callback, userdata); +} + +int sd_bus_add_fallback(sd_bus *bus, const char *prefix, sd_message_handler_t callback, void *userdata) { + return bus_add_object(bus, true, prefix, callback, userdata); +} + +int sd_bus_remove_fallback(sd_bus *bus, const char *prefix, sd_message_handler_t callback, void *userdata) { + return bus_remove_object(bus, true, prefix, callback, userdata); +}