X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournald.c;h=795b23547b068fb6fa0acbf51bab0d3a8acec545;hb=8db4213e7b38ebc54bfdc7215991cc23b9580e3a;hp=547c4ecc218e3935e65902d342ebb8d6eca69753;hpb=499fb2152f8518796607dd0406698cb6ce4c7098;p=elogind.git diff --git a/src/journal/journald.c b/src/journal/journald.c index 547c4ecc2..795b23547 100644 --- a/src/journal/journald.c +++ b/src/journal/journald.c @@ -31,10 +31,13 @@ #include #include -#include #include #include +#ifdef HAVE_LOGIND +#include +#endif + #include "mkdir.h" #include "hashmap.h" #include "journal-file.h" @@ -479,7 +482,9 @@ static void dispatch_message_real( if (ucred) { uint32_t audit; +#ifdef HAVE_LOGIND uid_t owner; +#endif realuid = ucred->uid; @@ -538,6 +543,7 @@ static void dispatch_message_real( IOVEC_SET_STRING(iovec[n++], cgroup); } +#ifdef HAVE_LOGIND if (sd_pid_get_session(ucred->pid, &t) >= 0) { session = strappend("_SYSTEMD_SESSION=", t); free(t); @@ -546,7 +552,12 @@ static void dispatch_message_real( IOVEC_SET_STRING(iovec[n++], session); } - if (sd_pid_get_unit(ucred->pid, &t) >= 0) { + if (sd_pid_get_owner_uid(ucred->uid, &owner) >= 0) + if (asprintf(&owner_uid, "_SYSTEMD_OWNER_UID=%lu", (unsigned long) owner) >= 0) + IOVEC_SET_STRING(iovec[n++], owner_uid); +#endif + + if (cg_pid_get_unit(ucred->pid, &t) >= 0) { unit = strappend("_SYSTEMD_UNIT=", t); free(t); @@ -554,10 +565,6 @@ static void dispatch_message_real( IOVEC_SET_STRING(iovec[n++], unit); } - if (sd_pid_get_owner_uid(ucred->uid, &owner) >= 0) - if (asprintf(&owner_uid, "_SYSTEMD_OWNER_UID=%lu", (unsigned long) owner) >= 0) - IOVEC_SET_STRING(iovec[n++], owner_uid); - #ifdef HAVE_SELINUX if (label) { selinux_context = malloc(sizeof("_SELINUX_CONTEXT=") + label_len); @@ -713,6 +720,9 @@ static void dispatch_message(Server *s, if (n == 0) return; + if (LOG_PRI(priority) > s->max_level_store) + return; + if (!ucred) goto finish; @@ -822,12 +832,15 @@ static void forward_syslog_iovec(Server *s, const struct iovec *iovec, unsigned log_debug("Failed to forward syslog message: %m"); } -static void forward_syslog_raw(Server *s, const char *buffer, struct ucred *ucred, struct timeval *tv) { +static void forward_syslog_raw(Server *s, int priority, const char *buffer, struct ucred *ucred, struct timeval *tv) { struct iovec iovec; assert(s); assert(buffer); + if (LOG_PRI(priority) > s->max_level_syslog) + return; + IOVEC_SET_STRING(iovec, buffer); forward_syslog_iovec(s, &iovec, 1, ucred, tv); } @@ -845,6 +858,9 @@ static void forward_syslog(Server *s, int priority, const char *identifier, cons assert(priority <= 999); assert(message); + if (LOG_PRI(priority) > s->max_level_syslog) + return; + /* First: priority field */ snprintf(header_priority, sizeof(header_priority), "<%i>", priority); char_array_0(header_priority); @@ -906,6 +922,9 @@ static void forward_kmsg(Server *s, int priority, const char *identifier, const assert(priority <= 999); assert(message); + if (LOG_PRI(priority) > s->max_level_kmsg) + return; + /* Never allow messages with kernel facility to be written to * kmsg, regardless where the data comes from. */ priority = fixup_priority(priority); @@ -953,15 +972,19 @@ finish: free(ident_buf); } -static void forward_console(Server *s, const char *identifier, const char *message, struct ucred *ucred) { +static void forward_console(Server *s, int priority, const char *identifier, const char *message, struct ucred *ucred) { struct iovec iovec[4]; char header_pid[16]; int n = 0, fd; char *ident_buf = NULL; + const char *tty; assert(s); assert(message); + if (LOG_PRI(priority) > s->max_level_console) + return; + /* First: identifier and PID */ if (ucred) { if (!identifier) { @@ -985,14 +1008,16 @@ static void forward_console(Server *s, const char *identifier, const char *messa IOVEC_SET_STRING(iovec[n++], message); IOVEC_SET_STRING(iovec[n++], "\n"); - fd = open_terminal("/dev/console", O_WRONLY|O_NOCTTY|O_CLOEXEC); + tty = s->tty_path ? s->tty_path : "/dev/console"; + + fd = open_terminal(tty, O_WRONLY|O_NOCTTY|O_CLOEXEC); if (fd < 0) { - log_debug("Failed to open /dev/console for logging: %s", strerror(errno)); + log_debug("Failed to open %s for logging: %s", tty, strerror(errno)); goto finish; } if (writev(fd, iovec, n) < 0) - log_debug("Failed to write to /dev/console for logging: %s", strerror(errno)); + log_debug("Failed to write to %s for logging: %s", tty, strerror(errno)); close_nointr_nofail(fd); @@ -1056,14 +1081,17 @@ static void process_syslog_message(Server *s, const char *buf, struct ucred *ucr unsigned n = 0; int priority = LOG_USER | LOG_INFO; char *identifier = NULL, *pid = NULL; + const char *orig; assert(s); assert(buf); + orig = buf; + parse_syslog_priority((char**) &buf, &priority); + if (s->forward_to_syslog) - forward_syslog_raw(s, buf, ucred, tv); + forward_syslog_raw(s, priority, orig, ucred, tv); - parse_syslog_priority((char**) &buf, &priority); skip_syslog_date((char**) &buf); read_identifier(&buf, &identifier, &pid); @@ -1071,7 +1099,7 @@ static void process_syslog_message(Server *s, const char *buf, struct ucred *ucr forward_kmsg(s, priority, identifier, buf, ucred); if (s->forward_to_console) - forward_console(s, identifier, buf, ucred); + forward_console(s, priority, identifier, buf, ucred); IOVEC_SET_STRING(iovec[n++], "_TRANSPORT=syslog"); @@ -1323,7 +1351,7 @@ static void process_native_message( forward_kmsg(s, priority, identifier, message, ucred); if (s->forward_to_console) - forward_console(s, identifier, message, ucred); + forward_console(s, priority, identifier, message, ucred); } dispatch_message(s, iovec, n, m, ucred, tv, label, label_len, priority); @@ -1421,7 +1449,7 @@ static int stdout_stream_log(StdoutStream *s, const char *p) { forward_kmsg(s->server, priority, s->identifier, p, &s->ucred); if (s->forward_to_console || s->server->forward_to_console) - forward_console(s->server, s->identifier, p, &s->ucred); + forward_console(s->server, priority, s->identifier, p, &s->ucred); IOVEC_SET_STRING(iovec[n++], "_TRANSPORT=stdout"); @@ -1692,8 +1720,8 @@ static int stdout_stream_new(Server *s) { } #ifdef HAVE_SELINUX - if (getpeercon(fd, &stream->security_context) < 0) - log_error("Failed to determine peer security context."); + if (getpeercon(fd, &stream->security_context) < 0 && errno != ENOPROTOOPT) + log_error("Failed to determine peer security context: %m"); #endif if (shutdown(fd, SHUT_WR) < 0) { @@ -1768,6 +1796,17 @@ static int parse_kernel_timestamp(char **_p, usec_t *t) { return 1; } +static bool is_us(const char *pid) { + pid_t t; + + assert(pid); + + if (parse_pid(pid, &t) < 0) + return false; + + return t == getpid(); +} + static void proc_kmsg_line(Server *s, const char *p) { struct iovec iovec[N_IOVEC_META_FIELDS + 7]; char *message = NULL, *syslog_priority = NULL, *syslog_pid = NULL, *syslog_facility = NULL, *syslog_identifier = NULL, *source_time = NULL; @@ -1807,6 +1846,11 @@ static void proc_kmsg_line(Server *s, const char *p) { } else { read_identifier(&p, &identifier, &pid); + /* Avoid any messages we generated ourselves via + * log_info() and friends. */ + if (pid && is_us(pid)) + goto finish; + if (s->forward_to_syslog) forward_syslog(s, priority, identifier, p, NULL, NULL); @@ -1832,6 +1876,7 @@ static void proc_kmsg_line(Server *s, const char *p) { dispatch_message(s, iovec, n, ELEMENTSOF(iovec), NULL, NULL, NULL, 0, priority); +finish: free(message); free(syslog_priority); free(syslog_identifier); @@ -1949,7 +1994,7 @@ static int system_journal_open(Server *s) { /* OK, we really need the runtime journal, so create * it if necessary. */ - (void) mkdir_parents(fn, 0755); + (void) mkdir_parents_label(fn, 0755); r = journal_file_open_reliably(fn, O_RDWR|O_CREAT, 0640, NULL, &s->runtime_journal); free(fn); @@ -2628,6 +2673,11 @@ static int server_init(Server *s) { s->forward_to_syslog = true; s->import_proc_kmsg = true; + s->max_level_store = LOG_DEBUG; + s->max_level_syslog = LOG_DEBUG; + s->max_level_kmsg = LOG_NOTICE; + s->max_level_console = LOG_INFO; + memset(&s->system_metrics, 0xFF, sizeof(s->system_metrics)); memset(&s->runtime_metrics, 0xFF, sizeof(s->runtime_metrics)); @@ -2758,6 +2808,7 @@ static void server_done(Server *s) { journal_rate_limit_free(s->rate_limit); free(s->buffer); + free(s->tty_path); } int main(int argc, char *argv[]) { @@ -2774,7 +2825,7 @@ int main(int argc, char *argv[]) { return EXIT_FAILURE; } - log_set_target(LOG_TARGET_CONSOLE); + log_set_target(LOG_TARGET_SAFE); log_set_facility(LOG_SYSLOG); log_parse_environment(); log_open();