X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fjournal-remote%2Fjournal-remote.c;h=21309743fe108cf12f40bb44e020055f28652916;hp=22f067aa1aac80ca0655e0687818ed98e07a3f18;hb=eb56eb9b40950f1edcffdb7313f8de4f8572a6d5;hpb=24739b7b757d22a4b629d410a768e4e85fb02282 diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c index 22f067aa1..21309743f 100644 --- a/src/journal-remote/journal-remote.c +++ b/src/journal-remote/journal-remote.c @@ -21,7 +21,6 @@ #include #include -#include #include #include #include @@ -33,7 +32,6 @@ #include #include "sd-daemon.h" -#include "sd-event.h" #include "journal-file.h" #include "journald-native.h" #include "socket-util.h" @@ -43,22 +41,21 @@ #include "strv.h" #include "fileio.h" #include "conf-parser.h" -#include "microhttpd-util.h" +#include "siphash24.h" #ifdef HAVE_GNUTLS #include #endif -#include "journal-remote-parse.h" +#include "journal-remote.h" #include "journal-remote-write.h" -#define REMOTE_JOURNAL_PATH "/var/log/journal/" SD_ID128_FORMAT_STR "/remote-%s.journal" +#define REMOTE_JOURNAL_PATH "/var/log/journal/remote" -#define KEY_FILE CERTIFICATE_ROOT "/private/journal-remote.pem" -#define CERT_FILE CERTIFICATE_ROOT "/certs/journal-remote.pem" -#define TRUST_FILE CERTIFICATE_ROOT "/ca/trusted.pem" +#define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-remote.pem" +#define CERT_FILE CERTIFICATE_ROOT "/certs/journal-remote.pem" +#define TRUST_FILE CERTIFICATE_ROOT "/ca/trusted.pem" -static char* arg_output = NULL; static char* arg_url = NULL; static char* arg_getter = NULL; static char* arg_listen_raw = NULL; @@ -70,6 +67,9 @@ static int arg_seal = false; static int http_socket = -1, https_socket = -1; static char** arg_gnutls_log = NULL; +static JournalWriteSplitMode arg_split_mode = JOURNAL_WRITE_SPLIT_HOST; +static char* arg_output = NULL; + static char *arg_key = NULL; static char *arg_cert = NULL; static char *arg_trust = NULL; @@ -130,7 +130,7 @@ static int spawn_child(const char* child, char** argv) { return fd[0]; } -static int spawn_curl(char* url) { +static int spawn_curl(const char* url) { char **argv = STRV_MAKE("curl", "-HAccept: application/vnd.fdo.journal", "--silent", @@ -144,14 +144,22 @@ static int spawn_curl(char* url) { return r; } -static int spawn_getter(char *getter, char *url) { +static int spawn_getter(const char *getter, const char *url) { int r; _cleanup_strv_free_ char **words = NULL; assert(getter); - words = strv_split_quoted(getter); - if (!words) - return log_oom(); + r = strv_split_quoted(&words, getter, false); + if (r < 0) { + log_error_errno(r, "Failed to split getter option: %m"); + return r; + } + + r = strv_extend(&words, url); + if (r < 0) { + log_error_errno(r, "Failed to create command line: %m"); + return r; + } r = spawn_child(words[0], words); if (r < 0) @@ -160,62 +168,52 @@ static int spawn_getter(char *getter, char *url) { return r; } -static int open_output(Writer *s, const char* url) { - _cleanup_free_ char *name, *output = NULL; - char *c; +#define filename_escape(s) xescape((s), "/ ") + +static int open_output(Writer *w, const char* host) { + _cleanup_free_ char *_output = NULL; + const char *output; int r; - assert(url); - name = strdup(url); - if (!name) - return log_oom(); + switch (arg_split_mode) { + case JOURNAL_WRITE_SPLIT_NONE: + output = arg_output ?: REMOTE_JOURNAL_PATH "/remote.journal"; + break; - for(c = name; *c; c++) { - if (*c == '/' || *c == ':' || *c == ' ') - *c = '~'; - else if (*c == '?') { - *c = '\0'; - break; - } - } + case JOURNAL_WRITE_SPLIT_HOST: { + _cleanup_free_ char *name; - if (!arg_output) { - sd_id128_t machine; - r = sd_id128_get_machine(&machine); - if (r < 0) { - log_error("failed to determine machine ID128: %s", strerror(-r)); - return r; - } + assert(host); + + name = filename_escape(host); + if (!name) + return log_oom(); - r = asprintf(&output, REMOTE_JOURNAL_PATH, - SD_ID128_FORMAT_VAL(machine), name); + r = asprintf(&_output, "%s/remote-%s.journal", + arg_output ?: REMOTE_JOURNAL_PATH, + name); if (r < 0) return log_oom(); - } else { - r = is_dir(arg_output, true); - if (r > 0) { - r = asprintf(&output, - "%s/remote-%s.journal", arg_output, name); - if (r < 0) - return log_oom(); - } else { - output = strdup(arg_output); - if (!output) - return log_oom(); - } + + output = _output; + break; + } + + default: + assert_not_reached("what?"); } r = journal_file_open_reliably(output, O_RDWR|O_CREAT, 0640, arg_compress, arg_seal, - &s->metrics, - s->mmap, - NULL, &s->journal); + &w->metrics, + w->mmap, + NULL, &w->journal); if (r < 0) - log_error("Failed to open output journal %s: %s", - arg_output, strerror(-r)); + log_error_errno(r, "Failed to open output journal %s: %m", + output); else - log_info("Opened output file %s", s->journal->path); + log_info("Opened output file %s", w->journal->path); return r; } @@ -223,26 +221,72 @@ static int open_output(Writer *s, const char* url) { ********************************************************************** **********************************************************************/ -typedef struct MHDDaemonWrapper { - uint64_t fd; - struct MHD_Daemon *daemon; +static int init_writer_hashmap(RemoteServer *s) { + static const struct hash_ops *hash_ops[] = { + [JOURNAL_WRITE_SPLIT_NONE] = NULL, + [JOURNAL_WRITE_SPLIT_HOST] = &string_hash_ops, + }; + + assert(arg_split_mode >= 0 && arg_split_mode < (int) ELEMENTSOF(hash_ops)); + + s->writers = hashmap_new(hash_ops[arg_split_mode]); + if (!s->writers) + return log_oom(); + + return 0; +} + +static int get_writer(RemoteServer *s, const char *host, + Writer **writer) { + const void *key; + _cleanup_writer_unref_ Writer *w = NULL; + int r; + + switch(arg_split_mode) { + case JOURNAL_WRITE_SPLIT_NONE: + key = "one and only"; + break; + + case JOURNAL_WRITE_SPLIT_HOST: + assert(host); + key = host; + break; + + default: + assert_not_reached("what split mode?"); + } - sd_event_source *event; -} MHDDaemonWrapper; + w = hashmap_get(s->writers, key); + if (w) + writer_ref(w); + else { + w = writer_new(s); + if (!w) + return log_oom(); -typedef struct RemoteServer { - RemoteSource **sources; - size_t sources_size; - size_t active; + if (arg_split_mode == JOURNAL_WRITE_SPLIT_HOST) { + w->hashmap_key = strdup(key); + if (!w->hashmap_key) + return log_oom(); + } - sd_event *events; - sd_event_source *sigterm_event, *sigint_event, *listen_event; + r = open_output(w, host); + if (r < 0) + return r; - Writer writer; + r = hashmap_put(s->writers, w->hashmap_key ?: key, w); + if (r < 0) + return r; + } - bool check_trust; - Hashmap *daemons; -} RemoteServer; + *writer = w; + w = NULL; + return 0; +} + +/********************************************************************** + ********************************************************************** + **********************************************************************/ /* This should go away as soon as µhttpd allows state to be passed around. */ static RemoteServer *server; @@ -251,6 +295,8 @@ static int dispatch_raw_source_event(sd_event_source *event, int fd, uint32_t revents, void *userdata); +static int dispatch_blocking_source_event(sd_event_source *event, + void *userdata); static int dispatch_raw_connection_event(sd_event_source *event, int fd, uint32_t revents, @@ -260,18 +306,31 @@ static int dispatch_http_event(sd_event_source *event, uint32_t revents, void *userdata); -static int get_source_for_fd(RemoteServer *s, int fd, RemoteSource **source) { +static int get_source_for_fd(RemoteServer *s, + int fd, char *name, RemoteSource **source) { + Writer *writer; + int r; + + /* This takes ownership of name, but only on success. */ + assert(fd >= 0); assert(source); if (!GREEDY_REALLOC0(s->sources, s->sources_size, fd + 1)) return log_oom(); + r = get_writer(s, name, &writer); + if (r < 0) + return log_warning_errno(r, "Failed to get writer for source %s: %m", + name); + if (s->sources[fd] == NULL) { - s->sources[fd] = new0(RemoteSource, 1); - if (!s->sources[fd]) + s->sources[fd] = source_new(fd, false, name, writer); + if (!s->sources[fd]) { + writer_unref(writer); return log_oom(); - s->sources[fd]->fd = -1; + } + s->active++; } @@ -287,50 +346,59 @@ static int remove_source(RemoteServer *s, int fd) { source = s->sources[fd]; if (source) { + /* this closes fd too */ source_free(source); s->sources[fd] = NULL; s->active--; } - close(fd); - return 0; } -static int add_source(RemoteServer *s, int fd, const char* name) { - RemoteSource *source = NULL; - _cleanup_free_ char *realname = NULL; +static int add_source(RemoteServer *s, int fd, char* name, bool own_name) { + + RemoteSource *source; int r; + /* This takes ownership of name, even on failure, if own_name is true. */ + assert(s); assert(fd >= 0); + assert(name); - if (name) { - realname = strdup(name); - if (!realname) - return log_oom(); - } else { - r = asprintf(&realname, "fd:%d", fd); - if (r < 0) + if (!own_name) { + name = strdup(name); + if (!name) return log_oom(); } - log_debug("Creating source for fd:%d (%s)", fd, realname); - - r = get_source_for_fd(s, fd, &source); + r = get_source_for_fd(s, fd, name, &source); if (r < 0) { - log_error("Failed to create source for fd:%d (%s)", fd, realname); + log_error_errno(r, "Failed to create source for fd:%d (%s): %m", + fd, name); + free(name); return r; } - assert(source); - assert(source->fd < 0); - source->fd = fd; r = sd_event_add_io(s->events, &source->event, - fd, EPOLLIN, dispatch_raw_source_event, s); + fd, EPOLLIN|EPOLLRDHUP|EPOLLPRI, + dispatch_raw_source_event, s); + if (r == -EPERM) { + log_debug("Falling back to sd_event_add_defer for fd:%d (%s)", fd, name); + r = sd_event_add_defer(s->events, &source->event, + dispatch_blocking_source_event, source); + if (r == 0) + sd_event_source_set_enabled(source->event, SD_EVENT_ON); + } + if (r < 0) { + log_error_errno(r, "Failed to register event source for fd:%d: %m", + fd); + goto error; + } + + r = sd_event_source_set_description(source->event, name); if (r < 0) { - log_error("Failed to register event source for fd:%d: %s", - fd, strerror(-r)); + log_error_errno(r, "Failed to set source name for fd:%d: %m", fd); goto error; } @@ -343,14 +411,24 @@ static int add_source(RemoteServer *s, int fd, const char* name) { static int add_raw_socket(RemoteServer *s, int fd) { int r; + _cleanup_close_ int fd_ = fd; + char name[strlen("raw-socket-") + DECIMAL_STR_MAX(int)]; - r = sd_event_add_io(s->events, &s->listen_event, fd, EPOLLIN, + assert(fd >= 0); + + r = sd_event_add_io(s->events, &s->listen_event, + fd, EPOLLIN, dispatch_raw_connection_event, s); - if (r < 0) { - close(fd); + if (r < 0) return r; - } + snprintf(name, sizeof(name), "raw-socket-%d", fd); + + r = sd_event_source_set_description(s->listen_event, name); + if (r < 0) + return r; + + fd_ = -1; s->active ++; return 0; } @@ -369,22 +447,30 @@ static int setup_raw_socket(RemoteServer *s, const char *address) { ********************************************************************** **********************************************************************/ -static RemoteSource *request_meta(void **connection_cls) { +static int request_meta(void **connection_cls, int fd, char *hostname) { RemoteSource *source; + Writer *writer; + int r; assert(connection_cls); if (*connection_cls) - return *connection_cls; + return 0; - source = new0(RemoteSource, 1); - if (!source) - return NULL; - source->fd = -1; + r = get_writer(server, hostname, &writer); + if (r < 0) + return log_warning_errno(r, "Failed to get writer for source %s: %m", + hostname); + + source = source_new(fd, true, hostname, writer); + if (!source) { + writer_unref(writer); + return log_oom(); + } log_debug("Added RemoteSource as connection metadata %p", source); *connection_cls = source; - return source; + return 0; } static void request_meta_free(void *cls, @@ -396,9 +482,11 @@ static void request_meta_free(void *cls, assert(connection_cls); s = *connection_cls; - log_debug("Cleaning up connection metadata %p", s); - source_free(s); - *connection_cls = NULL; + if (s) { + log_debug("Cleaning up connection metadata %p", s); + source_free(s); + *connection_cls = NULL; + } } static int process_http_upload( @@ -408,15 +496,16 @@ static int process_http_upload( RemoteSource *source) { bool finished = false; + size_t remaining; int r; assert(source); - log_debug("request_handler_upload: connection %p, %zu bytes", - connection, *upload_data_size); + log_trace("%s: connection %p, %zu bytes", + __func__, connection, *upload_data_size); if (*upload_data_size) { - log_info("Received %zu bytes", *upload_data_size); + log_trace("Received %zu bytes", *upload_data_size); r = push_data(source, upload_data, *upload_data_size); if (r < 0) @@ -427,7 +516,7 @@ static int process_http_upload( finished = true; while (true) { - r = process_source(source, &server->writer, arg_compress, arg_seal); + r = process_source(source, arg_compress, arg_seal); if (r == -EAGAIN || r == -EWOULDBLOCK) break; else if (r < 0) { @@ -449,10 +538,12 @@ static int process_http_upload( /* The upload is finished */ - if (source_non_empty(source)) { - log_warning("EOF reached with incomplete data"); - return mhd_respond(connection, MHD_HTTP_EXPECTATION_FAILED, - "Trailing data not processed."); + remaining = source_non_empty(source); + if (remaining > 0) { + log_warning("Premature EOFbyte. %zu bytes lost.", remaining); + return mhd_respondf(connection, MHD_HTTP_EXPECTATION_FAILED, + "Premature EOF. %zu bytes of trailing data not processed.", + remaining); } return mhd_respond(connection, MHD_HTTP_ACCEPTED, "OK.\n"); @@ -469,14 +560,15 @@ static int request_handler( void **connection_cls) { const char *header; - int r ,code; + int r, code, fd; + _cleanup_free_ char *hostname = NULL; assert(connection); assert(connection_cls); assert(url); assert(method); - log_debug("Handling a connection %s %s %s", method, url, version); + log_trace("Handling a connection %s %s %s", method, url, version); if (*connection_cls) return process_http_upload(connection, @@ -498,14 +590,43 @@ static int request_handler( "Content-Type: application/vnd.fdo.journal" " is required.\n"); + { + const union MHD_ConnectionInfo *ci; + + ci = MHD_get_connection_info(connection, + MHD_CONNECTION_INFO_CONNECTION_FD); + if (!ci) { + log_error("MHD_get_connection_info failed: cannot get remote fd"); + return mhd_respond(connection, MHD_HTTP_INTERNAL_SERVER_ERROR, + "Cannot check remote address"); + } + + fd = ci->connect_fd; + assert(fd >= 0); + } + if (server->check_trust) { - r = check_permissions(connection, &code); + r = check_permissions(connection, &code, &hostname); if (r < 0) return code; + } else { + r = getnameinfo_pretty(fd, &hostname); + if (r < 0) { + return mhd_respond(connection, MHD_HTTP_INTERNAL_SERVER_ERROR, + "Cannot check remote hostname"); + } } - if (!request_meta(connection_cls)) + assert(hostname); + + r = request_meta(connection_cls, fd, hostname); + if (r == -ENOMEM) return respond_oom(connection); + else if (r < 0) + return mhd_respond(connection, MHD_HTTP_INTERNAL_SERVER_ERROR, + strerror(-r)); + + hostname = NULL; return MHD_YES; } @@ -537,7 +658,7 @@ static int setup_microhttpd_server(RemoteServer *s, r = fd_nonblock(fd, true); if (r < 0) { - log_error("Failed to make fd:%d nonblocking: %s", fd, strerror(-r)); + log_error_errno(r, "Failed to make fd:%d nonblocking: %m", fd); return r; } @@ -592,13 +713,20 @@ static int setup_microhttpd_server(RemoteServer *s, } r = sd_event_add_io(s->events, &d->event, - epoll_fd, EPOLLIN, dispatch_http_event, d); + epoll_fd, EPOLLIN, + dispatch_http_event, d); if (r < 0) { - log_error("Failed to add event callback: %s", strerror(-r)); + log_error_errno(r, "Failed to add event callback: %m"); goto error; } - r = hashmap_ensure_allocated(&s->daemons, uint64_hash_func, uint64_compare_func); + r = sd_event_source_set_description(d->event, "epoll-fd"); + if (r < 0) { + log_error_errno(r, "Failed to set source name: %m"); + goto error; + } + + r = hashmap_ensure_allocated(&s->daemons, &uint64_hash_ops); if (r < 0) { log_oom(); goto error; @@ -606,7 +734,7 @@ static int setup_microhttpd_server(RemoteServer *s, r = hashmap_put(s->daemons, &d->fd, d); if (r < 0) { - log_error("Failed to add daemon to hashmap: %s", strerror(-r)); + log_error_errno(r, "Failed to add daemon to hashmap: %m"); goto error; } @@ -657,19 +785,6 @@ static int dispatch_http_event(sd_event_source *event, ********************************************************************** **********************************************************************/ -static int dispatch_sigterm(sd_event_source *event, - const struct signalfd_siginfo *si, - void *userdata) { - RemoteServer *s = userdata; - - assert(s); - - log_received_signal(LOG_INFO, si); - - sd_event_exit(s->events, 0); - return 0; -} - static int setup_signals(RemoteServer *s) { sigset_t mask; int r; @@ -680,57 +795,65 @@ static int setup_signals(RemoteServer *s) { sigset_add_many(&mask, SIGINT, SIGTERM, -1); assert_se(sigprocmask(SIG_SETMASK, &mask, NULL) == 0); - r = sd_event_add_signal(s->events, &s->sigterm_event, SIGTERM, dispatch_sigterm, s); + r = sd_event_add_signal(s->events, &s->sigterm_event, SIGTERM, NULL, s); if (r < 0) return r; - r = sd_event_add_signal(s->events, &s->sigint_event, SIGINT, dispatch_sigterm, s); + r = sd_event_add_signal(s->events, &s->sigint_event, SIGINT, NULL, s); if (r < 0) return r; return 0; } -static int fd_fd(const char *spec) { +static int negative_fd(const char *spec) { + /* Return a non-positive number as its inverse, -EINVAL otherwise. */ + int fd, r; r = safe_atoi(spec, &fd); if (r < 0) return r; - return -1; + if (fd > 0) + return -EINVAL; + else + return -fd; } - static int remoteserver_init(RemoteServer *s, const char* key, const char* cert, const char* trust) { int r, n, fd; - const char *output_name = NULL; char **file; assert(s); - if ((arg_listen_raw || arg_listen_http) && trust) { log_error("Option --trust makes all non-HTTPS connections untrusted."); return -EINVAL; } - sd_event_default(&s->events); + r = sd_event_default(&s->events); + if (r < 0) { + log_error_errno(r, "Failed to allocate event loop: %m"); + return r; + } setup_signals(s); assert(server == NULL); server = s; + r = init_writer_hashmap(s); + if (r < 0) + return r; + n = sd_listen_fds(true); - if (n < 0) { - log_error("Failed to read listening file descriptors from environment: %s", - strerror(-n)); - return n; - } else + if (n < 0) + return log_error_errno(n, "Failed to read listening file descriptors from environment: %m"); + else log_info("Received %d descriptors", n); if (MAX(http_socket, https_socket) >= SD_LISTEN_FDS_START + n) { @@ -739,7 +862,7 @@ static int remoteserver_init(RemoteServer *s, } for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + n; fd++) { - if (sd_is_socket(fd, AF_UNSPEC, 0, false)) { + if (sd_is_socket(fd, AF_UNSPEC, 0, true)) { log_info("Received a listening socket (fd:%d)", fd); if (fd == http_socket) @@ -748,10 +871,18 @@ static int remoteserver_init(RemoteServer *s, r = setup_microhttpd_server(s, fd, key, cert, trust); else r = add_raw_socket(s, fd); - } else if (sd_is_socket(fd, AF_UNSPEC, 0, true)) { - log_info("Received a connection socket (fd:%d)", fd); + } else if (sd_is_socket(fd, AF_UNSPEC, 0, false)) { + char *hostname; + + r = getnameinfo_pretty(fd, &hostname); + if (r < 0) { + log_error_errno(r, "Failed to retrieve remote name: %m"); + return r; + } + + log_info("Received a connection socket (fd:%d) from %s", fd, hostname); - r = add_source(s, fd, NULL); + r = add_source(s, fd, hostname, true); } else { log_error("Unknown socket passed on fd:%d", fd); @@ -759,22 +890,16 @@ static int remoteserver_init(RemoteServer *s, } if(r < 0) { - log_error("Failed to register socket (fd:%d): %s", - fd, strerror(-r)); + log_error_errno(r, "Failed to register socket (fd:%d): %m", + fd); return r; } - - output_name = "socket"; } if (arg_url) { - _cleanup_free_ char *url = NULL; - _cleanup_strv_free_ char **urlv = strv_new(arg_url, "/entries", NULL); - if (!urlv) - return log_oom(); - url = strv_join(urlv, ""); - if (!url) - return log_oom(); + const char *url, *hostname; + + url = strappenda(arg_url, "/entries"); if (arg_getter) { log_info("Spawning getter %s...", url); @@ -786,11 +911,14 @@ static int remoteserver_init(RemoteServer *s, if (fd < 0) return fd; - r = add_source(s, fd, arg_url); + hostname = + startswith(arg_url, "https://") ?: + startswith(arg_url, "http://") ?: + arg_url; + + r = add_source(s, fd, (char*) hostname, false); if (r < 0) return r; - - output_name = arg_url; } if (arg_listen_raw) { @@ -798,29 +926,25 @@ static int remoteserver_init(RemoteServer *s, r = setup_raw_socket(s, arg_listen_raw); if (r < 0) return r; - - output_name = arg_listen_raw; } if (arg_listen_http) { r = setup_microhttpd_socket(s, arg_listen_http, NULL, NULL, NULL); if (r < 0) return r; - - output_name = arg_listen_http; } if (arg_listen_https) { r = setup_microhttpd_socket(s, arg_listen_https, key, cert, trust); if (r < 0) return r; - - output_name = arg_listen_https; } STRV_FOREACH(file, arg_files) { + const char *output_name; + if (streq(*file, "-")) { - log_info("Reading standard input..."); + log_info("Using standard input as source."); fd = STDIN_FILENO; output_name = "stdin"; @@ -835,7 +959,7 @@ static int remoteserver_init(RemoteServer *s, output_name = *file; } - r = add_source(s, fd, output_name); + r = add_source(s, fd, (char*) output_name, false); if (r < 0) return r; } @@ -845,24 +969,22 @@ static int remoteserver_init(RemoteServer *s, return -EINVAL; } - if (!!n + !!arg_url + !!arg_listen_raw + !!arg_files) - output_name = "multiple"; - - r = writer_init(&s->writer); - if (r < 0) - return r; + if (arg_split_mode == JOURNAL_WRITE_SPLIT_NONE) { + /* In this case we know what the writer will be + called, so we can create it and verify that we can + create output as expected. */ + r = get_writer(s, NULL, &s->_single_writer); + if (r < 0) + return r; + } - r = open_output(&s->writer, output_name); - return r; + return 0; } -static int server_destroy(RemoteServer *s) { - int r; +static void server_destroy(RemoteServer *s) { size_t i; MHDDaemonWrapper *d; - r = writer_close(&s->writer); - while ((d = hashmap_steal_first(s->daemons))) { MHD_stop_daemon(d->daemon); sd_event_source_unref(d->event); @@ -874,17 +996,17 @@ static int server_destroy(RemoteServer *s) { assert(s->sources_size == 0 || s->sources); for (i = 0; i < s->sources_size; i++) remove_source(s, i); - free(s->sources); + writer_unref(s->_single_writer); + hashmap_free(s->writers); + sd_event_source_unref(s->sigterm_event); sd_event_source_unref(s->sigint_event); sd_event_source_unref(s->listen_event); sd_event_unref(s->events); /* fds that we're listening on remain open... */ - - return r; } /********************************************************************** @@ -904,23 +1026,41 @@ static int dispatch_raw_source_event(sd_event_source *event, source = s->sources[fd]; assert(source->fd == fd); - r = process_source(source, &s->writer, arg_compress, arg_seal); + r = process_source(source, arg_compress, arg_seal); if (source->state == STATE_EOF) { + size_t remaining; + log_info("EOF reached with source fd:%d (%s)", source->fd, source->name); - if (source_non_empty(source)) - log_warning("EOF reached with incomplete data"); + + remaining = source_non_empty(source); + if (remaining > 0) + log_warning("Premature EOF. %zu bytes lost.", remaining); remove_source(s, source->fd); - log_info("%zd active source remaining", s->active); + log_info("%zd active sources remaining", s->active); + return 0; } else if (r == -E2BIG) { log_error("Entry too big, skipped"); - r = 1; - } + return 1; + } else if (r == -EAGAIN) { + return 0; + } else if (r < 0) { + log_info_errno(r, "Closing connection: %m"); + remove_source(server, fd); + return 0; + } else + return 1; +} - return r; +static int dispatch_blocking_source_event(sd_event_source *event, + void *userdata) { + RemoteSource *source = userdata; + + return dispatch_raw_source_event(event, source->fd, EPOLLIN, server); } -static int accept_connection(const char* type, int fd, SocketAddress *addr) { +static int accept_connection(const char* type, int fd, + SocketAddress *addr, char **hostname) { int fd2, r; log_debug("Accepting new %s connection on fd:%d", type, fd); @@ -933,11 +1073,18 @@ static int accept_connection(const char* type, int fd, SocketAddress *addr) { switch(socket_address_family(addr)) { case AF_INET: case AF_INET6: { - char* _cleanup_free_ a = NULL; + _cleanup_free_ char *a = NULL; + char *b; r = socket_address_print(addr, &a); if (r < 0) { - log_error("socket_address_print(): %s", strerror(-r)); + log_error_errno(r, "socket_address_print(): %m"); + close(fd2); + return r; + } + + r = socknameinfo_pretty(&addr->sockaddr, addr->size, &b); + if (r < 0) { close(fd2); return r; } @@ -947,6 +1094,8 @@ static int accept_connection(const char* type, int fd, SocketAddress *addr) { socket_address_family(addr) == AF_INET ? "IP" : "IPv6", a); + *hostname = b; + return fd2; }; default: @@ -968,58 +1117,66 @@ static int dispatch_raw_connection_event(sd_event_source *event, .size = sizeof(union sockaddr_union), .type = SOCK_STREAM, }; + char *hostname; - fd2 = accept_connection("raw", fd, &addr); + fd2 = accept_connection("raw", fd, &addr, &hostname); if (fd2 < 0) return fd2; - return add_source(s, fd2, NULL); + return add_source(s, fd2, hostname, true); } /********************************************************************** ********************************************************************** **********************************************************************/ +static const char* const journal_write_split_mode_table[_JOURNAL_WRITE_SPLIT_MAX] = { + [JOURNAL_WRITE_SPLIT_NONE] = "none", + [JOURNAL_WRITE_SPLIT_HOST] = "host", +}; + +DEFINE_PRIVATE_STRING_TABLE_LOOKUP(journal_write_split_mode, JournalWriteSplitMode); +static DEFINE_CONFIG_PARSE_ENUM(config_parse_write_split_mode, + journal_write_split_mode, + JournalWriteSplitMode, + "Failed to parse split mode setting"); + static int parse_config(void) { const ConfigTableItem items[] = { - { "Remote", "ServerKeyFile", config_parse_path, 0, &arg_key }, - { "Remote", "ServerCertificateFile", config_parse_path, 0, &arg_cert }, - { "Remote", "TrustedCertificateFile", config_parse_path, 0, &arg_trust }, + { "Remote", "SplitMode", config_parse_write_split_mode, 0, &arg_split_mode }, + { "Remote", "ServerKeyFile", config_parse_path, 0, &arg_key }, + { "Remote", "ServerCertificateFile", config_parse_path, 0, &arg_cert }, + { "Remote", "TrustedCertificateFile", config_parse_path, 0, &arg_trust }, {}}; - int r; - r = config_parse(NULL, PKGSYSCONFDIR "/journal-remote.conf", NULL, - "Remote\0", - config_item_table_lookup, items, - false, false, NULL); - if (r < 0) - log_error("Failed to parse configuration file: %s", strerror(-r)); - - return r; + return config_parse(NULL, PKGSYSCONFDIR "/journal-remote.conf", NULL, + "Remote\0", + config_item_table_lookup, items, + false, false, true, NULL); } static void help(void) { printf("%s [OPTIONS...] {FILE|-}...\n\n" - "Write external journal events to a journal file.\n\n" - "Options:\n" - " --url=URL Read events from systemd-journal-gatewayd at URL\n" - " --getter=COMMAND Read events from the output of COMMAND\n" - " --listen-raw=ADDR Listen for connections at ADDR\n" - " --listen-http=ADDR Listen for HTTP connections at ADDR\n" - " --listen-https=ADDR Listen for HTTPS connections at ADDR\n" - " -o --output=FILE|DIR Write output to FILE or DIR/external-*.journal\n" - " --[no-]compress Use XZ-compression in the output journal (default: yes)\n" - " --[no-]seal Use Event sealing in the output journal (default: no)\n" - " --key=FILENAME Specify key in PEM format (default:\n" - " \"" 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" - " --gnutls-log=CATEGORY...\n" - " Specify a list of gnutls logging categories\n" - " -h --help Show this help and exit\n" - " --version Print version string and exit\n" + "Write external journal events to journal file(s).\n\n" + " -h --help Show this help\n" + " --version Show package version\n" + " --url=URL Read events from systemd-journal-gatewayd at URL\n" + " --getter=COMMAND Read events from the output of COMMAND\n" + " --listen-raw=ADDR Listen for connections at ADDR\n" + " --listen-http=ADDR Listen for HTTP connections at ADDR\n" + " --listen-https=ADDR Listen for HTTPS connections at ADDR\n" + " -o --output=FILE|DIR Write output to FILE or DIR/external-*.journal\n" + " --compress[=BOOL] XZ-compress the output journal (default: yes)\n" + " --seal[=BOOL] Use event sealing (default: no)\n" + " --key=FILENAME SSL key in PEM format (default:\n" + " \"" PRIV_KEY_FILE "\")\n" + " --cert=FILENAME SSL certificate in PEM format (default:\n" + " \"" CERT_FILE "\")\n" + " --trust=FILENAME|all SSL CA certificate or disable checking (default:\n" + " \"" TRUST_FILE "\")\n" + " --gnutls-log=CATEGORY...\n" + " Specify a list of gnutls logging categories\n" + " --split-mode=none|host How many output files to create\n" "\n" "Note: file descriptors from sd_listen_fds() will be consumed, too.\n" , program_invocation_short_name); @@ -1033,10 +1190,9 @@ static int parse_argv(int argc, char *argv[]) { ARG_LISTEN_HTTP, ARG_LISTEN_HTTPS, ARG_GETTER, + ARG_SPLIT_MODE, ARG_COMPRESS, - ARG_NO_COMPRESS, ARG_SEAL, - ARG_NO_SEAL, ARG_KEY, ARG_CERT, ARG_TRUST, @@ -1052,10 +1208,9 @@ static int parse_argv(int argc, char *argv[]) { { "listen-http", required_argument, NULL, ARG_LISTEN_HTTP }, { "listen-https", required_argument, NULL, ARG_LISTEN_HTTPS }, { "output", required_argument, NULL, 'o' }, - { "compress", no_argument, NULL, ARG_COMPRESS }, - { "no-compress", no_argument, NULL, ARG_NO_COMPRESS }, - { "seal", no_argument, NULL, ARG_SEAL }, - { "no-seal", no_argument, NULL, ARG_NO_SEAL }, + { "split-mode", required_argument, NULL, ARG_SPLIT_MODE }, + { "compress", optional_argument, NULL, ARG_COMPRESS }, + { "seal", optional_argument, NULL, ARG_SEAL }, { "key", required_argument, NULL, ARG_KEY }, { "cert", required_argument, NULL, ARG_CERT }, { "trust", required_argument, NULL, ARG_TRUST }, @@ -1064,6 +1219,7 @@ static int parse_argv(int argc, char *argv[]) { }; int c, r; + bool type_a, type_b; assert(argc >= 0); assert(argv); @@ -1112,7 +1268,7 @@ static int parse_argv(int argc, char *argv[]) { return -EINVAL; } - r = fd_fd(optarg); + r = negative_fd(optarg); if (r >= 0) http_socket = r; else @@ -1125,7 +1281,7 @@ static int parse_argv(int argc, char *argv[]) { return -EINVAL; } - r = fd_fd(optarg); + r = negative_fd(optarg); if (r >= 0) https_socket = r; else @@ -1187,22 +1343,45 @@ static int parse_argv(int argc, char *argv[]) { arg_output = optarg; break; - case ARG_COMPRESS: - arg_compress = true; + case ARG_SPLIT_MODE: + arg_split_mode = journal_write_split_mode_from_string(optarg); + if (arg_split_mode == _JOURNAL_WRITE_SPLIT_INVALID) { + log_error("Invalid split mode: %s", optarg); + return -EINVAL; + } break; - case ARG_NO_COMPRESS: - arg_compress = false; + + case ARG_COMPRESS: + if (optarg) { + r = parse_boolean(optarg); + if (r < 0) { + log_error("Failed to parse --compress= parameter."); + return -EINVAL; + } + + arg_compress = !!r; + } else + arg_compress = true; + break; + case ARG_SEAL: - arg_seal = true; - break; - case ARG_NO_SEAL: - arg_seal = false; + if (optarg) { + r = parse_boolean(optarg); + if (r < 0) { + log_error("Failed to parse --seal= parameter."); + return -EINVAL; + } + + arg_seal = !!r; + } else + arg_seal = true; + break; case ARG_GNUTLS_LOG: { #ifdef HAVE_GNUTLS - char *word, *state; + const char *word, *state; size_t size; FOREACH_WORD_SEPARATOR(word, size, optarg, ",", state) { @@ -1226,42 +1405,72 @@ static int parse_argv(int argc, char *argv[]) { return -EINVAL; default: - log_error("Unknown option code %c", c); - return -EINVAL; + assert_not_reached("Unknown option code."); } if (optind < argc) arg_files = argv + optind; + type_a = arg_getter || !strv_isempty(arg_files); + type_b = arg_url + || arg_listen_raw + || arg_listen_http || arg_listen_https + || sd_listen_fds(false) > 0; + if (type_a && type_b) { + log_error("Cannot use file input or --getter with " + "--arg-listen-... or socket activation."); + return -EINVAL; + } + if (type_a) { + if (!arg_output) { + log_error("Option --output must be specified with file input or --getter."); + return -EINVAL; + } + + arg_split_mode = JOURNAL_WRITE_SPLIT_NONE; + } + + if (arg_split_mode == JOURNAL_WRITE_SPLIT_NONE + && arg_output && is_dir(arg_output, true) > 0) { + log_error("For SplitMode=none, output must be a file."); + return -EINVAL; + } + + if (arg_split_mode == JOURNAL_WRITE_SPLIT_HOST + && arg_output && is_dir(arg_output, true) <= 0) { + log_error("For SplitMode=host, output must be a directory."); + return -EINVAL; + } + + log_debug("Full config: SplitMode=%s Key=%s Cert=%s Trust=%s", + journal_write_split_mode_to_string(arg_split_mode), + strna(arg_key), + strna(arg_cert), + strna(arg_trust)); + return 1 /* work to do */; } static int load_certificates(char **key, char **cert, char **trust) { int r; - r = read_full_file(arg_key ?: KEY_FILE, key, NULL); - if (r < 0) { - log_error("Failed to read key from file '%s': %s", - arg_key ?: KEY_FILE, strerror(-r)); - return r; - } + r = read_full_file(arg_key ?: PRIV_KEY_FILE, key, NULL); + if (r < 0) + return log_error_errno(r, "Failed to read key from file '%s': %m", + arg_key ?: PRIV_KEY_FILE); r = read_full_file(arg_cert ?: CERT_FILE, cert, NULL); - if (r < 0) { - log_error("Failed to read certificate from file '%s': %s", - arg_cert ?: CERT_FILE, strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to read certificate from file '%s': %m", + arg_cert ?: CERT_FILE); if (arg_trust_all) log_info("Certificate checking disabled."); else { r = read_full_file(arg_trust ?: TRUST_FILE, trust, NULL); - if (r < 0) { - log_error("Failed to read CA certificate file '%s': %s", - arg_trust ?: TRUST_FILE, strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to read CA certificate file '%s': %m", + arg_trust ?: TRUST_FILE); } return 0; @@ -1294,7 +1503,7 @@ static int setup_gnutls_logger(char **categories) { int main(int argc, char **argv) { RemoteServer s = {}; - int r, r2; + int r; _cleanup_free_ char *key = NULL, *cert = NULL, *trust = NULL; log_show_color(true); @@ -1312,13 +1521,18 @@ int main(int argc, char **argv) { if (r < 0) return EXIT_FAILURE; - if (load_certificates(&key, &cert, &trust) < 0) - return EXIT_FAILURE; + if (arg_listen_https || https_socket >= 0) + if (load_certificates(&key, &cert, &trust) < 0) + return EXIT_FAILURE; if (remoteserver_init(&s, key, cert, trust) < 0) return EXIT_FAILURE; - sd_event_set_watchdog(s.events, true); + r = sd_event_set_watchdog(s.events, true); + if (r < 0) + log_error_errno(r, "Failed to enable watchdog: %m"); + else + log_debug("Watchdog is %s.", r > 0 ? "enabled" : "disabled"); log_debug("%s running as pid "PID_FMT, program_invocation_short_name, getpid()); @@ -1335,19 +1549,21 @@ int main(int argc, char **argv) { r = sd_event_run(s.events, -1); if (r < 0) { - log_error("Failed to run event loop: %s", strerror(-r)); + log_error_errno(r, "Failed to run event loop: %m"); break; } } - log_info("Finishing after writing %" PRIu64 " entries", s.writer.seqnum); - r2 = server_destroy(&s); + sd_notifyf(false, + "STOPPING=1\n" + "STATUS=Shutting down after writing %" PRIu64 " entries...", s.event_count); + log_info("Finishing after writing %" PRIu64 " entries", s.event_count); - sd_notify(false, "STATUS=Shutting down..."); + server_destroy(&s); free(arg_key); free(arg_cert); free(arg_trust); - return r >= 0 && r2 >= 0 ? EXIT_SUCCESS : EXIT_FAILURE; + return r >= 0 ? EXIT_SUCCESS : EXIT_FAILURE; }