X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fjournal-remote%2Fjournal-upload.c;h=36c0241d029bb8b999b90f8f3badb5cefa4ade66;hp=b178df2d34bb0e24cfcff9905fbdc771d3de6955;hb=0a1beeb64207eaa88ab9236787b1cbc2f704ae14;hpb=799a8f39d8eb9ea725e85a598c0f5dbd658c8ba7 diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c index b178df2d3..36c0241d0 100644 --- a/src/journal-remote/journal-upload.c +++ b/src/journal-remote/journal-upload.c @@ -31,12 +31,14 @@ #include "util.h" #include "build.h" #include "fileio.h" +#include "mkdir.h" #include "conf-parser.h" #include "journal-upload.h" #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-upload.pem" #define CERT_FILE CERTIFICATE_ROOT "/certs/journal-upload.pem" #define TRUST_FILE CERTIFICATE_ROOT "/ca/trusted.pem" +#define DEFAULT_PORT 19532 static const char* arg_url; @@ -61,7 +63,7 @@ static const char *arg_save_state = NULL; #define STATE_FILE "/var/lib/systemd/journal-upload/state" #define easy_setopt(curl, opt, value, level, cmd) \ - { \ + do { \ code = curl_easy_setopt(curl, opt, value); \ if (code) { \ log_full(level, \ @@ -69,7 +71,7 @@ static const char *arg_save_state = NULL; curl_easy_strerror(code)); \ cmd; \ } \ - } + } while(0) static size_t output_callback(char *buf, size_t size, @@ -92,6 +94,32 @@ static size_t output_callback(char *buf, return size * nmemb; } +static int check_cursor_updating(Uploader *u) { + _cleanup_free_ char *temp_path = NULL; + _cleanup_fclose_ FILE *f = NULL; + int r; + + if (!u->state_file) + return 0; + + r = mkdir_parents(u->state_file, 0755); + if (r < 0) { + log_error("Cannot create parent directory of state file %s: %s", + u->state_file, strerror(-r)); + return r; + } + + r = fopen_temporary(u->state_file, &f, &temp_path); + if (r < 0) { + log_error("Cannot save state to %s: %s", + u->state_file, strerror(-r)); + return r; + } + unlink(temp_path); + + return 0; +} + static int update_cursor_state(Uploader *u) { _cleanup_free_ char *temp_path = NULL; _cleanup_fclose_ FILE *f = NULL; @@ -119,7 +147,7 @@ static int update_cursor_state(Uploader *u) { finish: if (r < 0) - log_error("Failed to save state %s: %s", u->state_file, strerror(-r)); + log_error_errno(-r, "Failed to save state %s: %m", u->state_file); return r; } @@ -134,11 +162,14 @@ static int load_cursor_state(Uploader *u) { "LAST_CURSOR", &u->last_cursor, NULL); - if (r < 0 && r != -ENOENT) { + if (r == -ENOENT) + log_debug("State file %s is not present.", u->state_file); + else if (r < 0) { log_error("Failed to read state file %s: %s", u->state_file, strerror(-r)); return r; - } + } else + log_debug("Last cursor was %s", u->last_cursor); return 0; } @@ -191,7 +222,7 @@ int start_upload(Uploader *u, easy_setopt(curl, CURLOPT_POST, 1L, LOG_ERR, return -EXFULL); - easy_setopt(curl, CURLOPT_ERRORBUFFER, &u->error, + easy_setopt(curl, CURLOPT_ERRORBUFFER, u->error, LOG_ERR, return -EXFULL); /* set where to write to */ @@ -220,15 +251,16 @@ int start_upload(Uploader *u, LOG_WARNING, ); if (arg_key || startswith(u->url, "https://")) { - assert(arg_cert); - easy_setopt(curl, CURLOPT_SSLKEY, arg_key ?: PRIV_KEY_FILE, LOG_ERR, return -EXFULL); easy_setopt(curl, CURLOPT_SSLCERT, arg_cert ?: CERT_FILE, LOG_ERR, return -EXFULL); } - if (arg_trust || startswith(u->url, "https://")) + if (streq_ptr(arg_trust, "all")) + easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0, + LOG_ERR, return -EUCLEAN); + else if (arg_trust || startswith(u->url, "https://")) easy_setopt(curl, CURLOPT_CAINFO, arg_trust ?: TRUST_FILE, LOG_ERR, return -EXFULL); @@ -324,7 +356,7 @@ static int dispatch_fd_input(sd_event_source *event, } static int open_file_for_upload(Uploader *u, const char *filename) { - int fd, r; + int fd, r = 0; if (streq(filename, "-")) fd = STDIN_FILENO; @@ -343,7 +375,7 @@ static int open_file_for_upload(Uploader *u, const char *filename) { fd, EPOLLIN, dispatch_fd_input, u); if (r < 0) { if (r != -EPERM || arg_follow > 0) { - log_error("Failed to register input event: %s", strerror(-r)); + log_error_errno(-r, "Failed to register input event: %m"); return r; } @@ -394,6 +426,7 @@ static int setup_signals(Uploader *u) { static int setup_uploader(Uploader *u, const char *url, const char *state_file) { int r; + const char *host, *proto = ""; assert(u); assert(url); @@ -401,10 +434,24 @@ static int setup_uploader(Uploader *u, const char *url, const char *state_file) memzero(u, sizeof(Uploader)); u->input = -1; - if (!startswith(url, "http://") && !startswith(url, "https://")) - url = strappenda("https://", url); + if (!(host = startswith(url, "http://")) && !(host = startswith(url, "https://"))) { + host = url; + proto = "https://"; + } - u->url = strappend(url, "/upload"); + if (strchr(host, ':')) + u->url = strjoin(proto, url, "/upload", NULL); + else { + char *t; + size_t x; + + t = strdupa(url); + x = strlen(t); + while (x > 0 && t[x - 1] == '/') + t[x - 1] = '\0'; + + u->url = strjoin(proto, t, ":" STRINGIFY(DEFAULT_PORT), "/upload", NULL); + } if (!u->url) return log_oom(); @@ -412,13 +459,13 @@ static int setup_uploader(Uploader *u, const char *url, const char *state_file) r = sd_event_default(&u->events); if (r < 0) { - log_error("sd_event_default failed: %s", strerror(-r)); + log_error_errno(-r, "sd_event_default failed: %m"); return r; } r = setup_signals(u); if (r < 0) { - log_error("Failed to set up signals: %s", strerror(-r)); + log_error_errno(-r, "Failed to set up signals: %m"); return r; } @@ -455,10 +502,12 @@ static int perform_upload(Uploader *u) { code = curl_easy_perform(u->easy); if (code) { - log_error("Upload to %s failed: %.*s", - u->url, - u->error[0] ? (int) sizeof(u->error) : INT_MAX, - u->error[0] ? u->error : curl_easy_strerror(code)); + if (u->error[0]) + log_error("Upload to %s failed: %.*s", + u->url, (int) sizeof(u->error), u->error); + else + log_error("Upload to %s failed: %s", + u->url, curl_easy_strerror(code)); return -EIO; } @@ -505,24 +554,29 @@ static int parse_config(void) { static void help(void) { printf("%s -u URL {FILE|-}...\n\n" "Upload journal events to a remote server.\n\n" - "Options:\n" - " -u --url=URL Upload to this address\n" - " --key=FILENAME Specify key in PEM format\n" - " --cert=FILENAME Specify certificate in PEM format\n" - " --trust=FILENAME Specify CA certificate in PEM format\n" - " --system Use the system journal\n" - " --user Use the user journal for the current user\n" - " -m --merge Use all available journals\n" - " -M --machine=CONTAINER Operate on local container\n" - " -D --directory=PATH Use journal files from directory\n" - " --file=PATH Use this journal file\n" - " --cursor=CURSOR Start at the specified cursor\n" - " --after-cursor=CURSOR Start after the specified cursor\n" - " --[no-]follow Do [not] wait for input\n" - " --save-state[=FILE] Save uploaded cursors (default \n" - " " STATE_FILE ")\n" - " -h --help Show this help and exit\n" - " --version Print version string and exit\n" + " -h --help Show this help\n" + " --version Show package version\n" + " -u --url=URL Upload to this address (default port " + STRINGIFY(DEFAULT_PORT) ")\n" + " --key=FILENAME Specify key in PEM format (default:\n" + " \"" PRIV_KEY_FILE "\")\n" + " --cert=FILENAME Specify certificate in PEM format (default:\n" + " \"" CERT_FILE "\")\n" + " --trust=FILENAME|all Specify CA certificate or disable checking (default:\n" + " \"" TRUST_FILE "\")\n" + " --system Use the system journal\n" + " --user Use the user journal for the current user\n" + " -m --merge Use all available journals\n" + " -M --machine=CONTAINER Operate on local container\n" + " -D --directory=PATH Use journal files from directory\n" + " --file=PATH Use this journal file\n" + " --cursor=CURSOR Start at the specified cursor\n" + " --after-cursor=CURSOR Start after the specified cursor\n" + " --follow[=BOOL] Do [not] wait for input\n" + " --save-state[=FILE] Save uploaded cursors (default \n" + " " STATE_FILE ")\n" + " -h --help Show this help and exit\n" + " --version Print version string and exit\n" , program_invocation_short_name); } @@ -538,7 +592,6 @@ static int parse_argv(int argc, char *argv[]) { ARG_CURSOR, ARG_AFTER_CURSOR, ARG_FOLLOW, - ARG_NO_FOLLOW, ARG_SAVE_STATE, }; @@ -557,8 +610,7 @@ static int parse_argv(int argc, char *argv[]) { { "file", required_argument, NULL, ARG_FILE }, { "cursor", required_argument, NULL, ARG_CURSOR }, { "after-cursor", required_argument, NULL, ARG_AFTER_CURSOR }, - { "follow", no_argument, NULL, ARG_FOLLOW }, - { "no-follow", no_argument, NULL, ARG_NO_FOLLOW }, + { "follow", optional_argument, NULL, ARG_FOLLOW }, { "save-state", optional_argument, NULL, ARG_SAVE_STATE }, {} }; @@ -650,7 +702,7 @@ static int parse_argv(int argc, char *argv[]) { case ARG_FILE: r = glob_extend(&arg_file, optarg); if (r < 0) { - log_error("Failed to add paths: %s", strerror(-r)); + log_error_errno(-r, "Failed to add paths: %m"); return r; }; break; @@ -675,11 +727,17 @@ static int parse_argv(int argc, char *argv[]) { break; case ARG_FOLLOW: - arg_follow = true; - break; + if (optarg) { + r = parse_boolean(optarg); + if (r < 0) { + log_error("Failed to parse --follow= parameter."); + return -EINVAL; + } + + arg_follow = !!r; + } else + arg_follow = true; - case ARG_NO_FOLLOW: - arg_follow = false; break; case ARG_SAVE_STATE: @@ -743,7 +801,7 @@ int main(int argc, char **argv) { log_parse_environment(); r = parse_config(); - if (r <= 0) + if (r < 0) goto finish; r = parse_argv(argc, argv); @@ -756,6 +814,10 @@ int main(int argc, char **argv) { sd_event_set_watchdog(u.events, true); + r = check_cursor_updating(&u); + if (r < 0) + goto cleanup; + log_debug("%s running as pid "PID_FMT, program_invocation_short_name, getpid()); @@ -778,6 +840,12 @@ int main(int argc, char **argv) { "STATUS=Processing input..."); while (true) { + r = sd_event_get_state(u.events); + if (r < 0) + break; + if (r == SD_EVENT_FINISHED) + break; + if (use_journal) { if (!u.journal) break; @@ -793,12 +861,6 @@ int main(int argc, char **argv) { if (r < 0) goto cleanup; - r = sd_event_get_state(u.events); - if (r < 0) - break; - if (r == SD_EVENT_FINISHED) - break; - if (u.uploading) { r = perform_upload(&u); if (r < 0) @@ -807,15 +869,18 @@ int main(int argc, char **argv) { r = sd_event_run(u.events, u.timeout); if (r < 0) { - log_error("Failed to run event loop: %s", strerror(-r)); + log_error_errno(-r, "Failed to run event loop: %m"); break; } } cleanup: - sd_notify(false, "STATUS=Shutting down..."); + sd_notify(false, + "STOPPING=1\n" + "STATUS=Shutting down..."); + destroy_uploader(&u); finish: - return r == 0 ? EXIT_SUCCESS : EXIT_FAILURE; + return r >= 0 ? EXIT_SUCCESS : EXIT_FAILURE; }