From bb3ff70a86faff85fe482995c8ba5332b1a34f76 Mon Sep 17 00:00:00 2001 From: Michal Sekletar Date: Wed, 30 May 2018 16:27:22 +0200 Subject: [PATCH] journal: forward messages from /dev/log unmodified to syslog.socket --- src/journal/journald-server.c | 2 +- src/journal/journald-syslog.c | 37 +++++++++++++++++++++++-------------- src/journal/journald-syslog.h | 2 +- 3 files changed, 25 insertions(+), 16 deletions(-) diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index 40c6714..5db3663 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -1155,7 +1155,7 @@ int server_process_datagram(sd_event_source *es, int fd, uint32_t revents, void if (fd == s->syslog_fd) { if (n > 0 && n_fds == 0) - server_process_syslog_message(s, strstrip(s->buffer), ucred, tv, label, label_len); + server_process_syslog_message(s, s->buffer, n, ucred, tv, label, label_len); else if (n_fds > 0) log_warning("Got file descriptors via syslog socket. Ignoring."); diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c index 007c69e..6124500 100644 --- a/src/journal/journald-syslog.c +++ b/src/journal/journald-syslog.c @@ -103,7 +103,7 @@ static void forward_syslog_iovec(Server *s, const struct iovec *iovec, unsigned log_debug_errno(errno, "Failed to forward syslog message: %m"); } -static void forward_syslog_raw(Server *s, int priority, const char *buffer, const struct ucred *ucred, const struct timeval *tv) { +static void forward_syslog_raw(Server *s, int priority, const char *buffer, size_t buffer_len, const struct ucred *ucred, const struct timeval *tv) { struct iovec iovec; assert(s); @@ -112,7 +112,7 @@ static void forward_syslog_raw(Server *s, int priority, const char *buffer, cons if (LOG_PRI(priority) > s->max_level_syslog) return; - iovec = IOVEC_MAKE_STRING(buffer); + iovec = IOVEC_MAKE((char *) buffer, buffer_len); forward_syslog_iovec(s, &iovec, 1, ucred, tv); } @@ -302,20 +302,20 @@ static void syslog_skip_date(char **buf) { void server_process_syslog_message( Server *s, const char *buf, + size_t buf_len, const struct ucred *ucred, const struct timeval *tv, const char *label, size_t label_len) { char syslog_priority[sizeof("PRIORITY=") + DECIMAL_STR_MAX(int)], - syslog_facility[sizeof("SYSLOG_FACILITY=") + DECIMAL_STR_MAX(int)]; + syslog_facility[sizeof("SYSLOG_FACILITY=") + DECIMAL_STR_MAX(int)], *msg; const char *message = NULL, *syslog_identifier = NULL, *syslog_pid = NULL; _cleanup_free_ char *identifier = NULL, *pid = NULL; int priority = LOG_USER | LOG_INFO, r; ClientContext *context = NULL; struct iovec *iovec; - const char *orig; - size_t n = 0, m; + size_t n = 0, m, i; assert(s); assert(buf); @@ -326,26 +326,35 @@ void server_process_syslog_message( log_warning_errno(r, "Failed to retrieve credentials for PID " PID_FMT ", ignoring: %m", ucred->pid); } - orig = buf; - syslog_parse_priority(&buf, &priority, true); + /* We are creating copy of the message because we want to forward original message verbatim to the legacy + syslog implementation */ + for (i = buf_len; i > 0; i--) + if (!strchr(WHITESPACE, buf[i-1])) + break; + + msg = newa(char, i + 1); + *((char *) mempcpy(msg, buf, i)) = 0; + msg = skip_leading_chars(msg, WHITESPACE); + + syslog_parse_priority((const char **)&msg, &priority, true); if (!client_context_test_priority(context, priority)) return; if (s->forward_to_syslog) - forward_syslog_raw(s, priority, orig, ucred, tv); + forward_syslog_raw(s, priority, buf, buf_len, ucred, tv); - syslog_skip_date((char**) &buf); - syslog_parse_identifier(&buf, &identifier, &pid); + syslog_skip_date(&msg); + syslog_parse_identifier((const char**)&msg, &identifier, &pid); if (s->forward_to_kmsg) - server_forward_kmsg(s, priority, identifier, buf, ucred); + server_forward_kmsg(s, priority, identifier, msg, ucred); if (s->forward_to_console) - server_forward_console(s, priority, identifier, buf, ucred); + server_forward_console(s, priority, identifier, msg, ucred); if (s->forward_to_wall) - server_forward_wall(s, priority, identifier, buf, ucred); + server_forward_wall(s, priority, identifier, msg, ucred); m = N_IOVEC_META_FIELDS + 6 + client_context_extra_fields_n_iovec(context); iovec = newa(struct iovec, m); @@ -370,7 +379,7 @@ void server_process_syslog_message( iovec[n++] = IOVEC_MAKE_STRING(syslog_pid); } - message = strjoina("MESSAGE=", buf); + message = strjoina("MESSAGE=", msg); if (message) iovec[n++] = IOVEC_MAKE_STRING(message); diff --git a/src/journal/journald-syslog.h b/src/journal/journald-syslog.h index c8affc7..656203d 100644 --- a/src/journal/journald-syslog.h +++ b/src/journal/journald-syslog.h @@ -15,7 +15,7 @@ size_t syslog_parse_identifier(const char **buf, char **identifier, char **pid); void server_forward_syslog(Server *s, int priority, const char *identifier, const char *message, const struct ucred *ucred, const struct timeval *tv); -void server_process_syslog_message(Server *s, const char *buf, const struct ucred *ucred, const struct timeval *tv, const char *label, size_t label_len); +void server_process_syslog_message(Server *s, const char *buf, size_t buf_len, const struct ucred *ucred, const struct timeval *tv, const char *label, size_t label_len); int server_open_syslog_socket(Server *s); void server_maybe_warn_forward_syslog_missed(Server *s); -- 2.7.4