X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fimport%2Fimportd.c;fp=src%2Fimport%2Fimportd.c;h=e2ff9f7162c8f6e3149fc855a945ff460668e62a;hp=8a6a8c8ed1be85e332bad1abd6551a0c487b49db;hb=b6e676ce41508e2aeea22202fc8f234126177f52;hpb=776a972612be7131ce6f7accd66e75ca7e0fce2a diff --git a/src/import/importd.c b/src/import/importd.c index 8a6a8c8ed..e2ff9f716 100644 --- a/src/import/importd.c +++ b/src/import/importd.c @@ -39,9 +39,11 @@ typedef struct Transfer Transfer; typedef struct Manager Manager; typedef enum TransferType { - TRANSFER_TAR, - TRANSFER_RAW, - TRANSFER_DKR, + TRANSFER_IMPORT_TAR, + TRANSFER_IMPORT_RAW, + TRANSFER_PULL_TAR, + TRANSFER_PULL_RAW, + TRANSFER_PULL_DKR, _TRANSFER_TYPE_MAX, _TRANSFER_TYPE_INVALID = -1, } TransferType; @@ -58,6 +60,7 @@ struct Transfer { char *remote; char *local; bool force_local; + bool read_only; char *dkr_index_url; @@ -73,6 +76,8 @@ struct Transfer { unsigned n_canceled; unsigned progress_percent; + + int stdin_fd; }; struct Manager { @@ -92,9 +97,11 @@ struct Manager { #define TRANSFERS_MAX 64 static const char* const transfer_type_table[_TRANSFER_TYPE_MAX] = { - [TRANSFER_TAR] = "tar", - [TRANSFER_RAW] = "raw", - [TRANSFER_DKR] = "dkr", + [TRANSFER_IMPORT_TAR] = "import-tar", + [TRANSFER_IMPORT_RAW] = "import-raw", + [TRANSFER_PULL_TAR] = "pull-tar", + [TRANSFER_PULL_RAW] = "pull-raw", + [TRANSFER_PULL_DKR] = "pull-dkr", }; DEFINE_PRIVATE_STRING_TABLE_LOOKUP_TO_STRING(transfer_type, TransferType); @@ -120,6 +127,7 @@ static Transfer *transfer_unref(Transfer *t) { } safe_close(t->log_fd); + safe_close(t->stdin_fd); free(t); return NULL; @@ -148,6 +156,8 @@ static int transfer_new(Manager *m, Transfer **ret) { t->type = _TRANSFER_TYPE_INVALID; t->log_fd = -1; + t->stdin_fd = -1; + t->verify = _IMPORT_VERIFY_INVALID; id = m->current_transfer_id + 1; @@ -353,19 +363,19 @@ static int transfer_start(Transfer *t) { return -errno; if (t->pid == 0) { const char *cmd[] = { - "systemd-pull", - transfer_type_to_string(t->type), - "--verify", + NULL, /* systemd-import or systemd-pull */ + NULL, /* tar, raw, dkr */ + NULL, /* --verify= */ NULL, /* verify argument */ NULL, /* maybe --force */ + NULL, /* maybe --read-only */ NULL, /* maybe --dkr-index-url */ NULL, /* the actual URL */ NULL, /* remote */ NULL, /* local */ NULL }; - int null_fd; - unsigned k = 3; + unsigned k = 0; /* Child */ @@ -388,20 +398,32 @@ static int transfer_start(Transfer *t) { if (pipefd[1] != STDOUT_FILENO && pipefd[1] != STDERR_FILENO) pipefd[1] = safe_close(pipefd[1]); - null_fd = open("/dev/null", O_RDONLY|O_NOCTTY); - if (null_fd < 0) { - log_error_errno(errno, "Failed to open /dev/null: %m"); - _exit(EXIT_FAILURE); + if (t->stdin_fd >= 0) { + if (dup2(t->stdin_fd, STDIN_FILENO) != STDIN_FILENO) { + log_error_errno(errno, "Failed to dup2() fd: %m"); + _exit(EXIT_FAILURE); + } + + if (t->stdin_fd != STDIN_FILENO) + safe_close(t->stdin_fd); + } else { + int null_fd; + + null_fd = open("/dev/null", O_RDONLY|O_NOCTTY); + if (null_fd < 0) { + log_error_errno(errno, "Failed to open /dev/null: %m"); + _exit(EXIT_FAILURE); + } + + if (dup2(null_fd, STDIN_FILENO) != STDIN_FILENO) { + log_error_errno(errno, "Failed to dup2() fd: %m"); + _exit(EXIT_FAILURE); + } + + if (null_fd != STDIN_FILENO) + safe_close(null_fd); } - if (dup2(null_fd, STDIN_FILENO) != STDIN_FILENO) { - log_error_errno(errno, "Failed to dup2() fd: %m"); - _exit(EXIT_FAILURE); - } - - if (null_fd != STDIN_FILENO) - safe_close(null_fd); - fd_cloexec(STDIN_FILENO, false); fd_cloexec(STDOUT_FILENO, false); fd_cloexec(STDERR_FILENO, false); @@ -409,22 +431,44 @@ static int transfer_start(Transfer *t) { setenv("SYSTEMD_LOG_TARGET", "console-prefixed", 1); setenv("NOTIFY_SOCKET", "/run/systemd/import/notify", 1); - cmd[k++] = import_verify_to_string(t->verify); + if (IN_SET(t->type, TRANSFER_IMPORT_TAR, TRANSFER_IMPORT_RAW)) + cmd[k++] = SYSTEMD_IMPORT_PATH; + else + cmd[k++] = SYSTEMD_PULL_PATH; + + if (IN_SET(t->type, TRANSFER_IMPORT_TAR, TRANSFER_PULL_TAR)) + cmd[k++] = "tar"; + else if (IN_SET(t->type, TRANSFER_IMPORT_RAW, TRANSFER_PULL_RAW)) + cmd[k++] = "raw"; + else + cmd[k++] = "dkr"; + + if (t->verify != _IMPORT_VERIFY_INVALID) { + cmd[k++] = "--verify"; + cmd[k++] = import_verify_to_string(t->verify); + } + if (t->force_local) cmd[k++] = "--force"; + if (t->read_only) + cmd[k++] = "--read-only"; if (t->dkr_index_url) { cmd[k++] = "--dkr-index-url"; cmd[k++] = t->dkr_index_url; } - cmd[k++] = t->remote; + if (t->remote) + cmd[k++] = t->remote; + else + cmd[k++] = "-"; + if (t->local) cmd[k++] = t->local; cmd[k] = NULL; - execv(SYSTEMD_PULL_PATH, (char * const *) cmd); - log_error_errno(errno, "Failed to execute import tool: %m"); + execv(cmd[0], (char * const *) cmd); + log_error_errno(errno, "Failed to execute %s tool: %m", cmd[0]); _exit(EXIT_FAILURE); } @@ -432,6 +476,8 @@ static int transfer_start(Transfer *t) { t->log_fd = pipefd[0]; pipefd[0] = -1; + t->stdin_fd = safe_close(t->stdin_fd); + r = sd_event_add_child(t->manager->event, &t->pid_event_source, t->pid, WEXITED, transfer_on_pid, t); if (r < 0) return r; @@ -644,6 +690,67 @@ static Transfer *manager_find(Manager *m, TransferType type, const char *dkr_ind return NULL; } +static int method_import_tar_or_raw(sd_bus *bus, sd_bus_message *msg, void *userdata, sd_bus_error *error) { + _cleanup_(transfer_unrefp) Transfer *t = NULL; + int fd, force, read_only, r; + const char *local, *object; + Manager *m = userdata; + TransferType type; + uint32_t id; + + r = bus_verify_polkit_async( + msg, + CAP_SYS_ADMIN, + "org.freedesktop.import1.import", + false, + UID_INVALID, + &m->polkit_registry, + error); + if (r < 0) + return r; + if (r == 0) + return 1; /* Will call us back */ + + r = sd_bus_message_read(msg, "hsbb", &fd, &local, &force, &read_only); + if (r < 0) + return r; + + if (!machine_name_is_valid(local)) + return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Local name %s is invalid", local); + + r = setup_machine_directory((uint64_t) -1, error); + if (r < 0) + return r; + + type = streq_ptr(sd_bus_message_get_member(msg), "ImportTar") ? TRANSFER_IMPORT_TAR : TRANSFER_IMPORT_RAW; + + r = transfer_new(m, &t); + if (r < 0) + return r; + + t->type = type; + t->force_local = force; + t->read_only = read_only; + + t->local = strdup(local); + if (!t->local) + return -ENOMEM; + + t->stdin_fd = fcntl(fd, F_DUPFD_CLOEXEC, 3); + if (t->stdin_fd < 0) + return -errno; + + r = transfer_start(t); + if (r < 0) + return r; + + object = t->object_path; + id = t->id; + t = NULL; + + return sd_bus_reply_method_return(msg, "uo", id, object); +} + 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; @@ -693,7 +800,7 @@ static int method_pull_tar_or_raw(sd_bus *bus, sd_bus_message *msg, void *userda if (r < 0) return r; - type = streq_ptr(sd_bus_message_get_member(msg), "PullTar") ? TRANSFER_TAR : TRANSFER_RAW; + type = streq_ptr(sd_bus_message_get_member(msg), "PullTar") ? TRANSFER_PULL_TAR : TRANSFER_PULL_RAW; if (manager_find(m, type, NULL, remote)) return sd_bus_error_setf(error, BUS_ERROR_TRANSFER_IN_PROGRESS, "Transfer for %s already in progress.", remote); @@ -710,9 +817,11 @@ static int method_pull_tar_or_raw(sd_bus *bus, sd_bus_message *msg, void *userda if (!t->remote) return -ENOMEM; - t->local = strdup(local); - if (!t->local) - return -ENOMEM; + if (local) { + t->local = strdup(local); + if (!t->local) + return -ENOMEM; + } r = transfer_start(t); if (r < 0) @@ -788,14 +897,14 @@ static int method_pull_dkr(sd_bus *bus, sd_bus_message *msg, void *userdata, sd_ if (r < 0) return r; - if (manager_find(m, TRANSFER_DKR, index_url, remote)) + if (manager_find(m, TRANSFER_PULL_DKR, index_url, remote)) return sd_bus_error_setf(error, BUS_ERROR_TRANSFER_IN_PROGRESS, "Transfer for %s already in progress.", remote); r = transfer_new(m, &t); if (r < 0) return r; - t->type = TRANSFER_DKR; + t->type = TRANSFER_PULL_DKR; t->verify = v; t->force_local = force; @@ -807,9 +916,11 @@ static int method_pull_dkr(sd_bus *bus, sd_bus_message *msg, void *userdata, sd_ if (!t->remote) return -ENOMEM; - t->local = strdup(local); - if (!t->local) - return -ENOMEM; + if (local) { + t->local = strdup(local); + if (!t->local) + return -ENOMEM; + } r = transfer_start(t); if (r < 0) @@ -967,6 +1078,8 @@ static const sd_bus_vtable transfer_vtable[] = { static const sd_bus_vtable manager_vtable[] = { SD_BUS_VTABLE_START(0), + SD_BUS_METHOD("ImportTar", "hsbb", "uo", method_import_tar_or_raw, SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD("ImportRaw", "hsbb", "uo", method_import_tar_or_raw, SD_BUS_VTABLE_UNPRIVILEGED), 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),