X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fimport%2Fimport.c;h=f3072b3775a683c796f88f8210b5a90515da0497;hp=4c36108c2efb8ed58cfaf7f82bc2efceae9a3a7e;hb=1f67bedec8b558f9317496613d9c3f3bd595c940;hpb=ff2670ad11a1a29d483b7a246c95b159ddc1137c diff --git a/src/import/import.c b/src/import/import.c index 4c36108c2..f3072b377 100644 --- a/src/import/import.c +++ b/src/import/import.c @@ -3,7 +3,7 @@ /*** This file is part of systemd. - Copyright 2014 Lennart Poettering + 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 @@ -26,15 +26,19 @@ #include "verbs.h" #include "build.h" #include "machine-image.h" +#include "import-util.h" #include "import-tar.h" #include "import-raw.h" -#include "import-dkr.h" -#include "import-util.h" static bool arg_force = false; +static bool arg_read_only = 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(TarImport *import, int error, void *userdata) { sd_event *event = userdata; @@ -43,64 +47,31 @@ static void on_tar_finished(TarImport *import, int error, void *userdata) { if (error == 0) log_info("Operation completed successfully."); - sd_event_exit(event, EXIT_FAILURE); -} - -static int strip_tar_suffixes(const char *name, char **ret) { - const char *e; - char *s; - - e = endswith(name, ".tar"); - if (!e) - e = endswith(name, ".tar.xz"); - if (!e) - e = endswith(name, ".tar.gz"); - if (!e) - e = endswith(name, ".tar.bz2"); - if (!e) - e = endswith(name, ".tgz"); - if (!e) - e = strchr(name, 0); - - if (e <= name) - return -EINVAL; - - s = strndup(name, e - name); - if (!s) - return -ENOMEM; - - *ret = s; - return 0; + sd_event_exit(event, abs(error)); } -static int pull_tar(int argc, char *argv[], void *userdata) { +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 *url, *local; - _cleanup_free_ char *l = NULL, *ll = NULL; - int r; + const char *path = NULL, *local = NULL; + _cleanup_free_ char *ll = NULL; + _cleanup_close_ int open_fd = -1; + int r, fd; - url = argv[1]; - if (!http_url_is_valid(url)) { - log_error("URL '%s' is not valid.", url); - return -EINVAL; - } + if (argc >= 2) + path = argv[1]; + if (isempty(path) || streq(path, "-")) + path = NULL; 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; - } - + else if (path) + local = basename(path); if (isempty(local) || streq(local, "-")) local = NULL; if (local) { - r = strip_tar_suffixes(local, &ll); + r = tar_strip_suffixes(local, &ll); if (r < 0) return log_oom(); @@ -120,34 +91,48 @@ static int pull_tar(int argc, char *argv[], void *userdata) { return -EEXIST; } } - - log_info("Pulling '%s', saving as '%s'.", url, local); } else - log_info("Pulling '%s'.", url); + 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, NULL, NULL); - sd_event_add_signal(event, NULL, SIGINT, NULL, NULL); + 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_pull(import, url, local, arg_force, arg_verify); + r = tar_import_start(import, fd, local, arg_force, arg_read_only); if (r < 0) - return log_error_errno(r, "Failed to pull image: %m"); + 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; + return -r; } static void on_raw_finished(RawImport *import, int error, void *userdata) { @@ -157,77 +142,31 @@ static void on_raw_finished(RawImport *import, int error, void *userdata) { if (error == 0) log_info("Operation completed successfully."); - sd_event_exit(event, EXIT_FAILURE); + sd_event_exit(event, abs(error)); } -static int strip_raw_suffixes(const char *p, char **ret) { - static const char suffixes[] = - ".xz\0" - ".gz\0" - ".bz2\0" - ".raw\0" - ".qcow2\0" - ".img\0" - ".bin\0"; - - _cleanup_free_ char *q = NULL; - - q = strdup(p); - if (!q) - return -ENOMEM; - - for (;;) { - const char *sfx; - bool changed = false; - - NULSTR_FOREACH(sfx, suffixes) { - char *e; - - e = endswith(q, sfx); - if (e) { - *e = 0; - changed = true; - } - } - - if (!changed) - break; - } - - *ret = q; - q = NULL; - - return 0; -} - -static int pull_raw(int argc, char *argv[], void *userdata) { +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 *url, *local; - _cleanup_free_ char *l = NULL, *ll = NULL; - int r; + const char *path = NULL, *local = NULL; + _cleanup_free_ char *ll = NULL; + _cleanup_close_ int open_fd = -1; + int r, fd; - url = argv[1]; - if (!http_url_is_valid(url)) { - log_error("URL '%s' is not valid.", url); - return -EINVAL; - } + if (argc >= 2) + path = argv[1]; + if (isempty(path) || streq(path, "-")) + path = NULL; 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; - } - + else if (path) + local = basename(path); if (isempty(local) || streq(local, "-")) local = NULL; if (local) { - r = strip_raw_suffixes(local, &ll); + r = raw_strip_suffixes(local, &ll); if (r < 0) return log_oom(); @@ -247,154 +186,62 @@ static int pull_raw(int argc, char *argv[], void *userdata) { 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, NULL, NULL); - sd_event_add_signal(event, NULL, SIGINT, NULL, 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_pull(import, 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(DkrImport *import, int error, void *userdata) { - sd_event *event = userdata; - assert(import); - - if (error == 0) - log_info("Operation completed successfully."); - - sd_event_exit(event, EXIT_FAILURE); -} - -static int pull_dkr(int argc, char *argv[], void *userdata) { - _cleanup_(dkr_import_unrefp) DkrImport *import = NULL; - _cleanup_event_unref_ sd_event *event = NULL; - const char *name, *tag, *local; - int r; + local = "imported"; - if (!arg_dkr_index_url) { - log_error("Please specify an index URL with --dkr-index-url="); - return -EINVAL; - } + 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"); - if (arg_verify != IMPORT_VERIFY_NO) { - log_error("Imports from dkr do not support image verification, please pass --verify=no."); - return -EINVAL; - } + fd = open_fd; - tag = strchr(argv[1], ':'); - if (tag) { - name = strndupa(argv[1], tag - argv[1]); - tag++; + log_info("Importing '%s', saving as '%s'.", path, local); } else { - name = argv[1]; - tag = "latest"; - } - - if (!dkr_name_is_valid(name)) { - log_error("Remote name '%s' is not valid.", name); - return -EINVAL; - } + _cleanup_free_ char *pretty = NULL; - if (!dkr_tag_is_valid(tag)) { - log_error("Tag name '%s' is not valid.", tag); - return -EINVAL; - } + fd = STDIN_FILENO; - if (argc >= 3) - local = argv[2]; - else { - local = strchr(name, '/'); - if (local) - local++; - else - local = name; + (void) readlink_malloc("/proc/self/fd/0", &pretty); + log_info("Importing '%s', saving as '%s'.", pretty, local); } - 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, NULL, NULL); - sd_event_add_signal(event, NULL, SIGINT, NULL, NULL); + sd_event_add_signal(event, NULL, SIGTERM, interrupt_signal_handler, NULL); + sd_event_add_signal(event, NULL, SIGINT, interrupt_signal_handler, NULL); - r = dkr_import_new(&import, event, arg_dkr_index_url, arg_image_root, on_dkr_finished, event); + 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 = dkr_import_pull(import, name, tag, local, arg_force); + r = raw_import_start(import, fd, local, arg_force, arg_read_only); if (r < 0) - return log_error_errno(r, "Failed to pull image: %m"); + 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 0; + return -r; } static int help(int argc, char *argv[], void *userdata) { printf("%s [OPTIONS...] {COMMAND} ...\n\n" - "Import container or virtual machine image.\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" - " --verify= Verify downloaded image, one of: 'no', 'sum'\n" - " 'signature'.\n" - " --image-root= Image root directory\n" - " --dkr-index-url=URL Specify index URL to use for downloads\n\n" + " --image-root=PATH Image root directory\n" + " --read-only Create a read-only image\n\n" "Commands:\n" - " pull-tar URL [NAME] Download a TAR image\n" - " pull-raw URL [NAME] Download a RAW image\n" - " pull-dkr REMOTE [NAME] Download a DKR image\n", + " tar FILE [NAME] Import a TAR image\n" + " raw FILE [NAME] Import a RAW image\n", program_invocation_short_name); return 0; @@ -405,18 +252,16 @@ static int parse_argv(int argc, char *argv[]) { enum { ARG_VERSION = 0x100, ARG_FORCE, - ARG_DKR_INDEX_URL, ARG_IMAGE_ROOT, - ARG_VERIFY, + 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 }, - { "dkr-index-url", required_argument, NULL, ARG_DKR_INDEX_URL }, { "image-root", required_argument, NULL, ARG_IMAGE_ROOT }, - { "verify", required_argument, NULL, ARG_VERIFY }, + { "read-only", no_argument, NULL, ARG_READ_ONLY }, {} }; @@ -441,26 +286,12 @@ static int parse_argv(int argc, char *argv[]) { 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; - } - + case ARG_READ_ONLY: + arg_read_only = true; break; case '?': @@ -476,10 +307,9 @@ static int parse_argv(int argc, char *argv[]) { static int import_main(int argc, char *argv[]) { static const Verb verbs[] = { - { "help", VERB_ANY, VERB_ANY, 0, help }, - { "pull-tar", 2, 3, 0, pull_tar }, - { "pull-raw", 2, 3, 0, pull_raw }, - { "pull-dkr", 2, 3, 0, pull_dkr }, + { "help", VERB_ANY, VERB_ANY, 0, help }, + { "tar", 2, 3, 0, import_tar }, + { "raw", 2, 3, 0, import_raw }, {} }; @@ -497,6 +327,8 @@ int main(int argc, char *argv[]) { if (r <= 0) goto finish; + ignore_signals(SIGPIPE, -1); + r = import_main(argc, argv); finish: