X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fimport%2Fimportd.c;h=58807378a7e58e5cc463d71c14f295bb1f8dc8f0;hp=40900ce36d755b4deb83332a20e8ed4320f7c9fd;hb=ce06fdfb3de7a6591041828361f8d10c04a4677e;hpb=ff828763c40cd138658abf9ed7a19da73c92dec1 diff --git a/src/import/importd.c b/src/import/importd.c index 40900ce36..58807378a 100644 --- a/src/import/importd.c +++ b/src/import/importd.c @@ -20,6 +20,7 @@ ***/ #include +#include #include "sd-bus.h" #include "util.h" @@ -27,6 +28,10 @@ #include "bus-util.h" #include "bus-common-errors.h" #include "def.h" +#include "socket-util.h" +#include "mkdir.h" +#include "def.h" +#include "missing.h" #include "import-util.h" typedef struct Transfer Transfer; @@ -66,6 +71,7 @@ struct Transfer { sd_event_source *log_event_source; unsigned n_canceled; + unsigned progress_percent; }; struct Manager { @@ -76,6 +82,10 @@ struct Manager { Hashmap *transfers; Hashmap *polkit_registry; + + int notify_fd; + + sd_event_source *notify_event_source; }; #define TRANSFERS_MAX 64 @@ -86,7 +96,7 @@ static const char* const transfer_type_table[_TRANSFER_TYPE_MAX] = { [TRANSFER_DKR] = "dkr", }; -DEFINE_PRIVATE_STRING_TABLE_LOOKUP(transfer_type, TransferType); +DEFINE_PRIVATE_STRING_TABLE_LOOKUP_TO_STRING(transfer_type, TransferType); static Transfer *transfer_unref(Transfer *t) { if (!t) @@ -343,9 +353,7 @@ static int transfer_start(Transfer *t) { if (t->pid == 0) { const char *cmd[] = { "systemd-pull", - t->type == TRANSFER_TAR ? "pull-tar" : - t->type == TRANSFER_RAW ? "pull-raw" : - "pull-dkr", + transfer_type_to_string(t->type), "--verify", NULL, /* verify argument */ NULL, /* maybe --force */ @@ -397,7 +405,8 @@ static int transfer_start(Transfer *t) { fd_cloexec(STDOUT_FILENO, false); fd_cloexec(STDERR_FILENO, false); - putenv((char*) "SYSTEMD_LOG_TARGET=console-prefixed"); + setenv("SYSTEMD_LOG_TARGET", "console-prefixed", 1); + setenv("NOTIFY_SOCKET", "/run/systemd/import/notify", 1); cmd[k++] = import_verify_to_string(t->verify); if (t->force_local) @@ -455,6 +464,9 @@ static Manager *manager_unref(Manager *m) { if (!m) return NULL; + sd_event_source_unref(m->notify_event_source); + safe_close(m->notify_fd); + while ((t = hashmap_first(m->transfers))) transfer_unref(t); @@ -472,8 +484,105 @@ static Manager *manager_unref(Manager *m) { DEFINE_TRIVIAL_CLEANUP_FUNC(Manager*, manager_unref); +static int manager_on_notify(sd_event_source *s, int fd, uint32_t revents, void *userdata) { + + char buf[NOTIFY_BUFFER_MAX+1]; + struct iovec iovec = { + .iov_base = buf, + .iov_len = sizeof(buf)-1, + }; + union { + struct cmsghdr cmsghdr; + uint8_t buf[CMSG_SPACE(sizeof(struct ucred)) + + CMSG_SPACE(sizeof(int) * NOTIFY_FD_MAX)]; + } control = {}; + struct msghdr msghdr = { + .msg_iov = &iovec, + .msg_iovlen = 1, + .msg_control = &control, + .msg_controllen = sizeof(control), + }; + struct ucred *ucred = NULL; + Manager *m = userdata; + struct cmsghdr *cmsg; + unsigned percent; + char *p, *e; + Transfer *t; + Iterator i; + ssize_t n; + int r; + + n = recvmsg(fd, &msghdr, MSG_DONTWAIT|MSG_CMSG_CLOEXEC); + if (n < 0) { + if (errno == EAGAIN || errno == EINTR) + return 0; + + return -errno; + } + + cmsg_close_all(&msghdr); + + for (cmsg = CMSG_FIRSTHDR(&msghdr); cmsg; cmsg = CMSG_NXTHDR(&msghdr, cmsg)) { + if (cmsg->cmsg_level == SOL_SOCKET && + cmsg->cmsg_type == SCM_CREDENTIALS && + cmsg->cmsg_len == CMSG_LEN(sizeof(struct ucred))) { + + ucred = (struct ucred*) CMSG_DATA(cmsg); + } + } + + if (msghdr.msg_flags & MSG_TRUNC) { + log_warning("Got overly long notification datagram, ignoring."); + return 0; + } + + if (!ucred || ucred->pid <= 0) { + log_warning("Got notification datagram lacking credential information, ignoring."); + return 0; + } + + HASHMAP_FOREACH(t, m->transfers, i) + if (ucred->pid == t->pid) + break; + + if (!t) { + log_warning("Got notification datagram from unexpected peer, ignoring."); + return 0; + } + + buf[n] = 0; + + p = startswith(buf, "X_IMPORT_PROGRESS="); + if (!p) { + p = strstr(buf, "\nX_IMPORT_PROGRESS="); + if (!p) + return 0; + + p += 19; + } + + e = strchrnul(p, '\n'); + *e = 0; + + r = safe_atou(p, &percent); + if (r < 0 || percent > 100) { + log_warning("Got invalid percent value, ignoring."); + return 0; + } + + t->progress_percent = percent; + + log_debug("Got percentage from client: %u%%", percent); + return 0; +} + static int manager_new(Manager **ret) { _cleanup_(manager_unrefp) Manager *m = NULL; + static const union sockaddr_union sa = { + .un.sun_family = AF_UNIX, + .un.sun_path = "/run/systemd/import/notify", + }; + static const int one = 1; int r; assert(ret); @@ -492,6 +601,23 @@ static int manager_new(Manager **ret) { if (r < 0) return r; + m->notify_fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0); + if (m->notify_fd < 0) + return -errno; + + (void) mkdir_parents_label(sa.un.sun_path, 0755); + (void) unlink(sa.un.sun_path); + + if (bind(m->notify_fd, &sa.sa, offsetof(union sockaddr_union, un.sun_path) + strlen(sa.un.sun_path)) < 0) + return -errno; + + if (setsockopt(m->notify_fd, SOL_SOCKET, SO_PASSCRED, &one, sizeof(one)) < 0) + return -errno; + + r = sd_event_add_io(m->event, &m->notify_event_source, m->notify_fd, EPOLLIN, manager_on_notify, m); + if (r < 0) + return r; + *ret = m; m = NULL; @@ -517,6 +643,23 @@ static Transfer *manager_find(Manager *m, TransferType type, const char *dkr_ind return NULL; } +static int check_btrfs(sd_bus_error *error) { + struct statfs sfs; + + if (statfs("/var/lib/machines", &sfs) < 0) { + if (errno != ENOENT) + return -errno; + + if (statfs("/var/lib", &sfs) < 0) + return -errno; + } + + if (!F_TYPE_EQUAL(sfs.f_type, BTRFS_SUPER_MAGIC)) + return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "/var/lib/machines is not a btrfs file system. Operation is not supported on legacy file systems."); + + return 0; +} + static int method_pull_tar_or_raw(sd_bus *bus, sd_bus_message *msg, void *userdata, sd_bus_error *error) { _cleanup_(transfer_unrefp) Transfer *t = NULL; const char *remote, *local, *verify, *object; @@ -535,6 +678,7 @@ static int method_pull_tar_or_raw(sd_bus *bus, sd_bus_message *msg, void *userda CAP_SYS_ADMIN, "org.freedesktop.import1.pull", false, + UID_INVALID, &m->polkit_registry, error); if (r < 0) @@ -561,6 +705,10 @@ static int method_pull_tar_or_raw(sd_bus *bus, sd_bus_message *msg, void *userda if (v < 0) return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Unknown verification mode %s", verify); + r = check_btrfs(error); + if (r < 0) + return r; + type = streq_ptr(sd_bus_message_get_member(msg), "PullTar") ? TRANSFER_TAR : TRANSFER_RAW; if (manager_find(m, type, NULL, remote)) @@ -610,6 +758,7 @@ static int method_pull_dkr(sd_bus *bus, sd_bus_message *msg, void *userdata, sd_ CAP_SYS_ADMIN, "org.freedesktop.import1.pull", false, + UID_INVALID, &m->polkit_registry, error); if (r < 0) @@ -651,6 +800,10 @@ static int method_pull_dkr(sd_bus *bus, sd_bus_message *msg, void *userdata, sd_ if (v != IMPORT_VERIFY_NO) return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, "DKR does not support verification."); + r = check_btrfs(error); + if (r < 0) + return r; + if (manager_find(m, TRANSFER_DKR, index_url, remote)) return sd_bus_error_setf(error, BUS_ERROR_TRANSFER_IN_PROGRESS, "Transfer for %s already in progress.", remote); @@ -700,7 +853,7 @@ static int method_list_transfers(sd_bus *bus, sd_bus_message *msg, void *userdat if (r < 0) return r; - r = sd_bus_message_open_container(reply, 'a', "(ussso)"); + r = sd_bus_message_open_container(reply, 'a', "(usssdo)"); if (r < 0) return r; @@ -708,11 +861,12 @@ static int method_list_transfers(sd_bus *bus, sd_bus_message *msg, void *userdat r = sd_bus_message_append( reply, - "(ussso)", + "(usssdo)", t->id, transfer_type_to_string(t->type), t->remote, t->local, + (double) t->progress_percent / 100.0, t->object_path); if (r < 0) return r; @@ -738,6 +892,7 @@ static int method_cancel(sd_bus *bus, sd_bus_message *msg, void *userdata, sd_bu CAP_SYS_ADMIN, "org.freedesktop.import1.pull", false, + UID_INVALID, &t->manager->polkit_registry, error); if (r < 0) @@ -767,6 +922,7 @@ static int method_cancel_transfer(sd_bus *bus, sd_bus_message *msg, void *userda CAP_SYS_ADMIN, "org.freedesktop.import1.pull", false, + UID_INVALID, &m->polkit_registry, error); if (r < 0) @@ -791,6 +947,24 @@ static int method_cancel_transfer(sd_bus *bus, sd_bus_message *msg, void *userda return sd_bus_reply_method_return(msg, NULL); } +static int property_get_progress( + sd_bus *bus, + const char *path, + const char *interface, + const char *property, + sd_bus_message *reply, + void *userdata, + sd_bus_error *error) { + + Transfer *t = userdata; + + assert(bus); + assert(reply); + assert(t); + + return sd_bus_message_append(reply, "d", (double) t->progress_percent / 100.0); +} + static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_type, transfer_type, TransferType); static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_verify, import_verify, ImportVerify); @@ -801,6 +975,7 @@ static const sd_bus_vtable transfer_vtable[] = { SD_BUS_PROPERTY("Remote", "s", NULL, offsetof(Transfer, remote), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("Type", "s", property_get_type, offsetof(Transfer, type), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("Verify", "s", property_get_verify, offsetof(Transfer, verify), SD_BUS_VTABLE_PROPERTY_CONST), + SD_BUS_PROPERTY("Progress", "d", property_get_progress, 0, 0), SD_BUS_METHOD("Cancel", NULL, NULL, method_cancel, SD_BUS_VTABLE_UNPRIVILEGED), SD_BUS_SIGNAL("LogMessage", "us", 0), SD_BUS_VTABLE_END, @@ -811,7 +986,7 @@ static const sd_bus_vtable manager_vtable[] = { SD_BUS_METHOD("PullTar", "sssb", "uo", method_pull_tar_or_raw, SD_BUS_VTABLE_UNPRIVILEGED), SD_BUS_METHOD("PullRaw", "sssb", "uo", method_pull_tar_or_raw, SD_BUS_VTABLE_UNPRIVILEGED), SD_BUS_METHOD("PullDkr", "sssssb", "uo", method_pull_dkr, SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD("ListTransfers", NULL, "a(ussso)", method_list_transfers, SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD("ListTransfers", NULL, "a(usssdo)", method_list_transfers, SD_BUS_VTABLE_UNPRIVILEGED), SD_BUS_METHOD("CancelTransfer", "u", NULL, method_cancel_transfer, SD_BUS_VTABLE_UNPRIVILEGED), SD_BUS_SIGNAL("TransferNew", "uo", 0), SD_BUS_SIGNAL("TransferRemoved", "uos", 0),