X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal-remote%2Fjournal-remote.c;h=827916d1a0af6ffde0aee52c25259bdff379cafc;hb=4a0a6ac03864998c83918175609275df712a5a05;hp=09144eaa979743d1c04a6d001e9ff0f01c9d0a69;hpb=851d4e2a67efb2c8777df151b697391ff1a76af0;p=elogind.git diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c index 09144eaa9..827916d1a 100644 --- a/src/journal-remote/journal-remote.c +++ b/src/journal-remote/journal-remote.c @@ -41,8 +41,11 @@ #include "build.h" #include "macro.h" #include "strv.h" +#include "hashmap.h" #include "fileio.h" +#include "conf-parser.h" #include "microhttpd-util.h" +#include "siphash24.h" #ifdef HAVE_GNUTLS #include @@ -51,9 +54,12 @@ #include "journal-remote-parse.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" -static char* arg_output = NULL; static char* arg_url = NULL; static char* arg_getter = NULL; static char* arg_listen_raw = NULL; @@ -65,9 +71,13 @@ static int arg_seal = false; static int http_socket = -1, https_socket = -1; static char** arg_gnutls_log = NULL; -static char *key_pem = NULL; -static char *cert_pem = NULL; -static char *trust_pem = NULL; +static JournalWriteSplitMode arg_split_mode = JOURNAL_WRITE_SPLIT_NONE; +static char* arg_output = NULL; + +static char *arg_key = NULL; +static char *arg_cert = NULL; +static char *arg_trust = NULL; +static bool arg_trust_all = false; /********************************************************************** ********************************************************************** @@ -124,7 +134,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", @@ -138,7 +148,7 @@ 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; @@ -147,6 +157,12 @@ static int spawn_getter(char *getter, char *url) { if (!words) return log_oom(); + r = strv_extend(&words, url); + if (r < 0) { + log_error("Failed to create command line: %s", strerror(-r)); + return r; + } + r = spawn_child(words[0], words); if (r < 0) log_error("Failed to spawn getter %s: %m", getter); @@ -154,62 +170,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); - r = asprintf(&output, REMOTE_JOURNAL_PATH, - SD_ID128_FORMAT_VAL(machine), name); + name = filename_escape(host); + if (!name) + return log_oom(); + + 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)); + output, strerror(-r)); else - log_info("Opened output file %s", s->journal->path); + log_info("Opened output file %s", w->journal->path); return r; } @@ -232,8 +238,9 @@ typedef struct RemoteServer { sd_event *events; sd_event_source *sigterm_event, *sigint_event, *listen_event; - Writer writer; + Hashmap *writers; + bool check_trust; Hashmap *daemons; } RemoteServer; @@ -280,47 +287,48 @@ 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, const char* _name) { + + RemoteSource *source; + char *name; int r; 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) - return log_oom(); - } + log_debug("Creating source for fd:%d (%s)", fd, _name); - log_debug("Creating source for fd:%d (%s)", fd, realname); + name = strdup(_name); + if (!name) + return log_oom(); r = get_source_for_fd(s, fd, &source); if (r < 0) { - log_error("Failed to create source for fd:%d (%s)", fd, realname); + log_error("Failed to create source for fd:%d (%s)", fd, name); + free(name); return r; } + assert(source); assert(source->fd < 0); + assert(!source->name); + source->fd = fd; + source->name = name; 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 < 0) { log_error("Failed to register event source for fd:%d: %s", fd, strerror(-r)); @@ -337,7 +345,8 @@ static int add_source(RemoteServer *s, int fd, const char* name) { static int add_raw_socket(RemoteServer *s, int fd) { int r; - r = sd_event_add_io(s->events, &s->listen_event, fd, EPOLLIN, + r = sd_event_add_io(s->events, &s->listen_event, + fd, EPOLLIN, dispatch_raw_connection_event, s); if (r < 0) { close(fd); @@ -362,17 +371,96 @@ static int setup_raw_socket(RemoteServer *s, const char *address) { ********************************************************************** **********************************************************************/ -static RemoteSource *request_meta(void **connection_cls) { +static int init_writer_hashmap(RemoteServer *s) { + static const struct { + hash_func_t hash_func; + compare_func_t compare_func; + } functions[] = { + [JOURNAL_WRITE_SPLIT_NONE] = {trivial_hash_func, + trivial_compare_func}, + [JOURNAL_WRITE_SPLIT_HOST] = {string_hash_func, + string_compare_func}, + }; + + assert(arg_split_mode >= 0 && arg_split_mode < (int) ELEMENTSOF(functions)); + + s->writers = hashmap_new(functions[arg_split_mode].hash_func, + functions[arg_split_mode].compare_func); + if (!s->writers) + return log_oom(); + + return 0; +} + +static int get_writer(RemoteServer *s, const char *host, sd_id128_t *machine, + Writer **writer) { + const void *key; + Writer *w; + 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?"); + } + + w = hashmap_get(s->writers, key); + if (!w) { + w = new0(Writer, 1); + if (!w) + return -ENOMEM; + + r = writer_init(w); + if (r < 0) { + free(w); + return r; + } + + r = hashmap_put(s->writers, key, w); + if (r < 0) { + writer_close(w); + free(w); + return r; + } + + r = open_output(w, host); + if (r < 0) + return r; + } + + *writer = w; + return 0; +} + +/********************************************************************** + ********************************************************************** + **********************************************************************/ + +static RemoteSource *request_meta(void **connection_cls, int fd, char *hostname) { RemoteSource *source; assert(connection_cls); - if (*connection_cls) + if (*connection_cls) { + free(hostname); return *connection_cls; + } source = new0(RemoteSource, 1); - if (!source) + if (!source) { + free(hostname); return NULL; - source->fd = -1; + } + + source->fd = -1; /* fd */ + source->name = hostname; log_debug("Added RemoteSource as connection metadata %p", source); @@ -400,14 +488,26 @@ static int process_http_upload( size_t *upload_data_size, RemoteSource *source) { - bool finished = false; + Writer *w; int r; + bool finished = false; + size_t remaining; assert(source); log_debug("request_handler_upload: connection %p, %zu bytes", connection, *upload_data_size); + r = get_writer(server, source->name, NULL, &w); + if (r < 0) { + log_warning("Failed to get writer for source %s (%s): %s", + source->name, source->name, strerror(-r)); + return mhd_respondf(connection, + MHD_HTTP_SERVICE_UNAVAILABLE, + "Failed to get writer for connection: %s.\n", + strerror(-r)); + } + if (*upload_data_size) { log_info("Received %zu bytes", *upload_data_size); @@ -420,7 +520,8 @@ static int process_http_upload( finished = true; while (true) { - r = process_source(source, &server->writer, arg_compress, arg_seal); + + r = process_source(source, w, arg_compress, arg_seal); if (r == -EAGAIN || r == -EWOULDBLOCK) break; else if (r < 0) { @@ -442,10 +543,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"); @@ -462,7 +565,8 @@ static int request_handler( void **connection_cls) { const char *header; - int r ,code; + int r, code, fd; + char *hostname; assert(connection); assert(connection_cls); @@ -491,18 +595,46 @@ static int request_handler( "Content-Type: application/vnd.fdo.journal" " is required.\n"); - if (trust_pem) { - r = check_permissions(connection, &code); + { + 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"); + return code; + } + + fd = ci->connect_fd; + assert(fd >= 0); + } + + if (server->check_trust) { + 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); + + if (!request_meta(connection_cls, fd, hostname)) return respond_oom(connection); return MHD_YES; } -static int setup_microhttpd_server(RemoteServer *s, int fd, bool https) { +static int setup_microhttpd_server(RemoteServer *s, + int fd, + const char *key, + const char *cert, + const char *trust) { struct MHD_OptionItem opts[] = { { MHD_OPTION_NOTIFY_COMPLETED, (intptr_t) request_meta_free}, { MHD_OPTION_EXTERNAL_LOGGER, (intptr_t) microhttpd_logger}, @@ -530,17 +662,19 @@ static int setup_microhttpd_server(RemoteServer *s, int fd, bool https) { return r; } - if (https) { + if (key) { + assert(cert); + opts[opts_pos++] = (struct MHD_OptionItem) - {MHD_OPTION_HTTPS_MEM_KEY, 0, key_pem}; + {MHD_OPTION_HTTPS_MEM_KEY, 0, (char*) key}; opts[opts_pos++] = (struct MHD_OptionItem) - {MHD_OPTION_HTTPS_MEM_CERT, 0, cert_pem}; + {MHD_OPTION_HTTPS_MEM_CERT, 0, (char*) cert}; flags |= MHD_USE_SSL; - if (trust_pem) + if (trust) opts[opts_pos++] = (struct MHD_OptionItem) - {MHD_OPTION_HTTPS_MEM_TRUST, 0, trust_pem}; + {MHD_OPTION_HTTPS_MEM_TRUST, 0, (char*) trust}; } d = new(MHDDaemonWrapper, 1); @@ -561,7 +695,7 @@ static int setup_microhttpd_server(RemoteServer *s, int fd, bool https) { } log_debug("Started MHD %s daemon on fd:%d (wrapper @ %p)", - https ? "HTTPS" : "HTTP", fd, d); + key ? "HTTPS" : "HTTP", fd, d); info = MHD_get_daemon_info(d->daemon, MHD_DAEMON_INFO_EPOLL_FD_LINUX_ONLY); @@ -579,7 +713,8 @@ static int setup_microhttpd_server(RemoteServer *s, int fd, bool https) { } 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)); goto error; @@ -609,14 +744,16 @@ error: static int setup_microhttpd_socket(RemoteServer *s, const char *address, - bool https) { + const char *key, + const char *cert, + const char *trust) { int fd; fd = make_socket_fd(LOG_INFO, address, SOCK_STREAM | SOCK_CLOEXEC); if (fd < 0) return fd; - return setup_microhttpd_server(s, fd, https); + return setup_microhttpd_server(s, fd, key, cert, trust); } static int dispatch_http_event(sd_event_source *event, @@ -628,8 +765,6 @@ static int dispatch_http_event(sd_event_source *event, assert(d); - log_info("%s", __func__); - r = MHD_run(d->daemon); if (r == MHD_NO) { log_error("MHD_run failed!"); @@ -685,20 +820,26 @@ static int fd_fd(const char *spec) { if (r < 0) return r; - if (fd >= 0) - return -ENOENT; - - return -fd; + return -1; } -static int remoteserver_init(RemoteServer *s) { +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); setup_signals(s); @@ -724,15 +865,23 @@ static int remoteserver_init(RemoteServer *s) { log_info("Received a listening socket (fd:%d)", fd); if (fd == http_socket) - r = setup_microhttpd_server(s, fd, false); + r = setup_microhttpd_server(s, fd, NULL, NULL, NULL); else if (fd == https_socket) - r = setup_microhttpd_server(s, fd, true); + 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); + _cleanup_free_ char *hostname = NULL; + + r = getnameinfo_pretty(fd, &hostname); + if (r < 0) { + log_error("Failed to retrieve remote name: %s", strerror(-r)); + 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); } else { log_error("Unknown socket passed on fd:%d", fd); @@ -749,13 +898,9 @@ static int remoteserver_init(RemoteServer *s) { } 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); @@ -767,7 +912,12 @@ 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, hostname); if (r < 0) return r; @@ -784,7 +934,7 @@ static int remoteserver_init(RemoteServer *s) { } if (arg_listen_http) { - r = setup_microhttpd_socket(s, arg_listen_http, false); + r = setup_microhttpd_socket(s, arg_listen_http, NULL, NULL, NULL); if (r < 0) return r; @@ -792,7 +942,7 @@ static int remoteserver_init(RemoteServer *s) { } if (arg_listen_https) { - r = setup_microhttpd_socket(s, arg_listen_https, true); + r = setup_microhttpd_socket(s, arg_listen_https, key, cert, trust); if (r < 0) return r; @@ -829,20 +979,43 @@ static int remoteserver_init(RemoteServer *s) { if (!!n + !!arg_url + !!arg_listen_raw + !!arg_files) output_name = "multiple"; - r = writer_init(&s->writer); + r = init_writer_hashmap(s); if (r < 0) return r; - r = open_output(&s->writer, output_name); - 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. */ + Writer *w; + + r = get_writer(s, NULL, NULL, &w); + if (r < 0) + return r; + } + + return 0; } -static int server_destroy(RemoteServer *s) { +static int server_destroy(RemoteServer *s, uint64_t *event_count) { int r; size_t i; + Writer *w; MHDDaemonWrapper *d; - r = writer_close(&s->writer); + *event_count = 0; + + while ((w = hashmap_steal_first(s->writers))) { + log_info("seqnum %"PRIu64, w->seqnum); + *event_count += w->seqnum; + + r = writer_close(w); + if (r < 0) + log_warning("Failed to close writer: %s", strerror(-r)); + free(w); + } + + hashmap_free(s->writers); while ((d = hashmap_steal_first(s->daemons))) { MHD_stop_daemon(d->daemon); @@ -877,6 +1050,7 @@ static int dispatch_raw_source_event(sd_event_source *event, uint32_t revents, void *userdata) { + Writer *w; RemoteServer *s = userdata; RemoteSource *source; int r; @@ -885,23 +1059,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 = get_writer(s, source->name, NULL, &w); + if (r < 0) { + log_warning("Failed to get writer for source %s (%s): %s", + source->name, source->name, strerror(-r)); + return r; + } + + r = process_source(source, w, 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); + return 0; } else if (r == -E2BIG) { log_error("Entry too big, skipped"); - r = 1; - } - - return r; + return 1; + } else if (r == -EAGAIN) { + return 0; + } else if (r < 0) { + log_info("Closing connection: %s", strerror(-r)); + remove_source(server, fd); + return 0; + } else + return 1; } -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); @@ -914,7 +1106,8 @@ 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) { @@ -923,11 +1116,19 @@ static int accept_connection(const char* type, int fd, SocketAddress *addr) { return r; } + r = socknameinfo_pretty(&addr->sockaddr, addr->size, &b); + if (r < 0) { + close(fd2); + return r; + } + log_info("Accepted %s %s connection from %s", type, socket_address_family(addr) == AF_INET ? "IP" : "IPv6", a); + *hostname = b; + return fd2; }; default: @@ -949,18 +1150,49 @@ 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); } /********************************************************************** ********************************************************************** **********************************************************************/ +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", "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; +} + static void help(void) { printf("%s [OPTIONS...] {FILE|-}...\n\n" "Write external journal events to a journal file.\n\n" @@ -973,9 +1205,12 @@ static void help(void) { " -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\n" - " --cert=FILENAME Specify certificate in PEM format\n" - " --trust=FILENAME Specify CA certificate in PEM format\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" @@ -993,6 +1228,7 @@ 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, @@ -1012,6 +1248,7 @@ 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' }, + { "split-mode", required_argument, NULL, ARG_SPLIT_MODE }, { "compress", no_argument, NULL, ARG_COMPRESS }, { "no-compress", no_argument, NULL, ARG_NO_COMPRESS }, { "seal", no_argument, NULL, ARG_SEAL }, @@ -1024,6 +1261,7 @@ static int parse_argv(int argc, char *argv[]) { }; int c, r; + bool type_a, type_b; assert(argc >= 0); assert(argv); @@ -1075,14 +1313,8 @@ static int parse_argv(int argc, char *argv[]) { r = fd_fd(optarg); if (r >= 0) http_socket = r; - else if (r == -ENOENT) + else arg_listen_http = optarg; - else { - log_error("Invalid port/fd specification %s: %s", - optarg, strerror(-r)); - return -EINVAL; - } - break; case ARG_LISTEN_HTTPS: @@ -1094,59 +1326,55 @@ static int parse_argv(int argc, char *argv[]) { r = fd_fd(optarg); if (r >= 0) https_socket = r; - else if (r == -ENOENT) + else arg_listen_https = optarg; - else { - log_error("Invalid port/fd specification %s: %s", - optarg, strerror(-r)); - return -EINVAL; - } break; case ARG_KEY: - if (key_pem) { + if (arg_key) { log_error("Key file specified twice"); return -EINVAL; } - r = read_full_file(optarg, &key_pem, NULL); - if (r < 0) { - log_error("Failed to read key file: %s", strerror(-r)); - return r; - } - assert(key_pem); + + arg_key = strdup(optarg); + if (!arg_key) + return log_oom(); + break; case ARG_CERT: - if (cert_pem) { + if (arg_cert) { log_error("Certificate file specified twice"); return -EINVAL; } - r = read_full_file(optarg, &cert_pem, NULL); - if (r < 0) { - log_error("Failed to read certificate file: %s", strerror(-r)); - return r; - } - assert(cert_pem); + + arg_cert = strdup(optarg); + if (!arg_cert) + return log_oom(); + break; case ARG_TRUST: -#ifdef HAVE_GNUTLS - if (trust_pem) { - log_error("CA certificate file specified twice"); + if (arg_trust || arg_trust_all) { + log_error("Confusing trusted CA configuration"); return -EINVAL; } - r = read_full_file(optarg, &trust_pem, NULL); - if (r < 0) { - log_error("Failed to read CA certificate file: %s", strerror(-r)); - return r; - } - assert(trust_pem); - break; + + if (streq(optarg, "all")) + arg_trust_all = true; + else { +#ifdef HAVE_GNUTLS + arg_trust = strdup(optarg); + if (!arg_trust) + return log_oom(); #else - log_error("Option --trust is not available."); - return -EINVAL; + log_error("Option --trust is not available."); + return -EINVAL; #endif + } + + break; case 'o': if (arg_output) { @@ -1157,6 +1385,14 @@ static int parse_argv(int argc, char *argv[]) { arg_output = optarg; break; + 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_COMPRESS: arg_compress = true; break; @@ -1200,17 +1436,80 @@ static int parse_argv(int argc, char *argv[]) { return -EINVAL; } - if (arg_listen_https && !(key_pem && cert_pem)) { - log_error("Options --key and --cert must be used when https sources are specified"); + 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 (optind < argc) - arg_files = argv + optind; + 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_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 (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; + } + } + + return 0; +} + static int setup_gnutls_logger(char **categories) { if (!arg_listen_http && !arg_listen_https) return 0; @@ -1239,10 +1538,16 @@ static int setup_gnutls_logger(char **categories) { int main(int argc, char **argv) { RemoteServer s = {}; int r, r2; + _cleanup_free_ char *key = NULL, *cert = NULL, *trust = NULL; + uint64_t entry_count; log_show_color(true); log_parse_environment(); + r = parse_config(); + if (r < 0) + return EXIT_FAILURE; + r = parse_argv(argc, argv); if (r <= 0) return r == 0 ? EXIT_SUCCESS : EXIT_FAILURE; @@ -1251,9 +1556,15 @@ int main(int argc, char **argv) { if (r < 0) return EXIT_FAILURE; - if (remoteserver_init(&s) < 0) + 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); + log_debug("%s running as pid "PID_FMT, program_invocation_short_name, getpid()); sd_notify(false, @@ -1274,10 +1585,14 @@ int main(int argc, char **argv) { } } - log_info("Finishing after writing %" PRIu64 " entries", s.writer.seqnum); - r2 = server_destroy(&s); + r2 = server_destroy(&s, &entry_count); + log_info("Finishing after writing %" PRIu64 " entries", entry_count); sd_notify(false, "STATUS=Shutting down..."); + free(arg_key); + free(arg_cert); + free(arg_trust); + return r >= 0 && r2 >= 0 ? EXIT_SUCCESS : EXIT_FAILURE; }