[systemd-commits] 5 commits - Makefile.am src/import src/shared
Lennart Poettering
lennart at kemper.freedesktop.org
Tue Jan 20 19:04:09 PST 2015
Makefile.am | 13 ++
src/import/import-job.c | 33 +++--
src/import/import-job.h | 8 -
src/import/import-pubring.gpg |binary
src/import/import-raw.c | 202 ++++++++++--------------------------
src/import/import-tar.c | 76 +++++++++++--
src/import/import-tar.h | 3
src/import/import-util.c | 234 ++++++++++++++++++++++++++++++++++++++++++
src/import/import-util.h | 5
src/import/import.c | 14 --
src/shared/util.c | 10 +
src/shared/util.h | 3
12 files changed, 416 insertions(+), 185 deletions(-)
New commits:
commit 0100b6e1bf682385e0939d4dd7be815d5cdf0e1a
Author: Lennart Poettering <lennart at poettering.net>
Date: Wed Jan 21 04:03:33 2015 +0100
import: also add verification support to tar importer
diff --git a/src/import/import-tar.c b/src/import/import-tar.c
index e8afc26..2a65f89 100644
--- a/src/import/import-tar.c
+++ b/src/import/import-tar.c
@@ -41,6 +41,8 @@ struct TarImport {
char *image_root;
ImportJob *tar_job;
+ ImportJob *checksum_job;
+ ImportJob *signature_job;
TarImportFinished on_finished;
void *userdata;
@@ -52,18 +54,22 @@ struct TarImport {
char *temp_path;
char *final_path;
+
+ ImportVerify verify;
};
TarImport* tar_import_unref(TarImport *i) {
if (!i)
return NULL;
- if (i->tar_pid > 0) {
- kill(i->tar_pid, SIGKILL);
- wait_for_terminate(i->tar_pid, NULL);
+ if (i->tar_pid > 1) {
+ (void) kill(i->tar_pid, SIGKILL);
+ (void) wait_for_terminate(i->tar_pid, NULL);
}
import_job_unref(i->tar_job);
+ import_job_unref(i->checksum_job);
+ import_job_unref(i->signature_job);
curl_glue_unref(i->glue);
sd_event_unref(i->event);
@@ -77,7 +83,6 @@ TarImport* tar_import_unref(TarImport *i) {
free(i->final_path);
free(i->image_root);
free(i->local);
-
free(i);
return NULL;
@@ -135,12 +140,12 @@ static int tar_import_make_local_copy(TarImport *i) {
r = import_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 = import_make_local_copy(i->final_path, i->image_root, i->local, i->force_local);
- if (r < 0)
- return r;
}
+ r = import_make_local_copy(i->final_path, i->image_root, i->local, i->force_local);
+ if (r < 0)
+ return r;
+
return 0;
}
@@ -153,6 +158,13 @@ static void tar_import_job_on_finished(ImportJob *j) {
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;
}
@@ -161,7 +173,14 @@ static void tar_import_job_on_finished(ImportJob *j) {
* successfully, or the download was skipped because we
* already have the etag. */
- j->disk_fd = safe_close(j->disk_fd);
+ if (i->tar_job->state != IMPORT_JOB_DONE)
+ return;
+ if (i->checksum_job && i->checksum_job->state != IMPORT_JOB_DONE)
+ return;
+ if (i->signature_job && i->signature_job->state != IMPORT_JOB_DONE)
+ 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);
@@ -170,7 +189,13 @@ static void tar_import_job_on_finished(ImportJob *j) {
goto finish;
}
- if (i->temp_path) {
+ if (!i->tar_job->etag_exists) {
+ /* This is a new download, verify it, and move it into place */
+
+ r = import_verify(i->tar_job, i->checksum_job, i->signature_job);
+ if (r < 0)
+ goto finish;
+
r = import_make_read_only(i->temp_path);
if (r < 0)
goto finish;
@@ -233,6 +258,8 @@ static int tar_import_job_on_open_disk(ImportJob *j) {
if (i->tar_pid == 0) {
int null_fd;
+ /* Child */
+
reset_all_signal_handlers();
reset_signal_mask();
assert_se(prctl(PR_SET_PDEATHSIG, SIGTERM) == 0);
@@ -274,7 +301,7 @@ static int tar_import_job_on_open_disk(ImportJob *j) {
return 0;
}
-int tar_import_pull(TarImport *i, const char *url, const char *local, bool force_local) {
+int tar_import_pull(TarImport *i, const char *url, const char *local, bool force_local, ImportVerify verify) {
int r;
assert(i);
@@ -291,8 +318,8 @@ int tar_import_pull(TarImport *i, const char *url, const char *local, bool force
r = free_and_strdup(&i->local, local);
if (r < 0)
return r;
-
i->force_local = force_local;
+ i->verify = verify;
r = import_job_new(&i->tar_job, url, i->glue, i);
if (r < 0)
@@ -300,10 +327,32 @@ int tar_import_pull(TarImport *i, const char *url, const char *local, bool force
i->tar_job->on_finished = tar_import_job_on_finished;
i->tar_job->on_open_disk = tar_import_job_on_open_disk;
+ i->tar_job->calc_checksum = verify != IMPORT_VERIFY_NO;
r = import_find_old_etags(url, i->image_root, DT_DIR, ".tar-", NULL, &i->tar_job->old_etags);
if (r < 0)
return r;
- return import_job_begin(i->tar_job);
+ r = import_make_verification_jobs(&i->checksum_job, &i->signature_job, verify, url, i->glue, tar_import_job_on_finished, i);
+ if (r < 0)
+ return r;
+
+ r = import_job_begin(i->tar_job);
+ if (r < 0)
+ return r;
+
+ if (i->checksum_job) {
+ r = import_job_begin(i->checksum_job);
+ if (r < 0)
+ return r;
+ }
+
+ if (i->signature_job) {
+ r = import_job_begin(i->signature_job);
+ if (r < 0)
+ return r;
+ }
+
+ return 0;
+
}
diff --git a/src/import/import-tar.h b/src/import/import-tar.h
index 6a7477f..6a2b901 100644
--- a/src/import/import-tar.h
+++ b/src/import/import-tar.h
@@ -23,6 +23,7 @@
#include "sd-event.h"
#include "macro.h"
+#include "import-util.h"
typedef struct TarImport TarImport;
@@ -33,4 +34,4 @@ TarImport* tar_import_unref(TarImport *import);
DEFINE_TRIVIAL_CLEANUP_FUNC(TarImport*, tar_import_unref);
-int tar_import_pull(TarImport *import, const char *rul, const char *local, bool force_local);
+int tar_import_pull(TarImport *import, const char *rul, const char *local, bool force_local, ImportVerify verify);
diff --git a/src/import/import-util.c b/src/import/import-util.c
index a36e83b..0330bc1 100644
--- a/src/import/import-util.c
+++ b/src/import/import-util.c
@@ -404,7 +404,7 @@ int import_verify(
r = pipe2(gpg_pipe, O_CLOEXEC);
if (r < 0)
- return log_error_errno(errno, "Failed to create pipe: %m");
+ return log_error_errno(errno, "Failed to create pipe for gpg: %m");
sig_file = mkostemp(sig_file_path, O_RDWR);
if (sig_file < 0)
diff --git a/src/import/import.c b/src/import/import.c
index d9cff3e..0c215c6 100644
--- a/src/import/import.c
+++ b/src/import/import.c
@@ -135,7 +135,7 @@ static int pull_tar(int argc, char *argv[], void *userdata) {
if (r < 0)
return log_error_errno(r, "Failed to allocate importer: %m");
- r = tar_import_pull(import, url, local, arg_force);
+ r = tar_import_pull(import, url, local, arg_force, arg_verify);
if (r < 0)
return log_error_errno(r, "Failed to pull image: %m");
commit 98c3800184cfc961b19d605f69d555d0cea8bb7a
Author: Lennart Poettering <lennart at poettering.net>
Date: Wed Jan 21 03:46:01 2015 +0100
import: make verification code generic, in preparation for using it pull-tar
diff --git a/src/import/import-job.c b/src/import/import-job.c
index 0b103f2..322aa1a 100644
--- a/src/import/import-job.c
+++ b/src/import/import-job.c
@@ -38,22 +38,20 @@ ImportJob* import_job_unref(ImportJob *j) {
else if (j->compressed == IMPORT_JOB_GZIP)
inflateEnd(&j->gzip);
- if (j->hash_context)
- gcry_md_close(j->hash_context);
+ 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->sha256);
+ free(j->checksum);
free(j);
return NULL;
}
-DEFINE_TRIVIAL_CLEANUP_FUNC(ImportJob*, import_job_unref);
-
static void import_job_finish(ImportJob *j, int ret) {
assert(j);
@@ -124,23 +122,23 @@ void import_job_curl_on_finished(CurlGlue *g, CURL *curl, CURLcode result) {
goto finish;
}
- if (j->hash_context) {
+ if (j->checksum_context) {
uint8_t *k;
- k = gcry_md_read(j->hash_context, GCRY_MD_SHA256);
+ k = gcry_md_read(j->checksum_context, GCRY_MD_SHA256);
if (!k) {
log_error("Failed to get checksum.");
r = -EIO;
goto finish;
}
- j->sha256 = hexmem(k, gcry_md_get_algo_dlen(GCRY_MD_SHA256));
- if (!j->sha256) {
+ 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->sha256);
+ log_debug("SHA256 of %s is %s.", j->url, j->checksum);
}
if (j->disk_fd >= 0 && j->allow_sparse) {
@@ -243,8 +241,8 @@ static int import_job_write_compressed(ImportJob *j, void *p, size_t sz) {
return -EFBIG;
}
- if (j->hash_context)
- gcry_md_write(j->hash_context, p, sz);
+ if (j->checksum_context)
+ gcry_md_write(j->checksum_context, p, sz);
switch (j->compressed) {
@@ -335,8 +333,8 @@ static int import_job_open_disk(ImportJob *j) {
}
}
- if (j->calc_hash) {
- if (gcry_md_open(&j->hash_context, GCRY_MD_SHA256, 0) != 0) {
+ 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;
}
diff --git a/src/import/import-job.h b/src/import/import-job.h
index 9ccaaf2..a9b58e6 100644
--- a/src/import/import-job.h
+++ b/src/import/import-job.h
@@ -96,10 +96,10 @@ struct ImportJob {
bool allow_sparse;
- bool calc_hash;
- gcry_md_hd_t hash_context;
+ bool calc_checksum;
+ gcry_md_hd_t checksum_context;
- char *sha256;
+ char *checksum;
};
int import_job_new(ImportJob **job, const char *url, CurlGlue *glue, void *userdata);
@@ -108,3 +108,5 @@ ImportJob* import_job_unref(ImportJob *job);
int import_job_begin(ImportJob *j);
void import_job_curl_on_finished(CurlGlue *g, CURL *curl, CURLcode result);
+
+DEFINE_TRIVIAL_CLEANUP_FUNC(ImportJob*, import_job_unref);
diff --git a/src/import/import-raw.c b/src/import/import-raw.c
index 67c805e..d2cb053 100644
--- a/src/import/import-raw.c
+++ b/src/import/import-raw.c
@@ -21,9 +21,7 @@
#include <sys/xattr.h>
#include <linux/fs.h>
-#include <sys/prctl.h>
#include <curl/curl.h>
-#include <gcrypt.h>
#include "utf8.h"
#include "strv.h"
@@ -47,7 +45,7 @@ struct RawImport {
char *image_root;
ImportJob *raw_job;
- ImportJob *sha256sums_job;
+ ImportJob *checksum_job;
ImportJob *signature_job;
RawImportFinished on_finished;
@@ -67,7 +65,7 @@ RawImport* raw_import_unref(RawImport *i) {
return NULL;
import_job_unref(i->raw_job);
- import_job_unref(i->sha256sums_job);
+ import_job_unref(i->checksum_job);
import_job_unref(i->signature_job);
curl_glue_unref(i->glue);
@@ -251,170 +249,6 @@ static int raw_import_make_local_copy(RawImport *i) {
return 0;
}
-static int raw_import_verify_sha256sum(RawImport *i) {
- _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";
- _cleanup_sigkill_wait_ pid_t pid = 0;
- int r;
-
- assert(i);
-
- assert(i->raw_job);
-
- if (!i->sha256sums_job)
- return 0;
-
- assert(i->raw_job->state == IMPORT_JOB_DONE);
- assert(i->raw_job->sha256);
-
- assert(i->sha256sums_job->state == IMPORT_JOB_DONE);
- assert(i->sha256sums_job->payload);
- assert(i->sha256sums_job->payload_size > 0);
-
- r = import_url_last_component(i->raw_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 = strappenda(i->raw_job->sha256, " *", fn, "\n");
-
- p = memmem(i->sha256sums_job->payload,
- i->sha256sums_job->payload_size,
- line,
- strlen(line));
-
- if (!p || (p != (char*) i->sha256sums_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.", i->raw_job->url);
-
- if (!i->signature_job)
- return 0;
-
- assert(i->signature_job->state == IMPORT_JOB_DONE);
- assert(i->signature_job->payload);
- assert(i->signature_job->payload_size > 0);
-
- r = pipe2(gpg_pipe, O_CLOEXEC);
- if (r < 0)
- return log_error_errno(errno, "Failed to create pipe: %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, i->signature_job->payload, i->signature_job->payload_size, false);
- if (r < 0) {
- log_error_errno(r, "Failed to write to temporary file: %m");
- goto finish;
- }
-
- 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",
- "--keyring=" VENDOR_KEYRING_PATH,
- NULL, /* maybe user keyring */
- NULL, /* --verify */
- NULL, /* signature file */
- NULL, /* dash */
- NULL /* trailing NULL */
- };
- unsigned k = ELEMENTSOF(cmd) - 5;
- 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);
-
- /* 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;
-
- cmd[k++] = "--verify";
- cmd[k++] = sig_file_path;
- cmd[k++] = "-";
- cmd[k++] = NULL;
-
- 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], i->sha256sums_job->payload, i->sha256sums_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);
-
- return r;
-}
-
static void raw_import_job_on_finished(ImportJob *j) {
RawImport *i;
int r;
@@ -424,7 +258,7 @@ static void raw_import_job_on_finished(ImportJob *j) {
i = j->userdata;
if (j->error != 0) {
- if (j == i->sha256sums_job)
+ 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?)");
@@ -442,17 +276,18 @@ static void raw_import_job_on_finished(ImportJob *j) {
*
* We only do something when we got all three files */
- if (!IMPORT_JOB_STATE_IS_COMPLETE(i->raw_job))
+ if (i->raw_job->state != IMPORT_JOB_DONE)
return;
- if (i->sha256sums_job && !IMPORT_JOB_STATE_IS_COMPLETE(i->sha256sums_job))
+ if (i->checksum_job && i->checksum_job->state != IMPORT_JOB_DONE)
return;
- if (i->signature_job && !IMPORT_JOB_STATE_IS_COMPLETE(i->signature_job))
+ if (i->signature_job && i->signature_job->state != IMPORT_JOB_DONE)
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);
- r = raw_import_verify_sha256sum(i);
+ r = import_verify(i->raw_job, i->checksum_job, i->signature_job);
if (r < 0)
goto finish;
@@ -546,50 +381,22 @@ int raw_import_pull(RawImport *i, const char *url, const char *local, bool force
i->raw_job->on_finished = raw_import_job_on_finished;
i->raw_job->on_open_disk = raw_import_job_on_open_disk;
- i->raw_job->calc_hash = true;
+ i->raw_job->calc_checksum = verify != IMPORT_VERIFY_NO;
r = import_find_old_etags(url, i->image_root, DT_REG, ".raw-", ".raw", &i->raw_job->old_etags);
if (r < 0)
return r;
- if (verify != IMPORT_VERIFY_NO) {
- _cleanup_free_ char *sha256sums_url = NULL;
-
- /* Queue job for the SHA256SUMS file for the image */
- r = import_url_change_last_component(url, "SHA256SUMS", &sha256sums_url);
- if (r < 0)
- return r;
-
- r = import_job_new(&i->sha256sums_job, sha256sums_url, i->glue, i);
- if (r < 0)
- return r;
-
- i->sha256sums_job->on_finished = raw_import_job_on_finished;
- i->sha256sums_job->uncompressed_max = i->sha256sums_job->compressed_max = 1ULL * 1024ULL * 1024ULL;
- }
-
- if (verify == IMPORT_VERIFY_SIGNATURE) {
- _cleanup_free_ char *sha256sums_sig_url = NULL;
-
- /* Queue job for the SHA256SUMS.gpg file for the image. */
- r = import_url_change_last_component(url, "SHA256SUMS.gpg", &sha256sums_sig_url);
- if (r < 0)
- return r;
-
- r = import_job_new(&i->signature_job, sha256sums_sig_url, i->glue, i);
- if (r < 0)
- return r;
-
- i->signature_job->on_finished = raw_import_job_on_finished;
- i->signature_job->uncompressed_max = i->signature_job->compressed_max = 1ULL * 1024ULL * 1024ULL;
- }
+ r = import_make_verification_jobs(&i->checksum_job, &i->signature_job, verify, url, i->glue, raw_import_job_on_finished, i);
+ if (r < 0)
+ return r;
r = import_job_begin(i->raw_job);
if (r < 0)
return r;
- if (i->sha256sums_job) {
- r = import_job_begin(i->sha256sums_job);
+ if (i->checksum_job) {
+ r = import_job_begin(i->checksum_job);
if (r < 0)
return r;
}
diff --git a/src/import/import-util.c b/src/import/import-util.c
index 79c60b3..a36e83b 100644
--- a/src/import/import-util.c
+++ b/src/import/import-util.c
@@ -19,10 +19,13 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+#include <sys/prctl.h>
+
#include "util.h"
#include "strv.h"
#include "copy.h"
#include "btrfs-util.h"
+#include "import-job.h"
#include "import-util.h"
#define FILENAME_ESCAPE "/.#\"\'"
@@ -278,3 +281,234 @@ static const char* const import_verify_table[_IMPORT_VERIFY_MAX] = {
};
DEFINE_STRING_TABLE_LOOKUP(import_verify, ImportVerify);
+
+int import_make_verification_jobs(
+ ImportJob **ret_checksum_job,
+ ImportJob **ret_signature_job,
+ ImportVerify verify,
+ const char *url,
+ CurlGlue *glue,
+ ImportJobFinished on_finished,
+ void *userdata) {
+
+ _cleanup_(import_job_unrefp) ImportJob *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 = import_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 = import_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 import_verify(
+ ImportJob *main_job,
+ ImportJob *checksum_job,
+ ImportJob *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";
+ _cleanup_sigkill_wait_ pid_t pid = 0;
+ int r;
+
+ assert(main_job);
+ assert(main_job->state == IMPORT_JOB_DONE);
+
+ if (!checksum_job)
+ return 0;
+
+ assert(main_job->calc_checksum);
+ assert(main_job->checksum);
+ assert(checksum_job->state == IMPORT_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 = strappenda(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 == IMPORT_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: %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;
+ }
+
+ 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",
+ "--keyring=" VENDOR_KEYRING_PATH,
+ NULL, /* maybe user keyring */
+ NULL, /* --verify */
+ NULL, /* signature file */
+ NULL, /* dash */
+ NULL /* trailing NULL */
+ };
+ unsigned k = ELEMENTSOF(cmd) - 5;
+ 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);
+
+ /* 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;
+
+ cmd[k++] = "--verify";
+ cmd[k++] = sig_file_path;
+ cmd[k++] = "-";
+ cmd[k++] = NULL;
+
+ 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);
+
+ return r;
+}
diff --git a/src/import/import-util.h b/src/import/import-util.h
index 811f3fa..6c63fc3 100644
--- a/src/import/import-util.h
+++ b/src/import/import-util.h
@@ -23,6 +23,8 @@
#include <stdbool.h>
+#include "import-job.h"
+
typedef enum ImportVerify {
IMPORT_VERIFY_NO,
IMPORT_VERIFY_SUM,
@@ -47,3 +49,6 @@ int import_url_change_last_component(const char *url, const char *suffix, char *
const char* import_verify_to_string(ImportVerify v) _const_;
ImportVerify import_verify_from_string(const char *s) _pure_;
+
+int import_make_verification_jobs(ImportJob **ret_checksum_job, ImportJob **ret_signature_job, ImportVerify verify, const char *url, CurlGlue *glue, ImportJobFinished on_finished, void *userdata);
+int import_verify(ImportJob *main_job, ImportJob *checksum_job, ImportJob *signature_job);
commit 5a3b1abd0ef47de9984d921463c2aaccc630fad6
Author: Lennart Poettering <lennart at poettering.net>
Date: Wed Jan 21 03:02:23 2015 +0100
import: improve logging
diff --git a/src/import/import-tar.c b/src/import/import-tar.c
index 08839ca..e8afc26 100644
--- a/src/import/import-tar.c
+++ b/src/import/import-tar.c
@@ -262,6 +262,7 @@ static int tar_import_job_on_open_disk(ImportJob *j) {
safe_close(null_fd);
execlp("tar", "tar", "--numeric-owner", "-C", i->temp_path, "-px", NULL);
+ log_error_errno(errno, "Failed to execute tar: %m");
_exit(EXIT_FAILURE);
}
diff --git a/src/import/import.c b/src/import/import.c
index 62e3118..d9cff3e 100644
--- a/src/import/import.c
+++ b/src/import/import.c
@@ -42,10 +42,8 @@ static void on_tar_finished(TarImport *import, int error, void *userdata) {
if (error == 0)
log_info("Operation completed successfully.");
- else
- log_error_errno(error, "Operation failed: %m");
- sd_event_exit(event, error);
+ sd_event_exit(event, EXIT_FAILURE);
}
static int strip_tar_suffixes(const char *name, char **ret) {
@@ -147,7 +145,7 @@ static int pull_tar(int argc, char *argv[], void *userdata) {
log_info("Exiting.");
- return 0;
+ return r;
}
static void on_raw_finished(RawImport *import, int error, void *userdata) {
@@ -156,10 +154,8 @@ static void on_raw_finished(RawImport *import, int error, void *userdata) {
if (error == 0)
log_info("Operation completed successfully.");
- else
- log_error_errno(error, "Operation failed: %m");
- sd_event_exit(event, error);
+ sd_event_exit(event, EXIT_FAILURE);
}
static int strip_raw_suffixes(const char *p, char **ret) {
@@ -275,7 +271,7 @@ static int pull_raw(int argc, char *argv[], void *userdata) {
log_info("Exiting.");
- return 0;
+ return r;
}
static void on_dkr_finished(DkrImport *import, int error, void *userdata) {
commit 90bc083bda5e97064d6a97c855ef7b4868f650de
Author: Lennart Poettering <lennart at poettering.net>
Date: Wed Jan 21 03:02:04 2015 +0100
import: show download speed while downloading
diff --git a/src/import/import-job.c b/src/import/import-job.c
index 6de3268..0b103f2 100644
--- a/src/import/import-job.c
+++ b/src/import/import-job.c
@@ -557,12 +557,17 @@ static int import_job_progress_callback(void *userdata, curl_off_t dltotal, curl
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.", percent, j->url, format_timespan(buf, sizeof(buf), left, USEC_PER_SEC));
+ 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);
commit 3576d6315f3b6b686cdcf9f280d5e829e3d3daa0
Author: Lennart Poettering <lennart at poettering.net>
Date: Wed Jan 21 03:01:13 2015 +0100
import: add image verification using gpg
This also adds an initial keyring for the verification, that contains
Ubuntu's and Fedora's key. We should probably add more entries sooner or
later.
diff --git a/Makefile.am b/Makefile.am
index b368e10..4c5c57c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5275,7 +5275,9 @@ systemd_import_CFLAGS = \
$(LIBCURL_CFLAGS) \
$(XZ_CFLAGS) \
$(ZLIB_CFLAGS) \
- $(GCRYPT_CFLAGS)
+ $(GCRYPT_CFLAGS) \
+ -D VENDOR_KEYRING_PATH=\"$(rootlibexecdir)/import-pubring.gpg\" \
+ -D USER_KEYRING_PATH=\"$(pkgsysconfdir)/import-pubring.gpg\"
systemd_import_LDADD = \
libsystemd-internal.la \
@@ -5303,6 +5305,9 @@ test_qcow2_LDADD = \
libsystemd-label.la \
libsystemd-shared.la \
$(ZLIB_LIBS)
+
+dist_rootlibexec_DATA = \
+ src/import/import-pubring.gpg
endif
endif
endif
@@ -6668,3 +6673,9 @@ git-contrib:
EXTRA_DIST += \
tools/gdb-sd_dump_hashmaps.py
+
+list-keys:
+ gpg --verbose --no-options --no-default-keyring --no-auto-key-locate --batch --trust-model=always --keyring=$(srcdir)/src/import/import-pubring.gpg --list-keys
+
+add-key:
+ gpg --verbose --no-options --no-default-keyring --no-auto-key-locate --batch --trust-model=always --keyring=$(srcdir)/src/import/import-pubring.gpg --import -
diff --git a/src/import/import-pubring.gpg b/src/import/import-pubring.gpg
new file mode 100644
index 0000000..be27776
Binary files /dev/null and b/src/import/import-pubring.gpg differ
diff --git a/src/import/import-raw.c b/src/import/import-raw.c
index 6fb0882..67c805e 100644
--- a/src/import/import-raw.c
+++ b/src/import/import-raw.c
@@ -21,6 +21,7 @@
#include <sys/xattr.h>
#include <linux/fs.h>
+#include <sys/prctl.h>
#include <curl/curl.h>
#include <gcrypt.h>
@@ -47,6 +48,7 @@ struct RawImport {
ImportJob *raw_job;
ImportJob *sha256sums_job;
+ ImportJob *signature_job;
RawImportFinished on_finished;
void *userdata;
@@ -65,6 +67,8 @@ RawImport* raw_import_unref(RawImport *i) {
return NULL;
import_job_unref(i->raw_job);
+ import_job_unref(i->sha256sums_job);
+ import_job_unref(i->signature_job);
curl_glue_unref(i->glue);
sd_event_unref(i->event);
@@ -248,17 +252,25 @@ static int raw_import_make_local_copy(RawImport *i) {
}
static int raw_import_verify_sha256sum(RawImport *i) {
+ _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";
+ _cleanup_sigkill_wait_ pid_t pid = 0;
int r;
assert(i);
- assert(i->verify != IMPORT_VERIFY_NO);
assert(i->raw_job);
+
+ if (!i->sha256sums_job)
+ return 0;
+
+ assert(i->raw_job->state == IMPORT_JOB_DONE);
assert(i->raw_job->sha256);
- assert(i->sha256sums_job);
+ assert(i->sha256sums_job->state == IMPORT_JOB_DONE);
assert(i->sha256sums_job->payload);
assert(i->sha256sums_job->payload_size > 0);
@@ -285,56 +297,125 @@ static int raw_import_verify_sha256sum(RawImport *i) {
log_info("SHA256 checksum of %s is valid.", i->raw_job->url);
- return 0;
-}
+ if (!i->signature_job)
+ return 0;
-static int raw_import_finalize(RawImport *i) {
- int r;
+ assert(i->signature_job->state == IMPORT_JOB_DONE);
+ assert(i->signature_job->payload);
+ assert(i->signature_job->payload_size > 0);
- assert(i);
+ r = pipe2(gpg_pipe, O_CLOEXEC);
+ if (r < 0)
+ return log_error_errno(errno, "Failed to create pipe: %m");
- if (!IMPORT_JOB_STATE_IS_COMPLETE(i->raw_job) ||
- (i->verify != IMPORT_VERIFY_NO && !IMPORT_JOB_STATE_IS_COMPLETE(i->sha256sums_job)))
- return 0;
+ sig_file = mkostemp(sig_file_path, O_RDWR);
+ if (sig_file < 0)
+ return log_error_errno(errno, "Failed to create temporary file: %m");
- if (i->verify != IMPORT_VERIFY_NO &&
- i->raw_job->etag_exists) {
+ r = loop_write(sig_file, i->signature_job->payload, i->signature_job->payload_size, false);
+ if (r < 0) {
+ log_error_errno(r, "Failed to write to temporary file: %m");
+ goto finish;
+ }
- assert(i->temp_path);
- assert(i->final_path);
- assert(i->raw_job->disk_fd >= 0);
+ 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",
+ "--keyring=" VENDOR_KEYRING_PATH,
+ NULL, /* maybe user keyring */
+ NULL, /* --verify */
+ NULL, /* signature file */
+ NULL, /* dash */
+ NULL /* trailing NULL */
+ };
+ unsigned k = ELEMENTSOF(cmd) - 5;
+ 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);
+ }
- r = raw_import_verify_sha256sum(i);
- if (r < 0)
- return r;
+ if (gpg_pipe[0] != STDIN_FILENO)
+ gpg_pipe[0] = safe_close(gpg_pipe[0]);
- r = rename(i->temp_path, i->final_path);
- if (r < 0)
- return log_error_errno(errno, "Failed to move RAW file into place: %m");
+ 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);
+ }
- free(i->temp_path);
- i->temp_path = NULL;
+ 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);
+
+ /* 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;
+
+ cmd[k++] = "--verify";
+ cmd[k++] = sig_file_path;
+ cmd[k++] = "-";
+ cmd[k++] = NULL;
+
+ execvp("gpg", (char * const *) cmd);
+ log_error_errno(errno, "Failed to execute gpg: %m");
+ _exit(EXIT_FAILURE);
}
- r = raw_import_make_local_copy(i);
- if (r < 0)
- return r;
+ gpg_pipe[0] = safe_close(gpg_pipe[0]);
- i->raw_job->disk_fd = safe_close(i->raw_job->disk_fd);
+ r = loop_write(gpg_pipe[1], i->sha256sums_job->payload, i->sha256sums_job->payload_size, false);
+ if (r < 0) {
+ log_error_errno(r, "Failed to write to pipe: %m");
+ goto finish;
+ }
- return 1;
-}
+ gpg_pipe[1] = safe_close(gpg_pipe[1]);
-static void raw_import_invoke_finished(RawImport *i, int r) {
- assert(i);
+ 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;
+ }
- if (i->on_finished)
- i->on_finished(i, r, i->userdata);
- else
- sd_event_exit(i->event, r);
+finish:
+ if (sig_file >= 0)
+ unlink(sig_file_path);
+
+ return r;
}
-static void raw_import_raw_job_on_finished(ImportJob *j) {
+static void raw_import_job_on_finished(ImportJob *j) {
RawImport *i;
int r;
@@ -343,6 +424,13 @@ static void raw_import_raw_job_on_finished(ImportJob *j) {
i = j->userdata;
if (j->error != 0) {
+ if (j == i->sha256sums_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;
}
@@ -350,60 +438,56 @@ static void raw_import_raw_job_on_finished(ImportJob *j) {
/* 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. */
+ * true.
+ *
+ * We only do something when we got all three files */
- if (!j->etag_exists) {
- assert(j->disk_fd >= 0);
+ if (!IMPORT_JOB_STATE_IS_COMPLETE(i->raw_job))
+ return;
+ if (i->sha256sums_job && !IMPORT_JOB_STATE_IS_COMPLETE(i->sha256sums_job))
+ return;
+ if (i->signature_job && !IMPORT_JOB_STATE_IS_COMPLETE(i->signature_job))
+ return;
- r = raw_import_maybe_convert_qcow2(i);
+ if (!i->raw_job->etag_exists) {
+ assert(i->raw_job->disk_fd >= 0);
+
+ r = raw_import_verify_sha256sum(i);
if (r < 0)
goto finish;
- r = import_make_read_only_fd(j->disk_fd);
+ r = raw_import_maybe_convert_qcow2(i);
if (r < 0)
goto finish;
- }
-
- r = raw_import_finalize(i);
- if (r < 0)
- goto finish;
- if (r == 0)
- return;
-
- r = 0;
-finish:
- raw_import_invoke_finished(i, r);
-}
-
-static void raw_import_sha256sums_job_on_finished(ImportJob *j) {
- RawImport *i;
- int r;
-
- assert(j);
- assert(j->userdata);
+ r = import_make_read_only_fd(i->raw_job->disk_fd);
+ if (r < 0)
+ goto finish;
- i = j->userdata;
- assert(i->verify != IMPORT_VERIFY_NO);
+ r = rename(i->temp_path, i->final_path);
+ if (r < 0) {
+ r = log_error_errno(errno, "Failed to move RAW file into place: %m");
+ goto finish;
+ }
- if (j->error != 0) {
- log_error_errno(j->error, "Failed to retrieve SHA256 checksum, cannot verify.");
- r = j->error;
- goto finish;
+ free(i->temp_path);
+ i->temp_path = NULL;
}
- r = raw_import_finalize(i);
+ r = raw_import_make_local_copy(i);
if (r < 0)
goto finish;
- if (r == 0)
- return;
r = 0;
+
finish:
- raw_import_invoke_finished(i, r);
+ if (i->on_finished)
+ i->on_finished(i, r, i->userdata);
+ else
+ sd_event_exit(i->event, r);
}
-static int raw_import_raw_job_on_open_disk(ImportJob *j) {
+static int raw_import_job_on_open_disk(ImportJob *j) {
RawImport *i;
int r;
@@ -434,7 +518,6 @@ static int raw_import_raw_job_on_open_disk(ImportJob *j) {
}
int raw_import_pull(RawImport *i, const char *url, const char *local, bool force_local, ImportVerify verify) {
- _cleanup_free_ char *sha256sums_url = NULL;
int r;
assert(i);
@@ -461,8 +544,8 @@ int raw_import_pull(RawImport *i, const char *url, const char *local, bool force
if (r < 0)
return r;
- i->raw_job->on_finished = raw_import_raw_job_on_finished;
- i->raw_job->on_open_disk = raw_import_raw_job_on_open_disk;
+ i->raw_job->on_finished = raw_import_job_on_finished;
+ i->raw_job->on_open_disk = raw_import_job_on_open_disk;
i->raw_job->calc_hash = true;
r = import_find_old_etags(url, i->image_root, DT_REG, ".raw-", ".raw", &i->raw_job->old_etags);
@@ -470,6 +553,8 @@ int raw_import_pull(RawImport *i, const char *url, const char *local, bool force
return r;
if (verify != IMPORT_VERIFY_NO) {
+ _cleanup_free_ char *sha256sums_url = NULL;
+
/* Queue job for the SHA256SUMS file for the image */
r = import_url_change_last_component(url, "SHA256SUMS", &sha256sums_url);
if (r < 0)
@@ -479,17 +564,41 @@ int raw_import_pull(RawImport *i, const char *url, const char *local, bool force
if (r < 0)
return r;
- i->sha256sums_job->on_finished = raw_import_sha256sums_job_on_finished;
+ i->sha256sums_job->on_finished = raw_import_job_on_finished;
i->sha256sums_job->uncompressed_max = i->sha256sums_job->compressed_max = 1ULL * 1024ULL * 1024ULL;
+ }
- r = import_job_begin(i->sha256sums_job);
+ if (verify == IMPORT_VERIFY_SIGNATURE) {
+ _cleanup_free_ char *sha256sums_sig_url = NULL;
+
+ /* Queue job for the SHA256SUMS.gpg file for the image. */
+ r = import_url_change_last_component(url, "SHA256SUMS.gpg", &sha256sums_sig_url);
if (r < 0)
return r;
+
+ r = import_job_new(&i->signature_job, sha256sums_sig_url, i->glue, i);
+ if (r < 0)
+ return r;
+
+ i->signature_job->on_finished = raw_import_job_on_finished;
+ i->signature_job->uncompressed_max = i->signature_job->compressed_max = 1ULL * 1024ULL * 1024ULL;
}
r = import_job_begin(i->raw_job);
if (r < 0)
return r;
+ if (i->sha256sums_job) {
+ r = import_job_begin(i->sha256sums_job);
+ if (r < 0)
+ return r;
+ }
+
+ if (i->signature_job) {
+ r = import_job_begin(i->signature_job);
+ if (r < 0)
+ return r;
+ }
+
return 0;
}
diff --git a/src/shared/util.c b/src/shared/util.c
index 5157b94..9392477 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -8011,3 +8011,13 @@ ssize_t sparse_write(int fd, const void *p, size_t sz, size_t run_length) {
return q - (const uint8_t*) p;
}
+
+void sigkill_wait(pid_t *pid) {
+ if (!pid)
+ return;
+ if (*pid <= 1)
+ return;
+
+ if (kill(*pid, SIGKILL) > 0)
+ (void) wait_for_terminate(*pid, NULL);
+}
diff --git a/src/shared/util.h b/src/shared/util.h
index d40c0b0..f59a2bb 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -1065,3 +1065,6 @@ void release_lock_file(LockFile *f);
#define RLIMIT_MAKE_CONST(lim) ((struct rlimit) { lim, lim })
ssize_t sparse_write(int fd, const void *p, size_t sz, size_t run_length);
+
+void sigkill_wait(pid_t *pid);
+#define _cleanup_sigkill_wait_ _cleanup_(sigkill_wait)
More information about the systemd-commits
mailing list