From 73f0c531fbb63b92927e04e8122a11327a9839e8 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Sun, 19 Apr 2015 13:28:46 +0200 Subject: [PATCH] Remove src/import --- src/import/.gitignore | 1 - src/import/Makefile | 1 - src/import/aufs-util.c | 73 - src/import/aufs-util.h | 24 - src/import/curl-util.c | 449 ------ src/import/curl-util.h | 57 - src/import/export-raw.c | 345 ----- src/import/export-raw.h | 37 - src/import/export-tar.c | 328 ----- src/import/export-tar.h | 37 - src/import/export.c | 319 ----- src/import/import-common.c | 224 --- src/import/import-common.h | 28 - src/import/import-compress.c | 470 ------- src/import/import-compress.h | 64 - src/import/import-pubring.gpg | Bin 9551 -> 0 bytes src/import/import-raw.c | 462 ------ src/import/import-raw.h | 37 - src/import/import-tar.c | 382 ----- src/import/import-tar.h | 37 - src/import/import.c | 336 ----- src/import/importd.c | 1322 ------------------ src/import/org.freedesktop.import1.conf | 66 - src/import/org.freedesktop.import1.policy.in | 49 - src/import/org.freedesktop.import1.service | 12 - src/import/pull-common.c | 424 ------ src/import/pull-common.h | 36 - src/import/pull-dkr.c | 897 ------------ src/import/pull-dkr.h | 36 - src/import/pull-job.c | 613 -------- src/import/pull-job.h | 117 -- src/import/pull-raw.c | 518 ------- src/import/pull-raw.h | 37 - src/import/pull-tar.c | 416 ------ src/import/pull-tar.h | 37 - src/import/pull.c | 442 ------ src/import/qcow2-util.c | 353 ----- src/import/qcow2-util.h | 25 - src/import/test-qcow2.c | 55 - 39 files changed, 9166 deletions(-) delete mode 100644 src/import/.gitignore delete mode 120000 src/import/Makefile delete mode 100644 src/import/aufs-util.c delete mode 100644 src/import/aufs-util.h delete mode 100644 src/import/curl-util.c delete mode 100644 src/import/curl-util.h delete mode 100644 src/import/export-raw.c delete mode 100644 src/import/export-raw.h delete mode 100644 src/import/export-tar.c delete mode 100644 src/import/export-tar.h delete mode 100644 src/import/export.c delete mode 100644 src/import/import-common.c delete mode 100644 src/import/import-common.h delete mode 100644 src/import/import-compress.c delete mode 100644 src/import/import-compress.h delete mode 100644 src/import/import-pubring.gpg delete mode 100644 src/import/import-raw.c delete mode 100644 src/import/import-raw.h delete mode 100644 src/import/import-tar.c delete mode 100644 src/import/import-tar.h delete mode 100644 src/import/import.c delete mode 100644 src/import/importd.c delete mode 100644 src/import/org.freedesktop.import1.conf delete mode 100644 src/import/org.freedesktop.import1.policy.in delete mode 100644 src/import/org.freedesktop.import1.service delete mode 100644 src/import/pull-common.c delete mode 100644 src/import/pull-common.h delete mode 100644 src/import/pull-dkr.c delete mode 100644 src/import/pull-dkr.h delete mode 100644 src/import/pull-job.c delete mode 100644 src/import/pull-job.h delete mode 100644 src/import/pull-raw.c delete mode 100644 src/import/pull-raw.h delete mode 100644 src/import/pull-tar.c delete mode 100644 src/import/pull-tar.h delete mode 100644 src/import/pull.c delete mode 100644 src/import/qcow2-util.c delete mode 100644 src/import/qcow2-util.h delete mode 100644 src/import/test-qcow2.c diff --git a/src/import/.gitignore b/src/import/.gitignore deleted file mode 100644 index 01106e2e6..000000000 --- a/src/import/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/org.freedesktop.import1.policy diff --git a/src/import/Makefile b/src/import/Makefile deleted file mode 120000 index d0b0e8e00..000000000 --- a/src/import/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile \ No newline at end of file diff --git a/src/import/aufs-util.c b/src/import/aufs-util.c deleted file mode 100644 index c1301cdb4..000000000 --- a/src/import/aufs-util.c +++ /dev/null @@ -1,73 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -/*** - This file is part of systemd. - - Copyright 2014 Lennart Poettering - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see . -***/ - -#include - -#include "util.h" -#include "aufs-util.h" - -static int nftw_cb( - const char *fpath, - const struct stat *sb, - int flag, - struct FTW *ftwbuf) { - - const char *fn, *original; - char *p; - int r; - - fn = fpath + ftwbuf->base; - - /* We remove all whiteout files, and all whiteouts */ - - original = startswith(fn, ".wh."); - if (!original) - return FTW_CONTINUE; - - log_debug("Removing whiteout indicator %s.", fpath); - r = rm_rf_dangerous(fpath, false, true, false); - if (r < 0) - return FTW_STOP; - - if (!startswith(fn, ".wh..wh.")) { - - p = alloca(ftwbuf->base + strlen(original)); - strcpy(mempcpy(p, fpath, ftwbuf->base), original); - - log_debug("Removing deleted file %s.", p); - r = rm_rf_dangerous(p, false, true, false); - if (r < 0) - return FTW_STOP; - } - - return FTW_CONTINUE; -} - -int aufs_resolve(const char *path) { - int r; - - errno = 0; - r = nftw(path, nftw_cb, 64, FTW_MOUNT|FTW_PHYS|FTW_ACTIONRETVAL); - if (r == FTW_STOP) - return errno ? -errno : -EIO; - - return 0; -} diff --git a/src/import/aufs-util.h b/src/import/aufs-util.h deleted file mode 100644 index 712fb81ce..000000000 --- a/src/import/aufs-util.h +++ /dev/null @@ -1,24 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -#pragma once - -/*** - This file is part of systemd. - - Copyright 2014 Lennart Poettering - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see . -***/ - -int aufs_resolve(const char *path); diff --git a/src/import/curl-util.c b/src/import/curl-util.c deleted file mode 100644 index d390cfb1f..000000000 --- a/src/import/curl-util.c +++ /dev/null @@ -1,449 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -/*** - This file is part of systemd. - - Copyright 2014 Lennart Poettering - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see . -***/ - -#include "curl-util.h" - -static void curl_glue_check_finished(CurlGlue *g) { - CURLMsg *msg; - int k = 0; - - assert(g); - - msg = curl_multi_info_read(g->curl, &k); - if (!msg) - return; - - if (msg->msg != CURLMSG_DONE) - return; - - if (g->on_finished) - g->on_finished(g, msg->easy_handle, msg->data.result); -} - -static int curl_glue_on_io(sd_event_source *s, int fd, uint32_t revents, void *userdata) { - CurlGlue *g = userdata; - int action, k = 0, translated_fd; - - assert(s); - assert(g); - - translated_fd = PTR_TO_INT(hashmap_get(g->translate_fds, INT_TO_PTR(fd+1))); - assert(translated_fd > 0); - translated_fd--; - - if ((revents & (EPOLLIN|EPOLLOUT)) == (EPOLLIN|EPOLLOUT)) - action = CURL_POLL_INOUT; - else if (revents & EPOLLIN) - action = CURL_POLL_IN; - else if (revents & EPOLLOUT) - action = CURL_POLL_OUT; - else - action = 0; - - if (curl_multi_socket_action(g->curl, translated_fd, action, &k) < 0) { - log_debug("Failed to propagate IO event."); - return -EINVAL; - } - - curl_glue_check_finished(g); - return 0; -} - -static int curl_glue_socket_callback(CURLM *curl, curl_socket_t s, int action, void *userdata, void *socketp) { - sd_event_source *io; - CurlGlue *g = userdata; - uint32_t events = 0; - int r; - - assert(curl); - assert(g); - - io = hashmap_get(g->ios, INT_TO_PTR(s+1)); - - if (action == CURL_POLL_REMOVE) { - if (io) { - int fd; - - fd = sd_event_source_get_io_fd(io); - assert(fd >= 0); - - sd_event_source_set_enabled(io, SD_EVENT_OFF); - sd_event_source_unref(io); - - hashmap_remove(g->ios, INT_TO_PTR(s+1)); - hashmap_remove(g->translate_fds, INT_TO_PTR(fd+1)); - - safe_close(fd); - } - - return 0; - } - - r = hashmap_ensure_allocated(&g->ios, &trivial_hash_ops); - if (r < 0) { - log_oom(); - return -1; - } - - r = hashmap_ensure_allocated(&g->translate_fds, &trivial_hash_ops); - if (r < 0) { - log_oom(); - return -1; - } - - if (action == CURL_POLL_IN) - events = EPOLLIN; - else if (action == CURL_POLL_OUT) - events = EPOLLOUT; - else if (action == CURL_POLL_INOUT) - events = EPOLLIN|EPOLLOUT; - - if (io) { - if (sd_event_source_set_io_events(io, events) < 0) - return -1; - - if (sd_event_source_set_enabled(io, SD_EVENT_ON) < 0) - return -1; - } else { - _cleanup_close_ int fd = -1; - - /* When curl needs to remove an fd from us it closes - * the fd first, and only then calls into us. This is - * nasty, since we cannot pass the fd on to epoll() - * anymore. Hence, duplicate the fds here, and keep a - * copy for epoll which we control after use. */ - - fd = fcntl(s, F_DUPFD_CLOEXEC, 3); - if (fd < 0) - return -1; - - if (sd_event_add_io(g->event, &io, fd, events, curl_glue_on_io, g) < 0) - return -1; - - sd_event_source_set_description(io, "curl-io"); - - r = hashmap_put(g->ios, INT_TO_PTR(s+1), io); - if (r < 0) { - log_oom(); - sd_event_source_unref(io); - return -1; - } - - r = hashmap_put(g->translate_fds, INT_TO_PTR(fd+1), INT_TO_PTR(s+1)); - if (r < 0) { - log_oom(); - hashmap_remove(g->ios, INT_TO_PTR(s+1)); - sd_event_source_unref(io); - return -1; - } - - fd = -1; - } - - return 0; -} - -static int curl_glue_on_timer(sd_event_source *s, uint64_t usec, void *userdata) { - CurlGlue *g = userdata; - int k = 0; - - assert(s); - assert(g); - - if (curl_multi_socket_action(g->curl, CURL_SOCKET_TIMEOUT, 0, &k) != CURLM_OK) { - log_debug("Failed to propagate timeout."); - return -EINVAL; - } - - curl_glue_check_finished(g); - return 0; -} - -static int curl_glue_timer_callback(CURLM *curl, long timeout_ms, void *userdata) { - CurlGlue *g = userdata; - usec_t usec; - - assert(curl); - assert(g); - - if (timeout_ms < 0) { - if (g->timer) { - if (sd_event_source_set_enabled(g->timer, SD_EVENT_OFF) < 0) - return -1; - } - - return 0; - } - - usec = now(clock_boottime_or_monotonic()) + (usec_t) timeout_ms * USEC_PER_MSEC + USEC_PER_MSEC - 1; - - if (g->timer) { - if (sd_event_source_set_time(g->timer, usec) < 0) - return -1; - - if (sd_event_source_set_enabled(g->timer, SD_EVENT_ONESHOT) < 0) - return -1; - } else { - if (sd_event_add_time(g->event, &g->timer, clock_boottime_or_monotonic(), usec, 0, curl_glue_on_timer, g) < 0) - return -1; - - sd_event_source_set_description(g->timer, "curl-timer"); - } - - return 0; -} - -CurlGlue *curl_glue_unref(CurlGlue *g) { - sd_event_source *io; - - if (!g) - return NULL; - - if (g->curl) - curl_multi_cleanup(g->curl); - - while ((io = hashmap_steal_first(g->ios))) { - int fd; - - fd = sd_event_source_get_io_fd(io); - assert(fd >= 0); - - hashmap_remove(g->translate_fds, INT_TO_PTR(fd+1)); - - safe_close(fd); - sd_event_source_unref(io); - } - - hashmap_free(g->ios); - - sd_event_source_unref(g->timer); - sd_event_unref(g->event); - free(g); - - return NULL; -} - -int curl_glue_new(CurlGlue **glue, sd_event *event) { - _cleanup_(curl_glue_unrefp) CurlGlue *g = NULL; - int r; - - g = new0(CurlGlue, 1); - if (!g) - return -ENOMEM; - - if (event) - g->event = sd_event_ref(event); - else { - r = sd_event_default(&g->event); - if (r < 0) - return r; - } - - g->curl = curl_multi_init(); - if (!g->curl) - return -ENOMEM; - - if (curl_multi_setopt(g->curl, CURLMOPT_SOCKETDATA, g) != CURLM_OK) - return -EINVAL; - - if (curl_multi_setopt(g->curl, CURLMOPT_SOCKETFUNCTION, curl_glue_socket_callback) != CURLM_OK) - return -EINVAL; - - if (curl_multi_setopt(g->curl, CURLMOPT_TIMERDATA, g) != CURLM_OK) - return -EINVAL; - - if (curl_multi_setopt(g->curl, CURLMOPT_TIMERFUNCTION, curl_glue_timer_callback) != CURLM_OK) - return -EINVAL; - - *glue = g; - g = NULL; - - return 0; -} - -int curl_glue_make(CURL **ret, const char *url, void *userdata) { - const char *useragent; - CURL *c; - int r; - - assert(ret); - assert(url); - - c = curl_easy_init(); - if (!c) - return -ENOMEM; - - /* curl_easy_setopt(c, CURLOPT_VERBOSE, 1L); */ - - if (curl_easy_setopt(c, CURLOPT_URL, url) != CURLE_OK) { - r = -EIO; - goto fail; - } - - if (curl_easy_setopt(c, CURLOPT_PRIVATE, userdata) != CURLE_OK) { - r = -EIO; - goto fail; - } - - useragent = strjoina(program_invocation_short_name, "/" PACKAGE_VERSION); - if (curl_easy_setopt(c, CURLOPT_USERAGENT, useragent) != CURLE_OK) { - r = -EIO; - goto fail; - } - - if (curl_easy_setopt(c, CURLOPT_FOLLOWLOCATION, 1L) != CURLE_OK) { - r = -EIO; - goto fail; - } - - *ret = c; - return 0; - -fail: - curl_easy_cleanup(c); - return r; -} - -int curl_glue_add(CurlGlue *g, CURL *c) { - assert(g); - assert(c); - - if (curl_multi_add_handle(g->curl, c) != CURLM_OK) - return -EIO; - - return 0; -} - -void curl_glue_remove_and_free(CurlGlue *g, CURL *c) { - assert(g); - - if (!c) - return; - - if (g->curl) - curl_multi_remove_handle(g->curl, c); - - curl_easy_cleanup(c); -} - -struct curl_slist *curl_slist_new(const char *first, ...) { - struct curl_slist *l; - va_list ap; - - if (!first) - return NULL; - - l = curl_slist_append(NULL, first); - if (!l) - return NULL; - - va_start(ap, first); - - for (;;) { - struct curl_slist *n; - const char *i; - - i = va_arg(ap, const char*); - if (!i) - break; - - n = curl_slist_append(l, i); - if (!n) { - va_end(ap); - curl_slist_free_all(l); - return NULL; - } - - l = n; - } - - va_end(ap); - return l; -} - -int curl_header_strdup(const void *contents, size_t sz, const char *field, char **value) { - const char *p = contents; - size_t l; - char *s; - - l = strlen(field); - if (sz < l) - return 0; - - if (memcmp(p, field, l) != 0) - return 0; - - p += l; - sz -= l; - - if (memchr(p, 0, sz)) - return 0; - - /* Skip over preceeding whitespace */ - while (sz > 0 && strchr(WHITESPACE, p[0])) { - p++; - sz--; - } - - /* Truncate trailing whitespace*/ - while (sz > 0 && strchr(WHITESPACE, p[sz-1])) - sz--; - - s = strndup(p, sz); - if (!s) - return -ENOMEM; - - *value = s; - return 1; -} - -int curl_parse_http_time(const char *t, usec_t *ret) { - const char *e; - locale_t loc; - struct tm tm; - time_t v; - - assert(t); - assert(ret); - - loc = newlocale(LC_TIME_MASK, "C", (locale_t) 0); - if (loc == (locale_t) 0) - return -errno; - - /* RFC822 */ - e = strptime_l(t, "%a, %d %b %Y %H:%M:%S %Z", &tm, loc); - if (!e || *e != 0) - /* RFC 850 */ - e = strptime_l(t, "%A, %d-%b-%y %H:%M:%S %Z", &tm, loc); - if (!e || *e != 0) - /* ANSI C */ - e = strptime_l(t, "%a %b %d %H:%M:%S %Y", &tm, loc); - freelocale(loc); - if (!e || *e != 0) - return -EINVAL; - - v = timegm(&tm); - if (v == (time_t) -1) - return -EINVAL; - - *ret = (usec_t) v * USEC_PER_SEC; - return 0; -} diff --git a/src/import/curl-util.h b/src/import/curl-util.h deleted file mode 100644 index c249069ff..000000000 --- a/src/import/curl-util.h +++ /dev/null @@ -1,57 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -#pragma once - -/*** - This file is part of systemd. - - Copyright 2014 Lennart Poettering - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see . -***/ - -#include -#include - -#include "hashmap.h" -#include "sd-event.h" - -typedef struct CurlGlue CurlGlue; - -struct CurlGlue { - sd_event *event; - CURLM *curl; - sd_event_source *timer; - Hashmap *ios; - Hashmap *translate_fds; - - void (*on_finished)(CurlGlue *g, CURL *curl, CURLcode code); - void *userdata; -}; - -int curl_glue_new(CurlGlue **glue, sd_event *event); -CurlGlue* curl_glue_unref(CurlGlue *glue); - -DEFINE_TRIVIAL_CLEANUP_FUNC(CurlGlue*, curl_glue_unref); - -int curl_glue_make(CURL **ret, const char *url, void *userdata); -int curl_glue_add(CurlGlue *g, CURL *c); -void curl_glue_remove_and_free(CurlGlue *g, CURL *c); - -struct curl_slist *curl_slist_new(const char *first, ...) _sentinel_; -int curl_header_strdup(const void *contents, size_t sz, const char *field, char **value); -int curl_parse_http_time(const char *t, usec_t *ret); - -DEFINE_TRIVIAL_CLEANUP_FUNC(CURL*, curl_easy_cleanup); -DEFINE_TRIVIAL_CLEANUP_FUNC(struct curl_slist*, curl_slist_free_all); diff --git a/src/import/export-raw.c b/src/import/export-raw.c deleted file mode 100644 index 4b6d8dac3..000000000 --- a/src/import/export-raw.c +++ /dev/null @@ -1,345 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -/*** - This file is part of systemd. - - Copyright 2015 Lennart Poettering - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see . -***/ - -#include -#include -#undef basename - -#include "sd-daemon.h" -#include "util.h" -#include "ratelimit.h" -#include "btrfs-util.h" -#include "copy.h" -#include "import-common.h" -#include "export-raw.h" - -#define COPY_BUFFER_SIZE (16*1024) - -struct RawExport { - sd_event *event; - - RawExportFinished on_finished; - void *userdata; - - char *path; - - int input_fd; - int output_fd; - - ImportCompress compress; - - sd_event_source *output_event_source; - - void *buffer; - size_t buffer_size; - size_t buffer_allocated; - - uint64_t written_compressed; - uint64_t written_uncompressed; - - unsigned last_percent; - RateLimit progress_rate_limit; - - struct stat st; - - bool eof; - bool tried_reflink; - bool tried_sendfile; -}; - -RawExport *raw_export_unref(RawExport *e) { - if (!e) - return NULL; - - sd_event_source_unref(e->output_event_source); - - import_compress_free(&e->compress); - - sd_event_unref(e->event); - - safe_close(e->input_fd); - - free(e->buffer); - free(e->path); - free(e); - - return NULL; -} - -int raw_export_new( - RawExport **ret, - sd_event *event, - RawExportFinished on_finished, - void *userdata) { - - _cleanup_(raw_export_unrefp) RawExport *e = NULL; - int r; - - assert(ret); - - e = new0(RawExport, 1); - if (!e) - return -ENOMEM; - - e->output_fd = e->input_fd = -1; - e->on_finished = on_finished; - e->userdata = userdata; - - RATELIMIT_INIT(e->progress_rate_limit, 100 * USEC_PER_MSEC, 1); - e->last_percent = (unsigned) -1; - - if (event) - e->event = sd_event_ref(event); - else { - r = sd_event_default(&e->event); - if (r < 0) - return r; - } - - *ret = e; - e = NULL; - - return 0; -} - -static void raw_export_report_progress(RawExport *e) { - unsigned percent; - assert(e); - - if (e->written_uncompressed >= (uint64_t) e->st.st_size) - percent = 100; - else - percent = (unsigned) ((e->written_uncompressed * UINT64_C(100)) / (uint64_t) e->st.st_size); - - if (percent == e->last_percent) - return; - - if (!ratelimit_test(&e->progress_rate_limit)) - return; - - sd_notifyf(false, "X_IMPORT_PROGRESS=%u", percent); - log_info("Exported %u%%.", percent); - - e->last_percent = percent; -} - -static int raw_export_process(RawExport *e) { - ssize_t l; - int r; - - assert(e); - - if (!e->tried_reflink && e->compress.type == IMPORT_COMPRESS_UNCOMPRESSED) { - - /* If we shall take an uncompressed snapshot we can - * reflink source to destination directly. Let's see - * if this works. */ - - r = btrfs_reflink(e->input_fd, e->output_fd); - if (r >= 0) { - r = 0; - goto finish; - } - - e->tried_reflink = true; - } - - if (!e->tried_sendfile && e->compress.type == IMPORT_COMPRESS_UNCOMPRESSED) { - - l = sendfile(e->output_fd, e->input_fd, NULL, COPY_BUFFER_SIZE); - if (l < 0) { - if (errno == EAGAIN) - return 0; - - e->tried_sendfile = true; - } else if (l == 0) { - r = 0; - goto finish; - } else { - e->written_uncompressed += l; - e->written_compressed += l; - - raw_export_report_progress(e); - - return 0; - } - } - - while (e->buffer_size <= 0) { - uint8_t input[COPY_BUFFER_SIZE]; - - if (e->eof) { - r = 0; - goto finish; - } - - l = read(e->input_fd, input, sizeof(input)); - if (l < 0) { - r = log_error_errno(errno, "Failed to read raw file: %m"); - goto finish; - } - - if (l == 0) { - e->eof = true; - r = import_compress_finish(&e->compress, &e->buffer, &e->buffer_size, &e->buffer_allocated); - } else { - e->written_uncompressed += l; - r = import_compress(&e->compress, input, l, &e->buffer, &e->buffer_size, &e->buffer_allocated); - } - if (r < 0) { - r = log_error_errno(r, "Failed to encode: %m"); - goto finish; - } - } - - l = write(e->output_fd, e->buffer, e->buffer_size); - if (l < 0) { - if (errno == EAGAIN) - return 0; - - r = log_error_errno(errno, "Failed to write output file: %m"); - goto finish; - } - - assert((size_t) l <= e->buffer_size); - memmove(e->buffer, (uint8_t*) e->buffer + l, e->buffer_size - l); - e->buffer_size -= l; - e->written_compressed += l; - - raw_export_report_progress(e); - - return 0; - -finish: - if (r >= 0) { - (void) copy_times(e->input_fd, e->output_fd); - (void) copy_xattr(e->input_fd, e->output_fd); - } - - if (e->on_finished) - e->on_finished(e, r, e->userdata); - else - sd_event_exit(e->event, r); - - return 0; -} - -static int raw_export_on_output(sd_event_source *s, int fd, uint32_t revents, void *userdata) { - RawExport *i = userdata; - - return raw_export_process(i); -} - -static int raw_export_on_defer(sd_event_source *s, void *userdata) { - RawExport *i = userdata; - - return raw_export_process(i); -} - -static int reflink_snapshot(int fd, const char *path) { - char *p, *d; - int new_fd, r; - - p = strdupa(path); - d = dirname(p); - - new_fd = open(d, O_TMPFILE|O_CLOEXEC|O_NOCTTY|O_RDWR, 0600); - if (new_fd < 0) { - _cleanup_free_ char *t = NULL; - - r = tempfn_random(path, &t); - if (r < 0) - return r; - - new_fd = open(t, O_CLOEXEC|O_CREAT|O_NOCTTY|O_RDWR, 0600); - if (new_fd < 0) - return -errno; - - (void) unlink(t); - } - - r = btrfs_reflink(fd, new_fd); - if (r < 0) { - safe_close(new_fd); - return r; - } - - return new_fd; -} - -int raw_export_start(RawExport *e, const char *path, int fd, ImportCompressType compress) { - _cleanup_close_ int sfd = -1, tfd = -1; - int r; - - assert(e); - assert(path); - assert(fd >= 0); - assert(compress < _IMPORT_COMPRESS_TYPE_MAX); - assert(compress != IMPORT_COMPRESS_UNKNOWN); - - if (e->output_fd >= 0) - return -EBUSY; - - r = fd_nonblock(fd, true); - if (r < 0) - return r; - - r = free_and_strdup(&e->path, path); - if (r < 0) - return r; - - sfd = open(path, O_RDONLY|O_CLOEXEC|O_NOCTTY); - if (sfd < 0) - return -errno; - - if (fstat(sfd, &e->st) < 0) - return -errno; - if (!S_ISREG(e->st.st_mode)) - return -ENOTTY; - - /* Try to take a reflink snapshot of the file, if we can t make the export atomic */ - tfd = reflink_snapshot(sfd, path); - if (tfd >= 0) { - e->input_fd = tfd; - tfd = -1; - } else { - e->input_fd = sfd; - sfd = -1; - } - - r = import_compress_init(&e->compress, compress); - if (r < 0) - return r; - - r = sd_event_add_io(e->event, &e->output_event_source, fd, EPOLLOUT, raw_export_on_output, e); - if (r == -EPERM) { - r = sd_event_add_defer(e->event, &e->output_event_source, raw_export_on_defer, e); - if (r < 0) - return r; - - r = sd_event_source_set_enabled(e->output_event_source, SD_EVENT_ON); - } - if (r < 0) - return r; - - e->output_fd = fd; - return r; -} diff --git a/src/import/export-raw.h b/src/import/export-raw.h deleted file mode 100644 index b71de6cb8..000000000 --- a/src/import/export-raw.h +++ /dev/null @@ -1,37 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -#pragma once - -/*** - This file is part of systemd. - - Copyright 2015 Lennart Poettering - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see . -***/ - -#include "sd-event.h" -#include "macro.h" -#include "import-compress.h" - -typedef struct RawExport RawExport; - -typedef void (*RawExportFinished)(RawExport *export, int error, void *userdata); - -int raw_export_new(RawExport **export, sd_event *event, RawExportFinished on_finished, void *userdata); -RawExport* raw_export_unref(RawExport *export); - -DEFINE_TRIVIAL_CLEANUP_FUNC(RawExport*, raw_export_unref); - -int raw_export_start(RawExport *export, const char *path, int fd, ImportCompressType compress); diff --git a/src/import/export-tar.c b/src/import/export-tar.c deleted file mode 100644 index c27bab46b..000000000 --- a/src/import/export-tar.c +++ /dev/null @@ -1,328 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -/*** - This file is part of systemd. - - Copyright 2015 Lennart Poettering - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see . -***/ - -#include - -#include "sd-daemon.h" -#include "util.h" -#include "ratelimit.h" -#include "btrfs-util.h" -#include "import-common.h" -#include "export-tar.h" - -#define COPY_BUFFER_SIZE (16*1024) - -struct TarExport { - sd_event *event; - - TarExportFinished on_finished; - void *userdata; - - char *path; - char *temp_path; - - int output_fd; - int tar_fd; - - ImportCompress compress; - - sd_event_source *output_event_source; - - void *buffer; - size_t buffer_size; - size_t buffer_allocated; - - uint64_t written_compressed; - uint64_t written_uncompressed; - - pid_t tar_pid; - - struct stat st; - uint64_t quota_referenced; - - unsigned last_percent; - RateLimit progress_rate_limit; - - bool eof; - bool tried_splice; -}; - -TarExport *tar_export_unref(TarExport *e) { - if (!e) - return NULL; - - sd_event_source_unref(e->output_event_source); - - if (e->tar_pid > 1) { - (void) kill_and_sigcont(e->tar_pid, SIGKILL); - (void) wait_for_terminate(e->tar_pid, NULL); - } - - if (e->temp_path) { - (void) btrfs_subvol_remove(e->temp_path); - free(e->temp_path); - } - - import_compress_free(&e->compress); - - sd_event_unref(e->event); - - safe_close(e->tar_fd); - - free(e->buffer); - free(e->path); - free(e); - - return NULL; -} - -int tar_export_new( - TarExport **ret, - sd_event *event, - TarExportFinished on_finished, - void *userdata) { - - _cleanup_(tar_export_unrefp) TarExport *e = NULL; - int r; - - assert(ret); - - e = new0(TarExport, 1); - if (!e) - return -ENOMEM; - - e->output_fd = e->tar_fd = -1; - e->on_finished = on_finished; - e->userdata = userdata; - e->quota_referenced = (uint64_t) -1; - - RATELIMIT_INIT(e->progress_rate_limit, 100 * USEC_PER_MSEC, 1); - e->last_percent = (unsigned) -1; - - if (event) - e->event = sd_event_ref(event); - else { - r = sd_event_default(&e->event); - if (r < 0) - return r; - } - - *ret = e; - e = NULL; - - return 0; -} - -static void tar_export_report_progress(TarExport *e) { - unsigned percent; - assert(e); - - /* Do we have any quota info? I fnot, we don't know anything about the progress */ - if (e->quota_referenced == (uint64_t) -1) - return; - - if (e->written_uncompressed >= e->quota_referenced) - percent = 100; - else - percent = (unsigned) ((e->written_uncompressed * UINT64_C(100)) / e->quota_referenced); - - if (percent == e->last_percent) - return; - - if (!ratelimit_test(&e->progress_rate_limit)) - return; - - sd_notifyf(false, "X_IMPORT_PROGRESS=%u", percent); - log_info("Exported %u%%.", percent); - - e->last_percent = percent; -} - -static int tar_export_process(TarExport *e) { - ssize_t l; - int r; - - assert(e); - - if (!e->tried_splice && e->compress.type == IMPORT_COMPRESS_UNCOMPRESSED) { - - l = splice(e->tar_fd, NULL, e->output_fd, NULL, COPY_BUFFER_SIZE, 0); - if (l < 0) { - if (errno == EAGAIN) - return 0; - - e->tried_splice = true; - } else if (l == 0) { - r = 0; - goto finish; - } else { - e->written_uncompressed += l; - e->written_compressed += l; - - tar_export_report_progress(e); - - return 0; - } - } - - while (e->buffer_size <= 0) { - uint8_t input[COPY_BUFFER_SIZE]; - - if (e->eof) { - r = 0; - goto finish; - } - - l = read(e->tar_fd, input, sizeof(input)); - if (l < 0) { - r = log_error_errno(errno, "Failed to read tar file: %m"); - goto finish; - } - - if (l == 0) { - e->eof = true; - r = import_compress_finish(&e->compress, &e->buffer, &e->buffer_size, &e->buffer_allocated); - } else { - e->written_uncompressed += l; - r = import_compress(&e->compress, input, l, &e->buffer, &e->buffer_size, &e->buffer_allocated); - } - if (r < 0) { - r = log_error_errno(r, "Failed to encode: %m"); - goto finish; - } - } - - l = write(e->output_fd, e->buffer, e->buffer_size); - if (l < 0) { - if (errno == EAGAIN) - return 0; - - r = log_error_errno(errno, "Failed to write output file: %m"); - goto finish; - } - - assert((size_t) l <= e->buffer_size); - memmove(e->buffer, (uint8_t*) e->buffer + l, e->buffer_size - l); - e->buffer_size -= l; - e->written_compressed += l; - - tar_export_report_progress(e); - - return 0; - -finish: - if (e->on_finished) - e->on_finished(e, r, e->userdata); - else - sd_event_exit(e->event, r); - - return 0; -} - -static int tar_export_on_output(sd_event_source *s, int fd, uint32_t revents, void *userdata) { - TarExport *i = userdata; - - return tar_export_process(i); -} - -static int tar_export_on_defer(sd_event_source *s, void *userdata) { - TarExport *i = userdata; - - return tar_export_process(i); -} - -int tar_export_start(TarExport *e, const char *path, int fd, ImportCompressType compress) { - _cleanup_close_ int sfd = -1; - int r; - - assert(e); - assert(path); - assert(fd >= 0); - assert(compress < _IMPORT_COMPRESS_TYPE_MAX); - assert(compress != IMPORT_COMPRESS_UNKNOWN); - - if (e->output_fd >= 0) - return -EBUSY; - - sfd = open(path, O_DIRECTORY|O_RDONLY|O_NOCTTY|O_CLOEXEC); - if (sfd < 0) - return -errno; - - if (fstat(sfd, &e->st) < 0) - return -errno; - - r = fd_nonblock(fd, true); - if (r < 0) - return r; - - r = free_and_strdup(&e->path, path); - if (r < 0) - return r; - - e->quota_referenced = (uint64_t) -1; - - if (e->st.st_ino == 256) { /* might be a btrfs subvolume? */ - BtrfsQuotaInfo q; - - r = btrfs_subvol_get_quota_fd(sfd, &q); - if (r >= 0) - e->quota_referenced = q.referenced; - - free(e->temp_path); - e->temp_path = NULL; - - r = tempfn_random(path, &e->temp_path); - if (r < 0) - return r; - - /* Let's try to make a snapshot, if we can, so that the export is atomic */ - r = btrfs_subvol_snapshot_fd(sfd, e->temp_path, true, false); - if (r < 0) { - log_debug_errno(r, "Couldn't create snapshot %s of %s, not exporting atomically: %m", e->temp_path, path); - free(e->temp_path); - e->temp_path = NULL; - } - } - - r = import_compress_init(&e->compress, compress); - if (r < 0) - return r; - - r = sd_event_add_io(e->event, &e->output_event_source, fd, EPOLLOUT, tar_export_on_output, e); - if (r == -EPERM) { - r = sd_event_add_defer(e->event, &e->output_event_source, tar_export_on_defer, e); - if (r < 0) - return r; - - r = sd_event_source_set_enabled(e->output_event_source, SD_EVENT_ON); - } - if (r < 0) - return r; - - e->tar_fd = import_fork_tar_c(e->temp_path ?: e->path, &e->tar_pid); - if (e->tar_fd < 0) { - e->output_event_source = sd_event_source_unref(e->output_event_source); - return e->tar_fd; - } - - e->output_fd = fd; - return r; -} diff --git a/src/import/export-tar.h b/src/import/export-tar.h deleted file mode 100644 index ce27a9fc1..000000000 --- a/src/import/export-tar.h +++ /dev/null @@ -1,37 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -#pragma once - -/*** - This file is part of systemd. - - Copyright 2015 Lennart Poettering - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see . -***/ - -#include "sd-event.h" -#include "macro.h" -#include "import-compress.h" - -typedef struct TarExport TarExport; - -typedef void (*TarExportFinished)(TarExport *export, int error, void *userdata); - -int tar_export_new(TarExport **export, sd_event *event, TarExportFinished on_finished, void *userdata); -TarExport* tar_export_unref(TarExport *export); - -DEFINE_TRIVIAL_CLEANUP_FUNC(TarExport*, tar_export_unref); - -int tar_export_start(TarExport *export, const char *path, int fd, ImportCompressType compress); diff --git a/src/import/export.c b/src/import/export.c deleted file mode 100644 index 201c5ab35..000000000 --- a/src/import/export.c +++ /dev/null @@ -1,319 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -/*** - This file is part of systemd. - - Copyright 2015 Lennart Poettering - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see . -***/ - -#include - -#include "sd-event.h" -#include "event-util.h" -#include "verbs.h" -#include "build.h" -#include "machine-image.h" -#include "import-util.h" -#include "export-tar.h" -#include "export-raw.h" - -static ImportCompressType arg_compress = IMPORT_COMPRESS_UNKNOWN; - -static void determine_compression_from_filename(const char *p) { - - if (arg_compress != IMPORT_COMPRESS_UNKNOWN) - return; - - if (!p) { - arg_compress = IMPORT_COMPRESS_UNCOMPRESSED; - return; - } - - if (endswith(p, ".xz")) - arg_compress = IMPORT_COMPRESS_XZ; - else if (endswith(p, ".gz")) - arg_compress = IMPORT_COMPRESS_GZIP; - else if (endswith(p, ".bz2")) - arg_compress = IMPORT_COMPRESS_BZIP2; - else - arg_compress = IMPORT_COMPRESS_UNCOMPRESSED; -} - -static int interrupt_signal_handler(sd_event_source *s, const struct signalfd_siginfo *si, void *userdata) { - log_notice("Transfer aborted."); - sd_event_exit(sd_event_source_get_event(s), EINTR); - return 0; -} - -static void on_tar_finished(TarExport *export, int error, void *userdata) { - sd_event *event = userdata; - assert(export); - - if (error == 0) - log_info("Operation completed successfully."); - - sd_event_exit(event, abs(error)); -} - -static int export_tar(int argc, char *argv[], void *userdata) { - _cleanup_(tar_export_unrefp) TarExport *export = NULL; - _cleanup_event_unref_ sd_event *event = NULL; - _cleanup_(image_unrefp) Image *image = NULL; - const char *path = NULL, *local = NULL; - _cleanup_close_ int open_fd = -1; - int r, fd; - - if (machine_name_is_valid(argv[1])) { - r = image_find(argv[1], &image); - if (r < 0) - return log_error_errno(r, "Failed to look for machine %s: %m", argv[1]); - if (r == 0) { - log_error("Machine image %s not found.", argv[1]); - return -ENOENT; - } - - local = image->path; - } else - local = argv[1]; - - if (argc >= 3) - path = argv[2]; - if (isempty(path) || streq(path, "-")) - path = NULL; - - determine_compression_from_filename(path); - - if (path) { - open_fd = open(path, O_WRONLY|O_CREAT|O_TRUNC|O_CLOEXEC|O_NOCTTY, 0666); - if (open_fd < 0) - return log_error_errno(errno, "Failed to open tar image for export: %m"); - - fd = open_fd; - - log_info("Exporting '%s', saving to '%s' with compression '%s'.", local, path, import_compress_type_to_string(arg_compress)); - } else { - _cleanup_free_ char *pretty = NULL; - - fd = STDOUT_FILENO; - - (void) readlink_malloc("/proc/self/fd/1", &pretty); - log_info("Exporting '%s', saving to '%s' with compression '%s'.", local, strna(pretty), import_compress_type_to_string(arg_compress)); - } - - r = sd_event_default(&event); - if (r < 0) - return log_error_errno(r, "Failed to allocate event loop: %m"); - - assert_se(sigprocmask_many(SIG_BLOCK, SIGTERM, SIGINT, -1) == 0); - sd_event_add_signal(event, NULL, SIGTERM, interrupt_signal_handler, NULL); - sd_event_add_signal(event, NULL, SIGINT, interrupt_signal_handler, NULL); - - r = tar_export_new(&export, event, on_tar_finished, event); - if (r < 0) - return log_error_errno(r, "Failed to allocate exporter: %m"); - - r = tar_export_start(export, local, fd, arg_compress); - if (r < 0) - return log_error_errno(r, "Failed to export image: %m"); - - r = sd_event_loop(event); - if (r < 0) - return log_error_errno(r, "Failed to run event loop: %m"); - - log_info("Exiting."); - return -r; -} - -static void on_raw_finished(RawExport *export, int error, void *userdata) { - sd_event *event = userdata; - assert(export); - - if (error == 0) - log_info("Operation completed successfully."); - - sd_event_exit(event, abs(error)); -} - -static int export_raw(int argc, char *argv[], void *userdata) { - _cleanup_(raw_export_unrefp) RawExport *export = NULL; - _cleanup_event_unref_ sd_event *event = NULL; - _cleanup_(image_unrefp) Image *image = NULL; - const char *path = NULL, *local = NULL; - _cleanup_close_ int open_fd = -1; - int r, fd; - - if (machine_name_is_valid(argv[1])) { - r = image_find(argv[1], &image); - if (r < 0) - return log_error_errno(r, "Failed to look for machine %s: %m", argv[1]); - if (r == 0) { - log_error("Machine image %s not found.", argv[1]); - return -ENOENT; - } - - local = image->path; - } else - local = argv[1]; - - if (argc >= 3) - path = argv[2]; - if (isempty(path) || streq(path, "-")) - path = NULL; - - determine_compression_from_filename(path); - - if (path) { - open_fd = open(path, O_WRONLY|O_CREAT|O_TRUNC|O_CLOEXEC|O_NOCTTY, 0666); - if (open_fd < 0) - return log_error_errno(errno, "Failed to open raw image for export: %m"); - - fd = open_fd; - - log_info("Exporting '%s', saving to '%s' with compression '%s'.", local, path, import_compress_type_to_string(arg_compress)); - } else { - _cleanup_free_ char *pretty = NULL; - - fd = STDOUT_FILENO; - - (void) readlink_malloc("/proc/self/fd/1", &pretty); - log_info("Exporting '%s', saving to '%s' with compression '%s'.", local, strna(pretty), import_compress_type_to_string(arg_compress)); - } - - r = sd_event_default(&event); - if (r < 0) - return log_error_errno(r, "Failed to allocate event loop: %m"); - - assert_se(sigprocmask_many(SIG_BLOCK, SIGTERM, SIGINT, -1) == 0); - sd_event_add_signal(event, NULL, SIGTERM, interrupt_signal_handler, NULL); - sd_event_add_signal(event, NULL, SIGINT, interrupt_signal_handler, NULL); - - r = raw_export_new(&export, event, on_raw_finished, event); - if (r < 0) - return log_error_errno(r, "Failed to allocate exporter: %m"); - - r = raw_export_start(export, local, fd, arg_compress); - if (r < 0) - return log_error_errno(r, "Failed to export image: %m"); - - r = sd_event_loop(event); - if (r < 0) - return log_error_errno(r, "Failed to run event loop: %m"); - - log_info("Exiting."); - return -r; -} - -static int help(int argc, char *argv[], void *userdata) { - - printf("%s [OPTIONS...] {COMMAND} ...\n\n" - "Export container or virtual machine images.\n\n" - " -h --help Show this help\n" - " --version Show package version\n" - " --format=FORMAT Select format\n\n" - "Commands:\n" - " tar NAME [FILE] Export a TAR image\n" - " raw NAME [FILE] Export a RAW image\n", - program_invocation_short_name); - - return 0; -} - -static int parse_argv(int argc, char *argv[]) { - - enum { - ARG_VERSION = 0x100, - ARG_FORMAT, - }; - - static const struct option options[] = { - { "help", no_argument, NULL, 'h' }, - { "version", no_argument, NULL, ARG_VERSION }, - { "format", required_argument, NULL, ARG_FORMAT }, - {} - }; - - int c; - - assert(argc >= 0); - assert(argv); - - while ((c = getopt_long(argc, argv, "h", options, NULL)) >= 0) - - switch (c) { - - case 'h': - return help(0, NULL, NULL); - - case ARG_VERSION: - puts(PACKAGE_STRING); - puts(SYSTEMD_FEATURES); - return 0; - - case ARG_FORMAT: - if (streq(optarg, "uncompressed")) - arg_compress = IMPORT_COMPRESS_UNCOMPRESSED; - else if (streq(optarg, "xz")) - arg_compress = IMPORT_COMPRESS_XZ; - else if (streq(optarg, "gzip")) - arg_compress = IMPORT_COMPRESS_GZIP; - else if (streq(optarg, "bzip2")) - arg_compress = IMPORT_COMPRESS_BZIP2; - else { - log_error("Unknown format: %s", optarg); - return -EINVAL; - } - break; - - case '?': - return -EINVAL; - - default: - assert_not_reached("Unhandled option"); - } - - return 1; -} - -static int export_main(int argc, char *argv[]) { - - static const Verb verbs[] = { - { "help", VERB_ANY, VERB_ANY, 0, help }, - { "tar", 2, 3, 0, export_tar }, - { "raw", 2, 3, 0, export_raw }, - {} - }; - - return dispatch_verb(argc, argv, verbs, NULL); -} - -int main(int argc, char *argv[]) { - int r; - - setlocale(LC_ALL, ""); - log_parse_environment(); - log_open(); - - r = parse_argv(argc, argv); - if (r <= 0) - goto finish; - - ignore_signals(SIGPIPE, -1); - - r = export_main(argc, argv); - -finish: - return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; -} diff --git a/src/import/import-common.c b/src/import/import-common.c deleted file mode 100644 index aede2f9b3..000000000 --- a/src/import/import-common.c +++ /dev/null @@ -1,224 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -/*** - This file is part of systemd. - - Copyright 2015 Lennart Poettering - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see . -***/ - -#include -#include -#include - -#include "util.h" -#include "btrfs-util.h" -#include "capability.h" -#include "import-common.h" - -int import_make_read_only_fd(int fd) { - int r; - - assert(fd >= 0); - - /* First, let's make this a read-only subvolume if it refers - * to a subvolume */ - r = btrfs_subvol_set_read_only_fd(fd, true); - if (r == -ENOTTY || r == -ENOTDIR || r == -EINVAL) { - struct stat st; - - /* This doesn't refer to a subvolume, or the file - * system isn't even btrfs. In that, case fall back to - * chmod()ing */ - - r = fstat(fd, &st); - if (r < 0) - return log_error_errno(errno, "Failed to stat temporary image: %m"); - - /* Drop "w" flag */ - if (fchmod(fd, st.st_mode & 07555) < 0) - return log_error_errno(errno, "Failed to chmod() final image: %m"); - - return 0; - - } else if (r < 0) - return log_error_errno(r, "Failed to make subvolume read-only: %m"); - - return 0; -} - -int import_make_read_only(const char *path) { - _cleanup_close_ int fd = 1; - - fd = open(path, O_RDONLY|O_NOCTTY|O_CLOEXEC); - if (fd < 0) - return log_error_errno(errno, "Failed to open %s: %m", path); - - return import_make_read_only_fd(fd); -} - -int import_fork_tar_x(const char *path, pid_t *ret) { - _cleanup_close_pair_ int pipefd[2] = { -1, -1 }; - pid_t pid; - int r; - - assert(path); - assert(ret); - - if (pipe2(pipefd, O_CLOEXEC) < 0) - return log_error_errno(errno, "Failed to create pipe for tar: %m"); - - pid = fork(); - if (pid < 0) - return log_error_errno(errno, "Failed to fork off tar: %m"); - - if (pid == 0) { - int null_fd; - uint64_t retain = - (1ULL << CAP_CHOWN) | - (1ULL << CAP_FOWNER) | - (1ULL << CAP_FSETID) | - (1ULL << CAP_MKNOD) | - (1ULL << CAP_SETFCAP) | - (1ULL << CAP_DAC_OVERRIDE); - - /* Child */ - - reset_all_signal_handlers(); - reset_signal_mask(); - assert_se(prctl(PR_SET_PDEATHSIG, SIGTERM) == 0); - - pipefd[1] = safe_close(pipefd[1]); - - if (dup2(pipefd[0], STDIN_FILENO) != STDIN_FILENO) { - log_error_errno(errno, "Failed to dup2() fd: %m"); - _exit(EXIT_FAILURE); - } - - if (pipefd[0] != STDIN_FILENO) - pipefd[0] = safe_close(pipefd[0]); - - null_fd = open("/dev/null", O_WRONLY|O_NOCTTY); - if (null_fd < 0) { - log_error_errno(errno, "Failed to open /dev/null: %m"); - _exit(EXIT_FAILURE); - } - - if (dup2(null_fd, STDOUT_FILENO) != STDOUT_FILENO) { - log_error_errno(errno, "Failed to dup2() fd: %m"); - _exit(EXIT_FAILURE); - } - - if (null_fd != STDOUT_FILENO) - null_fd = safe_close(null_fd); - - fd_cloexec(STDIN_FILENO, false); - fd_cloexec(STDOUT_FILENO, false); - fd_cloexec(STDERR_FILENO, false); - - if (unshare(CLONE_NEWNET) < 0) - log_error_errno(errno, "Failed to lock tar into network namespace, ignoring: %m"); - - r = capability_bounding_set_drop(~retain, true); - if (r < 0) - log_error_errno(r, "Failed to drop capabilities, ignoring: %m"); - - execlp("tar", "tar", "--numeric-owner", "-C", path, "-px", NULL); - log_error_errno(errno, "Failed to execute tar: %m"); - _exit(EXIT_FAILURE); - } - - pipefd[0] = safe_close(pipefd[0]); - r = pipefd[1]; - pipefd[1] = -1; - - *ret = pid; - - return r; -} - -int import_fork_tar_c(const char *path, pid_t *ret) { - _cleanup_close_pair_ int pipefd[2] = { -1, -1 }; - pid_t pid; - int r; - - assert(path); - assert(ret); - - if (pipe2(pipefd, O_CLOEXEC) < 0) - return log_error_errno(errno, "Failed to create pipe for tar: %m"); - - pid = fork(); - if (pid < 0) - return log_error_errno(errno, "Failed to fork off tar: %m"); - - if (pid == 0) { - int null_fd; - uint64_t retain = (1ULL << CAP_DAC_OVERRIDE); - - /* Child */ - - reset_all_signal_handlers(); - reset_signal_mask(); - assert_se(prctl(PR_SET_PDEATHSIG, SIGTERM) == 0); - - pipefd[0] = safe_close(pipefd[0]); - - if (dup2(pipefd[1], STDOUT_FILENO) != STDOUT_FILENO) { - log_error_errno(errno, "Failed to dup2() fd: %m"); - _exit(EXIT_FAILURE); - } - - if (pipefd[1] != STDOUT_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 (dup2(null_fd, STDIN_FILENO) != STDIN_FILENO) { - log_error_errno(errno, "Failed to dup2() fd: %m"); - _exit(EXIT_FAILURE); - } - - if (null_fd != STDIN_FILENO) - null_fd = safe_close(null_fd); - - fd_cloexec(STDIN_FILENO, false); - fd_cloexec(STDOUT_FILENO, false); - fd_cloexec(STDERR_FILENO, false); - - if (unshare(CLONE_NEWNET) < 0) - log_error_errno(errno, "Failed to lock tar into network namespace, ignoring: %m"); - - r = capability_bounding_set_drop(~retain, true); - if (r < 0) - log_error_errno(r, "Failed to drop capabilities, ignoring: %m"); - - execlp("tar", "tar", "--sparse", "-C", path, "-c", ".", NULL); - log_error_errno(errno, "Failed to execute tar: %m"); - _exit(EXIT_FAILURE); - } - - pipefd[1] = safe_close(pipefd[1]); - r = pipefd[0]; - pipefd[0] = -1; - - *ret = pid; - - return r; -} diff --git a/src/import/import-common.h b/src/import/import-common.h deleted file mode 100644 index 7b60de80c..000000000 --- a/src/import/import-common.h +++ /dev/null @@ -1,28 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -#pragma once - -/*** - This file is part of systemd. - - Copyright 2015 Lennart Poettering - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see . -***/ - -int import_make_read_only_fd(int fd); -int import_make_read_only(const char *path); - -int import_fork_tar_c(const char *path, pid_t *ret); -int import_fork_tar_x(const char *path, pid_t *ret); diff --git a/src/import/import-compress.c b/src/import/import-compress.c deleted file mode 100644 index d6b813303..000000000 --- a/src/import/import-compress.c +++ /dev/null @@ -1,470 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -/*** - This file is part of systemd. - - Copyright 2015 Lennart Poettering - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see . -***/ - -#include "util.h" -#include "import-compress.h" - -void import_compress_free(ImportCompress *c) { - assert(c); - - if (c->type == IMPORT_COMPRESS_XZ) - lzma_end(&c->xz); - else if (c->type == IMPORT_COMPRESS_GZIP) { - if (c->encoding) - deflateEnd(&c->gzip); - else - inflateEnd(&c->gzip); - } else if (c->type == IMPORT_COMPRESS_BZIP2) { - if (c->encoding) - BZ2_bzCompressEnd(&c->bzip2); - else - BZ2_bzDecompressEnd(&c->bzip2); - } - - c->type = IMPORT_COMPRESS_UNKNOWN; -} - -int import_uncompress_detect(ImportCompress *c, const void *data, size_t size) { - static const uint8_t xz_signature[] = { - 0xfd, '7', 'z', 'X', 'Z', 0x00 - }; - static const uint8_t gzip_signature[] = { - 0x1f, 0x8b - }; - static const uint8_t bzip2_signature[] = { - 'B', 'Z', 'h' - }; - - int r; - - assert(c); - - if (c->type != IMPORT_COMPRESS_UNKNOWN) - return 1; - - if (size < MAX3(sizeof(xz_signature), - sizeof(gzip_signature), - sizeof(bzip2_signature))) - return 0; - - assert(data); - - if (memcmp(data, xz_signature, sizeof(xz_signature)) == 0) { - lzma_ret xzr; - - xzr = lzma_stream_decoder(&c->xz, UINT64_MAX, LZMA_TELL_UNSUPPORTED_CHECK); - if (xzr != LZMA_OK) - return -EIO; - - c->type = IMPORT_COMPRESS_XZ; - - } else if (memcmp(data, gzip_signature, sizeof(gzip_signature)) == 0) { - r = inflateInit2(&c->gzip, 15+16); - if (r != Z_OK) - return -EIO; - - c->type = IMPORT_COMPRESS_GZIP; - - } else if (memcmp(data, bzip2_signature, sizeof(bzip2_signature)) == 0) { - r = BZ2_bzDecompressInit(&c->bzip2, 0, 0); - if (r != BZ_OK) - return -EIO; - - c->type = IMPORT_COMPRESS_BZIP2; - } else - c->type = IMPORT_COMPRESS_UNCOMPRESSED; - - c->encoding = false; - - return 1; -} - -int import_uncompress(ImportCompress *c, const void *data, size_t size, ImportCompressCallback callback, void *userdata) { - int r; - - assert(c); - assert(callback); - - r = import_uncompress_detect(c, data, size); - if (r <= 0) - return r; - - if (c->encoding) - return -EINVAL; - - if (size <= 0) - return 1; - - assert(data); - - switch (c->type) { - - case IMPORT_COMPRESS_UNCOMPRESSED: - r = callback(data, size, userdata); - if (r < 0) - return r; - - break; - - case IMPORT_COMPRESS_XZ: - c->xz.next_in = data; - c->xz.avail_in = size; - - while (c->xz.avail_in > 0) { - uint8_t buffer[16 * 1024]; - lzma_ret lzr; - - c->xz.next_out = buffer; - c->xz.avail_out = sizeof(buffer); - - lzr = lzma_code(&c->xz, LZMA_RUN); - if (lzr != LZMA_OK && lzr != LZMA_STREAM_END) - return -EIO; - - r = callback(buffer, sizeof(buffer) - c->xz.avail_out, userdata); - if (r < 0) - return r; - } - - break; - - case IMPORT_COMPRESS_GZIP: - c->gzip.next_in = (void*) data; - c->gzip.avail_in = size; - - while (c->gzip.avail_in > 0) { - uint8_t buffer[16 * 1024]; - - c->gzip.next_out = buffer; - c->gzip.avail_out = sizeof(buffer); - - r = inflate(&c->gzip, Z_NO_FLUSH); - if (r != Z_OK && r != Z_STREAM_END) - return -EIO; - - r = callback(buffer, sizeof(buffer) - c->gzip.avail_out, userdata); - if (r < 0) - return r; - } - - break; - - case IMPORT_COMPRESS_BZIP2: - c->bzip2.next_in = (void*) data; - c->bzip2.avail_in = size; - - while (c->bzip2.avail_in > 0) { - uint8_t buffer[16 * 1024]; - - c->bzip2.next_out = (char*) buffer; - c->bzip2.avail_out = sizeof(buffer); - - r = BZ2_bzDecompress(&c->bzip2); - if (r != BZ_OK && r != BZ_STREAM_END) - return -EIO; - - r = callback(buffer, sizeof(buffer) - c->bzip2.avail_out, userdata); - if (r < 0) - return r; - } - - break; - - default: - assert_not_reached("Unknown compression"); - } - - return 1; -} - -int import_compress_init(ImportCompress *c, ImportCompressType t) { - int r; - - assert(c); - - switch (t) { - - case IMPORT_COMPRESS_XZ: { - lzma_ret xzr; - - xzr = lzma_easy_encoder(&c->xz, LZMA_PRESET_DEFAULT, LZMA_CHECK_CRC64); - if (xzr != LZMA_OK) - return -EIO; - - c->type = IMPORT_COMPRESS_XZ; - break; - } - - case IMPORT_COMPRESS_GZIP: - r = deflateInit2(&c->gzip, Z_DEFAULT_COMPRESSION, Z_DEFLATED, 15 + 16, 8, Z_DEFAULT_STRATEGY); - if (r != Z_OK) - return -EIO; - - c->type = IMPORT_COMPRESS_GZIP; - break; - - case IMPORT_COMPRESS_BZIP2: - r = BZ2_bzCompressInit(&c->bzip2, 9, 0, 0); - if (r != BZ_OK) - return -EIO; - - c->type = IMPORT_COMPRESS_BZIP2; - break; - - case IMPORT_COMPRESS_UNCOMPRESSED: - c->type = IMPORT_COMPRESS_UNCOMPRESSED; - break; - - default: - return -EOPNOTSUPP; - } - - c->encoding = true; - return 0; -} - -static int enlarge_buffer(void **buffer, size_t *buffer_size, size_t *buffer_allocated) { - size_t l; - void *p; - - if (*buffer_allocated > *buffer_size) - return 0; - - l = MAX(16*1024U, (*buffer_size * 2)); - p = realloc(*buffer, l); - if (!p) - return -ENOMEM; - - *buffer = p; - *buffer_allocated = l; - - return 1; -} - -int import_compress(ImportCompress *c, const void *data, size_t size, void **buffer, size_t *buffer_size, size_t *buffer_allocated) { - int r; - - assert(c); - assert(buffer); - assert(buffer_size); - assert(buffer_allocated); - - if (!c->encoding) - return -EINVAL; - - if (size <= 0) - return 0; - - assert(data); - - *buffer_size = 0; - - switch (c->type) { - - case IMPORT_COMPRESS_XZ: - - c->xz.next_in = data; - c->xz.avail_in = size; - - while (c->xz.avail_in > 0) { - lzma_ret lzr; - - r = enlarge_buffer(buffer, buffer_size, buffer_allocated); - if (r < 0) - return r; - - c->xz.next_out = (uint8_t*) *buffer + *buffer_size; - c->xz.avail_out = *buffer_allocated - *buffer_size; - - lzr = lzma_code(&c->xz, LZMA_RUN); - if (lzr != LZMA_OK) - return -EIO; - - *buffer_size += (*buffer_allocated - *buffer_size) - c->xz.avail_out; - } - - break; - - case IMPORT_COMPRESS_GZIP: - - c->gzip.next_in = (void*) data; - c->gzip.avail_in = size; - - while (c->gzip.avail_in > 0) { - r = enlarge_buffer(buffer, buffer_size, buffer_allocated); - if (r < 0) - return r; - - c->gzip.next_out = (uint8_t*) *buffer + *buffer_size; - c->gzip.avail_out = *buffer_allocated - *buffer_size; - - r = deflate(&c->gzip, Z_NO_FLUSH); - if (r != Z_OK) - return -EIO; - - *buffer_size += (*buffer_allocated - *buffer_size) - c->gzip.avail_out; - } - - break; - - case IMPORT_COMPRESS_BZIP2: - - c->bzip2.next_in = (void*) data; - c->bzip2.avail_in = size; - - while (c->bzip2.avail_in > 0) { - r = enlarge_buffer(buffer, buffer_size, buffer_allocated); - if (r < 0) - return r; - - c->bzip2.next_out = (void*) ((uint8_t*) *buffer + *buffer_size); - c->bzip2.avail_out = *buffer_allocated - *buffer_size; - - r = BZ2_bzCompress(&c->bzip2, BZ_RUN); - if (r != BZ_RUN_OK) - return -EIO; - - *buffer_size += (*buffer_allocated - *buffer_size) - c->bzip2.avail_out; - } - - break; - - case IMPORT_COMPRESS_UNCOMPRESSED: - - if (*buffer_allocated < size) { - void *p; - - p = realloc(*buffer, size); - if (!p) - return -ENOMEM; - - *buffer = p; - *buffer_allocated = size; - } - - memcpy(*buffer, data, size); - *buffer_size = size; - break; - - default: - return -EOPNOTSUPP; - } - - return 0; -} - -int import_compress_finish(ImportCompress *c, void **buffer, size_t *buffer_size, size_t *buffer_allocated) { - int r; - - assert(c); - assert(buffer); - assert(buffer_size); - assert(buffer_allocated); - - if (!c->encoding) - return -EINVAL; - - *buffer_size = 0; - - switch (c->type) { - - case IMPORT_COMPRESS_XZ: { - lzma_ret lzr; - - c->xz.avail_in = 0; - - do { - r = enlarge_buffer(buffer, buffer_size, buffer_allocated); - if (r < 0) - return r; - - c->xz.next_out = (uint8_t*) *buffer + *buffer_size; - c->xz.avail_out = *buffer_allocated - *buffer_size; - - lzr = lzma_code(&c->xz, LZMA_FINISH); - if (lzr != LZMA_OK && lzr != LZMA_STREAM_END) - return -EIO; - - *buffer_size += (*buffer_allocated - *buffer_size) - c->xz.avail_out; - } while (lzr != LZMA_STREAM_END); - - break; - } - - case IMPORT_COMPRESS_GZIP: - c->gzip.avail_in = 0; - - do { - r = enlarge_buffer(buffer, buffer_size, buffer_allocated); - if (r < 0) - return r; - - c->gzip.next_out = (uint8_t*) *buffer + *buffer_size; - c->gzip.avail_out = *buffer_allocated - *buffer_size; - - r = deflate(&c->gzip, Z_FINISH); - if (r != Z_OK && r != Z_STREAM_END) - return -EIO; - - *buffer_size += (*buffer_allocated - *buffer_size) - c->gzip.avail_out; - } while (r != Z_STREAM_END); - - break; - - case IMPORT_COMPRESS_BZIP2: - c->bzip2.avail_in = 0; - - do { - r = enlarge_buffer(buffer, buffer_size, buffer_allocated); - if (r < 0) - return r; - - c->bzip2.next_out = (void*) ((uint8_t*) *buffer + *buffer_size); - c->bzip2.avail_out = *buffer_allocated - *buffer_size; - - r = BZ2_bzCompress(&c->bzip2, BZ_FINISH); - if (r != BZ_FINISH_OK && r != BZ_STREAM_END) - return -EIO; - - *buffer_size += (*buffer_allocated - *buffer_size) - c->bzip2.avail_out; - } while (r != BZ_STREAM_END); - - break; - - case IMPORT_COMPRESS_UNCOMPRESSED: - break; - - default: - return -EOPNOTSUPP; - } - - return 0; -} - -static const char* const import_compress_type_table[_IMPORT_COMPRESS_TYPE_MAX] = { - [IMPORT_COMPRESS_UNKNOWN] = "unknown", - [IMPORT_COMPRESS_UNCOMPRESSED] = "uncompressed", - [IMPORT_COMPRESS_XZ] = "xz", - [IMPORT_COMPRESS_GZIP] = "gzip", - [IMPORT_COMPRESS_BZIP2] = "bzip2", -}; - -DEFINE_STRING_TABLE_LOOKUP(import_compress_type, ImportCompressType); diff --git a/src/import/import-compress.h b/src/import/import-compress.h deleted file mode 100644 index 50d91f732..000000000 --- a/src/import/import-compress.h +++ /dev/null @@ -1,64 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -#pragma once - -/*** - This file is part of systemd. - - Copyright 2015 Lennart Poettering - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see . -***/ - -#include - -#include -#include -#include - -#include "macro.h" - -typedef enum ImportCompressType { - IMPORT_COMPRESS_UNKNOWN, - IMPORT_COMPRESS_UNCOMPRESSED, - IMPORT_COMPRESS_XZ, - IMPORT_COMPRESS_GZIP, - IMPORT_COMPRESS_BZIP2, - _IMPORT_COMPRESS_TYPE_MAX, - _IMPORT_COMPRESS_TYPE_INVALID = -1, -} ImportCompressType; - -typedef struct ImportCompress { - ImportCompressType type; - bool encoding; - union { - lzma_stream xz; - z_stream gzip; - bz_stream bzip2; - }; -} ImportCompress; - -typedef int (*ImportCompressCallback)(const void *data, size_t size, void *userdata); - -void import_compress_free(ImportCompress *c); - -int import_uncompress_detect(ImportCompress *c, const void *data, size_t size); -int import_uncompress(ImportCompress *c, const void *data, size_t size, ImportCompressCallback callback, void *userdata); - -int import_compress_init(ImportCompress *c, ImportCompressType t); -int import_compress(ImportCompress *c, const void *data, size_t size, void **buffer, size_t *buffer_size, size_t *buffer_allocated); -int import_compress_finish(ImportCompress *c, void **buffer, size_t *buffer_size, size_t *buffer_allocated); - -const char* import_compress_type_to_string(ImportCompressType t) _const_; -ImportCompressType import_compress_type_from_string(const char *s) _pure_; diff --git a/src/import/import-pubring.gpg b/src/import/import-pubring.gpg deleted file mode 100644 index be27776896f30f580b03ad79d733483f81c8d117..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9551 zcmb7~Wl$YTyQMc9hX5OQcXxN!;10oIo9skOHiLVy6vh=yK}A1e0|RuSW}%44~W8|R2{x{W~hvPDlp zbCsPxk)GBqx6WR)7Dw|Xm<3texYI1Ud8nSwCW>plN|MgCROOMks$Qr$KhUk7*s3Or z=g6HIT+6E;)Ck^NwtEv!u3*a2PSkY*jEGHeSV*Zf@o{kh;!bh?_A%P-&00z|SIgCM ziTF*Jp5x)mjXYx5n_XG9oKq|9E=X~TCy0TKx=UxB@7e#nQ-6#>2Vh5@thdzbDm>bM)4 z(6B$^dk;+pZUPSPx!0?J^eiU!n^kRonOR5ikC|nf3ibPP{?E%@8bHv|D|u~BfCsynigr=8m6^a#47h1%4@7X z2c2hPU5tP9&HvHCt)vBj3ITwqXOS{Db8t2$Q8PDnus1Vy_9CHSW1}Szu=vlm$Ulpt zvxBv{sVkF%Ggv4R$ODBA0R)gi1OFBh5FZ5w5grZ}5(t9{2ZTpJgu((sLI8;%fY@IF z2=Jh#>F1c-%$iIsLzEB8gv-;)Fv0`0ocy#Yy10RLJik6GN#}Khsv62#P2b7MmqAJi zan-kYR(IB=ePrOB?Mcgmrsnon@0=0~@m-tHlpwhf#_T-*wuo@59sP&lQ>;mLx=qxR z^(rxe{DR_*Hzg-j|M$cC3KTh~d_T$V^yVn)@bo4oW@B<<`r z{@c3veGkLC>;soBw94)*&2@{uxf(}mm=Y4ld)ZYYs^HS}Qiwm{u zephfO0L+j8+?gAx)sQDLlZk;|^j^S08nJ+5f0JZRj1$e#VLb@z;-Bc@W*{BgK@)ez zkfMvR7CsvgB^$Lfk2WNhg=?i?;~?oLwGY4gX-juEhPGzZ(e%>@-%q(P&qCs)mRPAQ zgzB?wIN`M+PUI9tA|L6mE@R0<;$H<@D_957mZ}pb9lh5t2)1x5bn4vWj-XAqI5?UF zj+Bl=0^N~$jGhEKUtwsGkmQrE%PZWdY3n3GlVH6pA8f4aE>-6%+F8B^Q0l-nx~*Ih zp};VlI?|!xYwuNo-F9n8>&!KERH_UHnOgU!z)*bAZ&gMEq~^P`^$7IQ0}wLG167C= zTW)gmSU4=zKmcS5)ISCU0s(Sg)dyHS-S0Yv18f58iqQtpHaoSw@CqXREsxD-!tlIQp%W>t6@Y4sWj3^0RR$d|{!(1g_-5t1v-&f7 ziE;^n8vDTLXnE4GK7D5obrhPadUw>KZ6J&2^8|OJO>?MBv*R&J3>>kIeiz{e1|Zc( zDw@%iGK68WJLup(rf%3FB4PeX#b~$>+Hf6P&O zZG_~o@p)%a=7*JjoNgl-70ImI&%>q|7ZRtp?Q%W)MUL;{Yi{SL zbYH*`hre_vxFkD`uRO@WBx{glP+6GDI-RGCwx1iZyz>Jh>F9ViZRjH2j9OAQhA^|n zU2ABPtPa^{h2})k56%%Qby5PIJtw}-lAm5~dxL@m2eWn~4xnLA4S!j*Y@${>ttmL6 za)8I;f|Xyo8uV8IkkBANklqx;sVAp(z^d84Rj~SM_If7e5mBD`aF3v%izKAwdnsMlt?}WPd()J8+%MYQLI6v{l zxWKIGH%2t89V3B-84SL^^2C&al8wboY};OVZbylWngg{tS|(dT^I)`JJtKJ&4m5Hs z3&zQ1pK72`|B}{~YU7G{m|d{Nv-W|AQ!yc$oL9!Mk3>!1LK+8N`z34-PK-|4aia@p zQ#;T3a92l#vI;JG;hEz;K|C~nsLon31R|ie-ZA!x^2K?=3)|ZoD*&YLtj9gp=mb$0 zpk&FAa~UF^8T)8{@1*SvCMtwmh0CG@>|>k4Y*P%>R$-mO-S~pLQn%nITr+;+7gj{J z73RXvKx|U9Sti^z+!tJs+L#Gb_NI{yP~@)5tB6!&?;VvbU44x0c88%s6z^*)C-*@( zC@uW>sljd{5^JwZ4au>D)E9NU{AI^nQ$#16A)sHe#+xPH!|XlKTSQb95x zZ!Fi`3kA2b?G|BZu2oY!@L>g{~?#FVi z>=1Q!LUL#u2_%NX`72J~|BaJR|1~w*H$Z?Y?Jz^jxMK=6mT~g@gMt@6leH~8k^o5| zBNX@P+x*eE)`zCqaY@S`(JVg{N^O(bEn{;vE6Vy zdPoUV(#woH-8|uD)0F4kmg?4ZNpe-7U9knpGtEWCd6cM6&(rWF>=K&>(zNV}*_9PQ zhR6FneGA!N=w>rwb# z$_8=nSjhkKHoh$1?C{9gBSgG7vloNhrt~-lAbI6>qOmKhz2>)Z(kpFxueq$E)lS>| zVd|ota(bpfC*P3MKd9`6o=DH7G+%`TWo>p#Zb&RpxcX7xVd6K5D76RaI!`}S)-TQ9 z`Qw$Ra4AHrf$b!t)44Na88*Fo9bsSH57X zXN^V|Rr!(jI>^}^FM)%L?V@8%g4{?w-;vD2`D5SaPUB(RHkqwOwyU}Oy|#uR1ZR$= znf8fL)DjsqM32}u%&Ur<(943Vzf&XaKiJwj_!qV=5V3#vK0MV9?(YeB+_+j4?ebC! z5RlF*7%&f~3jI-e#{VY?Dx zkcT0z&+!To?3n37bR%r91)5E#cR`o|NP|ngO2*AX*o_1Tf_YQ&P~Cq%EfWIVBW}sx z04c`G1#WX@FMZgE?ywD4iD}@JlmMO?vl_P8(B0l|;XEAtJmuA%7_$UF;mvWXRF+&q z1S}=>mp1*Z3DgAVGfzv3jcW!IBb63?d!un#y;U)oeW-bxBOr&PAi#jj|J987u-~f zrq&Ob-n6#<$Vao>Llw^ceTrSl3rYP1{WaJSNZjX zAdk6MxJzVjq&y$ZhT#My(q*btLO5%)!+b z!|$h8;vuzfj<_KxZ?`G`&gFIyI7PJ?p~>A6yOwAeXC4grsB0cXD)U0s3QDxym*~9 z;Bm}Jz&kFzNmc^3B9g|g`=dG^eYuE~B!n{3NY=cy1N+C|IVn4ec(o3%n}p9kPln*r zQ-DDmG~8k_zd2_wEq@avi2u8SE8h03 zbjn@UBv8RGN85tasNS@BW*r0L$b;`6M&DcR`8(O{NZ%bd7-m+Vlv?wOv;0F(rZB>3 zEd|({^)aP07@_$xqCIc={@{mA_y74586vCAp)c_zy_Kb%BhS5-@7clYlf&C(Ng^Cq z^~5^OlZ!alo9t#Ds-Q0lvWMG2W=IrhNbQYwZ}jZG@|>N15q~Btkki&&eCQEzg@#JW z8f#vX2HYY5tzGfk9c_614!L@1`)gLW2s?uAr2=(T^<2@KuMz8QYrHp>Mw(>~EHb$z zWl6yI_0a0IxhUDAcaate8=y#NeqY=zZ;TTj?bJG#6dY53ArwNBHY&SE-2TZG7Y>_b zHyLwcB7ul1(x1$IWE#ldRRXO@H2A^O+@$X^(tZ#ICs1Ry;*rqbyqgP(U!4ZsN z>F&McB+#_0|L>{LFRTUG?VI?v52`f$nD(U%-e;6p1@R0#ZN_l0Xf|Vh<8oM`lq(3* zzxbjL#h=3lzAw4eGBb|iLcRYea7q21e51XtU*DJj@^OoO@+s7!2q5Pwmi&LWW!C>; zTmD-}|D6Gu+Wo=JDQaE4K1ccR?ky*N8&oHGfI?0lM~eu}Gz(nqm&Q@Q{$=vRb&ylA zk+3&!PQ&>-)TM5xWFp0$&@CUoaVT@8rh#06^OW&i{8rzzMb2IDSL_yBUpl;H!u-f% zl3dPTVg|pM#>h*G<9&{pv`MkGzT=0e0(<;SaovXze`(c95X!3VDPtJbq((cAKC@R~ z`sHUx3#mx$87uEUI~J65<(z?0GvbSc_}PjcN=S}0Kti1~xoN7mU=uqDcC(Nmesa)NeVJklQ(xcK4OMk#p< zX8%EDjh6;4iVtuR%Wtr*dhnF6-rsb$ToNntz;gC3DO0c7CY@m)#tMT)BQ!YbDMAca zs2+_AA}Xo{0#~~X z4>J{`So;w@B5jWLAD#&Pp~8w($eJs^W(q^$H6xdX;k2c`y`@N^Aj+DYVe8ZnLF*%k zSwKD5;HRw4#l}Gk^9F#CgIC0e*%n_O9Sk-vW?g28={ibd^r8#PVUK<@hn9y3TkhIA zkYtg~MJH0C6id5fEmKtBPCe}XA>AAtW+FJtA+gi0rQyvG)EkmXBURD=`Km^E2;xd5 zJV?C=@hnC|$GP!U{kJXut((8v@-Rw<{z!cA1x9VA?J@<7znKJ8d23UIT@ieS=bxUa zP8PU?gGgzNt>Ve%-~b#B&E{$5mblTrpbC4I-qDq|tP7%_b`GELW|vw%7#r_9t1BDm z^1de~<`}EC$ioTIRg;>*@~rhk6ijLoFlz|FecW6kGyF0%rOdNgm#WtzqY!zPY%hY) zs>4$bSaIR1X-Ss#uO;j+-!a9`9K5XRj@xZGrgL>zZYL(2L&89t`8}u&W9-`pP;^_r z0IY1upNo@^d~|{pa8kF8q)Dck#M?>u#mG6$Tk?=cCA;f70LN|Ye&t@$Z zYY3LVd||!a2t0+ZOIyd()!CiIDht@~S_2S`iVqbCYi&bDYsBM-1IaHXdd&C(RXo*{ z9zA?Ng!&K&a1ZX~$nvDZzbn^k?uhP)s3L+wQj3A-5NJh7;;6%AaM0K4(wgpZ zFEsv8rj49cwn^;Dh1YPmVS4qZj4boaDCAWyY%s3ZzzK7PxU&d643lR&C^ygixnrc`e@4aG(8qdvh;clIL0 zF3P?pyYY_*-QoClMU6qqhvk9{HKkNC3AFlt!JyG8ce+Xb{v$J`w`R%x7s;PZY`a+g z{u%X1dZ*~nQsCRF(Xt#*J2U$S%gTIHXF9KSuEBL+d1`RBpRrxV!*xV`W<~32 z_Kq^4B!L(jF}3<(qqLsh#&f;Tp{uiy?h~Xg_O(o$tfSNArBim|0`JqQ`R{=YA)MPA z8J)W1O12?UR67$xJJH=W3&>w)3A~C=+Z8Zb^^AQxg#2Vd8_@e~J!Pno=x-GlmP4@0 zqA`VU&LN^5@AsG3uN!`__iK^ctm=7sF*8yw-@ENi6Ty+@(by&a%z9JjvPJ1|4d+XK zs}>3RghwJ^5Aj`6LIVB*M@j9=igk`tV%@gzIIs%x! zC}6q@VdJltfBk+k-Ia?L(#q)7ksfbTO`l0x(T0Vv&?m3Q&ZJ6!69znelpl5k3}+OH z^v)N5dy-oQ$fsLmYxy0An8y_;q-tz>y>y*PJklVyujC4AaIeP@7hM@Cnb9P+ zG~%10i-nQB@uL+%-R{<dzy`4At825Tu$Fw3o#>=SpnNoX5N#2Ia`fskH_-NC?f-^F~~xfYdEQtx*m+4>voh zb*?w3oOp@M&2&!1If?#=z=qAF9EDg`FDyX>!dOTbn);Y+!cHG^**)>y3&b!}?^#$~ zv*V{02=7&^7Utw~c($)Di(2He>l#8R{jRg60o~is_USs|{WBU;pZTk0EC#+LRj6Si z!q1BfW_%9&#>AI8(?UX72{7Gc|MjW6ySgR1qeUWfRL@}Xs;P?fY;qSxCyK6FapG!s zC{>8X({5hkKnpXq&&iaCwvYpe&b5`nNDcbE;ZoB!aT;a zg6=D$uzVP+87#FrT^-}v!Bc~?0(#{aycHKDgrr0Rw`J?QIc(uDe;hL$I|jwh&Pxr( zV|Ak8CJyZ{jKiqs*}jomqO>S;_3dto6dBi|-2~`tdh({rWCOiFDc9mrZw?T$8iSNd zQ(*&?=D)xIH$RuC!(&Tre>mN&oc$kc71jL-&wu!ZeR=AalI;290wK^CK?iNRo~))nL=VcjyRQ#qHpQ{>E8h`b*rR%8 z9vM&=hAXItj}j48`)uSD2KE&Tgq`&JM3mKEFUiH5=H-t<+GaJ#l(cu)LQ3uYbpx`LiBfO?+pO&AT@ zl|jix@z=d9@-t8gr8>7x_jB;{Lg6SJ$eCg~IeKQ4ft60R7VAoWijg-mlA}lzRyP|<~>2|pQ7}fon6ZnbZkISHaYgyG=4~f6YaCBnF+&q6H zJ#rz!!MBC5+*Eu+OU^d2337YHHD8GuGw;@0YcujuEuGr%0b{aVa1Z_3Bct+Y5pftl z|1Ui$?Zc=-8ZkqdPXje!84l$KLR|SGVifWdiO*1khZg7^k+gzL_iy2FV_1D&1BBIx zSeQ>PrkTHE9~(`oQw!+`Vl;6Ioq`&K*&e#$5u01R zw(0QA1dyosslzW(3r>74P;2ej`4mcOE+#tb!~434YZ!n7@D|zFHrsC97^2j^a#j*k z=bZ=X@wV=t_Q`F@xqz!flAgxo8gc)3TmGNJs;KUN2dj}4is4E5!s?wBC?8r$u|mAA zs;nfE(d51M(YPt?ukTbX9&(0il@f+AjG3Bq_b0o)yB+s}4Qb+CA++QfA@Kfcc`L@{ z`$N}olKHWCqV)#L$9vn$41r57u9)>ykld8muh=I_48Nei6L!^G=f2Y&KYHf9FNOC= znGTLb;nuiTSzG}n5)MkJtkqACUJ3LdkhUw!X&zZ3Ric;G6?O}0IN0O6{RfSAgKaaM zsVN`09w?h(->4_ zhRpgIKSm5JYDhE~?dNqUBYuAB2vlG2pjlOpP$q-07J2}7UEO{7>kWkE9Z9fmP}}M^ z4xNxX4=;xLY@ay=wIdb~FAZO@ zK4iM)Av3SAd<_R9wMTxm-@Qb!#;I>5_tm?xHX}uA{p2oSuTBjH*p@7w`}gy!r*-h} zX;h7?(4|RYoHJ`OH)$!o?Tl+DX-K9oDK5(K6p)zhs`|m|-^y+NwH>)?TF$?0r(Nr_ zEbc?9hK^&>$gR6A^mRb8&y(IDfc_itmW9g8Yp;ZbBcg~KJrbYzIxVsN&{W{A-PK+b zHN%mM^+S`@QC-xcfIkH}3v*)`JN(WUwz(lA z46V5P%h|fV_h`IpiNus<)pF2);flfR5Ec8LO>g(jabNV$^J8NYBuj{p8rTkq2B<~5 zM!N+BuJc`vrqso87-}_Z3q#&Kc$FmW0rbEFapf`!Pp_y@`a7XbMFXZr*Mo38_u))Y zD_Bv@t)?TMQPR&T+28iy%D!vQH(b)kiy4wk=TJ9O$exxeBs6ZnJ#_Zc3PUOHZ-Y<$ zQM$n#LJWl$?ub-gDi1;9AUguj9iKMccin^R>WKHmT-<7h6N#o5yAwPXk_y40LQM!j zDjuAB;<4-7icL1l+v=t~bo04!>SADv0Iu*<_w{nDH1GaOldD#~g$@?cjRVy82UlYw zzg3Q#F9&K&>xpK@etwv?mJBp4DMSeCPugL0l;G56dNi>dGfVs4yo^rlE;Gt@%B3NA zUKmFZ!e~oKp3OnoI*Jk(eTFr^4|iChABfSM?M!DA@;_Kpvd|A=TJkb4 zMathlspw!+ALuEph`VA@( zD~#|4o37ActnIlOpW2he?F$9s93t(_s5EO^siIkAiGIC$82e-?Zbr)NkJXG}FqS=L zU$$Pq+mQKGw&FXzMn}k{Ta+OWZ8S9Os;O&{FneDW%x&~28>b(Q3>=Ny{mqi59gpd* zG{@Wf?dX;otoo24G8Lfw7tsK*7jFB6#eN+~etPv+^)wjPm0CZ+VY^nA52UH0upA>< zXs{WJF}1JIK-bSdOz3R4vcisUB7!s}9LT-t-IR=}%&GQ*q&ovkwBlgJFfkE~nMhws z01kvvQ%ut{QFbUz^UCt0+f!puC7``1kmfu+!48e7yt6_1)iXCuM|iMtuMB=AF^m#o z^$2TCj7B>oA(!8?bb;LymGla%PyvAtq0aKN|44-UKjRFfKzzu5rWXDd9vvn0e})>M zF%jV55TXAbX#o7K9=tEM3VzMLflSmW@0`27&9$)QtDxuv1h$ff%`Ab!P8Qh&eL!#j^WW(`NlSVW~Ei+xd1!#&z+-)9XM|*9f z^D1g(nIt4>wW|e%!dhfRub9_a2{o{Di1f>qS}AgUU_}3J3&@VT7VzdhjUc6T?{>CC z3{k)JORGR()<+3~==`&cU4+`)s}+Z3Q9FFb;sb4AfC6GXlD^BKKziY89@98_tJ)EH zP;#hB=u*CjTY*mH3Ajga3Qo#Dzp%w9Z+aFrFl8spJlSpwK-N=8@k>-f$S{826*hR@ z7~=b|9Ei9;rEfet72j&$mlIe{4x>(2@2#1>3?$RY`Y0&z#`O|cyW`Do>v!puypon*{T~7JH$0g-T6G&YLsZY9H}|vvj>7^qyCP({{>Bc;DrDH diff --git a/src/import/import-raw.c b/src/import/import-raw.c deleted file mode 100644 index 7d1ac2afd..000000000 --- a/src/import/import-raw.c +++ /dev/null @@ -1,462 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -/*** - This file is part of systemd. - - Copyright 2015 Lennart Poettering - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see . -***/ - -#include - -#include "sd-daemon.h" -#include "sd-event.h" -#include "util.h" -#include "path-util.h" -#include "btrfs-util.h" -#include "copy.h" -#include "mkdir.h" -#include "ratelimit.h" -#include "machine-pool.h" -#include "qcow2-util.h" -#include "import-compress.h" -#include "import-common.h" -#include "import-raw.h" - -struct RawImport { - sd_event *event; - - char *image_root; - - RawImportFinished on_finished; - void *userdata; - - char *local; - bool force_local; - bool read_only; - bool grow_machine_directory; - - char *temp_path; - char *final_path; - - int input_fd; - int output_fd; - - ImportCompress compress; - - uint64_t written_since_last_grow; - - sd_event_source *input_event_source; - - uint8_t buffer[16*1024]; - size_t buffer_size; - - uint64_t written_compressed; - uint64_t written_uncompressed; - - struct stat st; - - unsigned last_percent; - RateLimit progress_rate_limit; -}; - -RawImport* raw_import_unref(RawImport *i) { - if (!i) - return NULL; - - sd_event_unref(i->event); - - if (i->temp_path) { - (void) unlink(i->temp_path); - free(i->temp_path); - } - - import_compress_free(&i->compress); - - sd_event_source_unref(i->input_event_source); - - safe_close(i->output_fd); - - free(i->final_path); - free(i->image_root); - free(i->local); - free(i); - - return NULL; -} - -int raw_import_new( - RawImport **ret, - sd_event *event, - const char *image_root, - RawImportFinished on_finished, - void *userdata) { - - _cleanup_(raw_import_unrefp) RawImport *i = NULL; - int r; - - assert(ret); - - i = new0(RawImport, 1); - if (!i) - return -ENOMEM; - - i->input_fd = i->output_fd = -1; - i->on_finished = on_finished; - i->userdata = userdata; - - RATELIMIT_INIT(i->progress_rate_limit, 100 * USEC_PER_MSEC, 1); - i->last_percent = (unsigned) -1; - - i->image_root = strdup(image_root ?: "/var/lib/machines"); - if (!i->image_root) - return -ENOMEM; - - i->grow_machine_directory = path_startswith(i->image_root, "/var/lib/machines"); - - if (event) - i->event = sd_event_ref(event); - else { - r = sd_event_default(&i->event); - if (r < 0) - return r; - } - - *ret = i; - i = NULL; - - return 0; -} - -static void raw_import_report_progress(RawImport *i) { - unsigned percent; - assert(i); - - /* We have no size information, unless the source is a regular file */ - if (!S_ISREG(i->st.st_mode)) - return; - - if (i->written_compressed >= (uint64_t) i->st.st_size) - percent = 100; - else - percent = (unsigned) ((i->written_compressed * UINT64_C(100)) / (uint64_t) i->st.st_size); - - if (percent == i->last_percent) - return; - - if (!ratelimit_test(&i->progress_rate_limit)) - return; - - sd_notifyf(false, "X_IMPORT_PROGRESS=%u", percent); - log_info("Imported %u%%.", percent); - - i->last_percent = percent; -} - -static int raw_import_maybe_convert_qcow2(RawImport *i) { - _cleanup_close_ int converted_fd = -1; - _cleanup_free_ char *t = NULL; - int r; - - assert(i); - - r = qcow2_detect(i->output_fd); - if (r < 0) - return log_error_errno(r, "Failed to detect whether this is a QCOW2 image: %m"); - if (r == 0) - return 0; - - /* This is a QCOW2 image, let's convert it */ - r = tempfn_random(i->final_path, &t); - if (r < 0) - return log_oom(); - - converted_fd = open(t, O_RDWR|O_CREAT|O_EXCL|O_NOCTTY|O_CLOEXEC, 0664); - if (converted_fd < 0) - return log_error_errno(errno, "Failed to create %s: %m", t); - - r = chattr_fd(converted_fd, true, FS_NOCOW_FL); - if (r < 0) - log_warning_errno(errno, "Failed to set file attributes on %s: %m", t); - - log_info("Unpacking QCOW2 file."); - - r = qcow2_convert(i->output_fd, converted_fd); - if (r < 0) { - unlink(t); - return log_error_errno(r, "Failed to convert qcow2 image: %m"); - } - - (void) unlink(i->temp_path); - free(i->temp_path); - i->temp_path = t; - t = NULL; - - safe_close(i->output_fd); - i->output_fd = converted_fd; - converted_fd = -1; - - return 1; -} - -static int raw_import_finish(RawImport *i) { - int r; - - assert(i); - assert(i->output_fd >= 0); - assert(i->temp_path); - assert(i->final_path); - - /* In case this was a sparse file, make sure the file system is right */ - if (i->written_uncompressed > 0) { - if (ftruncate(i->output_fd, i->written_uncompressed) < 0) - return log_error_errno(errno, "Failed to truncate file: %m"); - } - - r = raw_import_maybe_convert_qcow2(i); - if (r < 0) - return r; - - if (S_ISREG(i->st.st_mode)) { - (void) copy_times(i->input_fd, i->output_fd); - (void) copy_xattr(i->input_fd, i->output_fd); - } - - if (i->read_only) { - r = import_make_read_only_fd(i->output_fd); - if (r < 0) - return r; - } - - if (i->force_local) { - (void) btrfs_subvol_remove(i->final_path); - (void) rm_rf_dangerous(i->final_path, false, true, false); - } - - r = rename_noreplace(AT_FDCWD, i->temp_path, AT_FDCWD, i->final_path); - if (r < 0) - return log_error_errno(r, "Failed to move image into place: %m"); - - free(i->temp_path); - i->temp_path = NULL; - - return 0; -} - -static int raw_import_open_disk(RawImport *i) { - int r; - - assert(i); - - assert(!i->final_path); - assert(!i->temp_path); - assert(i->output_fd < 0); - - i->final_path = strjoin(i->image_root, "/", i->local, ".raw", NULL); - if (!i->final_path) - return log_oom(); - - r = tempfn_random(i->final_path, &i->temp_path); - if (r < 0) - return log_oom(); - - (void) mkdir_parents_label(i->temp_path, 0700); - - i->output_fd = open(i->temp_path, O_RDWR|O_CREAT|O_EXCL|O_NOCTTY|O_CLOEXEC, 0664); - if (i->output_fd < 0) - return log_error_errno(errno, "Failed to open destination %s: %m", i->temp_path); - - r = chattr_fd(i->output_fd, true, FS_NOCOW_FL); - if (r < 0) - log_warning_errno(errno, "Failed to set file attributes on %s: %m", i->temp_path); - - return 0; -} - -static int raw_import_try_reflink(RawImport *i) { - off_t p; - int r; - - assert(i); - assert(i->input_fd >= 0); - assert(i->output_fd >= 0); - - if (i->compress.type != IMPORT_COMPRESS_UNCOMPRESSED) - return 0; - - if (!S_ISREG(i->st.st_mode)) - return 0; - - p = lseek(i->input_fd, 0, SEEK_CUR); - if (p == (off_t) -1) - return log_error_errno(errno, "Failed to read file offset of input file: %m"); - - /* Let's only try a btrfs reflink, if we are reading from the beginning of the file */ - if ((uint64_t) p != (uint64_t) i->buffer_size) - return 0; - - r = btrfs_reflink(i->input_fd, i->output_fd); - if (r >= 0) - return 1; - - return 0; -} - -static int raw_import_write(const void *p, size_t sz, void *userdata) { - RawImport *i = userdata; - ssize_t n; - - if (i->grow_machine_directory && i->written_since_last_grow >= GROW_INTERVAL_BYTES) { - i->written_since_last_grow = 0; - grow_machine_directory(); - } - - n = sparse_write(i->output_fd, p, sz, 64); - if (n < 0) - return -errno; - if ((size_t) n < sz) - return -EIO; - - i->written_uncompressed += sz; - i->written_since_last_grow += sz; - - return 0; -} - -static int raw_import_process(RawImport *i) { - ssize_t l; - int r; - - assert(i); - assert(i->buffer_size < sizeof(i->buffer)); - - l = read(i->input_fd, i->buffer + i->buffer_size, sizeof(i->buffer) - i->buffer_size); - if (l < 0) { - if (errno == EAGAIN) - return 0; - - r = log_error_errno(errno, "Failed to read input file: %m"); - goto finish; - } - if (l == 0) { - if (i->compress.type == IMPORT_COMPRESS_UNKNOWN) { - log_error("Premature end of file: %m"); - r = -EIO; - goto finish; - } - - r = raw_import_finish(i); - goto finish; - } - - i->buffer_size += l; - - if (i->compress.type == IMPORT_COMPRESS_UNKNOWN) { - r = import_uncompress_detect(&i->compress, i->buffer, i->buffer_size); - if (r < 0) { - log_error("Failed to detect file compression: %m"); - goto finish; - } - if (r == 0) /* Need more data */ - return 0; - - r = raw_import_open_disk(i); - if (r < 0) - goto finish; - - r = raw_import_try_reflink(i); - if (r < 0) - goto finish; - if (r > 0) { - r = raw_import_finish(i); - goto finish; - } - } - - r = import_uncompress(&i->compress, i->buffer, i->buffer_size, raw_import_write, i); - if (r < 0) { - log_error_errno(r, "Failed to decode and write: %m"); - goto finish; - } - - i->written_compressed += i->buffer_size; - i->buffer_size = 0; - - raw_import_report_progress(i); - - return 0; - -finish: - if (i->on_finished) - i->on_finished(i, r, i->userdata); - else - sd_event_exit(i->event, r); - - return 0; -} - -static int raw_import_on_input(sd_event_source *s, int fd, uint32_t revents, void *userdata) { - RawImport *i = userdata; - - return raw_import_process(i); -} - -static int raw_import_on_defer(sd_event_source *s, void *userdata) { - RawImport *i = userdata; - - return raw_import_process(i); -} - -int raw_import_start(RawImport *i, int fd, const char *local, bool force_local, bool read_only) { - int r; - - assert(i); - assert(fd >= 0); - assert(local); - - if (!machine_name_is_valid(local)) - return -EINVAL; - - if (i->input_fd >= 0) - return -EBUSY; - - r = fd_nonblock(fd, true); - if (r < 0) - return r; - - r = free_and_strdup(&i->local, local); - if (r < 0) - return r; - i->force_local = force_local; - i->read_only = read_only; - - if (fstat(fd, &i->st) < 0) - return -errno; - - r = sd_event_add_io(i->event, &i->input_event_source, fd, EPOLLIN, raw_import_on_input, i); - if (r == -EPERM) { - /* This fd does not support epoll, for example because it is a regular file. Busy read in that case */ - r = sd_event_add_defer(i->event, &i->input_event_source, raw_import_on_defer, i); - if (r < 0) - return r; - - r = sd_event_source_set_enabled(i->input_event_source, SD_EVENT_ON); - } - if (r < 0) - return r; - - i->input_fd = fd; - return r; -} diff --git a/src/import/import-raw.h b/src/import/import-raw.h deleted file mode 100644 index bf7c77034..000000000 --- a/src/import/import-raw.h +++ /dev/null @@ -1,37 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -#pragma once - -/*** - This file is part of systemd. - - Copyright 2015 Lennart Poettering - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see . -***/ - -#include "sd-event.h" -#include "macro.h" -#include "import-util.h" - -typedef struct RawImport RawImport; - -typedef void (*RawImportFinished)(RawImport *import, int error, void *userdata); - -int raw_import_new(RawImport **import, sd_event *event, const char *image_root, RawImportFinished on_finished, void *userdata); -RawImport* raw_import_unref(RawImport *import); - -DEFINE_TRIVIAL_CLEANUP_FUNC(RawImport*, raw_import_unref); - -int raw_import_start(RawImport *i, int fd, const char *local, bool force_local, bool read_only); diff --git a/src/import/import-tar.c b/src/import/import-tar.c deleted file mode 100644 index ef2345c7b..000000000 --- a/src/import/import-tar.c +++ /dev/null @@ -1,382 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -/*** - This file is part of systemd. - - Copyright 2015 Lennart Poettering - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see . -***/ - -#include - -#include "sd-daemon.h" -#include "sd-event.h" -#include "util.h" -#include "path-util.h" -#include "btrfs-util.h" -#include "copy.h" -#include "mkdir.h" -#include "ratelimit.h" -#include "machine-pool.h" -#include "qcow2-util.h" -#include "import-compress.h" -#include "import-common.h" -#include "import-tar.h" - -struct TarImport { - sd_event *event; - - char *image_root; - - TarImportFinished on_finished; - void *userdata; - - char *local; - bool force_local; - bool read_only; - bool grow_machine_directory; - - char *temp_path; - char *final_path; - - int input_fd; - int tar_fd; - - ImportCompress compress; - - uint64_t written_since_last_grow; - - sd_event_source *input_event_source; - - uint8_t buffer[16*1024]; - size_t buffer_size; - - uint64_t written_compressed; - uint64_t written_uncompressed; - - struct stat st; - - pid_t tar_pid; - - unsigned last_percent; - RateLimit progress_rate_limit; -}; - -TarImport* tar_import_unref(TarImport *i) { - if (!i) - return NULL; - - sd_event_source_unref(i->input_event_source); - - if (i->tar_pid > 1) { - (void) kill_and_sigcont(i->tar_pid, SIGKILL); - (void) wait_for_terminate(i->tar_pid, NULL); - } - - if (i->temp_path) { - (void) btrfs_subvol_remove(i->temp_path); - (void) rm_rf_dangerous(i->temp_path, false, true, false); - free(i->temp_path); - } - - import_compress_free(&i->compress); - - sd_event_unref(i->event); - - safe_close(i->tar_fd); - - free(i->final_path); - free(i->image_root); - free(i->local); - free(i); - - return NULL; -} - -int tar_import_new( - TarImport **ret, - sd_event *event, - const char *image_root, - TarImportFinished on_finished, - void *userdata) { - - _cleanup_(tar_import_unrefp) TarImport *i = NULL; - int r; - - assert(ret); - - i = new0(TarImport, 1); - if (!i) - return -ENOMEM; - - i->input_fd = i->tar_fd = -1; - i->on_finished = on_finished; - i->userdata = userdata; - - RATELIMIT_INIT(i->progress_rate_limit, 100 * USEC_PER_MSEC, 1); - i->last_percent = (unsigned) -1; - - i->image_root = strdup(image_root ?: "/var/lib/machines"); - if (!i->image_root) - return -ENOMEM; - - i->grow_machine_directory = path_startswith(i->image_root, "/var/lib/machines"); - - if (event) - i->event = sd_event_ref(event); - else { - r = sd_event_default(&i->event); - if (r < 0) - return r; - } - - *ret = i; - i = NULL; - - return 0; -} - -static void tar_import_report_progress(TarImport *i) { - unsigned percent; - assert(i); - - /* We have no size information, unless the source is a regular file */ - if (!S_ISREG(i->st.st_mode)) - return; - - if (i->written_compressed >= (uint64_t) i->st.st_size) - percent = 100; - else - percent = (unsigned) ((i->written_compressed * UINT64_C(100)) / (uint64_t) i->st.st_size); - - if (percent == i->last_percent) - return; - - if (!ratelimit_test(&i->progress_rate_limit)) - return; - - sd_notifyf(false, "X_IMPORT_PROGRESS=%u", percent); - log_info("Imported %u%%.", percent); - - i->last_percent = percent; -} - -static int tar_import_finish(TarImport *i) { - int r; - - assert(i); - assert(i->tar_fd >= 0); - assert(i->temp_path); - assert(i->final_path); - - i->tar_fd = safe_close(i->tar_fd); - - if (i->tar_pid > 0) { - r = wait_for_terminate_and_warn("tar", i->tar_pid, true); - i->tar_pid = 0; - if (r < 0) - return r; - } - - if (i->read_only) { - r = import_make_read_only(i->temp_path); - if (r < 0) - return r; - } - - if (i->force_local) { - (void) btrfs_subvol_remove(i->final_path); - (void) rm_rf_dangerous(i->final_path, false, true, false); - } - - r = rename_noreplace(AT_FDCWD, i->temp_path, AT_FDCWD, i->final_path); - if (r < 0) - return log_error_errno(r, "Failed to move image into place: %m"); - - free(i->temp_path); - i->temp_path = NULL; - - return 0; -} - -static int tar_import_fork_tar(TarImport *i) { - int r; - - assert(i); - - assert(!i->final_path); - assert(!i->temp_path); - assert(i->tar_fd < 0); - - i->final_path = strjoin(i->image_root, "/", i->local, NULL); - if (!i->final_path) - return log_oom(); - - r = tempfn_random(i->final_path, &i->temp_path); - if (r < 0) - return log_oom(); - - (void) mkdir_parents_label(i->temp_path, 0700); - - r = btrfs_subvol_make(i->temp_path); - if (r == -ENOTTY) { - if (mkdir(i->temp_path, 0755) < 0) - return log_error_errno(errno, "Failed to create directory %s: %m", i->temp_path); - } else if (r < 0) - return log_error_errno(errno, "Failed to create subvolume %s: %m", i->temp_path); - - i->tar_fd = import_fork_tar_x(i->temp_path, &i->tar_pid); - if (i->tar_fd < 0) - return i->tar_fd; - - return 0; -} - -static int tar_import_write(const void *p, size_t sz, void *userdata) { - TarImport *i = userdata; - int r; - - if (i->grow_machine_directory && i->written_since_last_grow >= GROW_INTERVAL_BYTES) { - i->written_since_last_grow = 0; - grow_machine_directory(); - } - - r = loop_write(i->tar_fd, p, sz, false); - if (r < 0) - return r; - - i->written_uncompressed += sz; - i->written_since_last_grow += sz; - - return 0; -} - -static int tar_import_process(TarImport *i) { - ssize_t l; - int r; - - assert(i); - assert(i->buffer_size < sizeof(i->buffer)); - - l = read(i->input_fd, i->buffer + i->buffer_size, sizeof(i->buffer) - i->buffer_size); - if (l < 0) { - if (errno == EAGAIN) - return 0; - - r = log_error_errno(errno, "Failed to read input file: %m"); - goto finish; - } - if (l == 0) { - if (i->compress.type == IMPORT_COMPRESS_UNKNOWN) { - log_error("Premature end of file: %m"); - r = -EIO; - goto finish; - } - - r = tar_import_finish(i); - goto finish; - } - - i->buffer_size += l; - - if (i->compress.type == IMPORT_COMPRESS_UNKNOWN) { - r = import_uncompress_detect(&i->compress, i->buffer, i->buffer_size); - if (r < 0) { - log_error("Failed to detect file compression: %m"); - goto finish; - } - if (r == 0) /* Need more data */ - return 0; - - r = tar_import_fork_tar(i); - if (r < 0) - goto finish; - } - - r = import_uncompress(&i->compress, i->buffer, i->buffer_size, tar_import_write, i); - if (r < 0) { - log_error_errno(r, "Failed to decode and write: %m"); - goto finish; - } - - i->written_compressed += i->buffer_size; - i->buffer_size = 0; - - tar_import_report_progress(i); - - return 0; - -finish: - if (i->on_finished) - i->on_finished(i, r, i->userdata); - else - sd_event_exit(i->event, r); - - return 0; -} - -static int tar_import_on_input(sd_event_source *s, int fd, uint32_t revents, void *userdata) { - TarImport *i = userdata; - - return tar_import_process(i); -} - -static int tar_import_on_defer(sd_event_source *s, void *userdata) { - TarImport *i = userdata; - - return tar_import_process(i); -} - -int tar_import_start(TarImport *i, int fd, const char *local, bool force_local, bool read_only) { - int r; - - assert(i); - assert(fd >= 0); - assert(local); - - if (!machine_name_is_valid(local)) - return -EINVAL; - - if (i->input_fd >= 0) - return -EBUSY; - - r = fd_nonblock(fd, true); - if (r < 0) - return r; - - r = free_and_strdup(&i->local, local); - if (r < 0) - return r; - i->force_local = force_local; - i->read_only = read_only; - - if (fstat(fd, &i->st) < 0) - return -errno; - - r = sd_event_add_io(i->event, &i->input_event_source, fd, EPOLLIN, tar_import_on_input, i); - if (r == -EPERM) { - /* This fd does not support epoll, for example because it is a regular file. Busy read in that case */ - r = sd_event_add_defer(i->event, &i->input_event_source, tar_import_on_defer, i); - if (r < 0) - return r; - - r = sd_event_source_set_enabled(i->input_event_source, SD_EVENT_ON); - } - if (r < 0) - return r; - - i->input_fd = fd; - return r; -} diff --git a/src/import/import-tar.h b/src/import/import-tar.h deleted file mode 100644 index aaecb5139..000000000 --- a/src/import/import-tar.h +++ /dev/null @@ -1,37 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -#pragma once - -/*** - This file is part of systemd. - - Copyright 2015 Lennart Poettering - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see . -***/ - -#include "sd-event.h" -#include "macro.h" -#include "import-util.h" - -typedef struct TarImport TarImport; - -typedef void (*TarImportFinished)(TarImport *import, int error, void *userdata); - -int tar_import_new(TarImport **import, sd_event *event, const char *image_root, TarImportFinished on_finished, void *userdata); -TarImport* tar_import_unref(TarImport *import); - -DEFINE_TRIVIAL_CLEANUP_FUNC(TarImport*, tar_import_unref); - -int tar_import_start(TarImport *import, int fd, const char *local, bool force_local, bool read_only); diff --git a/src/import/import.c b/src/import/import.c deleted file mode 100644 index f3072b377..000000000 --- a/src/import/import.c +++ /dev/null @@ -1,336 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -/*** - This file is part of systemd. - - Copyright 2015 Lennart Poettering - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see . -***/ - -#include - -#include "sd-event.h" -#include "event-util.h" -#include "verbs.h" -#include "build.h" -#include "machine-image.h" -#include "import-util.h" -#include "import-tar.h" -#include "import-raw.h" - -static bool arg_force = false; -static bool arg_read_only = false; -static const char *arg_image_root = "/var/lib/machines"; - -static int interrupt_signal_handler(sd_event_source *s, const struct signalfd_siginfo *si, void *userdata) { - log_notice("Transfer aborted."); - sd_event_exit(sd_event_source_get_event(s), EINTR); - return 0; -} - -static void on_tar_finished(TarImport *import, int error, void *userdata) { - sd_event *event = userdata; - assert(import); - - if (error == 0) - log_info("Operation completed successfully."); - - sd_event_exit(event, abs(error)); -} - -static int import_tar(int argc, char *argv[], void *userdata) { - _cleanup_(tar_import_unrefp) TarImport *import = NULL; - _cleanup_event_unref_ sd_event *event = NULL; - const char *path = NULL, *local = NULL; - _cleanup_free_ char *ll = NULL; - _cleanup_close_ int open_fd = -1; - int r, fd; - - if (argc >= 2) - path = argv[1]; - if (isempty(path) || streq(path, "-")) - path = NULL; - - if (argc >= 3) - local = argv[2]; - else if (path) - local = basename(path); - if (isempty(local) || streq(local, "-")) - local = NULL; - - if (local) { - r = tar_strip_suffixes(local, &ll); - if (r < 0) - return log_oom(); - - local = ll; - - if (!machine_name_is_valid(local)) { - log_error("Local image name '%s' is not valid.", local); - return -EINVAL; - } - - if (!arg_force) { - r = image_find(local, NULL); - if (r < 0) - return log_error_errno(r, "Failed to check whether image '%s' exists: %m", local); - else if (r > 0) { - log_error_errno(EEXIST, "Image '%s' already exists.", local); - return -EEXIST; - } - } - } else - local = "imported"; - - if (path) { - open_fd = open(path, O_RDONLY|O_CLOEXEC|O_NOCTTY); - if (open_fd < 0) - return log_error_errno(errno, "Failed to open tar image to import: %m"); - - fd = open_fd; - - log_info("Importing '%s', saving as '%s'.", path, local); - } else { - _cleanup_free_ char *pretty = NULL; - - fd = STDIN_FILENO; - - (void) readlink_malloc("/proc/self/fd/0", &pretty); - log_info("Importing '%s', saving as '%s'.", strna(pretty), local); - } - - r = sd_event_default(&event); - if (r < 0) - return log_error_errno(r, "Failed to allocate event loop: %m"); - - assert_se(sigprocmask_many(SIG_BLOCK, SIGTERM, SIGINT, -1) == 0); - sd_event_add_signal(event, NULL, SIGTERM, interrupt_signal_handler, NULL); - sd_event_add_signal(event, NULL, SIGINT, interrupt_signal_handler, NULL); - - r = tar_import_new(&import, event, arg_image_root, on_tar_finished, event); - if (r < 0) - return log_error_errno(r, "Failed to allocate importer: %m"); - - r = tar_import_start(import, fd, local, arg_force, arg_read_only); - if (r < 0) - return log_error_errno(r, "Failed to import image: %m"); - - r = sd_event_loop(event); - if (r < 0) - return log_error_errno(r, "Failed to run event loop: %m"); - - log_info("Exiting."); - return -r; -} - -static void on_raw_finished(RawImport *import, int error, void *userdata) { - sd_event *event = userdata; - assert(import); - - if (error == 0) - log_info("Operation completed successfully."); - - sd_event_exit(event, abs(error)); -} - -static int import_raw(int argc, char *argv[], void *userdata) { - _cleanup_(raw_import_unrefp) RawImport *import = NULL; - _cleanup_event_unref_ sd_event *event = NULL; - const char *path = NULL, *local = NULL; - _cleanup_free_ char *ll = NULL; - _cleanup_close_ int open_fd = -1; - int r, fd; - - if (argc >= 2) - path = argv[1]; - if (isempty(path) || streq(path, "-")) - path = NULL; - - if (argc >= 3) - local = argv[2]; - else if (path) - local = basename(path); - if (isempty(local) || streq(local, "-")) - local = NULL; - - if (local) { - r = raw_strip_suffixes(local, &ll); - if (r < 0) - return log_oom(); - - local = ll; - - if (!machine_name_is_valid(local)) { - log_error("Local image name '%s' is not valid.", local); - return -EINVAL; - } - - if (!arg_force) { - r = image_find(local, NULL); - if (r < 0) - return log_error_errno(r, "Failed to check whether image '%s' exists: %m", local); - else if (r > 0) { - log_error_errno(EEXIST, "Image '%s' already exists.", local); - return -EEXIST; - } - } - } else - local = "imported"; - - if (path) { - open_fd = open(path, O_RDONLY|O_CLOEXEC|O_NOCTTY); - if (open_fd < 0) - return log_error_errno(errno, "Failed to open raw image to import: %m"); - - fd = open_fd; - - log_info("Importing '%s', saving as '%s'.", path, local); - } else { - _cleanup_free_ char *pretty = NULL; - - fd = STDIN_FILENO; - - (void) readlink_malloc("/proc/self/fd/0", &pretty); - log_info("Importing '%s', saving as '%s'.", pretty, local); - } - - r = sd_event_default(&event); - if (r < 0) - return log_error_errno(r, "Failed to allocate event loop: %m"); - - assert_se(sigprocmask_many(SIG_BLOCK, SIGTERM, SIGINT, -1) == 0); - sd_event_add_signal(event, NULL, SIGTERM, interrupt_signal_handler, NULL); - sd_event_add_signal(event, NULL, SIGINT, interrupt_signal_handler, NULL); - - r = raw_import_new(&import, event, arg_image_root, on_raw_finished, event); - if (r < 0) - return log_error_errno(r, "Failed to allocate importer: %m"); - - r = raw_import_start(import, fd, local, arg_force, arg_read_only); - if (r < 0) - return log_error_errno(r, "Failed to import image: %m"); - - r = sd_event_loop(event); - if (r < 0) - return log_error_errno(r, "Failed to run event loop: %m"); - - log_info("Exiting."); - return -r; -} - -static int help(int argc, char *argv[], void *userdata) { - - printf("%s [OPTIONS...] {COMMAND} ...\n\n" - "Import container or virtual machine images.\n\n" - " -h --help Show this help\n" - " --version Show package version\n" - " --force Force creation of image\n" - " --image-root=PATH Image root directory\n" - " --read-only Create a read-only image\n\n" - "Commands:\n" - " tar FILE [NAME] Import a TAR image\n" - " raw FILE [NAME] Import a RAW image\n", - program_invocation_short_name); - - return 0; -} - -static int parse_argv(int argc, char *argv[]) { - - enum { - ARG_VERSION = 0x100, - ARG_FORCE, - ARG_IMAGE_ROOT, - ARG_READ_ONLY, - }; - - static const struct option options[] = { - { "help", no_argument, NULL, 'h' }, - { "version", no_argument, NULL, ARG_VERSION }, - { "force", no_argument, NULL, ARG_FORCE }, - { "image-root", required_argument, NULL, ARG_IMAGE_ROOT }, - { "read-only", no_argument, NULL, ARG_READ_ONLY }, - {} - }; - - int c; - - assert(argc >= 0); - assert(argv); - - while ((c = getopt_long(argc, argv, "h", options, NULL)) >= 0) - - switch (c) { - - case 'h': - return help(0, NULL, NULL); - - case ARG_VERSION: - puts(PACKAGE_STRING); - puts(SYSTEMD_FEATURES); - return 0; - - case ARG_FORCE: - arg_force = true; - break; - - case ARG_IMAGE_ROOT: - arg_image_root = optarg; - break; - - case ARG_READ_ONLY: - arg_read_only = true; - break; - - case '?': - return -EINVAL; - - default: - assert_not_reached("Unhandled option"); - } - - return 1; -} - -static int import_main(int argc, char *argv[]) { - - static const Verb verbs[] = { - { "help", VERB_ANY, VERB_ANY, 0, help }, - { "tar", 2, 3, 0, import_tar }, - { "raw", 2, 3, 0, import_raw }, - {} - }; - - return dispatch_verb(argc, argv, verbs, NULL); -} - -int main(int argc, char *argv[]) { - int r; - - setlocale(LC_ALL, ""); - log_parse_environment(); - log_open(); - - r = parse_argv(argc, argv); - if (r <= 0) - goto finish; - - ignore_signals(SIGPIPE, -1); - - r = import_main(argc, argv); - -finish: - return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; -} diff --git a/src/import/importd.c b/src/import/importd.c deleted file mode 100644 index 018ca9253..000000000 --- a/src/import/importd.c +++ /dev/null @@ -1,1322 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -/*** - This file is part of systemd. - - Copyright 2015 Lennart Poettering - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see . -***/ - -#include - -#include "sd-bus.h" -#include "util.h" -#include "strv.h" -#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 "machine-pool.h" -#include "path-util.h" -#include "import-util.h" - -typedef struct Transfer Transfer; -typedef struct Manager Manager; - -typedef enum TransferType { - TRANSFER_IMPORT_TAR, - TRANSFER_IMPORT_RAW, - TRANSFER_EXPORT_TAR, - TRANSFER_EXPORT_RAW, - TRANSFER_PULL_TAR, - TRANSFER_PULL_RAW, - TRANSFER_PULL_DKR, - _TRANSFER_TYPE_MAX, - _TRANSFER_TYPE_INVALID = -1, -} TransferType; - -struct Transfer { - Manager *manager; - - uint32_t id; - char *object_path; - - TransferType type; - ImportVerify verify; - - char *remote; - char *local; - bool force_local; - bool read_only; - - char *dkr_index_url; - char *format; - - pid_t pid; - - int log_fd; - - char log_message[LINE_MAX]; - size_t log_message_size; - - sd_event_source *pid_event_source; - sd_event_source *log_event_source; - - unsigned n_canceled; - unsigned progress_percent; - - int stdin_fd; - int stdout_fd; -}; - -struct Manager { - sd_event *event; - sd_bus *bus; - - uint32_t current_transfer_id; - Hashmap *transfers; - - Hashmap *polkit_registry; - - int notify_fd; - - sd_event_source *notify_event_source; -}; - -#define TRANSFERS_MAX 64 - -static const char* const transfer_type_table[_TRANSFER_TYPE_MAX] = { - [TRANSFER_IMPORT_TAR] = "import-tar", - [TRANSFER_IMPORT_RAW] = "import-raw", - [TRANSFER_EXPORT_TAR] = "export-tar", - [TRANSFER_EXPORT_RAW] = "export-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); - -static Transfer *transfer_unref(Transfer *t) { - if (!t) - return NULL; - - if (t->manager) - hashmap_remove(t->manager->transfers, UINT32_TO_PTR(t->id)); - - sd_event_source_unref(t->pid_event_source); - sd_event_source_unref(t->log_event_source); - - free(t->remote); - free(t->local); - free(t->dkr_index_url); - free(t->format); - free(t->object_path); - - if (t->pid > 0) { - (void) kill_and_sigcont(t->pid, SIGKILL); - (void) wait_for_terminate(t->pid, NULL); - } - - safe_close(t->log_fd); - safe_close(t->stdin_fd); - safe_close(t->stdout_fd); - - free(t); - return NULL; -} - -DEFINE_TRIVIAL_CLEANUP_FUNC(Transfer*, transfer_unref); - -static int transfer_new(Manager *m, Transfer **ret) { - _cleanup_(transfer_unrefp) Transfer *t = NULL; - uint32_t id; - int r; - - assert(m); - assert(ret); - - if (hashmap_size(m->transfers) >= TRANSFERS_MAX) - return -E2BIG; - - r = hashmap_ensure_allocated(&m->transfers, &trivial_hash_ops); - if (r < 0) - return r; - - t = new0(Transfer, 1); - if (!t) - return -ENOMEM; - - t->type = _TRANSFER_TYPE_INVALID; - t->log_fd = -1; - t->stdin_fd = -1; - t->verify = _IMPORT_VERIFY_INVALID; - - id = m->current_transfer_id + 1; - - if (asprintf(&t->object_path, "/org/freedesktop/import1/transfer/_%" PRIu32, id) < 0) - return -ENOMEM; - - r = hashmap_put(m->transfers, UINT32_TO_PTR(id), t); - if (r < 0) - return r; - - m->current_transfer_id = id; - - t->manager = m; - t->id = id; - - *ret = t; - t = NULL; - - return 0; -} - -static void transfer_send_log_line(Transfer *t, const char *line) { - int r, priority = LOG_INFO; - - assert(t); - assert(line); - - syslog_parse_priority(&line, &priority, true); - - log_full(priority, "(transfer%" PRIu32 ") %s", t->id, line); - - r = sd_bus_emit_signal( - t->manager->bus, - t->object_path, - "org.freedesktop.import1.Transfer", - "LogMessage", - "us", - priority, - line); - if (r < 0) - log_error_errno(r, "Cannot emit message: %m"); - } - -static void transfer_send_logs(Transfer *t, bool flush) { - assert(t); - - /* Try to send out all log messages, if we can. But if we - * can't we remove the messages from the buffer, but don't - * fail */ - - while (t->log_message_size > 0) { - _cleanup_free_ char *n = NULL; - char *e; - - if (t->log_message_size >= sizeof(t->log_message)) - e = t->log_message + sizeof(t->log_message); - else { - char *a, *b; - - a = memchr(t->log_message, 0, t->log_message_size); - b = memchr(t->log_message, '\n', t->log_message_size); - - if (a && b) - e = a < b ? a : b; - else if (a) - e = a; - else - e = b; - } - - if (!e) { - if (!flush) - return; - - e = t->log_message + t->log_message_size; - } - - n = strndup(t->log_message, e - t->log_message); - - /* Skip over NUL and newlines */ - while ((e < t->log_message + t->log_message_size) && (*e == 0 || *e == '\n')) - e++; - - memmove(t->log_message, e, t->log_message + sizeof(t->log_message) - e); - t->log_message_size -= e - t->log_message; - - if (!n) { - log_oom(); - continue; - } - - if (isempty(n)) - continue; - - transfer_send_log_line(t, n); - } -} - -static int transfer_finalize(Transfer *t, bool success) { - int r; - - assert(t); - - transfer_send_logs(t, true); - - r = sd_bus_emit_signal( - t->manager->bus, - "/org/freedesktop/import1", - "org.freedesktop.import1.Manager", - "TransferRemoved", - "uos", - t->id, - t->object_path, - success ? "done" : - t->n_canceled > 0 ? "canceled" : "failed"); - - if (r < 0) - log_error_errno(r, "Cannot emit message: %m"); - - transfer_unref(t); - return 0; -} - -static int transfer_cancel(Transfer *t) { - int r; - - assert(t); - - r = kill_and_sigcont(t->pid, t->n_canceled < 3 ? SIGTERM : SIGKILL); - if (r < 0) - return r; - - t->n_canceled++; - return 0; -} - -static int transfer_on_pid(sd_event_source *s, const siginfo_t *si, void *userdata) { - Transfer *t = userdata; - bool success = false; - - assert(s); - assert(t); - - if (si->si_code == CLD_EXITED) { - if (si->si_status != 0) - log_error("Import process failed with exit code %i.", si->si_status); - else { - log_debug("Import process succeeded."); - success = true; - } - - } else if (si->si_code == CLD_KILLED || - si->si_code == CLD_DUMPED) - - log_error("Import process terminated by signal %s.", signal_to_string(si->si_status)); - else - log_error("Import process failed due to unknown reason."); - - t->pid = 0; - - return transfer_finalize(t, success); -} - -static int transfer_on_log(sd_event_source *s, int fd, uint32_t revents, void *userdata) { - Transfer *t = userdata; - ssize_t l; - - assert(s); - assert(t); - - l = read(fd, t->log_message + t->log_message_size, sizeof(t->log_message) - t->log_message_size); - if (l <= 0) { - /* EOF/read error. We just close the pipe here, and - * close the watch, waiting for the SIGCHLD to arrive, - * before we do anything else. */ - - if (l < 0) - log_error_errno(errno, "Failed to read log message: %m"); - - t->log_event_source = sd_event_source_unref(t->log_event_source); - return 0; - } - - t->log_message_size += l; - - transfer_send_logs(t, false); - - return 0; -} - -static int transfer_start(Transfer *t) { - _cleanup_close_pair_ int pipefd[2] = { -1, -1 }; - int r; - - assert(t); - assert(t->pid <= 0); - - if (pipe2(pipefd, O_CLOEXEC) < 0) - return -errno; - - t->pid = fork(); - if (t->pid < 0) - return -errno; - if (t->pid == 0) { - const char *cmd[] = { - NULL, /* systemd-import, systemd-export 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, /* if so: the actual URL */ - NULL, /* maybe --format= */ - NULL, /* if so: the actual format */ - NULL, /* remote */ - NULL, /* local */ - NULL - }; - unsigned k = 0; - - /* Child */ - - reset_all_signal_handlers(); - reset_signal_mask(); - assert_se(prctl(PR_SET_PDEATHSIG, SIGTERM) == 0); - - pipefd[0] = safe_close(pipefd[0]); - - if (dup2(pipefd[1], STDERR_FILENO) != STDERR_FILENO) { - log_error_errno(errno, "Failed to dup2() fd: %m"); - _exit(EXIT_FAILURE); - } - - if (t->stdout_fd >= 0) { - if (dup2(t->stdout_fd, STDOUT_FILENO) != STDOUT_FILENO) { - log_error_errno(errno, "Failed to dup2() fd: %m"); - _exit(EXIT_FAILURE); - } - - if (t->stdout_fd != STDOUT_FILENO) - safe_close(t->stdout_fd); - } else { - if (dup2(pipefd[1], STDOUT_FILENO) != STDOUT_FILENO) { - log_error_errno(errno, "Failed to dup2() fd: %m"); - _exit(EXIT_FAILURE); - } - } - - if (pipefd[1] != STDOUT_FILENO && pipefd[1] != STDERR_FILENO) - pipefd[1] = safe_close(pipefd[1]); - - 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); - } - - fd_cloexec(STDIN_FILENO, false); - fd_cloexec(STDOUT_FILENO, false); - fd_cloexec(STDERR_FILENO, false); - - setenv("SYSTEMD_LOG_TARGET", "console-prefixed", 1); - setenv("NOTIFY_SOCKET", "/run/systemd/import/notify", 1); - - if (IN_SET(t->type, TRANSFER_IMPORT_TAR, TRANSFER_IMPORT_RAW)) - cmd[k++] = SYSTEMD_IMPORT_PATH; - else if (IN_SET(t->type, TRANSFER_EXPORT_TAR, TRANSFER_EXPORT_RAW)) - cmd[k++] = SYSTEMD_EXPORT_PATH; - else - cmd[k++] = SYSTEMD_PULL_PATH; - - if (IN_SET(t->type, TRANSFER_IMPORT_TAR, TRANSFER_EXPORT_TAR, TRANSFER_PULL_TAR)) - cmd[k++] = "tar"; - else if (IN_SET(t->type, TRANSFER_IMPORT_RAW, TRANSFER_EXPORT_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; - } - - if (t->format) { - cmd[k++] = "--format"; - cmd[k++] = t->format; - } - - if (!IN_SET(t->type, TRANSFER_EXPORT_TAR, TRANSFER_EXPORT_RAW)) { - if (t->remote) - cmd[k++] = t->remote; - else - cmd[k++] = "-"; - } - - if (t->local) - cmd[k++] = t->local; - cmd[k] = NULL; - - execv(cmd[0], (char * const *) cmd); - log_error_errno(errno, "Failed to execute %s tool: %m", cmd[0]); - _exit(EXIT_FAILURE); - } - - pipefd[1] = safe_close(pipefd[1]); - 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; - - r = sd_event_add_io(t->manager->event, &t->log_event_source, t->log_fd, EPOLLIN, transfer_on_log, t); - if (r < 0) - return r; - - /* Make sure always process logging before SIGCHLD */ - r = sd_event_source_set_priority(t->log_event_source, SD_EVENT_PRIORITY_NORMAL -5); - if (r < 0) - return r; - - r = sd_bus_emit_signal( - t->manager->bus, - "/org/freedesktop/import1", - "org.freedesktop.import1.Manager", - "TransferNew", - "uo", - t->id, - t->object_path); - if (r < 0) - return r; - - return 0; -} - -static Manager *manager_unref(Manager *m) { - Transfer *t; - - 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); - - hashmap_free(m->transfers); - - bus_verify_polkit_async_registry_free(m->polkit_registry); - - sd_bus_close(m->bus); - sd_bus_unref(m->bus); - sd_event_unref(m->event); - - free(m); - return NULL; -} - -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); - - m = new0(Manager, 1); - if (!m) - return -ENOMEM; - - r = sd_event_default(&m->event); - if (r < 0) - return r; - - sd_event_set_watchdog(m->event, true); - - r = sd_bus_default_system(&m->bus); - 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; - - return 0; -} - -static Transfer *manager_find(Manager *m, TransferType type, const char *dkr_index_url, const char *remote) { - Transfer *t; - Iterator i; - - assert(m); - assert(type >= 0); - assert(type < _TRANSFER_TYPE_MAX); - - HASHMAP_FOREACH(t, m->transfers, i) { - - if (t->type == type && - streq_ptr(t->remote, remote) && - streq_ptr(t->dkr_index_url, dkr_index_url)) - return t; - } - - 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_export_tar_or_raw(sd_bus *bus, sd_bus_message *msg, void *userdata, sd_bus_error *error) { - _cleanup_(transfer_unrefp) Transfer *t = NULL; - int fd, r; - const char *local, *object, *format; - Manager *m = userdata; - TransferType type; - uint32_t id; - - r = bus_verify_polkit_async( - msg, - CAP_SYS_ADMIN, - "org.freedesktop.import1.export", - 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, "shs", &local, &fd, &format); - 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); - - type = streq_ptr(sd_bus_message_get_member(msg), "ExportTar") ? TRANSFER_EXPORT_TAR : TRANSFER_EXPORT_RAW; - - r = transfer_new(m, &t); - if (r < 0) - return r; - - t->type = type; - - if (!isempty(format)) { - t->format = strdup(format); - if (!t->format) - return -ENOMEM; - } - - t->local = strdup(local); - if (!t->local) - return -ENOMEM; - - t->stdout_fd = fcntl(fd, F_DUPFD_CLOEXEC, 3); - if (t->stdout_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; - Manager *m = userdata; - ImportVerify v; - TransferType type; - int force, r; - uint32_t id; - - assert(bus); - assert(msg); - assert(m); - - r = bus_verify_polkit_async( - msg, - CAP_SYS_ADMIN, - "org.freedesktop.import1.pull", - 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, "sssb", &remote, &local, &verify, &force); - if (r < 0) - return r; - - if (!http_url_is_valid(remote)) - return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "URL %s is invalid", remote); - - if (isempty(local)) - local = NULL; - else if (!machine_name_is_valid(local)) - return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Local name %s is invalid", local); - - if (isempty(verify)) - v = IMPORT_VERIFY_SIGNATURE; - else - v = import_verify_from_string(verify); - if (v < 0) - return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Unknown verification mode %s", verify); - - r = setup_machine_directory((uint64_t) -1, error); - if (r < 0) - return r; - - 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); - - r = transfer_new(m, &t); - if (r < 0) - return r; - - t->type = type; - t->verify = v; - t->force_local = force; - - t->remote = strdup(remote); - if (!t->remote) - return -ENOMEM; - - if (local) { - t->local = strdup(local); - if (!t->local) - return -ENOMEM; - } - - 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_dkr(sd_bus *bus, sd_bus_message *msg, void *userdata, sd_bus_error *error) { - _cleanup_(transfer_unrefp) Transfer *t = NULL; - const char *index_url, *remote, *tag, *local, *verify, *object; - Manager *m = userdata; - ImportVerify v; - int force, r; - uint32_t id; - - assert(bus); - assert(msg); - assert(m); - - r = bus_verify_polkit_async( - msg, - CAP_SYS_ADMIN, - "org.freedesktop.import1.pull", - 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, "sssssb", &index_url, &remote, &tag, &local, &verify, &force); - if (r < 0) - return r; - - if (isempty(index_url)) - index_url = DEFAULT_DKR_INDEX_URL; - if (!index_url) - return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Index URL must be specified."); - if (!http_url_is_valid(index_url)) - return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Index URL %s is invalid", index_url); - - if (!dkr_name_is_valid(remote)) - return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Remote name %s is not valid", remote); - - if (isempty(tag)) - tag = "latest"; - else if (!dkr_tag_is_valid(tag)) - return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Tag %s is not valid", tag); - - if (isempty(local)) - local = NULL; - else if (!machine_name_is_valid(local)) - return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Local name %s is invalid", local); - - if (isempty(verify)) - v = IMPORT_VERIFY_SIGNATURE; - else - v = import_verify_from_string(verify); - if (v < 0) - return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Unknown verification mode %s", verify); - - if (v != IMPORT_VERIFY_NO) - return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, "DKR does not support verification."); - - r = setup_machine_directory((uint64_t) -1, error); - if (r < 0) - return r; - - 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_PULL_DKR; - t->verify = v; - t->force_local = force; - - t->dkr_index_url = strdup(index_url); - if (!t->dkr_index_url) - return -ENOMEM; - - t->remote = strjoin(remote, ":", tag, NULL); - if (!t->remote) - return -ENOMEM; - - if (local) { - t->local = strdup(local); - if (!t->local) - return -ENOMEM; - } - - 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_list_transfers(sd_bus *bus, sd_bus_message *msg, void *userdata, sd_bus_error *error) { - _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; - Manager *m = userdata; - Transfer *t; - Iterator i; - int r; - - assert(bus); - assert(msg); - assert(m); - - r = sd_bus_message_new_method_return(msg, &reply); - if (r < 0) - return r; - - r = sd_bus_message_open_container(reply, 'a', "(usssdo)"); - if (r < 0) - return r; - - HASHMAP_FOREACH(t, m->transfers, i) { - - r = sd_bus_message_append( - reply, - "(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; - } - - r = sd_bus_message_close_container(reply); - if (r < 0) - return r; - - return sd_bus_send(bus, reply, NULL); -} - -static int method_cancel(sd_bus *bus, sd_bus_message *msg, void *userdata, sd_bus_error *error) { - Transfer *t = userdata; - int r; - - assert(bus); - assert(msg); - assert(t); - - r = bus_verify_polkit_async( - msg, - CAP_SYS_ADMIN, - "org.freedesktop.import1.pull", - false, - UID_INVALID, - &t->manager->polkit_registry, - error); - if (r < 0) - return r; - if (r == 0) - return 1; /* Will call us back */ - - r = transfer_cancel(t); - if (r < 0) - return r; - - return sd_bus_reply_method_return(msg, NULL); -} - -static int method_cancel_transfer(sd_bus *bus, sd_bus_message *msg, void *userdata, sd_bus_error *error) { - Manager *m = userdata; - Transfer *t; - uint32_t id; - int r; - - assert(bus); - assert(msg); - assert(m); - - r = bus_verify_polkit_async( - msg, - CAP_SYS_ADMIN, - "org.freedesktop.import1.pull", - 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, "u", &id); - if (r < 0) - return r; - if (id <= 0) - return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid transfer id"); - - t = hashmap_get(m->transfers, UINT32_TO_PTR(id)); - if (!t) - return sd_bus_error_setf(error, BUS_ERROR_NO_SUCH_TRANSFER, "No transfer by id %" PRIu32, id); - - r = transfer_cancel(t); - if (r < 0) - return r; - - 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); - -static const sd_bus_vtable transfer_vtable[] = { - SD_BUS_VTABLE_START(0), - SD_BUS_PROPERTY("Id", "u", NULL, offsetof(Transfer, id), SD_BUS_VTABLE_PROPERTY_CONST), - SD_BUS_PROPERTY("Local", "s", NULL, offsetof(Transfer, local), SD_BUS_VTABLE_PROPERTY_CONST), - 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, -}; - -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("ExportTar", "shs", "uo", method_export_tar_or_raw, SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD("ExportRaw", "shs", "uo", method_export_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), - 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), - SD_BUS_VTABLE_END, -}; - -static int transfer_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error) { - Manager *m = userdata; - Transfer *t; - const char *p; - uint32_t id; - int r; - - assert(bus); - assert(path); - assert(interface); - assert(found); - assert(m); - - p = startswith(path, "/org/freedesktop/import1/transfer/_"); - if (!p) - return 0; - - r = safe_atou32(p, &id); - if (r < 0 || id == 0) - return 0; - - t = hashmap_get(m->transfers, UINT32_TO_PTR(id)); - if (!t) - return 0; - - *found = t; - return 1; -} - -static int transfer_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error) { - _cleanup_strv_free_ char **l = NULL; - Manager *m = userdata; - Transfer *t; - unsigned k = 0; - Iterator i; - - l = new0(char*, hashmap_size(m->transfers) + 1); - if (!l) - return -ENOMEM; - - HASHMAP_FOREACH(t, m->transfers, i) { - - l[k] = strdup(t->object_path); - if (!l[k]) - return -ENOMEM; - - k++; - } - - *nodes = l; - l = NULL; - - return 1; -} - -static int manager_add_bus_objects(Manager *m) { - int r; - - assert(m); - - r = sd_bus_add_object_vtable(m->bus, NULL, "/org/freedesktop/import1", "org.freedesktop.import1.Manager", manager_vtable, m); - if (r < 0) - return log_error_errno(r, "Failed to register object: %m"); - - r = sd_bus_add_fallback_vtable(m->bus, NULL, "/org/freedesktop/import1/transfer", "org.freedesktop.import1.Transfer", transfer_vtable, transfer_object_find, m); - if (r < 0) - return log_error_errno(r, "Failed to register object: %m"); - - r = sd_bus_add_node_enumerator(m->bus, NULL, "/org/freedesktop/import1/transfer", transfer_node_enumerator, m); - if (r < 0) - return log_error_errno(r, "Failed to add transfer enumerator: %m"); - - r = sd_bus_request_name(m->bus, "org.freedesktop.import1", 0); - if (r < 0) - return log_error_errno(r, "Failed to register name: %m"); - - r = sd_bus_attach_event(m->bus, m->event, 0); - if (r < 0) - return log_error_errno(r, "Failed to attach bus to event loop: %m"); - - return 0; -} - -static bool manager_check_idle(void *userdata) { - Manager *m = userdata; - - return hashmap_isempty(m->transfers); -} - -static int manager_run(Manager *m) { - assert(m); - - return bus_event_loop_with_idle( - m->event, - m->bus, - "org.freedesktop.import1", - DEFAULT_EXIT_USEC, - manager_check_idle, - m); -} - -int main(int argc, char *argv[]) { - _cleanup_(manager_unrefp) Manager *m = NULL; - int r; - - log_set_target(LOG_TARGET_AUTO); - log_parse_environment(); - log_open(); - - umask(0022); - - if (argc != 1) { - log_error("This program takes no arguments."); - r = -EINVAL; - goto finish; - } - - assert_se(sigprocmask_many(SIG_BLOCK, SIGCHLD, -1) >= 0); - - r = manager_new(&m); - if (r < 0) { - log_error_errno(r, "Failed to allocate manager object: %m"); - goto finish; - } - - r = manager_add_bus_objects(m); - if (r < 0) - goto finish; - - r = manager_run(m); - if (r < 0) { - log_error_errno(r, "Failed to run event loop: %m"); - goto finish; - } - -finish: - return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; -} diff --git a/src/import/org.freedesktop.import1.conf b/src/import/org.freedesktop.import1.conf deleted file mode 100644 index ae36af422..000000000 --- a/src/import/org.freedesktop.import1.conf +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/import/org.freedesktop.import1.policy.in b/src/import/org.freedesktop.import1.policy.in deleted file mode 100644 index 85924ed74..000000000 --- a/src/import/org.freedesktop.import1.policy.in +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - The systemd Project - http://www.freedesktop.org/wiki/Software/systemd - - - <_description>Import a VM or container image - <_message>Authentication is required to import a VM or container image - - auth_admin - auth_admin - auth_admin_keep - - - - - <_description>Export a VM or container image - <_message>Authentication is required to export a VM or container image - - auth_admin - auth_admin - auth_admin_keep - - - - - <_description>Download a VM or container image - <_message>Authentication is required to download a VM or container image - - auth_admin - auth_admin - auth_admin_keep - - - - diff --git a/src/import/org.freedesktop.import1.service b/src/import/org.freedesktop.import1.service deleted file mode 100644 index 8fc4c4788..000000000 --- a/src/import/org.freedesktop.import1.service +++ /dev/null @@ -1,12 +0,0 @@ -# This file is part of systemd. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. - -[D-BUS Service] -Name=org.freedesktop.import1 -Exec=/bin/false -User=root -SystemdService=dbus-org.freedesktop.import1.service diff --git a/src/import/pull-common.c b/src/import/pull-common.c deleted file mode 100644 index 94dd54bd5..000000000 --- a/src/import/pull-common.c +++ /dev/null @@ -1,424 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -/*** - This file is part of systemd. - - Copyright 2015 Lennart Poettering - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see . -***/ - -#include - -#include "util.h" -#include "strv.h" -#include "copy.h" -#include "btrfs-util.h" -#include "capability.h" -#include "pull-job.h" -#include "pull-common.h" - -#define FILENAME_ESCAPE "/.#\"\'" - -int pull_find_old_etags(const char *url, const char *image_root, int dt, const char *prefix, const char *suffix, char ***etags) { - _cleanup_free_ char *escaped_url = NULL; - _cleanup_closedir_ DIR *d = NULL; - _cleanup_strv_free_ char **l = NULL; - struct dirent *de; - int r; - - assert(url); - assert(etags); - - if (!image_root) - image_root = "/var/lib/machines"; - - escaped_url = xescape(url, FILENAME_ESCAPE); - if (!escaped_url) - return -ENOMEM; - - d = opendir(image_root); - if (!d) { - if (errno == ENOENT) { - *etags = NULL; - return 0; - } - - return -errno; - } - - FOREACH_DIRENT_ALL(de, d, return -errno) { - const char *a, *b; - char *u; - - if (de->d_type != DT_UNKNOWN && - de->d_type != dt) - continue; - - if (prefix) { - a = startswith(de->d_name, prefix); - if (!a) - continue; - } else - a = de->d_name; - - a = startswith(a, escaped_url); - if (!a) - continue; - - a = startswith(a, "."); - if (!a) - continue; - - if (suffix) { - b = endswith(de->d_name, suffix); - if (!b) - continue; - } else - b = strchr(de->d_name, 0); - - if (a >= b) - continue; - - u = cunescape_length(a, b - a); - if (!u) - return -ENOMEM; - - if (!http_etag_is_valid(u)) { - free(u); - continue; - } - - r = strv_consume(&l, u); - if (r < 0) - return r; - } - - *etags = l; - l = NULL; - - return 0; -} - -int pull_make_local_copy(const char *final, const char *image_root, const char *local, bool force_local) { - const char *p; - int r; - - assert(final); - assert(local); - - if (!image_root) - image_root = "/var/lib/machines"; - - p = strjoina(image_root, "/", local); - - if (force_local) { - (void) btrfs_subvol_remove(p); - (void) rm_rf_dangerous(p, false, true, false); - } - - r = btrfs_subvol_snapshot(final, p, false, false); - if (r == -ENOTTY) { - r = copy_tree(final, p, false); - if (r < 0) - return log_error_errno(r, "Failed to copy image: %m"); - } else if (r < 0) - return log_error_errno(r, "Failed to create local image: %m"); - - log_info("Created new local image '%s'.", local); - - return 0; -} - -int pull_make_path(const char *url, const char *etag, const char *image_root, const char *prefix, const char *suffix, char **ret) { - _cleanup_free_ char *escaped_url = NULL; - char *path; - - assert(url); - assert(ret); - - if (!image_root) - image_root = "/var/lib/machines"; - - escaped_url = xescape(url, FILENAME_ESCAPE); - if (!escaped_url) - return -ENOMEM; - - if (etag) { - _cleanup_free_ char *escaped_etag = NULL; - - escaped_etag = xescape(etag, FILENAME_ESCAPE); - if (!escaped_etag) - return -ENOMEM; - - path = strjoin(image_root, "/", strempty(prefix), escaped_url, ".", escaped_etag, strempty(suffix), NULL); - } else - path = strjoin(image_root, "/", strempty(prefix), escaped_url, strempty(suffix), NULL); - if (!path) - return -ENOMEM; - - *ret = path; - return 0; -} - -int pull_make_verification_jobs( - PullJob **ret_checksum_job, - PullJob **ret_signature_job, - ImportVerify verify, - const char *url, - CurlGlue *glue, - PullJobFinished on_finished, - void *userdata) { - - _cleanup_(pull_job_unrefp) PullJob *checksum_job = NULL, *signature_job = NULL; - int r; - - assert(ret_checksum_job); - assert(ret_signature_job); - assert(verify >= 0); - assert(verify < _IMPORT_VERIFY_MAX); - assert(url); - assert(glue); - - if (verify != IMPORT_VERIFY_NO) { - _cleanup_free_ char *checksum_url = NULL; - - /* Queue job for the SHA256SUMS file for the image */ - r = import_url_change_last_component(url, "SHA256SUMS", &checksum_url); - if (r < 0) - return r; - - r = pull_job_new(&checksum_job, checksum_url, glue, userdata); - if (r < 0) - return r; - - checksum_job->on_finished = on_finished; - checksum_job->uncompressed_max = checksum_job->compressed_max = 1ULL * 1024ULL * 1024ULL; - } - - if (verify == IMPORT_VERIFY_SIGNATURE) { - _cleanup_free_ char *signature_url = NULL; - - /* Queue job for the SHA256SUMS.gpg file for the image. */ - r = import_url_change_last_component(url, "SHA256SUMS.gpg", &signature_url); - if (r < 0) - return r; - - r = pull_job_new(&signature_job, signature_url, glue, userdata); - if (r < 0) - return r; - - signature_job->on_finished = on_finished; - signature_job->uncompressed_max = signature_job->compressed_max = 1ULL * 1024ULL * 1024ULL; - } - - *ret_checksum_job = checksum_job; - *ret_signature_job = signature_job; - - checksum_job = signature_job = NULL; - - return 0; -} - -int pull_verify( - PullJob *main_job, - PullJob *checksum_job, - PullJob *signature_job) { - - _cleanup_close_pair_ int gpg_pipe[2] = { -1, -1 }; - _cleanup_free_ char *fn = NULL; - _cleanup_close_ int sig_file = -1; - const char *p, *line; - char sig_file_path[] = "/tmp/sigXXXXXX", gpg_home[] = "/tmp/gpghomeXXXXXX"; - _cleanup_sigkill_wait_ pid_t pid = 0; - bool gpg_home_created = false; - int r; - - assert(main_job); - assert(main_job->state == PULL_JOB_DONE); - - if (!checksum_job) - return 0; - - assert(main_job->calc_checksum); - assert(main_job->checksum); - assert(checksum_job->state == PULL_JOB_DONE); - - if (!checksum_job->payload || checksum_job->payload_size <= 0) { - log_error("Checksum is empty, cannot verify."); - return -EBADMSG; - } - - r = import_url_last_component(main_job->url, &fn); - if (r < 0) - return log_oom(); - - if (!filename_is_valid(fn)) { - log_error("Cannot verify checksum, could not determine valid server-side file name."); - return -EBADMSG; - } - - line = strjoina(main_job->checksum, " *", fn, "\n"); - - p = memmem(checksum_job->payload, - checksum_job->payload_size, - line, - strlen(line)); - - if (!p || (p != (char*) checksum_job->payload && p[-1] != '\n')) { - log_error("Checksum did not check out, payload has been tempered with."); - return -EBADMSG; - } - - log_info("SHA256 checksum of %s is valid.", main_job->url); - - if (!signature_job) - return 0; - - assert(signature_job->state == PULL_JOB_DONE); - - if (!signature_job->payload || signature_job->payload_size <= 0) { - log_error("Signature is empty, cannot verify."); - return -EBADMSG; - } - - r = pipe2(gpg_pipe, O_CLOEXEC); - if (r < 0) - return log_error_errno(errno, "Failed to create pipe for gpg: %m"); - - sig_file = mkostemp(sig_file_path, O_RDWR); - if (sig_file < 0) - return log_error_errno(errno, "Failed to create temporary file: %m"); - - r = loop_write(sig_file, signature_job->payload, signature_job->payload_size, false); - if (r < 0) { - log_error_errno(r, "Failed to write to temporary file: %m"); - goto finish; - } - - if (!mkdtemp(gpg_home)) { - r = log_error_errno(errno, "Failed to create tempory home for gpg: %m"); - goto finish; - } - - gpg_home_created = true; - - pid = fork(); - if (pid < 0) - return log_error_errno(errno, "Failed to fork off gpg: %m"); - if (pid == 0) { - const char *cmd[] = { - "gpg", - "--no-options", - "--no-default-keyring", - "--no-auto-key-locate", - "--no-auto-check-trustdb", - "--batch", - "--trust-model=always", - NULL, /* --homedir= */ - NULL, /* --keyring= */ - NULL, /* --verify */ - NULL, /* signature file */ - NULL, /* dash */ - NULL /* trailing NULL */ - }; - unsigned k = ELEMENTSOF(cmd) - 6; - int null_fd; - - /* Child */ - - reset_all_signal_handlers(); - reset_signal_mask(); - assert_se(prctl(PR_SET_PDEATHSIG, SIGTERM) == 0); - - gpg_pipe[1] = safe_close(gpg_pipe[1]); - - if (dup2(gpg_pipe[0], STDIN_FILENO) != STDIN_FILENO) { - log_error_errno(errno, "Failed to dup2() fd: %m"); - _exit(EXIT_FAILURE); - } - - if (gpg_pipe[0] != STDIN_FILENO) - gpg_pipe[0] = safe_close(gpg_pipe[0]); - - null_fd = open("/dev/null", O_WRONLY|O_NOCTTY); - if (null_fd < 0) { - log_error_errno(errno, "Failed to open /dev/null: %m"); - _exit(EXIT_FAILURE); - } - - if (dup2(null_fd, STDOUT_FILENO) != STDOUT_FILENO) { - log_error_errno(errno, "Failed to dup2() fd: %m"); - _exit(EXIT_FAILURE); - } - - if (null_fd != STDOUT_FILENO) - null_fd = safe_close(null_fd); - - cmd[k++] = strjoina("--homedir=", gpg_home); - - /* We add the user keyring only to the command line - * arguments, if it's around since gpg fails - * otherwise. */ - if (access(USER_KEYRING_PATH, F_OK) >= 0) - cmd[k++] = "--keyring=" USER_KEYRING_PATH; - else - cmd[k++] = "--keyring=" VENDOR_KEYRING_PATH; - - cmd[k++] = "--verify"; - cmd[k++] = sig_file_path; - cmd[k++] = "-"; - cmd[k++] = NULL; - - fd_cloexec(STDIN_FILENO, false); - fd_cloexec(STDOUT_FILENO, false); - fd_cloexec(STDERR_FILENO, false); - - execvp("gpg2", (char * const *) cmd); - execvp("gpg", (char * const *) cmd); - log_error_errno(errno, "Failed to execute gpg: %m"); - _exit(EXIT_FAILURE); - } - - gpg_pipe[0] = safe_close(gpg_pipe[0]); - - r = loop_write(gpg_pipe[1], checksum_job->payload, checksum_job->payload_size, false); - if (r < 0) { - log_error_errno(r, "Failed to write to pipe: %m"); - goto finish; - } - - gpg_pipe[1] = safe_close(gpg_pipe[1]); - - r = wait_for_terminate_and_warn("gpg", pid, true); - pid = 0; - if (r < 0) - goto finish; - if (r > 0) { - log_error("Signature verification failed."); - r = -EBADMSG; - } else { - log_info("Signature verification succeeded."); - r = 0; - } - -finish: - if (sig_file >= 0) - unlink(sig_file_path); - - if (gpg_home_created) - rm_rf_dangerous(gpg_home, false, true, false); - - return r; -} diff --git a/src/import/pull-common.h b/src/import/pull-common.h deleted file mode 100644 index bb9cf3efc..000000000 --- a/src/import/pull-common.h +++ /dev/null @@ -1,36 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -#pragma once - -/*** - This file is part of systemd. - - Copyright 2015 Lennart Poettering - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see . -***/ - -#include - -#include "pull-job.h" -#include "import-util.h" - -int pull_make_local_copy(const char *final, const char *root, const char *local, bool force_local); - -int pull_find_old_etags(const char *url, const char *root, int dt, const char *prefix, const char *suffix, char ***etags); - -int pull_make_path(const char *url, const char *etag, const char *image_root, const char *prefix, const char *suffix, char **ret); - -int pull_make_verification_jobs(PullJob **ret_checksum_job, PullJob **ret_signature_job, ImportVerify verify, const char *url, CurlGlue *glue, PullJobFinished on_finished, void *userdata); -int pull_verify(PullJob *main_job, PullJob *checksum_job, PullJob *signature_job); diff --git a/src/import/pull-dkr.c b/src/import/pull-dkr.c deleted file mode 100644 index 1a7dc310c..000000000 --- a/src/import/pull-dkr.c +++ /dev/null @@ -1,897 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -/*** - This file is part of systemd. - - Copyright 2014 Lennart Poettering - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see . -***/ - -#include -#include - -#include "sd-daemon.h" -#include "json.h" -#include "strv.h" -#include "btrfs-util.h" -#include "utf8.h" -#include "mkdir.h" -#include "path-util.h" -#include "import-util.h" -#include "curl-util.h" -#include "aufs-util.h" -#include "pull-job.h" -#include "pull-common.h" -#include "import-common.h" -#include "pull-dkr.h" - -typedef enum DkrProgress { - DKR_SEARCHING, - DKR_RESOLVING, - DKR_METADATA, - DKR_DOWNLOADING, - DKR_COPYING, -} DkrProgress; - -struct DkrPull { - sd_event *event; - CurlGlue *glue; - - char *index_url; - char *image_root; - - PullJob *images_job; - PullJob *tags_job; - PullJob *ancestry_job; - PullJob *json_job; - PullJob *layer_job; - - char *name; - char *tag; - char *id; - - char *response_token; - char **response_registries; - - char **ancestry; - unsigned n_ancestry; - unsigned current_ancestry; - - DkrPullFinished on_finished; - void *userdata; - - char *local; - bool force_local; - bool grow_machine_directory; - - char *temp_path; - char *final_path; - - pid_t tar_pid; -}; - -#define PROTOCOL_PREFIX "https://" - -#define HEADER_TOKEN "X-Do" /* the HTTP header for the auth token */ "cker-Token:" -#define HEADER_REGISTRY "X-Do" /*the HTTP header for the registry */ "cker-Endpoints:" - -#define LAYERS_MAX 2048 - -static void dkr_pull_job_on_finished(PullJob *j); - -DkrPull* dkr_pull_unref(DkrPull *i) { - if (!i) - return NULL; - - if (i->tar_pid > 1) { - (void) kill_and_sigcont(i->tar_pid, SIGKILL); - (void) wait_for_terminate(i->tar_pid, NULL); - } - - pull_job_unref(i->images_job); - pull_job_unref(i->tags_job); - pull_job_unref(i->ancestry_job); - pull_job_unref(i->json_job); - pull_job_unref(i->layer_job); - - curl_glue_unref(i->glue); - sd_event_unref(i->event); - - if (i->temp_path) { - (void) btrfs_subvol_remove(i->temp_path); - (void) rm_rf_dangerous(i->temp_path, false, true, false); - free(i->temp_path); - } - - free(i->name); - free(i->tag); - free(i->id); - free(i->response_token); - free(i->response_registries); - strv_free(i->ancestry); - free(i->final_path); - free(i->index_url); - free(i->image_root); - free(i->local); - free(i); - - return NULL; -} - -int dkr_pull_new( - DkrPull **ret, - sd_event *event, - const char *index_url, - const char *image_root, - DkrPullFinished on_finished, - void *userdata) { - - _cleanup_(dkr_pull_unrefp) DkrPull *i = NULL; - char *e; - int r; - - assert(ret); - assert(index_url); - - if (!http_url_is_valid(index_url)) - return -EINVAL; - - i = new0(DkrPull, 1); - if (!i) - return -ENOMEM; - - i->on_finished = on_finished; - i->userdata = userdata; - - i->image_root = strdup(image_root ?: "/var/lib/machines"); - if (!i->image_root) - return -ENOMEM; - - i->grow_machine_directory = path_startswith(i->image_root, "/var/lib/machines"); - - i->index_url = strdup(index_url); - if (!i->index_url) - return -ENOMEM; - - e = endswith(i->index_url, "/"); - if (e) - *e = 0; - - if (event) - i->event = sd_event_ref(event); - else { - r = sd_event_default(&i->event); - if (r < 0) - return r; - } - - r = curl_glue_new(&i->glue, i->event); - if (r < 0) - return r; - - i->glue->on_finished = pull_job_curl_on_finished; - i->glue->userdata = i; - - *ret = i; - i = NULL; - - return 0; -} - -static void dkr_pull_report_progress(DkrPull *i, DkrProgress p) { - unsigned percent; - - assert(i); - - switch (p) { - - case DKR_SEARCHING: - percent = 0; - if (i->images_job) - percent += i->images_job->progress_percent * 5 / 100; - break; - - case DKR_RESOLVING: - percent = 5; - if (i->tags_job) - percent += i->tags_job->progress_percent * 5 / 100; - break; - - case DKR_METADATA: - percent = 10; - if (i->ancestry_job) - percent += i->ancestry_job->progress_percent * 5 / 100; - if (i->json_job) - percent += i->json_job->progress_percent * 5 / 100; - break; - - case DKR_DOWNLOADING: - percent = 20; - percent += 75 * i->current_ancestry / MAX(1U, i->n_ancestry); - if (i->layer_job) - percent += i->layer_job->progress_percent * 75 / MAX(1U, i->n_ancestry) / 100; - - break; - - case DKR_COPYING: - percent = 95; - break; - - default: - assert_not_reached("Unknown progress state"); - } - - sd_notifyf(false, "X_IMPORT_PROGRESS=%u", percent); - log_debug("Combined progress %u%%", percent); -} - -static int parse_id(const void *payload, size_t size, char **ret) { - _cleanup_free_ char *buf = NULL, *id = NULL, *other = NULL; - union json_value v = {}; - void *json_state = NULL; - const char *p; - int t; - - assert(payload); - assert(ret); - - if (size <= 0) - return -EBADMSG; - - if (memchr(payload, 0, size)) - return -EBADMSG; - - buf = strndup(payload, size); - if (!buf) - return -ENOMEM; - - p = buf; - t = json_tokenize(&p, &id, &v, &json_state, NULL); - if (t < 0) - return t; - if (t != JSON_STRING) - return -EBADMSG; - - t = json_tokenize(&p, &other, &v, &json_state, NULL); - if (t < 0) - return t; - if (t != JSON_END) - return -EBADMSG; - - if (!dkr_id_is_valid(id)) - return -EBADMSG; - - *ret = id; - id = NULL; - - return 0; -} - -static int parse_ancestry(const void *payload, size_t size, char ***ret) { - _cleanup_free_ char *buf = NULL; - void *json_state = NULL; - const char *p; - enum { - STATE_BEGIN, - STATE_ITEM, - STATE_COMMA, - STATE_END, - } state = STATE_BEGIN; - _cleanup_strv_free_ char **l = NULL; - size_t n = 0, allocated = 0; - - if (size <= 0) - return -EBADMSG; - - if (memchr(payload, 0, size)) - return -EBADMSG; - - buf = strndup(payload, size); - if (!buf) - return -ENOMEM; - - p = buf; - for (;;) { - _cleanup_free_ char *str; - union json_value v = {}; - int t; - - t = json_tokenize(&p, &str, &v, &json_state, NULL); - if (t < 0) - return t; - - switch (state) { - - case STATE_BEGIN: - if (t == JSON_ARRAY_OPEN) - state = STATE_ITEM; - else - return -EBADMSG; - - break; - - case STATE_ITEM: - if (t == JSON_STRING) { - if (!dkr_id_is_valid(str)) - return -EBADMSG; - - if (n+1 > LAYERS_MAX) - return -EFBIG; - - if (!GREEDY_REALLOC(l, allocated, n + 2)) - return -ENOMEM; - - l[n++] = str; - str = NULL; - l[n] = NULL; - - state = STATE_COMMA; - - } else if (t == JSON_ARRAY_CLOSE) - state = STATE_END; - else - return -EBADMSG; - - break; - - case STATE_COMMA: - if (t == JSON_COMMA) - state = STATE_ITEM; - else if (t == JSON_ARRAY_CLOSE) - state = STATE_END; - else - return -EBADMSG; - break; - - case STATE_END: - if (t == JSON_END) { - - if (strv_isempty(l)) - return -EBADMSG; - - if (!strv_is_uniq(l)) - return -EBADMSG; - - l = strv_reverse(l); - - *ret = l; - l = NULL; - return 0; - } else - return -EBADMSG; - } - - } -} - -static const char *dkr_pull_current_layer(DkrPull *i) { - assert(i); - - if (strv_isempty(i->ancestry)) - return NULL; - - return i->ancestry[i->current_ancestry]; -} - -static const char *dkr_pull_current_base_layer(DkrPull *i) { - assert(i); - - if (strv_isempty(i->ancestry)) - return NULL; - - if (i->current_ancestry <= 0) - return NULL; - - return i->ancestry[i->current_ancestry-1]; -} - -static int dkr_pull_add_token(DkrPull *i, PullJob *j) { - const char *t; - - assert(i); - assert(j); - - if (i->response_token) - t = strjoina("Authorization: Token ", i->response_token); - else - t = HEADER_TOKEN " true"; - - j->request_header = curl_slist_new("Accept: application/json", t, NULL); - if (!j->request_header) - return -ENOMEM; - - return 0; -} - -static bool dkr_pull_is_done(DkrPull *i) { - assert(i); - assert(i->images_job); - - if (i->images_job->state != PULL_JOB_DONE) - return false; - - if (!i->tags_job || i->tags_job->state != PULL_JOB_DONE) - return false; - - if (!i->ancestry_job || i->ancestry_job->state != PULL_JOB_DONE) - return false; - - if (!i->json_job || i->json_job->state != PULL_JOB_DONE) - return false; - - if (i->layer_job && i->layer_job->state != PULL_JOB_DONE) - return false; - - if (dkr_pull_current_layer(i)) - return false; - - return true; -} - -static int dkr_pull_make_local_copy(DkrPull *i) { - int r; - - assert(i); - - if (!i->local) - return 0; - - if (!i->final_path) { - i->final_path = strjoin(i->image_root, "/.dkr-", i->id, NULL); - if (!i->final_path) - return log_oom(); - } - - r = pull_make_local_copy(i->final_path, i->image_root, i->local, i->force_local); - if (r < 0) - return r; - - return 0; -} - -static int dkr_pull_job_on_open_disk(PullJob *j) { - const char *base; - DkrPull *i; - int r; - - assert(j); - assert(j->userdata); - - i = j->userdata; - assert(i->layer_job == j); - assert(i->final_path); - assert(!i->temp_path); - assert(i->tar_pid <= 0); - - r = tempfn_random(i->final_path, &i->temp_path); - if (r < 0) - return log_oom(); - - mkdir_parents_label(i->temp_path, 0700); - - base = dkr_pull_current_base_layer(i); - if (base) { - const char *base_path; - - base_path = strjoina(i->image_root, "/.dkr-", base); - r = btrfs_subvol_snapshot(base_path, i->temp_path, false, true); - } else - r = btrfs_subvol_make(i->temp_path); - if (r < 0) - return log_error_errno(r, "Failed to make btrfs subvolume %s: %m", i->temp_path); - - j->disk_fd = import_fork_tar_x(i->temp_path, &i->tar_pid); - if (j->disk_fd < 0) - return j->disk_fd; - - return 0; -} - -static void dkr_pull_job_on_progress(PullJob *j) { - DkrPull *i; - - assert(j); - assert(j->userdata); - - i = j->userdata; - - dkr_pull_report_progress( - i, - j == i->images_job ? DKR_SEARCHING : - j == i->tags_job ? DKR_RESOLVING : - j == i->ancestry_job || j == i->json_job ? DKR_METADATA : - DKR_DOWNLOADING); -} - -static int dkr_pull_pull_layer(DkrPull *i) { - _cleanup_free_ char *path = NULL; - const char *url, *layer = NULL; - int r; - - assert(i); - assert(!i->layer_job); - assert(!i->temp_path); - assert(!i->final_path); - - for (;;) { - layer = dkr_pull_current_layer(i); - if (!layer) - return 0; /* no more layers */ - - path = strjoin(i->image_root, "/.dkr-", layer, NULL); - if (!path) - return log_oom(); - - if (laccess(path, F_OK) < 0) { - if (errno == ENOENT) - break; - - return log_error_errno(errno, "Failed to check for container: %m"); - } - - log_info("Layer %s already exists, skipping.", layer); - - i->current_ancestry++; - - free(path); - path = NULL; - } - - log_info("Pulling layer %s...", layer); - - i->final_path = path; - path = NULL; - - url = strjoina(PROTOCOL_PREFIX, i->response_registries[0], "/v1/images/", layer, "/layer"); - r = pull_job_new(&i->layer_job, url, i->glue, i); - if (r < 0) - return log_error_errno(r, "Failed to allocate layer job: %m"); - - r = dkr_pull_add_token(i, i->layer_job); - if (r < 0) - return log_oom(); - - i->layer_job->on_finished = dkr_pull_job_on_finished; - i->layer_job->on_open_disk = dkr_pull_job_on_open_disk; - i->layer_job->on_progress = dkr_pull_job_on_progress; - i->layer_job->grow_machine_directory = i->grow_machine_directory; - - r = pull_job_begin(i->layer_job); - if (r < 0) - return log_error_errno(r, "Failed to start layer job: %m"); - - return 0; -} - -static void dkr_pull_job_on_finished(PullJob *j) { - DkrPull *i; - int r; - - assert(j); - assert(j->userdata); - - i = j->userdata; - if (j->error != 0) { - if (j == i->images_job) - log_error_errno(j->error, "Failed to retrieve images list. (Wrong index URL?)"); - else if (j == i->tags_job) - log_error_errno(j->error, "Failed to retrieve tags list."); - else if (j == i->ancestry_job) - log_error_errno(j->error, "Failed to retrieve ancestry list."); - else if (j == i->json_job) - log_error_errno(j->error, "Failed to retrieve json data."); - else - log_error_errno(j->error, "Failed to retrieve layer data."); - - r = j->error; - goto finish; - } - - if (i->images_job == j) { - const char *url; - - assert(!i->tags_job); - assert(!i->ancestry_job); - assert(!i->json_job); - assert(!i->layer_job); - - if (strv_isempty(i->response_registries)) { - r = -EBADMSG; - log_error("Didn't get registry information."); - goto finish; - } - - log_info("Index lookup succeeded, directed to registry %s.", i->response_registries[0]); - dkr_pull_report_progress(i, DKR_RESOLVING); - - url = strjoina(PROTOCOL_PREFIX, i->response_registries[0], "/v1/repositories/", i->name, "/tags/", i->tag); - r = pull_job_new(&i->tags_job, url, i->glue, i); - if (r < 0) { - log_error_errno(r, "Failed to allocate tags job: %m"); - goto finish; - } - - r = dkr_pull_add_token(i, i->tags_job); - if (r < 0) { - log_oom(); - goto finish; - } - - i->tags_job->on_finished = dkr_pull_job_on_finished; - i->tags_job->on_progress = dkr_pull_job_on_progress; - - r = pull_job_begin(i->tags_job); - if (r < 0) { - log_error_errno(r, "Failed to start tags job: %m"); - goto finish; - } - - } else if (i->tags_job == j) { - const char *url; - char *id = NULL; - - assert(!i->ancestry_job); - assert(!i->json_job); - assert(!i->layer_job); - - r = parse_id(j->payload, j->payload_size, &id); - if (r < 0) { - log_error_errno(r, "Failed to parse JSON id."); - goto finish; - } - - free(i->id); - i->id = id; - - log_info("Tag lookup succeeded, resolved to layer %s.", i->id); - dkr_pull_report_progress(i, DKR_METADATA); - - url = strjoina(PROTOCOL_PREFIX, i->response_registries[0], "/v1/images/", i->id, "/ancestry"); - r = pull_job_new(&i->ancestry_job, url, i->glue, i); - if (r < 0) { - log_error_errno(r, "Failed to allocate ancestry job: %m"); - goto finish; - } - - r = dkr_pull_add_token(i, i->ancestry_job); - if (r < 0) { - log_oom(); - goto finish; - } - - i->ancestry_job->on_finished = dkr_pull_job_on_finished; - i->ancestry_job->on_progress = dkr_pull_job_on_progress; - - url = strjoina(PROTOCOL_PREFIX, i->response_registries[0], "/v1/images/", i->id, "/json"); - r = pull_job_new(&i->json_job, url, i->glue, i); - if (r < 0) { - log_error_errno(r, "Failed to allocate json job: %m"); - goto finish; - } - - r = dkr_pull_add_token(i, i->json_job); - if (r < 0) { - log_oom(); - goto finish; - } - - i->json_job->on_finished = dkr_pull_job_on_finished; - i->json_job->on_progress = dkr_pull_job_on_progress; - - r = pull_job_begin(i->ancestry_job); - if (r < 0) { - log_error_errno(r, "Failed to start ancestry job: %m"); - goto finish; - } - - r = pull_job_begin(i->json_job); - if (r < 0) { - log_error_errno(r, "Failed to start json job: %m"); - goto finish; - } - - } else if (i->ancestry_job == j) { - char **ancestry = NULL, **k; - unsigned n; - - assert(!i->layer_job); - - r = parse_ancestry(j->payload, j->payload_size, &ancestry); - if (r < 0) { - log_error_errno(r, "Failed to parse JSON id."); - goto finish; - } - - n = strv_length(ancestry); - if (n <= 0 || !streq(ancestry[n-1], i->id)) { - log_error("Ancestry doesn't end in main layer."); - strv_free(ancestry); - r = -EBADMSG; - goto finish; - } - - log_info("Ancestor lookup succeeded, requires layers:\n"); - STRV_FOREACH(k, ancestry) - log_info("\t%s", *k); - - strv_free(i->ancestry); - i->ancestry = ancestry; - i->n_ancestry = n; - i->current_ancestry = 0; - - dkr_pull_report_progress(i, DKR_DOWNLOADING); - - r = dkr_pull_pull_layer(i); - if (r < 0) - goto finish; - - } else if (i->layer_job == j) { - assert(i->temp_path); - assert(i->final_path); - - j->disk_fd = safe_close(j->disk_fd); - - if (i->tar_pid > 0) { - r = wait_for_terminate_and_warn("tar", i->tar_pid, true); - i->tar_pid = 0; - if (r < 0) - goto finish; - } - - r = aufs_resolve(i->temp_path); - if (r < 0) { - log_error_errno(r, "Failed to resolve aufs whiteouts: %m"); - goto finish; - } - - r = btrfs_subvol_set_read_only(i->temp_path, true); - if (r < 0) { - log_error_errno(r, "Failed to mark snapshot read-only: %m"); - goto finish; - } - - if (rename(i->temp_path, i->final_path) < 0) { - log_error_errno(errno, "Failed to rename snaphsot: %m"); - goto finish; - } - - log_info("Completed writing to layer %s.", i->final_path); - - i->layer_job = pull_job_unref(i->layer_job); - free(i->temp_path); - i->temp_path = NULL; - free(i->final_path); - i->final_path = NULL; - - i->current_ancestry ++; - r = dkr_pull_pull_layer(i); - if (r < 0) - goto finish; - - } else if (i->json_job != j) - assert_not_reached("Got finished event for unknown curl object"); - - if (!dkr_pull_is_done(i)) - return; - - dkr_pull_report_progress(i, DKR_COPYING); - - r = dkr_pull_make_local_copy(i); - if (r < 0) - goto finish; - - r = 0; - -finish: - if (i->on_finished) - i->on_finished(i, r, i->userdata); - else - sd_event_exit(i->event, r); -} - -static int dkr_pull_job_on_header(PullJob *j, const char *header, size_t sz) { - _cleanup_free_ char *registry = NULL; - char *token; - DkrPull *i; - int r; - - assert(j); - assert(j->userdata); - - i = j->userdata; - - r = curl_header_strdup(header, sz, HEADER_TOKEN, &token); - if (r < 0) - return log_oom(); - if (r > 0) { - free(i->response_token); - i->response_token = token; - return 0; - } - - r = curl_header_strdup(header, sz, HEADER_REGISTRY, ®istry); - if (r < 0) - return log_oom(); - if (r > 0) { - char **l, **k; - - l = strv_split(registry, ","); - if (!l) - return log_oom(); - - STRV_FOREACH(k, l) { - if (!hostname_is_valid(*k)) { - log_error("Registry hostname is not valid."); - strv_free(l); - return -EBADMSG; - } - } - - strv_free(i->response_registries); - i->response_registries = l; - } - - return 0; -} - -int dkr_pull_start(DkrPull *i, const char *name, const char *tag, const char *local, bool force_local) { - const char *url; - int r; - - assert(i); - - if (!dkr_name_is_valid(name)) - return -EINVAL; - - if (tag && !dkr_tag_is_valid(tag)) - return -EINVAL; - - if (local && !machine_name_is_valid(local)) - return -EINVAL; - - if (i->images_job) - return -EBUSY; - - if (!tag) - tag = "latest"; - - r = free_and_strdup(&i->local, local); - if (r < 0) - return r; - i->force_local = force_local; - - r = free_and_strdup(&i->name, name); - if (r < 0) - return r; - r = free_and_strdup(&i->tag, tag); - if (r < 0) - return r; - - url = strjoina(i->index_url, "/v1/repositories/", name, "/images"); - - r = pull_job_new(&i->images_job, url, i->glue, i); - if (r < 0) - return r; - - r = dkr_pull_add_token(i, i->images_job); - if (r < 0) - return r; - - i->images_job->on_finished = dkr_pull_job_on_finished; - i->images_job->on_header = dkr_pull_job_on_header; - i->images_job->on_progress = dkr_pull_job_on_progress; - - return pull_job_begin(i->images_job); -} diff --git a/src/import/pull-dkr.h b/src/import/pull-dkr.h deleted file mode 100644 index 4c4b10c7a..000000000 --- a/src/import/pull-dkr.h +++ /dev/null @@ -1,36 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -/*** - This file is part of systemd. - - Copyright 2014 Lennart Poettering - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see . -***/ - -#pragma once - -#include "sd-event.h" -#include "util.h" - -typedef struct DkrPull DkrPull; - -typedef void (*DkrPullFinished)(DkrPull *pull, int error, void *userdata); - -int dkr_pull_new(DkrPull **pull, sd_event *event, const char *index_url, const char *image_root, DkrPullFinished on_finished, void *userdata); -DkrPull* dkr_pull_unref(DkrPull *pull); - -DEFINE_TRIVIAL_CLEANUP_FUNC(DkrPull*, dkr_pull_unref); - -int dkr_pull_start(DkrPull *pull, const char *name, const char *tag, const char *local, bool force_local); diff --git a/src/import/pull-job.c b/src/import/pull-job.c deleted file mode 100644 index 42939f210..000000000 --- a/src/import/pull-job.c +++ /dev/null @@ -1,613 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -/*** - This file is part of systemd. - - Copyright 2015 Lennart Poettering - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see . -***/ - -#include - -#include "strv.h" -#include "machine-pool.h" -#include "pull-job.h" - -PullJob* pull_job_unref(PullJob *j) { - if (!j) - return NULL; - - curl_glue_remove_and_free(j->glue, j->curl); - curl_slist_free_all(j->request_header); - - safe_close(j->disk_fd); - - import_compress_free(&j->compress); - - if (j->checksum_context) - gcry_md_close(j->checksum_context); - - free(j->url); - free(j->etag); - strv_free(j->old_etags); - free(j->payload); - free(j->checksum); - - free(j); - - return NULL; -} - -static void pull_job_finish(PullJob *j, int ret) { - assert(j); - - if (j->state == PULL_JOB_DONE || - j->state == PULL_JOB_FAILED) - return; - - if (ret == 0) { - j->state = PULL_JOB_DONE; - j->progress_percent = 100; - log_info("Download of %s complete.", j->url); - } else { - j->state = PULL_JOB_FAILED; - j->error = ret; - } - - if (j->on_finished) - j->on_finished(j); -} - -void pull_job_curl_on_finished(CurlGlue *g, CURL *curl, CURLcode result) { - PullJob *j = NULL; - CURLcode code; - long status; - int r; - - if (curl_easy_getinfo(curl, CURLINFO_PRIVATE, (char **)&j) != CURLE_OK) - return; - - if (!j || j->state == PULL_JOB_DONE || j->state == PULL_JOB_FAILED) - return; - - if (result != CURLE_OK) { - log_error("Transfer failed: %s", curl_easy_strerror(result)); - r = -EIO; - goto finish; - } - - code = curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &status); - if (code != CURLE_OK) { - log_error("Failed to retrieve response code: %s", curl_easy_strerror(code)); - r = -EIO; - goto finish; - } else if (status == 304) { - log_info("Image already downloaded. Skipping download."); - j->etag_exists = true; - r = 0; - goto finish; - } else if (status >= 300) { - log_error("HTTP request to %s failed with code %li.", j->url, status); - r = -EIO; - goto finish; - } else if (status < 200) { - log_error("HTTP request to %s finished with unexpected code %li.", j->url, status); - r = -EIO; - goto finish; - } - - if (j->state != PULL_JOB_RUNNING) { - log_error("Premature connection termination."); - r = -EIO; - goto finish; - } - - if (j->content_length != (uint64_t) -1 && - j->content_length != j->written_compressed) { - log_error("Download truncated."); - r = -EIO; - goto finish; - } - - if (j->checksum_context) { - uint8_t *k; - - k = gcry_md_read(j->checksum_context, GCRY_MD_SHA256); - if (!k) { - log_error("Failed to get checksum."); - r = -EIO; - goto finish; - } - - j->checksum = hexmem(k, gcry_md_get_algo_dlen(GCRY_MD_SHA256)); - if (!j->checksum) { - r = log_oom(); - goto finish; - } - - log_debug("SHA256 of %s is %s.", j->url, j->checksum); - } - - if (j->disk_fd >= 0 && j->allow_sparse) { - /* Make sure the file size is right, in case the file was - * sparse and we just seeked for the last part */ - - if (ftruncate(j->disk_fd, j->written_uncompressed) < 0) { - r = log_error_errno(errno, "Failed to truncate file: %m"); - goto finish; - } - - if (j->etag) - (void) fsetxattr(j->disk_fd, "user.source_etag", j->etag, strlen(j->etag), 0); - if (j->url) - (void) fsetxattr(j->disk_fd, "user.source_url", j->url, strlen(j->url), 0); - - if (j->mtime != 0) { - struct timespec ut[2]; - - timespec_store(&ut[0], j->mtime); - ut[1] = ut[0]; - (void) futimens(j->disk_fd, ut); - - (void) fd_setcrtime(j->disk_fd, j->mtime); - } - } - - r = 0; - -finish: - pull_job_finish(j, r); -} - -static int pull_job_write_uncompressed(const void *p, size_t sz, void *userdata) { - PullJob *j = userdata; - ssize_t n; - - assert(j); - assert(p); - - if (sz <= 0) - return 0; - - if (j->written_uncompressed + sz < j->written_uncompressed) { - log_error("File too large, overflow"); - return -EOVERFLOW; - } - - if (j->written_uncompressed + sz > j->uncompressed_max) { - log_error("File overly large, refusing"); - return -EFBIG; - } - - if (j->disk_fd >= 0) { - - if (j->grow_machine_directory && j->written_since_last_grow >= GROW_INTERVAL_BYTES) { - j->written_since_last_grow = 0; - grow_machine_directory(); - } - - if (j->allow_sparse) - n = sparse_write(j->disk_fd, p, sz, 64); - else - n = write(j->disk_fd, p, sz); - if (n < 0) - return log_error_errno(errno, "Failed to write file: %m"); - if ((size_t) n < sz) { - log_error("Short write"); - return -EIO; - } - } else { - - if (!GREEDY_REALLOC(j->payload, j->payload_allocated, j->payload_size + sz)) - return log_oom(); - - memcpy(j->payload + j->payload_size, p, sz); - j->payload_size += sz; - } - - j->written_uncompressed += sz; - j->written_since_last_grow += sz; - - return 0; -} - -static int pull_job_write_compressed(PullJob *j, void *p, size_t sz) { - int r; - - assert(j); - assert(p); - - if (sz <= 0) - return 0; - - if (j->written_compressed + sz < j->written_compressed) { - log_error("File too large, overflow"); - return -EOVERFLOW; - } - - if (j->written_compressed + sz > j->compressed_max) { - log_error("File overly large, refusing."); - return -EFBIG; - } - - if (j->content_length != (uint64_t) -1 && - j->written_compressed + sz > j->content_length) { - log_error("Content length incorrect."); - return -EFBIG; - } - - if (j->checksum_context) - gcry_md_write(j->checksum_context, p, sz); - - r = import_uncompress(&j->compress, p, sz, pull_job_write_uncompressed, j); - if (r < 0) - return r; - - j->written_compressed += sz; - - return 0; -} - -static int pull_job_open_disk(PullJob *j) { - int r; - - assert(j); - - if (j->on_open_disk) { - r = j->on_open_disk(j); - if (r < 0) - return r; - } - - if (j->disk_fd >= 0) { - /* Check if we can do sparse files */ - - if (lseek(j->disk_fd, SEEK_SET, 0) == 0) - j->allow_sparse = true; - else { - if (errno != ESPIPE) - return log_error_errno(errno, "Failed to seek on file descriptor: %m"); - - j->allow_sparse = false; - } - } - - if (j->calc_checksum) { - if (gcry_md_open(&j->checksum_context, GCRY_MD_SHA256, 0) != 0) { - log_error("Failed to initialize hash context."); - return -EIO; - } - } - - return 0; -} - -static int pull_job_detect_compression(PullJob *j) { - _cleanup_free_ uint8_t *stub = NULL; - size_t stub_size; - - int r; - - assert(j); - - r = import_uncompress_detect(&j->compress, j->payload, j->payload_size); - if (r < 0) - return log_error_errno(r, "Failed to initialize compressor: %m"); - if (r == 0) - return 0; - - log_debug("Stream is compressed: %s", import_compress_type_to_string(j->compress.type)); - - r = pull_job_open_disk(j); - if (r < 0) - return r; - - /* Now, take the payload we read so far, and decompress it */ - stub = j->payload; - stub_size = j->payload_size; - - j->payload = NULL; - j->payload_size = 0; - j->payload_allocated = 0; - - j->state = PULL_JOB_RUNNING; - - r = pull_job_write_compressed(j, stub, stub_size); - if (r < 0) - return r; - - return 0; -} - -static size_t pull_job_write_callback(void *contents, size_t size, size_t nmemb, void *userdata) { - PullJob *j = userdata; - size_t sz = size * nmemb; - int r; - - assert(contents); - assert(j); - - switch (j->state) { - - case PULL_JOB_ANALYZING: - /* Let's first check what it actually is */ - - if (!GREEDY_REALLOC(j->payload, j->payload_allocated, j->payload_size + sz)) { - r = log_oom(); - goto fail; - } - - memcpy(j->payload + j->payload_size, contents, sz); - j->payload_size += sz; - - r = pull_job_detect_compression(j); - if (r < 0) - goto fail; - - break; - - case PULL_JOB_RUNNING: - - r = pull_job_write_compressed(j, contents, sz); - if (r < 0) - goto fail; - - break; - - case PULL_JOB_DONE: - case PULL_JOB_FAILED: - r = -ESTALE; - goto fail; - - default: - assert_not_reached("Impossible state."); - } - - return sz; - -fail: - pull_job_finish(j, r); - return 0; -} - -static size_t pull_job_header_callback(void *contents, size_t size, size_t nmemb, void *userdata) { - PullJob *j = userdata; - size_t sz = size * nmemb; - _cleanup_free_ char *length = NULL, *last_modified = NULL; - char *etag; - int r; - - assert(contents); - assert(j); - - if (j->state == PULL_JOB_DONE || j->state == PULL_JOB_FAILED) { - r = -ESTALE; - goto fail; - } - - assert(j->state == PULL_JOB_ANALYZING); - - r = curl_header_strdup(contents, sz, "ETag:", &etag); - if (r < 0) { - log_oom(); - goto fail; - } - if (r > 0) { - free(j->etag); - j->etag = etag; - - if (strv_contains(j->old_etags, j->etag)) { - log_info("Image already downloaded. Skipping download."); - j->etag_exists = true; - pull_job_finish(j, 0); - return sz; - } - - return sz; - } - - r = curl_header_strdup(contents, sz, "Content-Length:", &length); - if (r < 0) { - log_oom(); - goto fail; - } - if (r > 0) { - (void) safe_atou64(length, &j->content_length); - - if (j->content_length != (uint64_t) -1) { - char bytes[FORMAT_BYTES_MAX]; - - if (j->content_length > j->compressed_max) { - log_error("Content too large."); - r = -EFBIG; - goto fail; - } - - log_info("Downloading %s for %s.", format_bytes(bytes, sizeof(bytes), j->content_length), j->url); - } - - return sz; - } - - r = curl_header_strdup(contents, sz, "Last-Modified:", &last_modified); - if (r < 0) { - log_oom(); - goto fail; - } - if (r > 0) { - (void) curl_parse_http_time(last_modified, &j->mtime); - return sz; - } - - if (j->on_header) { - r = j->on_header(j, contents, sz); - if (r < 0) - goto fail; - } - - return sz; - -fail: - pull_job_finish(j, r); - return 0; -} - -static int pull_job_progress_callback(void *userdata, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow) { - PullJob *j = userdata; - unsigned percent; - usec_t n; - - assert(j); - - if (dltotal <= 0) - return 0; - - percent = ((100 * dlnow) / dltotal); - n = now(CLOCK_MONOTONIC); - - if (n > j->last_status_usec + USEC_PER_SEC && - percent != j->progress_percent && - dlnow < dltotal) { - char buf[FORMAT_TIMESPAN_MAX]; - - if (n - j->start_usec > USEC_PER_SEC && dlnow > 0) { - char y[FORMAT_BYTES_MAX]; - usec_t left, done; - - done = n - j->start_usec; - left = (usec_t) (((double) done * (double) dltotal) / dlnow) - done; - - log_info("Got %u%% of %s. %s left at %s/s.", - percent, - j->url, - format_timespan(buf, sizeof(buf), left, USEC_PER_SEC), - format_bytes(y, sizeof(y), (uint64_t) ((double) dlnow / ((double) done / (double) USEC_PER_SEC)))); - } else - log_info("Got %u%% of %s.", percent, j->url); - - j->progress_percent = percent; - j->last_status_usec = n; - - if (j->on_progress) - j->on_progress(j); - } - - return 0; -} - -int pull_job_new(PullJob **ret, const char *url, CurlGlue *glue, void *userdata) { - _cleanup_(pull_job_unrefp) PullJob *j = NULL; - - assert(url); - assert(glue); - assert(ret); - - j = new0(PullJob, 1); - if (!j) - return -ENOMEM; - - j->state = PULL_JOB_INIT; - j->disk_fd = -1; - j->userdata = userdata; - j->glue = glue; - j->content_length = (uint64_t) -1; - j->start_usec = now(CLOCK_MONOTONIC); - j->compressed_max = j->uncompressed_max = 8LLU * 1024LLU * 1024LLU * 1024LLU; /* 8GB */ - - j->url = strdup(url); - if (!j->url) - return -ENOMEM; - - *ret = j; - j = NULL; - - return 0; -} - -int pull_job_begin(PullJob *j) { - int r; - - assert(j); - - if (j->state != PULL_JOB_INIT) - return -EBUSY; - - if (j->grow_machine_directory) - grow_machine_directory(); - - r = curl_glue_make(&j->curl, j->url, j); - if (r < 0) - return r; - - if (!strv_isempty(j->old_etags)) { - _cleanup_free_ char *cc = NULL, *hdr = NULL; - - cc = strv_join(j->old_etags, ", "); - if (!cc) - return -ENOMEM; - - hdr = strappend("If-None-Match: ", cc); - if (!hdr) - return -ENOMEM; - - if (!j->request_header) { - j->request_header = curl_slist_new(hdr, NULL); - if (!j->request_header) - return -ENOMEM; - } else { - struct curl_slist *l; - - l = curl_slist_append(j->request_header, hdr); - if (!l) - return -ENOMEM; - - j->request_header = l; - } - } - - if (j->request_header) { - if (curl_easy_setopt(j->curl, CURLOPT_HTTPHEADER, j->request_header) != CURLE_OK) - return -EIO; - } - - if (curl_easy_setopt(j->curl, CURLOPT_WRITEFUNCTION, pull_job_write_callback) != CURLE_OK) - return -EIO; - - if (curl_easy_setopt(j->curl, CURLOPT_WRITEDATA, j) != CURLE_OK) - return -EIO; - - if (curl_easy_setopt(j->curl, CURLOPT_HEADERFUNCTION, pull_job_header_callback) != CURLE_OK) - return -EIO; - - if (curl_easy_setopt(j->curl, CURLOPT_HEADERDATA, j) != CURLE_OK) - return -EIO; - - if (curl_easy_setopt(j->curl, CURLOPT_XFERINFOFUNCTION, pull_job_progress_callback) != CURLE_OK) - return -EIO; - - if (curl_easy_setopt(j->curl, CURLOPT_XFERINFODATA, j) != CURLE_OK) - return -EIO; - - if (curl_easy_setopt(j->curl, CURLOPT_NOPROGRESS, 0) != CURLE_OK) - return -EIO; - - r = curl_glue_add(j->glue, j->curl); - if (r < 0) - return r; - - j->state = PULL_JOB_ANALYZING; - - return 0; -} diff --git a/src/import/pull-job.h b/src/import/pull-job.h deleted file mode 100644 index 3239aeac2..000000000 --- a/src/import/pull-job.h +++ /dev/null @@ -1,117 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -#pragma once - -/*** - This file is part of systemd. - - Copyright 2015 Lennart Poettering - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see . -***/ - -#include - -#include "macro.h" -#include "curl-util.h" -#include "import-compress.h" - -typedef struct PullJob PullJob; - -typedef void (*PullJobFinished)(PullJob *job); -typedef int (*PullJobOpenDisk)(PullJob *job); -typedef int (*PullJobHeader)(PullJob *job, const char *header, size_t sz); -typedef void (*PullJobProgress)(PullJob *job); - -typedef enum PullJobState { - PULL_JOB_INIT, - PULL_JOB_ANALYZING, /* Still reading into ->payload, to figure out what we have */ - PULL_JOB_RUNNING, /* Writing to destination */ - PULL_JOB_DONE, - PULL_JOB_FAILED, - _PULL_JOB_STATE_MAX, - _PULL_JOB_STATE_INVALID = -1, -} PullJobState; - -#define PULL_JOB_STATE_IS_COMPLETE(j) (IN_SET((j)->state, PULL_JOB_DONE, PULL_JOB_FAILED)) - -typedef enum PullJobCompression { - PULL_JOB_UNCOMPRESSED, - PULL_JOB_XZ, - PULL_JOB_GZIP, - PULL_JOB_BZIP2, - _PULL_JOB_COMPRESSION_MAX, - _PULL_JOB_COMPRESSION_INVALID = -1, -} PullJobCompression; - -struct PullJob { - PullJobState state; - int error; - - char *url; - - void *userdata; - PullJobFinished on_finished; - PullJobOpenDisk on_open_disk; - PullJobHeader on_header; - PullJobProgress on_progress; - - CurlGlue *glue; - CURL *curl; - struct curl_slist *request_header; - - char *etag; - char **old_etags; - bool etag_exists; - - uint64_t content_length; - uint64_t written_compressed; - uint64_t written_uncompressed; - - uint64_t uncompressed_max; - uint64_t compressed_max; - - uint8_t *payload; - size_t payload_size; - size_t payload_allocated; - - int disk_fd; - - usec_t mtime; - - ImportCompress compress; - - unsigned progress_percent; - usec_t start_usec; - usec_t last_status_usec; - - bool allow_sparse; - - bool calc_checksum; - gcry_md_hd_t checksum_context; - - char *checksum; - - bool grow_machine_directory; - uint64_t written_since_last_grow; -}; - -int pull_job_new(PullJob **job, const char *url, CurlGlue *glue, void *userdata); -PullJob* pull_job_unref(PullJob *job); - -int pull_job_begin(PullJob *j); - -void pull_job_curl_on_finished(CurlGlue *g, CURL *curl, CURLcode result); - -DEFINE_TRIVIAL_CLEANUP_FUNC(PullJob*, pull_job_unref); diff --git a/src/import/pull-raw.c b/src/import/pull-raw.c deleted file mode 100644 index c0c6d57ea..000000000 --- a/src/import/pull-raw.c +++ /dev/null @@ -1,518 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -/*** - This file is part of systemd. - - Copyright 2014 Lennart Poettering - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see . -***/ - -#include -#include -#include - -#include "sd-daemon.h" -#include "utf8.h" -#include "strv.h" -#include "copy.h" -#include "btrfs-util.h" -#include "util.h" -#include "macro.h" -#include "mkdir.h" -#include "path-util.h" -#include "import-util.h" -#include "import-common.h" -#include "curl-util.h" -#include "qcow2-util.h" -#include "pull-job.h" -#include "pull-common.h" -#include "pull-raw.h" - -typedef enum RawProgress { - RAW_DOWNLOADING, - RAW_VERIFYING, - RAW_UNPACKING, - RAW_FINALIZING, - RAW_COPYING, -} RawProgress; - -struct RawPull { - sd_event *event; - CurlGlue *glue; - - char *image_root; - - PullJob *raw_job; - PullJob *checksum_job; - PullJob *signature_job; - - RawPullFinished on_finished; - void *userdata; - - char *local; - bool force_local; - bool grow_machine_directory; - - char *temp_path; - char *final_path; - - ImportVerify verify; -}; - -RawPull* raw_pull_unref(RawPull *i) { - if (!i) - return NULL; - - pull_job_unref(i->raw_job); - pull_job_unref(i->checksum_job); - pull_job_unref(i->signature_job); - - curl_glue_unref(i->glue); - sd_event_unref(i->event); - - if (i->temp_path) { - (void) unlink(i->temp_path); - free(i->temp_path); - } - - free(i->final_path); - free(i->image_root); - free(i->local); - free(i); - - return NULL; -} - -int raw_pull_new( - RawPull **ret, - sd_event *event, - const char *image_root, - RawPullFinished on_finished, - void *userdata) { - - _cleanup_(raw_pull_unrefp) RawPull *i = NULL; - int r; - - assert(ret); - - i = new0(RawPull, 1); - if (!i) - return -ENOMEM; - - i->on_finished = on_finished; - i->userdata = userdata; - - i->image_root = strdup(image_root ?: "/var/lib/machines"); - if (!i->image_root) - return -ENOMEM; - - i->grow_machine_directory = path_startswith(i->image_root, "/var/lib/machines"); - - if (event) - i->event = sd_event_ref(event); - else { - r = sd_event_default(&i->event); - if (r < 0) - return r; - } - - r = curl_glue_new(&i->glue, i->event); - if (r < 0) - return r; - - i->glue->on_finished = pull_job_curl_on_finished; - i->glue->userdata = i; - - *ret = i; - i = NULL; - - return 0; -} - -static void raw_pull_report_progress(RawPull *i, RawProgress p) { - unsigned percent; - - assert(i); - - switch (p) { - - case RAW_DOWNLOADING: { - unsigned remain = 80; - - percent = 0; - - if (i->checksum_job) { - percent += i->checksum_job->progress_percent * 5 / 100; - remain -= 5; - } - - if (i->signature_job) { - percent += i->signature_job->progress_percent * 5 / 100; - remain -= 5; - } - - if (i->raw_job) - percent += i->raw_job->progress_percent * remain / 100; - break; - } - - case RAW_VERIFYING: - percent = 80; - break; - - case RAW_UNPACKING: - percent = 85; - break; - - case RAW_FINALIZING: - percent = 90; - break; - - case RAW_COPYING: - percent = 95; - break; - - default: - assert_not_reached("Unknown progress state"); - } - - sd_notifyf(false, "X_IMPORT_PROGRESS=%u", percent); - log_debug("Combined progress %u%%", percent); -} - -static int raw_pull_maybe_convert_qcow2(RawPull *i) { - _cleanup_close_ int converted_fd = -1; - _cleanup_free_ char *t = NULL; - int r; - - assert(i); - assert(i->raw_job); - - r = qcow2_detect(i->raw_job->disk_fd); - if (r < 0) - return log_error_errno(r, "Failed to detect whether this is a QCOW2 image: %m"); - if (r == 0) - return 0; - - /* This is a QCOW2 image, let's convert it */ - r = tempfn_random(i->final_path, &t); - if (r < 0) - return log_oom(); - - converted_fd = open(t, O_RDWR|O_CREAT|O_EXCL|O_NOCTTY|O_CLOEXEC, 0664); - if (converted_fd < 0) - return log_error_errno(errno, "Failed to create %s: %m", t); - - r = chattr_fd(converted_fd, true, FS_NOCOW_FL); - if (r < 0) - log_warning_errno(errno, "Failed to set file attributes on %s: %m", t); - - log_info("Unpacking QCOW2 file."); - - r = qcow2_convert(i->raw_job->disk_fd, converted_fd); - if (r < 0) { - unlink(t); - return log_error_errno(r, "Failed to convert qcow2 image: %m"); - } - - (void) unlink(i->temp_path); - free(i->temp_path); - i->temp_path = t; - t = NULL; - - safe_close(i->raw_job->disk_fd); - i->raw_job->disk_fd = converted_fd; - converted_fd = -1; - - return 1; -} - -static int raw_pull_make_local_copy(RawPull *i) { - _cleanup_free_ char *tp = NULL; - _cleanup_close_ int dfd = -1; - const char *p; - int r; - - assert(i); - assert(i->raw_job); - - if (!i->local) - return 0; - - if (i->raw_job->etag_exists) { - /* We have downloaded this one previously, reopen it */ - - assert(i->raw_job->disk_fd < 0); - - if (!i->final_path) { - r = pull_make_path(i->raw_job->url, i->raw_job->etag, i->image_root, ".raw-", ".raw", &i->final_path); - if (r < 0) - return log_oom(); - } - - i->raw_job->disk_fd = open(i->final_path, O_RDONLY|O_NOCTTY|O_CLOEXEC); - if (i->raw_job->disk_fd < 0) - return log_error_errno(errno, "Failed to open vendor image: %m"); - } else { - /* We freshly downloaded the image, use it */ - - assert(i->raw_job->disk_fd >= 0); - - if (lseek(i->raw_job->disk_fd, SEEK_SET, 0) == (off_t) -1) - return log_error_errno(errno, "Failed to seek to beginning of vendor image: %m"); - } - - p = strjoina(i->image_root, "/", i->local, ".raw"); - - if (i->force_local) { - (void) btrfs_subvol_remove(p); - (void) rm_rf_dangerous(p, false, true, false); - } - - r = tempfn_random(p, &tp); - if (r < 0) - return log_oom(); - - dfd = open(tp, O_WRONLY|O_CREAT|O_EXCL|O_NOCTTY|O_CLOEXEC, 0664); - if (dfd < 0) - return log_error_errno(errno, "Failed to create writable copy of image: %m"); - - /* Turn off COW writing. This should greatly improve - * performance on COW file systems like btrfs, since it - * reduces fragmentation caused by not allowing in-place - * writes. */ - r = chattr_fd(dfd, true, FS_NOCOW_FL); - if (r < 0) - log_warning_errno(errno, "Failed to set file attributes on %s: %m", tp); - - r = copy_bytes(i->raw_job->disk_fd, dfd, (off_t) -1, true); - if (r < 0) { - unlink(tp); - return log_error_errno(r, "Failed to make writable copy of image: %m"); - } - - (void) copy_times(i->raw_job->disk_fd, dfd); - (void) copy_xattr(i->raw_job->disk_fd, dfd); - - dfd = safe_close(dfd); - - r = rename(tp, p); - if (r < 0) { - unlink(tp); - return log_error_errno(errno, "Failed to move writable image into place: %m"); - } - - log_info("Created new local image '%s'.", i->local); - return 0; -} - -static bool raw_pull_is_done(RawPull *i) { - assert(i); - assert(i->raw_job); - - if (i->raw_job->state != PULL_JOB_DONE) - return false; - if (i->checksum_job && i->checksum_job->state != PULL_JOB_DONE) - return false; - if (i->signature_job && i->signature_job->state != PULL_JOB_DONE) - return false; - - return true; -} - -static void raw_pull_job_on_finished(PullJob *j) { - RawPull *i; - int r; - - assert(j); - assert(j->userdata); - - i = j->userdata; - if (j->error != 0) { - if (j == i->checksum_job) - log_error_errno(j->error, "Failed to retrieve SHA256 checksum, cannot verify. (Try --verify=no?)"); - else if (j == i->signature_job) - log_error_errno(j->error, "Failed to retrieve signature file, cannot verify. (Try --verify=no?)"); - else - log_error_errno(j->error, "Failed to retrieve image file. (Wrong URL?)"); - - r = j->error; - goto finish; - } - - /* This is invoked if either the download completed - * successfully, or the download was skipped because we - * already have the etag. In this case ->etag_exists is - * true. - * - * We only do something when we got all three files */ - - if (!raw_pull_is_done(i)) - return; - - if (!i->raw_job->etag_exists) { - /* This is a new download, verify it, and move it into place */ - assert(i->raw_job->disk_fd >= 0); - - raw_pull_report_progress(i, RAW_VERIFYING); - - r = pull_verify(i->raw_job, i->checksum_job, i->signature_job); - if (r < 0) - goto finish; - - raw_pull_report_progress(i, RAW_UNPACKING); - - r = raw_pull_maybe_convert_qcow2(i); - if (r < 0) - goto finish; - - raw_pull_report_progress(i, RAW_FINALIZING); - - r = import_make_read_only_fd(i->raw_job->disk_fd); - if (r < 0) - goto finish; - - r = rename_noreplace(AT_FDCWD, i->temp_path, AT_FDCWD, i->final_path); - if (r < 0) { - log_error_errno(r, "Failed to move RAW file into place: %m"); - goto finish; - } - - free(i->temp_path); - i->temp_path = NULL; - } - - raw_pull_report_progress(i, RAW_COPYING); - - r = raw_pull_make_local_copy(i); - if (r < 0) - goto finish; - - r = 0; - -finish: - if (i->on_finished) - i->on_finished(i, r, i->userdata); - else - sd_event_exit(i->event, r); -} - -static int raw_pull_job_on_open_disk(PullJob *j) { - RawPull *i; - int r; - - assert(j); - assert(j->userdata); - - i = j->userdata; - assert(i->raw_job == j); - assert(!i->final_path); - assert(!i->temp_path); - - r = pull_make_path(j->url, j->etag, i->image_root, ".raw-", ".raw", &i->final_path); - if (r < 0) - return log_oom(); - - r = tempfn_random(i->final_path, &i->temp_path); - if (r < 0) - return log_oom(); - - (void) mkdir_parents_label(i->temp_path, 0700); - - j->disk_fd = open(i->temp_path, O_RDWR|O_CREAT|O_EXCL|O_NOCTTY|O_CLOEXEC, 0664); - if (j->disk_fd < 0) - return log_error_errno(errno, "Failed to create %s: %m", i->temp_path); - - r = chattr_fd(j->disk_fd, true, FS_NOCOW_FL); - if (r < 0) - log_warning_errno(errno, "Failed to set file attributes on %s: %m", i->temp_path); - - return 0; -} - -static void raw_pull_job_on_progress(PullJob *j) { - RawPull *i; - - assert(j); - assert(j->userdata); - - i = j->userdata; - - raw_pull_report_progress(i, RAW_DOWNLOADING); -} - -int raw_pull_start(RawPull *i, const char *url, const char *local, bool force_local, ImportVerify verify) { - int r; - - assert(i); - assert(verify < _IMPORT_VERIFY_MAX); - assert(verify >= 0); - - if (!http_url_is_valid(url)) - return -EINVAL; - - if (local && !machine_name_is_valid(local)) - return -EINVAL; - - if (i->raw_job) - return -EBUSY; - - r = free_and_strdup(&i->local, local); - if (r < 0) - return r; - i->force_local = force_local; - i->verify = verify; - - /* Queue job for the image itself */ - r = pull_job_new(&i->raw_job, url, i->glue, i); - if (r < 0) - return r; - - i->raw_job->on_finished = raw_pull_job_on_finished; - i->raw_job->on_open_disk = raw_pull_job_on_open_disk; - i->raw_job->on_progress = raw_pull_job_on_progress; - i->raw_job->calc_checksum = verify != IMPORT_VERIFY_NO; - i->raw_job->grow_machine_directory = i->grow_machine_directory; - - r = pull_find_old_etags(url, i->image_root, DT_REG, ".raw-", ".raw", &i->raw_job->old_etags); - if (r < 0) - return r; - - r = pull_make_verification_jobs(&i->checksum_job, &i->signature_job, verify, url, i->glue, raw_pull_job_on_finished, i); - if (r < 0) - return r; - - r = pull_job_begin(i->raw_job); - if (r < 0) - return r; - - if (i->checksum_job) { - i->checksum_job->on_progress = raw_pull_job_on_progress; - - r = pull_job_begin(i->checksum_job); - if (r < 0) - return r; - } - - if (i->signature_job) { - i->signature_job->on_progress = raw_pull_job_on_progress; - - r = pull_job_begin(i->signature_job); - if (r < 0) - return r; - } - - return 0; -} diff --git a/src/import/pull-raw.h b/src/import/pull-raw.h deleted file mode 100644 index 808f7be81..000000000 --- a/src/import/pull-raw.h +++ /dev/null @@ -1,37 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -#pragma once - -/*** - This file is part of systemd. - - Copyright 2014 Lennart Poettering - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see . -***/ - -#include "sd-event.h" -#include "macro.h" -#include "import-util.h" - -typedef struct RawPull RawPull; - -typedef void (*RawPullFinished)(RawPull *pull, int error, void *userdata); - -int raw_pull_new(RawPull **pull, sd_event *event, const char *image_root, RawPullFinished on_finished, void *userdata); -RawPull* raw_pull_unref(RawPull *pull); - -DEFINE_TRIVIAL_CLEANUP_FUNC(RawPull*, raw_pull_unref); - -int raw_pull_start(RawPull *pull, const char *url, const char *local, bool force_local, ImportVerify verify); diff --git a/src/import/pull-tar.c b/src/import/pull-tar.c deleted file mode 100644 index 58cafdd78..000000000 --- a/src/import/pull-tar.c +++ /dev/null @@ -1,416 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -/*** - This file is part of systemd. - - Copyright 2015 Lennart Poettering - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see . -***/ - -#include -#include - -#include "sd-daemon.h" -#include "utf8.h" -#include "strv.h" -#include "copy.h" -#include "btrfs-util.h" -#include "util.h" -#include "macro.h" -#include "mkdir.h" -#include "path-util.h" -#include "import-util.h" -#include "import-common.h" -#include "curl-util.h" -#include "pull-job.h" -#include "pull-common.h" -#include "pull-tar.h" - -typedef enum TarProgress { - TAR_DOWNLOADING, - TAR_VERIFYING, - TAR_FINALIZING, - TAR_COPYING, -} TarProgress; - -struct TarPull { - sd_event *event; - CurlGlue *glue; - - char *image_root; - - PullJob *tar_job; - PullJob *checksum_job; - PullJob *signature_job; - - TarPullFinished on_finished; - void *userdata; - - char *local; - bool force_local; - bool grow_machine_directory; - - pid_t tar_pid; - - char *temp_path; - char *final_path; - - ImportVerify verify; -}; - -TarPull* tar_pull_unref(TarPull *i) { - if (!i) - return NULL; - - if (i->tar_pid > 1) { - (void) kill_and_sigcont(i->tar_pid, SIGKILL); - (void) wait_for_terminate(i->tar_pid, NULL); - } - - pull_job_unref(i->tar_job); - pull_job_unref(i->checksum_job); - pull_job_unref(i->signature_job); - - curl_glue_unref(i->glue); - sd_event_unref(i->event); - - if (i->temp_path) { - (void) btrfs_subvol_remove(i->temp_path); - (void) rm_rf_dangerous(i->temp_path, false, true, false); - free(i->temp_path); - } - - free(i->final_path); - free(i->image_root); - free(i->local); - free(i); - - return NULL; -} - -int tar_pull_new( - TarPull **ret, - sd_event *event, - const char *image_root, - TarPullFinished on_finished, - void *userdata) { - - _cleanup_(tar_pull_unrefp) TarPull *i = NULL; - int r; - - assert(ret); - assert(event); - - i = new0(TarPull, 1); - if (!i) - return -ENOMEM; - - i->on_finished = on_finished; - i->userdata = userdata; - - i->image_root = strdup(image_root ?: "/var/lib/machines"); - if (!i->image_root) - return -ENOMEM; - - i->grow_machine_directory = path_startswith(i->image_root, "/var/lib/machines"); - - if (event) - i->event = sd_event_ref(event); - else { - r = sd_event_default(&i->event); - if (r < 0) - return r; - } - - r = curl_glue_new(&i->glue, i->event); - if (r < 0) - return r; - - i->glue->on_finished = pull_job_curl_on_finished; - i->glue->userdata = i; - - *ret = i; - i = NULL; - - return 0; -} - -static void tar_pull_report_progress(TarPull *i, TarProgress p) { - unsigned percent; - - assert(i); - - switch (p) { - - case TAR_DOWNLOADING: { - unsigned remain = 85; - - percent = 0; - - if (i->checksum_job) { - percent += i->checksum_job->progress_percent * 5 / 100; - remain -= 5; - } - - if (i->signature_job) { - percent += i->signature_job->progress_percent * 5 / 100; - remain -= 5; - } - - if (i->tar_job) - percent += i->tar_job->progress_percent * remain / 100; - break; - } - - case TAR_VERIFYING: - percent = 85; - break; - - case TAR_FINALIZING: - percent = 90; - break; - - case TAR_COPYING: - percent = 95; - break; - - default: - assert_not_reached("Unknown progress state"); - } - - sd_notifyf(false, "X_IMPORT_PROGRESS=%u", percent); - log_debug("Combined progress %u%%", percent); -} - -static int tar_pull_make_local_copy(TarPull *i) { - int r; - - assert(i); - assert(i->tar_job); - - if (!i->local) - return 0; - - if (!i->final_path) { - r = pull_make_path(i->tar_job->url, i->tar_job->etag, i->image_root, ".tar-", NULL, &i->final_path); - if (r < 0) - return log_oom(); - } - - r = pull_make_local_copy(i->final_path, i->image_root, i->local, i->force_local); - if (r < 0) - return r; - - return 0; -} - -static bool tar_pull_is_done(TarPull *i) { - assert(i); - assert(i->tar_job); - - if (i->tar_job->state != PULL_JOB_DONE) - return false; - if (i->checksum_job && i->checksum_job->state != PULL_JOB_DONE) - return false; - if (i->signature_job && i->signature_job->state != PULL_JOB_DONE) - return false; - - return true; -} - -static void tar_pull_job_on_finished(PullJob *j) { - TarPull *i; - int r; - - assert(j); - assert(j->userdata); - - i = j->userdata; - if (j->error != 0) { - if (j == i->checksum_job) - log_error_errno(j->error, "Failed to retrieve SHA256 checksum, cannot verify. (Try --verify=no?)"); - else if (j == i->signature_job) - log_error_errno(j->error, "Failed to retrieve signature file, cannot verify. (Try --verify=no?)"); - else - log_error_errno(j->error, "Failed to retrieve image file. (Wrong URL?)"); - - r = j->error; - goto finish; - } - - /* This is invoked if either the download completed - * successfully, or the download was skipped because we - * already have the etag. */ - - if (!tar_pull_is_done(i)) - return; - - j->disk_fd = safe_close(i->tar_job->disk_fd); - - if (i->tar_pid > 0) { - r = wait_for_terminate_and_warn("tar", i->tar_pid, true); - i->tar_pid = 0; - if (r < 0) - goto finish; - } - - if (!i->tar_job->etag_exists) { - /* This is a new download, verify it, and move it into place */ - - tar_pull_report_progress(i, TAR_VERIFYING); - - r = pull_verify(i->tar_job, i->checksum_job, i->signature_job); - if (r < 0) - goto finish; - - tar_pull_report_progress(i, TAR_FINALIZING); - - r = import_make_read_only(i->temp_path); - if (r < 0) - goto finish; - - r = rename_noreplace(AT_FDCWD, i->temp_path, AT_FDCWD, i->final_path); - if (r < 0) { - log_error_errno(r, "Failed to rename to final image name: %m"); - goto finish; - } - - free(i->temp_path); - i->temp_path = NULL; - } - - tar_pull_report_progress(i, TAR_COPYING); - - r = tar_pull_make_local_copy(i); - if (r < 0) - goto finish; - - r = 0; - -finish: - if (i->on_finished) - i->on_finished(i, r, i->userdata); - else - sd_event_exit(i->event, r); -} - -static int tar_pull_job_on_open_disk(PullJob *j) { - TarPull *i; - int r; - - assert(j); - assert(j->userdata); - - i = j->userdata; - assert(i->tar_job == j); - assert(!i->final_path); - assert(!i->temp_path); - assert(i->tar_pid <= 0); - - r = pull_make_path(j->url, j->etag, i->image_root, ".tar-", NULL, &i->final_path); - if (r < 0) - return log_oom(); - - r = tempfn_random(i->final_path, &i->temp_path); - if (r < 0) - return log_oom(); - - mkdir_parents_label(i->temp_path, 0700); - - r = btrfs_subvol_make(i->temp_path); - if (r == -ENOTTY) { - if (mkdir(i->temp_path, 0755) < 0) - return log_error_errno(errno, "Failed to create directory %s: %m", i->temp_path); - } else if (r < 0) - return log_error_errno(errno, "Failed to create subvolume %s: %m", i->temp_path); - - j->disk_fd = import_fork_tar_x(i->temp_path, &i->tar_pid); - if (j->disk_fd < 0) - return j->disk_fd; - - return 0; -} - -static void tar_pull_job_on_progress(PullJob *j) { - TarPull *i; - - assert(j); - assert(j->userdata); - - i = j->userdata; - - tar_pull_report_progress(i, TAR_DOWNLOADING); -} - -int tar_pull_start(TarPull *i, const char *url, const char *local, bool force_local, ImportVerify verify) { - int r; - - assert(i); - - if (!http_url_is_valid(url)) - return -EINVAL; - - if (local && !machine_name_is_valid(local)) - return -EINVAL; - - if (i->tar_job) - return -EBUSY; - - r = free_and_strdup(&i->local, local); - if (r < 0) - return r; - i->force_local = force_local; - i->verify = verify; - - r = pull_job_new(&i->tar_job, url, i->glue, i); - if (r < 0) - return r; - - i->tar_job->on_finished = tar_pull_job_on_finished; - i->tar_job->on_open_disk = tar_pull_job_on_open_disk; - i->tar_job->on_progress = tar_pull_job_on_progress; - i->tar_job->calc_checksum = verify != IMPORT_VERIFY_NO; - i->tar_job->grow_machine_directory = i->grow_machine_directory; - - r = pull_find_old_etags(url, i->image_root, DT_DIR, ".tar-", NULL, &i->tar_job->old_etags); - if (r < 0) - return r; - - r = pull_make_verification_jobs(&i->checksum_job, &i->signature_job, verify, url, i->glue, tar_pull_job_on_finished, i); - if (r < 0) - return r; - - r = pull_job_begin(i->tar_job); - if (r < 0) - return r; - - if (i->checksum_job) { - i->checksum_job->on_progress = tar_pull_job_on_progress; - - r = pull_job_begin(i->checksum_job); - if (r < 0) - return r; - } - - if (i->signature_job) { - i->signature_job->on_progress = tar_pull_job_on_progress; - - r = pull_job_begin(i->signature_job); - if (r < 0) - return r; - } - - return 0; -} diff --git a/src/import/pull-tar.h b/src/import/pull-tar.h deleted file mode 100644 index 0ed507748..000000000 --- a/src/import/pull-tar.h +++ /dev/null @@ -1,37 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -#pragma once - -/*** - This file is part of systemd. - - Copyright 2015 Lennart Poettering - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see . -***/ - -#include "sd-event.h" -#include "macro.h" -#include "import-util.h" - -typedef struct TarPull TarPull; - -typedef void (*TarPullFinished)(TarPull *pull, int error, void *userdata); - -int tar_pull_new(TarPull **pull, sd_event *event, const char *image_root, TarPullFinished on_finished, void *userdata); -TarPull* tar_pull_unref(TarPull *pull); - -DEFINE_TRIVIAL_CLEANUP_FUNC(TarPull*, tar_pull_unref); - -int tar_pull_start(TarPull *pull, const char *url, const char *local, bool force_local, ImportVerify verify); diff --git a/src/import/pull.c b/src/import/pull.c deleted file mode 100644 index ef7b0359a..000000000 --- a/src/import/pull.c +++ /dev/null @@ -1,442 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -/*** - This file is part of systemd. - - Copyright 2014 Lennart Poettering - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see . -***/ - -#include - -#include "sd-event.h" -#include "event-util.h" -#include "verbs.h" -#include "build.h" -#include "machine-image.h" -#include "import-util.h" -#include "pull-tar.h" -#include "pull-raw.h" -#include "pull-dkr.h" - -static bool arg_force = false; -static const char *arg_image_root = "/var/lib/machines"; -static ImportVerify arg_verify = IMPORT_VERIFY_SIGNATURE; -static const char* arg_dkr_index_url = DEFAULT_DKR_INDEX_URL; - -static int interrupt_signal_handler(sd_event_source *s, const struct signalfd_siginfo *si, void *userdata) { - log_notice("Transfer aborted."); - sd_event_exit(sd_event_source_get_event(s), EINTR); - return 0; -} - -static void on_tar_finished(TarPull *pull, int error, void *userdata) { - sd_event *event = userdata; - assert(pull); - - if (error == 0) - log_info("Operation completed successfully."); - - sd_event_exit(event, abs(error)); -} - -static int pull_tar(int argc, char *argv[], void *userdata) { - _cleanup_(tar_pull_unrefp) TarPull *pull = NULL; - _cleanup_event_unref_ sd_event *event = NULL; - const char *url, *local; - _cleanup_free_ char *l = NULL, *ll = NULL; - int r; - - url = argv[1]; - if (!http_url_is_valid(url)) { - log_error("URL '%s' is not valid.", url); - return -EINVAL; - } - - if (argc >= 3) - local = argv[2]; - else { - r = import_url_last_component(url, &l); - if (r < 0) - return log_error_errno(r, "Failed get final component of URL: %m"); - - local = l; - } - - if (isempty(local) || streq(local, "-")) - local = NULL; - - if (local) { - r = tar_strip_suffixes(local, &ll); - if (r < 0) - return log_oom(); - - local = ll; - - if (!machine_name_is_valid(local)) { - log_error("Local image name '%s' is not valid.", local); - return -EINVAL; - } - - if (!arg_force) { - r = image_find(local, NULL); - if (r < 0) - return log_error_errno(r, "Failed to check whether image '%s' exists: %m", local); - else if (r > 0) { - log_error_errno(EEXIST, "Image '%s' already exists.", local); - return -EEXIST; - } - } - - log_info("Pulling '%s', saving as '%s'.", url, local); - } else - log_info("Pulling '%s'.", url); - - r = sd_event_default(&event); - if (r < 0) - return log_error_errno(r, "Failed to allocate event loop: %m"); - - assert_se(sigprocmask_many(SIG_BLOCK, SIGTERM, SIGINT, -1) == 0); - sd_event_add_signal(event, NULL, SIGTERM, interrupt_signal_handler, NULL); - sd_event_add_signal(event, NULL, SIGINT, interrupt_signal_handler, NULL); - - r = tar_pull_new(&pull, event, arg_image_root, on_tar_finished, event); - if (r < 0) - return log_error_errno(r, "Failed to allocate puller: %m"); - - r = tar_pull_start(pull, url, local, arg_force, arg_verify); - if (r < 0) - return log_error_errno(r, "Failed to pull image: %m"); - - r = sd_event_loop(event); - if (r < 0) - return log_error_errno(r, "Failed to run event loop: %m"); - - log_info("Exiting."); - return -r; -} - -static void on_raw_finished(RawPull *pull, int error, void *userdata) { - sd_event *event = userdata; - assert(pull); - - if (error == 0) - log_info("Operation completed successfully."); - - sd_event_exit(event, abs(error)); -} - -static int pull_raw(int argc, char *argv[], void *userdata) { - _cleanup_(raw_pull_unrefp) RawPull *pull = NULL; - _cleanup_event_unref_ sd_event *event = NULL; - const char *url, *local; - _cleanup_free_ char *l = NULL, *ll = NULL; - int r; - - url = argv[1]; - if (!http_url_is_valid(url)) { - log_error("URL '%s' is not valid.", url); - return -EINVAL; - } - - if (argc >= 3) - local = argv[2]; - else { - r = import_url_last_component(url, &l); - if (r < 0) - return log_error_errno(r, "Failed get final component of URL: %m"); - - local = l; - } - - if (isempty(local) || streq(local, "-")) - local = NULL; - - if (local) { - r = raw_strip_suffixes(local, &ll); - if (r < 0) - return log_oom(); - - local = ll; - - if (!machine_name_is_valid(local)) { - log_error("Local image name '%s' is not valid.", local); - return -EINVAL; - } - - if (!arg_force) { - r = image_find(local, NULL); - if (r < 0) - return log_error_errno(r, "Failed to check whether image '%s' exists: %m", local); - else if (r > 0) { - log_error_errno(EEXIST, "Image '%s' already exists.", local); - return -EEXIST; - } - } - - log_info("Pulling '%s', saving as '%s'.", url, local); - } else - log_info("Pulling '%s'.", url); - - r = sd_event_default(&event); - if (r < 0) - return log_error_errno(r, "Failed to allocate event loop: %m"); - - assert_se(sigprocmask_many(SIG_BLOCK, SIGTERM, SIGINT, -1) == 0); - sd_event_add_signal(event, NULL, SIGTERM, interrupt_signal_handler, NULL); - sd_event_add_signal(event, NULL, SIGINT, interrupt_signal_handler, NULL); - - r = raw_pull_new(&pull, event, arg_image_root, on_raw_finished, event); - if (r < 0) - return log_error_errno(r, "Failed to allocate puller: %m"); - - r = raw_pull_start(pull, url, local, arg_force, arg_verify); - if (r < 0) - return log_error_errno(r, "Failed to pull image: %m"); - - r = sd_event_loop(event); - if (r < 0) - return log_error_errno(r, "Failed to run event loop: %m"); - - log_info("Exiting."); - return -r; -} - -static void on_dkr_finished(DkrPull *pull, int error, void *userdata) { - sd_event *event = userdata; - assert(pull); - - if (error == 0) - log_info("Operation completed successfully."); - - sd_event_exit(event, abs(error)); -} - -static int pull_dkr(int argc, char *argv[], void *userdata) { - _cleanup_(dkr_pull_unrefp) DkrPull *pull = NULL; - _cleanup_event_unref_ sd_event *event = NULL; - const char *name, *tag, *local; - int r; - - if (!arg_dkr_index_url) { - log_error("Please specify an index URL with --dkr-index-url="); - return -EINVAL; - } - - if (arg_verify != IMPORT_VERIFY_NO) { - log_error("Pulls from dkr do not support image verification, please pass --verify=no."); - return -EINVAL; - } - - tag = strchr(argv[1], ':'); - if (tag) { - name = strndupa(argv[1], tag - argv[1]); - tag++; - } else { - name = argv[1]; - tag = "latest"; - } - - if (!dkr_name_is_valid(name)) { - log_error("Remote name '%s' is not valid.", name); - return -EINVAL; - } - - if (!dkr_tag_is_valid(tag)) { - log_error("Tag name '%s' is not valid.", tag); - return -EINVAL; - } - - if (argc >= 3) - local = argv[2]; - else { - local = strchr(name, '/'); - if (local) - local++; - else - local = name; - } - - if (isempty(local) || streq(local, "-")) - local = NULL; - - if (local) { - if (!machine_name_is_valid(local)) { - log_error("Local image name '%s' is not valid.", local); - return -EINVAL; - } - - if (!arg_force) { - r = image_find(local, NULL); - if (r < 0) - return log_error_errno(r, "Failed to check whether image '%s' exists: %m", local); - else if (r > 0) { - log_error_errno(EEXIST, "Image '%s' already exists.", local); - return -EEXIST; - } - } - - log_info("Pulling '%s' with tag '%s', saving as '%s'.", name, tag, local); - } else - log_info("Pulling '%s' with tag '%s'.", name, tag); - - r = sd_event_default(&event); - if (r < 0) - return log_error_errno(r, "Failed to allocate event loop: %m"); - - assert_se(sigprocmask_many(SIG_BLOCK, SIGTERM, SIGINT, -1) == 0); - sd_event_add_signal(event, NULL, SIGTERM, interrupt_signal_handler, NULL); - sd_event_add_signal(event, NULL, SIGINT, interrupt_signal_handler, NULL); - - r = dkr_pull_new(&pull, event, arg_dkr_index_url, arg_image_root, on_dkr_finished, event); - if (r < 0) - return log_error_errno(r, "Failed to allocate puller: %m"); - - r = dkr_pull_start(pull, name, tag, local, arg_force); - if (r < 0) - return log_error_errno(r, "Failed to pull image: %m"); - - r = sd_event_loop(event); - if (r < 0) - return log_error_errno(r, "Failed to run event loop: %m"); - - log_info("Exiting."); - return -r; -} - -static int help(int argc, char *argv[], void *userdata) { - - printf("%s [OPTIONS...] {COMMAND} ...\n\n" - "Download container or virtual machine images.\n\n" - " -h --help Show this help\n" - " --version Show package version\n" - " --force Force creation of image\n" - " --verify= Verify downloaded image, one of: 'no',\n" - " 'checksum', 'signature'.\n" - " --image-root=PATH Image root directory\n" - " --dkr-index-url=URL Specify index URL to use for downloads\n\n" - "Commands:\n" - " tar URL [NAME] Download a TAR image\n" - " raw URL [NAME] Download a RAW image\n" - " dkr REMOTE [NAME] Download a DKR image\n", - program_invocation_short_name); - - return 0; -} - -static int parse_argv(int argc, char *argv[]) { - - enum { - ARG_VERSION = 0x100, - ARG_FORCE, - ARG_DKR_INDEX_URL, - ARG_IMAGE_ROOT, - ARG_VERIFY, - }; - - static const struct option options[] = { - { "help", no_argument, NULL, 'h' }, - { "version", no_argument, NULL, ARG_VERSION }, - { "force", no_argument, NULL, ARG_FORCE }, - { "dkr-index-url", required_argument, NULL, ARG_DKR_INDEX_URL }, - { "image-root", required_argument, NULL, ARG_IMAGE_ROOT }, - { "verify", required_argument, NULL, ARG_VERIFY }, - {} - }; - - int c; - - assert(argc >= 0); - assert(argv); - - while ((c = getopt_long(argc, argv, "h", options, NULL)) >= 0) - - switch (c) { - - case 'h': - return help(0, NULL, NULL); - - case ARG_VERSION: - puts(PACKAGE_STRING); - puts(SYSTEMD_FEATURES); - return 0; - - case ARG_FORCE: - arg_force = true; - break; - - case ARG_DKR_INDEX_URL: - if (!http_url_is_valid(optarg)) { - log_error("Index URL is not valid: %s", optarg); - return -EINVAL; - } - - arg_dkr_index_url = optarg; - break; - - case ARG_IMAGE_ROOT: - arg_image_root = optarg; - break; - - case ARG_VERIFY: - arg_verify = import_verify_from_string(optarg); - if (arg_verify < 0) { - log_error("Invalid verification setting '%s'", optarg); - return -EINVAL; - } - - break; - - case '?': - return -EINVAL; - - default: - assert_not_reached("Unhandled option"); - } - - return 1; -} - -static int pull_main(int argc, char *argv[]) { - - static const Verb verbs[] = { - { "help", VERB_ANY, VERB_ANY, 0, help }, - { "tar", 2, 3, 0, pull_tar }, - { "raw", 2, 3, 0, pull_raw }, - { "dkr", 2, 3, 0, pull_dkr }, - {} - }; - - return dispatch_verb(argc, argv, verbs, NULL); -} - -int main(int argc, char *argv[]) { - int r; - - setlocale(LC_ALL, ""); - log_parse_environment(); - log_open(); - - r = parse_argv(argc, argv); - if (r <= 0) - goto finish; - - ignore_signals(SIGPIPE, -1); - - r = pull_main(argc, argv); - -finish: - return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; -} diff --git a/src/import/qcow2-util.c b/src/import/qcow2-util.c deleted file mode 100644 index fd3cf1b0e..000000000 --- a/src/import/qcow2-util.c +++ /dev/null @@ -1,353 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -/*** - This file is part of systemd. - - Copyright 2015 Lennart Poettering - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see . -***/ - -#include - -#include "util.h" -#include "sparse-endian.h" -#include "qcow2-util.h" -#include "btrfs-util.h" - -#define QCOW2_MAGIC 0x514649fb - -#define QCOW2_COPIED (1ULL << 63) -#define QCOW2_COMPRESSED (1ULL << 62) -#define QCOW2_ZERO (1ULL << 0) - -typedef struct _packed_ Header { - be32_t magic; - be32_t version; - - be64_t backing_file_offset; - be32_t backing_file_size; - - be32_t cluster_bits; - be64_t size; - be32_t crypt_method; - - be32_t l1_size; - be64_t l1_table_offset; - - be64_t refcount_table_offset; - be32_t refcount_table_clusters; - - be32_t nb_snapshots; - be64_t snapshots_offset; - - /* The remainder is only present on QCOW3 */ - be64_t incompatible_features; - be64_t compatible_features; - be64_t autoclear_features; - - be32_t refcount_order; - be32_t header_length; -} Header; - -#define HEADER_MAGIC(header) be32toh((header)->magic) -#define HEADER_VERSION(header) be32toh((header)->version) -#define HEADER_CLUSTER_BITS(header) be32toh((header)->cluster_bits) -#define HEADER_CLUSTER_SIZE(header) (1ULL << HEADER_CLUSTER_BITS(header)) -#define HEADER_L2_BITS(header) (HEADER_CLUSTER_BITS(header) - 3) -#define HEADER_SIZE(header) be64toh((header)->size) -#define HEADER_CRYPT_METHOD(header) be32toh((header)->crypt_method) -#define HEADER_L1_SIZE(header) be32toh((header)->l1_size) -#define HEADER_L2_SIZE(header) (HEADER_CLUSTER_SIZE(header)/sizeof(uint64_t)) -#define HEADER_L1_TABLE_OFFSET(header) be64toh((header)->l1_table_offset) - -static uint32_t HEADER_HEADER_LENGTH(const Header *h) { - if (HEADER_VERSION(h) < 3) - return offsetof(Header, incompatible_features); - - return be32toh(h->header_length); -} - -static int copy_cluster( - int sfd, uint64_t soffset, - int dfd, uint64_t doffset, - uint64_t cluster_size, - void *buffer) { - - ssize_t l; - int r; - - r = btrfs_clone_range(sfd, soffset, dfd, doffset, cluster_size); - if (r >= 0) - return r; - - l = pread(sfd, buffer, cluster_size, soffset); - if (l < 0) - return -errno; - if ((uint64_t) l != cluster_size) - return -EIO; - - l = pwrite(dfd, buffer, cluster_size, doffset); - if (l < 0) - return -errno; - if ((uint64_t) l != cluster_size) - return -EIO; - - return 0; -} - -static int decompress_cluster( - int sfd, uint64_t soffset, - int dfd, uint64_t doffset, - uint64_t compressed_size, - uint64_t cluster_size, - void *buffer1, - void *buffer2) { - - _cleanup_free_ void *large_buffer = NULL; - z_stream s = {}; - uint64_t sz; - ssize_t l; - int r; - - if (compressed_size > cluster_size) { - /* The usual cluster buffer doesn't suffice, let's - * allocate a larger one, temporarily */ - - large_buffer = malloc(compressed_size); - if (!large_buffer) - return -ENOMEM; - - buffer1 = large_buffer; - } - - l = pread(sfd, buffer1, compressed_size, soffset); - if (l < 0) - return -errno; - if ((uint64_t) l != compressed_size) - return -EIO; - - s.next_in = buffer1; - s.avail_in = compressed_size; - s.next_out = buffer2; - s.avail_out = cluster_size; - - r = inflateInit2(&s, -12); - if (r != Z_OK) - return -EIO; - - r = inflate(&s, Z_FINISH); - sz = (uint8_t*) s.next_out - (uint8_t*) buffer2; - inflateEnd(&s); - if (r != Z_STREAM_END || sz != cluster_size) - return -EIO; - - l = pwrite(dfd, buffer2, cluster_size, doffset); - if (l < 0) - return -errno; - if ((uint64_t) l != cluster_size) - return -EIO; - - return 0; -} - -static int normalize_offset( - const Header *header, - uint64_t p, - uint64_t *ret, - bool *compressed, - uint64_t *compressed_size) { - - uint64_t q; - - q = be64toh(p); - - if (q & QCOW2_COMPRESSED) { - uint64_t sz, csize_shift, csize_mask; - - if (!compressed) - return -EOPNOTSUPP; - - csize_shift = 64 - 2 - (HEADER_CLUSTER_BITS(header) - 8); - csize_mask = (1ULL << (HEADER_CLUSTER_BITS(header) - 8)) - 1; - sz = (((q >> csize_shift) & csize_mask) + 1) * 512 - (q & 511); - q &= ((1ULL << csize_shift) - 1); - - if (compressed_size) - *compressed_size = sz; - - *compressed = true; - - } else { - if (compressed) { - *compressed = false; - *compressed_size = 0; - } - - if (q & QCOW2_ZERO) { - /* We make no distinction between zero blocks and holes */ - *ret = 0; - return 0; - } - - q &= ~QCOW2_COPIED; - } - - *ret = q; - return q > 0; /* returns positive if not a hole */ -} - -static int verify_header(const Header *header) { - assert(header); - - if (HEADER_MAGIC(header) != QCOW2_MAGIC) - return -EBADMSG; - - if (HEADER_VERSION(header) != 2 && - HEADER_VERSION(header) != 3) - return -EOPNOTSUPP; - - if (HEADER_CRYPT_METHOD(header) != 0) - return -EOPNOTSUPP; - - if (HEADER_CLUSTER_BITS(header) < 9) /* 512K */ - return -EBADMSG; - - if (HEADER_CLUSTER_BITS(header) > 21) /* 2MB */ - return -EBADMSG; - - if (HEADER_SIZE(header) % HEADER_CLUSTER_SIZE(header) != 0) - return -EBADMSG; - - if (HEADER_L1_SIZE(header) > 32*1024*1024) /* 32MB */ - return -EBADMSG; - - if (HEADER_VERSION(header) == 3) { - - if (header->incompatible_features != 0) - return -EOPNOTSUPP; - - if (HEADER_HEADER_LENGTH(header) < sizeof(Header)) - return -EBADMSG; - } - - return 0; -} - -int qcow2_convert(int qcow2_fd, int raw_fd) { - _cleanup_free_ void *buffer1 = NULL, *buffer2 = NULL; - _cleanup_free_ be64_t *l1_table = NULL, *l2_table = NULL; - uint64_t sz, i; - Header header; - ssize_t l; - int r; - - l = pread(qcow2_fd, &header, sizeof(header), 0); - if (l < 0) - return -errno; - if (l != sizeof(header)) - return -EIO; - - r = verify_header(&header); - if (r < 0) - return r; - - l1_table = new(be64_t, HEADER_L1_SIZE(&header)); - if (!l1_table) - return -ENOMEM; - - l2_table = malloc(HEADER_CLUSTER_SIZE(&header)); - if (!l2_table) - return -ENOMEM; - - buffer1 = malloc(HEADER_CLUSTER_SIZE(&header)); - if (!buffer1) - return -ENOMEM; - - buffer2 = malloc(HEADER_CLUSTER_SIZE(&header)); - if (!buffer2) - return -ENOMEM; - - /* Empty the file if it exists, we rely on zero bits */ - if (ftruncate(raw_fd, 0) < 0) - return -errno; - - if (ftruncate(raw_fd, HEADER_SIZE(&header)) < 0) - return -errno; - - sz = sizeof(uint64_t) * HEADER_L1_SIZE(&header); - l = pread(qcow2_fd, l1_table, sz, HEADER_L1_TABLE_OFFSET(&header)); - if (l < 0) - return -errno; - if ((uint64_t) l != sz) - return -EIO; - - for (i = 0; i < HEADER_L1_SIZE(&header); i ++) { - uint64_t l2_begin, j; - - r = normalize_offset(&header, l1_table[i], &l2_begin, NULL, NULL); - if (r < 0) - return r; - if (r == 0) - continue; - - l = pread(qcow2_fd, l2_table, HEADER_CLUSTER_SIZE(&header), l2_begin); - if (l < 0) - return -errno; - if ((uint64_t) l != HEADER_CLUSTER_SIZE(&header)) - return -EIO; - - for (j = 0; j < HEADER_L2_SIZE(&header); j++) { - uint64_t data_begin, p, compressed_size; - bool compressed; - - p = ((i << HEADER_L2_BITS(&header)) + j) << HEADER_CLUSTER_BITS(&header); - - r = normalize_offset(&header, l2_table[j], &data_begin, &compressed, &compressed_size); - if (r < 0) - return r; - if (r == 0) - continue; - - if (compressed) - r = decompress_cluster( - qcow2_fd, data_begin, - raw_fd, p, - compressed_size, HEADER_CLUSTER_SIZE(&header), - buffer1, buffer2); - else - r = copy_cluster( - qcow2_fd, data_begin, - raw_fd, p, - HEADER_CLUSTER_SIZE(&header), buffer1); - if (r < 0) - return r; - } - } - - return 0; -} - -int qcow2_detect(int fd) { - be32_t id; - ssize_t l; - - l = pread(fd, &id, sizeof(id), 0); - if (l < 0) - return -errno; - if (l != sizeof(id)) - return -EIO; - - return htobe32(QCOW2_MAGIC) == id; -} diff --git a/src/import/qcow2-util.h b/src/import/qcow2-util.h deleted file mode 100644 index be7fd1d0c..000000000 --- a/src/import/qcow2-util.h +++ /dev/null @@ -1,25 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -#pragma once - -/*** - This file is part of systemd. - - Copyright 2015 Lennart Poettering - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see . -***/ - -int qcow2_detect(int fd); -int qcow2_convert(int qcow2_fd, int raw_fd); diff --git a/src/import/test-qcow2.c b/src/import/test-qcow2.c deleted file mode 100644 index 9a6c3e8b3..000000000 --- a/src/import/test-qcow2.c +++ /dev/null @@ -1,55 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -/*** - This file is part of systemd. - - Copyright 2015 Lennart Poettering - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see . -***/ - -#include "log.h" -#include "util.h" - -#include "qcow2-util.h" - -int main(int argc, char *argv[]) { - _cleanup_close_ int sfd = -1, dfd = -1; - int r; - - if (argc != 3) { - log_error("Needs two arguments."); - return EXIT_FAILURE; - } - - sfd = open(argv[1], O_RDONLY|O_CLOEXEC|O_NOCTTY); - if (sfd < 0) { - log_error_errno(errno, "Can't open source file: %m"); - return EXIT_FAILURE; - } - - dfd = open(argv[2], O_WRONLY|O_CREAT|O_CLOEXEC|O_NOCTTY, 0666); - if (dfd < 0) { - log_error_errno(errno, "Can't open destination file: %m"); - return EXIT_FAILURE; - } - - r = qcow2_convert(sfd, dfd); - if (r < 0) { - log_error_errno(r, "Failed to unpack: %m"); - return EXIT_FAILURE; - } - - return EXIT_SUCCESS; -} -- 2.30.2