chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
network-address,test-network: avoid undefined behaviour
[elogind.git]
/
src
/
journal-remote
/
journal-upload.c
diff --git
a/src/journal-remote/journal-upload.c
b/src/journal-remote/journal-upload.c
index 37c12f0e07ca50c7e8405ba644e057271883cdab..75bb434c0861f44a9ca924682c07416f57ac3dc4 100644
(file)
--- a/
src/journal-remote/journal-upload.c
+++ b/
src/journal-remote/journal-upload.c
@@
-26,13
+26,13
@@
#include <getopt.h>
#include "sd-daemon.h"
#include <getopt.h>
#include "sd-daemon.h"
-
#include "log.h"
#include "util.h"
#include "build.h"
#include "fileio.h"
#include "mkdir.h"
#include "conf-parser.h"
#include "log.h"
#include "util.h"
#include "build.h"
#include "fileio.h"
#include "mkdir.h"
#include "conf-parser.h"
+#include "sigbus.h"
#include "journal-upload.h"
#define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-upload.pem"
#include "journal-upload.h"
#define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-upload.pem"
@@
-40,14
+40,10
@@
#define TRUST_FILE CERTIFICATE_ROOT "/ca/trusted.pem"
#define DEFAULT_PORT 19532
#define TRUST_FILE CERTIFICATE_ROOT "/ca/trusted.pem"
#define DEFAULT_PORT 19532
-static const char* arg_url;
-
-static void close_fd_input(Uploader *u);
-
+static const char* arg_url = NULL;
static const char *arg_key = NULL;
static const char *arg_cert = NULL;
static const char *arg_trust = NULL;
static const char *arg_key = NULL;
static const char *arg_cert = NULL;
static const char *arg_trust = NULL;
-
static const char *arg_directory = NULL;
static char **arg_file = NULL;
static const char *arg_cursor = NULL;
static const char *arg_directory = NULL;
static char **arg_file = NULL;
static const char *arg_cursor = NULL;
@@
-58,12
+54,14
@@
static bool arg_merge = false;
static int arg_follow = -1;
static const char *arg_save_state = NULL;
static int arg_follow = -1;
static const char *arg_save_state = NULL;
+static void close_fd_input(Uploader *u);
+
#define SERVER_ANSWER_KEEP 2048
#define STATE_FILE "/var/lib/systemd/journal-upload/state"
#define easy_setopt(curl, opt, value, level, cmd) \
#define SERVER_ANSWER_KEEP 2048
#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, \
code = curl_easy_setopt(curl, opt, value); \
if (code) { \
log_full(level, \
@@
-71,7
+69,7
@@
static const char *arg_save_state = NULL;
curl_easy_strerror(code)); \
cmd; \
} \
curl_easy_strerror(code)); \
cmd; \
} \
- }
+ }
while(0)
static size_t output_callback(char *buf,
size_t size,
static size_t output_callback(char *buf,
size_t size,
@@
-87,8
+85,8
@@
static size_t output_callback(char *buf,
if (nmemb && !u->answer) {
u->answer = strndup(buf, size*nmemb);
if (!u->answer)
if (nmemb && !u->answer) {
u->answer = strndup(buf, size*nmemb);
if (!u->answer)
- log_warning
("Failed to store server answer (%zu bytes): %s
",
-
size*nmemb, strerror(ENOMEM)
);
+ log_warning
_errno(ENOMEM, "Failed to store server answer (%zu bytes): %m
",
+
size*nmemb
);
}
return size * nmemb;
}
return size * nmemb;
@@
-103,18
+101,14
@@
static int check_cursor_updating(Uploader *u) {
return 0;
r = mkdir_parents(u->state_file, 0755);
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;
- }
+ if (r < 0)
+ return log_error_errno(r, "Cannot create parent directory of state file %s: %m",
+ u->state_file);
r = fopen_temporary(u->state_file, &f, &temp_path);
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;
- }
+ if (r < 0)
+ return log_error_errno(r, "Cannot save state to %s: %m",
+ u->state_file);
unlink(temp_path);
return 0;
unlink(temp_path);
return 0;
@@
-147,7
+141,7
@@
static int update_cursor_state(Uploader *u) {
finish:
if (r < 0)
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;
}
return r;
}
@@
-162,11
+156,13
@@
static int load_cursor_state(Uploader *u) {
"LAST_CURSOR", &u->last_cursor,
NULL);
"LAST_CURSOR", &u->last_cursor,
NULL);
- if (r < 0 && r != -ENOENT) {
- log_error("Failed to read state file %s: %s",
- u->state_file, strerror(-r));
- return r;
- }
+ if (r == -ENOENT)
+ log_debug("State file %s is not present.", u->state_file);
+ else if (r < 0)
+ return log_error_errno(r, "Failed to read state file %s: %m",
+ u->state_file);
+ else
+ log_debug("Last cursor was %s", u->last_cursor);
return 0;
}
return 0;
}
@@
-240,8
+236,9
@@
int start_upload(Uploader *u,
easy_setopt(curl, CURLOPT_HTTPHEADER, u->header,
LOG_ERR, return -EXFULL);
easy_setopt(curl, CURLOPT_HTTPHEADER, u->header,
LOG_ERR, return -EXFULL);
- /* enable verbose for easier tracing */
- easy_setopt(curl, CURLOPT_VERBOSE, 1L, LOG_WARNING, );
+ if (_unlikely_(log_get_max_level() >= LOG_DEBUG))
+ /* enable verbose for easier tracing */
+ easy_setopt(curl, CURLOPT_VERBOSE, 1L, LOG_WARNING, );
easy_setopt(curl, CURLOPT_USERAGENT,
"systemd-journal-upload " PACKAGE_STRING,
easy_setopt(curl, CURLOPT_USERAGENT,
"systemd-journal-upload " PACKAGE_STRING,
@@
-254,7
+251,10
@@
int start_upload(Uploader *u,
LOG_ERR, return -EXFULL);
}
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);
easy_setopt(curl, CURLOPT_CAINFO, arg_trust ?: TRUST_FILE,
LOG_ERR, return -EXFULL);
@@
-296,7
+296,7
@@
static size_t fd_input_callback(void *buf, size_t size, size_t nmemb, void *user
return 0;
r = read(u->input, buf, size * nmemb);
return 0;
r = read(u->input, buf, size * nmemb);
- log_debug("%s: allowed %zu, read %z
u
", __func__, size*nmemb, r);
+ log_debug("%s: allowed %zu, read %z
d
", __func__, size*nmemb, r);
if (r > 0)
return r;
if (r > 0)
return r;
@@
-307,7
+307,7
@@
static size_t fd_input_callback(void *buf, size_t size, size_t nmemb, void *user
close_fd_input(u);
return 0;
} else {
close_fd_input(u);
return 0;
} else {
- log_error
(
"Aborting transfer after read error on input: %m.");
+ log_error
_errno(errno,
"Aborting transfer after read error on input: %m.");
return CURL_READFUNC_ABORT;
}
}
return CURL_READFUNC_ABORT;
}
}
@@
-356,10
+356,8
@@
static int open_file_for_upload(Uploader *u, const char *filename) {
fd = STDIN_FILENO;
else {
fd = open(filename, O_RDONLY|O_CLOEXEC|O_NOCTTY);
fd = STDIN_FILENO;
else {
fd = open(filename, O_RDONLY|O_CLOEXEC|O_NOCTTY);
- if (fd < 0) {
- log_error("Failed to open %s: %m", filename);
- return -errno;
- }
+ if (fd < 0)
+ return log_error_errno(errno, "Failed to open %s: %m", filename);
}
u->input = fd;
}
u->input = fd;
@@
-368,10
+366,8
@@
static int open_file_for_upload(Uploader *u, const char *filename) {
r = sd_event_add_io(u->events, &u->input_event,
fd, EPOLLIN, dispatch_fd_input, u);
if (r < 0) {
r = sd_event_add_io(u->events, &u->input_event,
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));
- return r;
- }
+ if (r != -EPERM || arg_follow > 0)
+ return log_error_errno(r, "Failed to register input event: %m");
/* Normal files should just be consumed without polling. */
r = start_upload(u, fd_input_callback, u);
/* Normal files should just be consumed without polling. */
r = start_upload(u, fd_input_callback, u);
@@
-452,16
+448,12
@@
static int setup_uploader(Uploader *u, const char *url, const char *state_file)
u->state_file = state_file;
r = sd_event_default(&u->events);
u->state_file = state_file;
r = sd_event_default(&u->events);
- if (r < 0) {
- log_error("sd_event_default failed: %s", strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "sd_event_default failed: %m");
r = setup_signals(u);
r = setup_signals(u);
- if (r < 0) {
- log_error("Failed to set up signals: %s", strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to set up signals: %m");
return load_cursor_state(u);
}
return load_cursor_state(u);
}
@@
-496,10
+488,12
@@
static int perform_upload(Uploader *u) {
code = curl_easy_perform(u->easy);
if (code) {
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;
}
return -EIO;
}
@@
-511,15
+505,15
@@
static int perform_upload(Uploader *u) {
}
if (status >= 300) {
}
if (status >= 300) {
- log_error("Upload to %s failed with code %l
u
: %s",
+ log_error("Upload to %s failed with code %l
d
: %s",
u->url, status, strna(u->answer));
return -EIO;
} else if (status < 200) {
u->url, status, strna(u->answer));
return -EIO;
} else if (status < 200) {
- log_error("Upload to %s finished with unexpected code %l
u
: %s",
+ log_error("Upload to %s finished with unexpected code %l
d
: %s",
u->url, status, strna(u->answer));
return -EIO;
} else
u->url, status, strna(u->answer));
return -EIO;
} else
- log_debug("Upload finished successfully with code %l
u
: %s",
+ log_debug("Upload finished successfully with code %l
d
: %s",
status, strna(u->answer));
free(u->last_cursor);
status, strna(u->answer));
free(u->last_cursor);
@@
-537,10
+531,10
@@
static int parse_config(void) {
{ "Upload", "TrustedCertificateFile", config_parse_path, 0, &arg_trust },
{}};
{ "Upload", "TrustedCertificateFile", config_parse_path, 0, &arg_trust },
{}};
- return config_parse
(NULL, PKGSYSCONFDIR "/journal-upload.conf", NULL
,
-
"Upload\0"
,
- config_item_table_lookup, items,
-
false, false, tru
e, NULL);
+ return config_parse
_many(PKGSYSCONFDIR "/journal-upload.conf"
,
+
CONF_DIRS_NULSTR("systemd/journal-upload.conf")
,
+
"Upload\0",
config_item_table_lookup, items,
+
fals
e, NULL);
}
static void help(void) {
}
static void help(void) {
@@
-693,10
+687,8
@@
static int parse_argv(int argc, char *argv[]) {
case ARG_FILE:
r = glob_extend(&arg_file, optarg);
case ARG_FILE:
r = glob_extend(&arg_file, optarg);
- if (r < 0) {
- log_error("Failed to add paths: %s", strerror(-r));
- return r;
- };
+ if (r < 0)
+ return log_error_errno(r, "Failed to add paths: %m");
break;
case ARG_CURSOR:
break;
case ARG_CURSOR:
@@
-778,9
+770,8
@@
static int open_journal(sd_journal **j) {
else
r = sd_journal_open(j, !arg_merge*SD_JOURNAL_LOCAL_ONLY + arg_journal_type);
if (r < 0)
else
r = sd_journal_open(j, !arg_merge*SD_JOURNAL_LOCAL_ONLY + arg_journal_type);
if (r < 0)
- log_error("Failed to open %s: %s",
- arg_directory ? arg_directory : arg_file ? "files" : "journal",
- strerror(-r));
+ log_error_errno(r, "Failed to open %s: %m",
+ arg_directory ? arg_directory : arg_file ? "files" : "journal");
return r;
}
return r;
}
@@
-800,6
+791,8
@@
int main(int argc, char **argv) {
if (r <= 0)
goto finish;
if (r <= 0)
goto finish;
+ sigbus_install();
+
r = setup_uploader(&u, arg_url, arg_save_state);
if (r < 0)
goto cleanup;
r = setup_uploader(&u, arg_url, arg_save_state);
if (r < 0)
goto cleanup;
@@
-832,6
+825,12
@@
int main(int argc, char **argv) {
"STATUS=Processing input...");
while (true) {
"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;
if (use_journal) {
if (!u.journal)
break;
@@
-847,12
+846,6
@@
int main(int argc, char **argv) {
if (r < 0)
goto cleanup;
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)
if (u.uploading) {
r = perform_upload(&u);
if (r < 0)
@@
-861,7
+854,7
@@
int main(int argc, char **argv) {
r = sd_event_run(u.events, u.timeout);
if (r < 0) {
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;
}
}
break;
}
}
@@
-874,5
+867,5
@@
cleanup:
destroy_uploader(&u);
finish:
destroy_uploader(&u);
finish:
- return r
=
= 0 ? EXIT_SUCCESS : EXIT_FAILURE;
+ return r
>
= 0 ? EXIT_SUCCESS : EXIT_FAILURE;
}
}