X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/40c90bca9f7e2952bd64faebceb53538f80805a7..fdfe718d5ed9f551120a29af214883d59ddb85d1:/src/src/log.c diff --git a/src/src/log.c b/src/src/log.c index 860b8b0a2..9cde369c0 100644 --- a/src/src/log.c +++ b/src/src/log.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2016 */ +/* Copyright (c) University of Cambridge 1995 - 2018 */ /* See the file NOTICE for conditions of use and distribution. */ /* Functions for writing log files. The code for maintaining datestamped @@ -47,6 +47,8 @@ static BOOL path_inspected = FALSE; static int logging_mode = LOG_MODE_FILE; static uschar *file_path = US""; +static size_t pid_position[2]; + /* These should be kept in-step with the private delivery error number definitions in macros.h */ @@ -117,7 +119,7 @@ static const uschar * exim_errstrings[] = { const uschar * exim_errstr(int err) { -return errno < 0 ? exim_errstrings[-err] : CUS strerror(err); +return err < 0 ? exim_errstrings[-err] : CUS strerror(err); } /************************************************* @@ -138,25 +140,32 @@ Returns: nothing */ static void -write_syslog(int priority, uschar *s) +write_syslog(int priority, const uschar *s) { int len, pass; int linecount = 0; if (running_in_test_harness) return; -if (!syslog_timestamp) s += log_timezone? 26 : 20; +if (!syslog_pid && LOGGING(pid)) + s = string_sprintf("%.*s%s", (int)pid_position[0], s, s + pid_position[1]); +if (!syslog_timestamp) + { + len = log_timezone ? 26 : 20; + if (LOGGING(millisec)) len += 4; + s += len; + } len = Ustrlen(s); #ifndef NO_OPENLOG if (!syslog_open) { - #ifdef SYSLOG_LOG_PID +# ifdef SYSLOG_LOG_PID openlog(CS syslog_processname, LOG_PID|LOG_CONS, syslog_facility); - #else +# else openlog(CS syslog_processname, LOG_CONS, syslog_facility); - #endif +# endif syslog_open = TRUE; } #endif @@ -168,15 +177,15 @@ for (pass = 0; pass < 2; pass++) { int i; int tlen; - uschar *ss = s; + const uschar * ss = s; for (i = 1, tlen = len; tlen > 0; i++) { int plen = tlen; uschar *nlptr = Ustrchr(ss, '\n'); if (nlptr != NULL) plen = nlptr - ss; - #ifndef SYSLOG_LONG_LINES +#ifndef SYSLOG_LONG_LINES if (plen > MAX_SYSLOG_LEN) plen = MAX_SYSLOG_LEN; - #endif +#endif tlen -= plen; if (ss[plen] == '\n') tlen--; /* chars left */ @@ -186,7 +195,7 @@ for (pass = 0; pass < 2; pass++) syslog(priority, "%.*s", plen, ss); else syslog(priority, "[%d%c%d] %.*s", i, - (ss[plen] == '\n' && tlen != 0)? '\\' : '/', + ss[plen] == '\n' && tlen != 0 ? '\\' : '/', linecount, plen, ss); } ss += plen; @@ -219,16 +228,16 @@ Returns: The function does not return static void die(uschar *s1, uschar *s2) { -if (s1 != NULL) +if (s1) { write_syslog(LOG_CRIT, s1); - if (debug_file != NULL) debug_printf("%s\n", s1); - if (log_stderr != NULL && log_stderr != debug_file) + if (debug_file) debug_printf("%s\n", s1); + if (log_stderr && log_stderr != debug_file) fprintf(log_stderr, "%s\n", s1); } if (receive_call_bombout) receive_bomb_out(NULL, s2); /* does not return */ if (smtp_input) smtp_closedown(s2); -exim_exit(EXIT_FAILURE); +exim_exit(EXIT_FAILURE, NULL); } @@ -252,7 +261,11 @@ Returns: a file descriptor, or < 0 on failure (errno set) int log_create(uschar *name) { -int fd = Uopen(name, O_CREAT|O_APPEND|O_WRONLY, LOG_MODE); +int fd = Uopen(name, +#ifdef O_CLOEXEC + O_CLOEXEC | +#endif + O_CREAT|O_APPEND|O_WRONLY, LOG_MODE); /* If creation failed, attempt to build a log directory in case that is the problem. */ @@ -264,9 +277,13 @@ if (fd < 0 && errno == ENOENT) *lastslash = 0; created = directory_make(NULL, name, LOG_DIRECTORY_MODE, FALSE); DEBUG(D_any) debug_printf("%s log directory %s\n", - created? "created" : "failed to create", name); + created ? "created" : "failed to create", name); *lastslash = '/'; - if (created) fd = Uopen(name, O_CREAT|O_APPEND|O_WRONLY, LOG_MODE); + if (created) fd = Uopen(name, +#ifdef O_CLOEXEC + O_CLOEXEC | +#endif + O_CREAT|O_APPEND|O_WRONLY, LOG_MODE); } return fd; @@ -316,7 +333,11 @@ if (pid == 0) /* If we created a subprocess, wait for it. If it succeeded, try the open. */ while (pid > 0 && waitpid(pid, &status, 0) != pid); -if (status == 0) fd = Uopen(name, O_APPEND|O_WRONLY, LOG_MODE); +if (status == 0) fd = Uopen(name, +#ifdef O_CLOEXEC + O_CLOEXEC | +#endif + O_APPEND|O_WRONLY, LOG_MODE); /* If we failed to create a subprocess, we are in a bad way. We return with fd still < 0, and errno set, letting the caller handle the error. */ @@ -375,7 +396,7 @@ it gets statted to see if it has been cycled. With a datestamp, the datestamp will be compared. The static slot for saving it is the same size as buffer, and the text has been checked above to fit, so this use of strcpy() is OK. */ -if (type == lt_main) +if (type == lt_main && string_datestamp_offset >= 0) { Ustrcpy(mainlog_name, buffer); mainlog_datestamp = mainlog_name + string_datestamp_offset; @@ -383,7 +404,7 @@ if (type == lt_main) /* Ditto for the reject log */ -else if (type == lt_reject) +else if (type == lt_reject && string_datestamp_offset >= 0) { Ustrcpy(rejectlog_name, buffer); rejectlog_datestamp = rejectlog_name + string_datestamp_offset; @@ -411,38 +432,41 @@ char afterwards if at the start, otherwise one before. */ else if (string_datestamp_offset >= 0) { - uschar *from = buffer + string_datestamp_offset; - uschar *to = from + string_datestamp_length; + uschar * from = buffer + string_datestamp_offset; + uschar * to = from + string_datestamp_length; + if (from == buffer || from[-1] == '/') { if (!isalnum(*to)) to++; } else - { if (!isalnum(from[-1])) from--; - } - - /* This strcpy is ok, because we know that to is a substring of from. */ - Ustrcpy(from, to); + /* This copy is ok, because we know that to is a substring of from. But + due to overlap we must use memmove() not Ustrcpy(). */ + memmove(from, to, Ustrlen(to)+1); } /* If the file name is too long, it is an unrecoverable disaster */ if (!ok) - { die(US"exim: log file path too long: aborting", US"Logging failure; please try later"); - } /* We now have the file name. Try to open an existing file. After a successful open, arrange for automatic closure on exec(), and then return. */ -*fd = Uopen(buffer, O_APPEND|O_WRONLY, LOG_MODE); +*fd = Uopen(buffer, +#ifdef O_CLOEXEC + O_CLOEXEC | +#endif + O_APPEND|O_WRONLY, LOG_MODE); if (*fd >= 0) { +#ifndef O_CLOEXEC (void)fcntl(*fd, F_SETFD, fcntl(*fd, F_GETFD) | FD_CLOEXEC); +#endif return; } @@ -469,7 +493,9 @@ else if (euid == root_uid) *fd = log_create_as_exim(buffer); if (*fd >= 0) { +#ifndef O_CLOEXEC (void)fcntl(*fd, F_SETFD, fcntl(*fd, F_GETFD) | FD_CLOEXEC); +#endif return; } @@ -535,10 +561,7 @@ if ((flags & (LOG_CONFIG_FOR & ~LOG_CONFIG)) != 0) } if ((flags & (LOG_CONFIG_IN & ~LOG_CONFIG)) != 0) - { - sprintf(CS ptr, " in line %d of %s", config_lineno, config_filename); - while (*ptr) ptr++; - } + ptr += sprintf(CS ptr, " in line %d of %s", config_lineno, config_filename); Ustrcpy(ptr, ":\n "); return ptr + 4; @@ -643,6 +666,14 @@ while ((t = string_nextinlist(&tt, &sep, log_buffer, LOG_BUFFER_SIZE))) } +void +mainlog_close(void) +{ +if (mainlogfd < 0) return; +(void)close(mainlogfd); +mainlogfd = -1; +mainlog_inode = 0; +} /************************************************* * Write message to log file * @@ -672,7 +703,7 @@ If it is not, don't try to write to the log because permission will probably be denied. Avoid actually writing to the logs when exim is called with -bv or -bt to -test an address, but take other actions, such as panicing. +test an address, but take other actions, such as panicking. In Exim proper, the buffer for building the message is got at start-up, so that nothing gets done if it can't be got. However, some functions that are also @@ -704,7 +735,7 @@ Returns: nothing void log_write(unsigned int selector, int flags, const char *format, ...) { -uschar *ptr; +uschar * ptr; int length; int paniclogfd; ssize_t written_len; @@ -717,11 +748,11 @@ original log line that caused the problem. Afterwards, expire. */ if (panic_recurseflag) { - uschar *extra = (panic_save_buffer == NULL)? US"" : panic_save_buffer; - if (debug_file != NULL) debug_printf("%s%s", extra, log_buffer); - if (log_stderr != NULL && log_stderr != debug_file) + uschar *extra = panic_save_buffer ? panic_save_buffer : US""; + if (debug_file) debug_printf("%s%s", extra, log_buffer); + if (log_stderr && log_stderr != debug_file) fprintf(log_stderr, "%s%s", extra, log_buffer); - if (*extra != 0) write_syslog(LOG_CRIT, extra); + if (*extra) write_syslog(LOG_CRIT, extra); write_syslog(LOG_CRIT, log_buffer); die(US"exim: could not open panic log - aborting: see message(s) above", US"Unexpected log failure, please try later"); @@ -734,7 +765,7 @@ if (!log_buffer) if (!(log_buffer = US malloc(LOG_BUFFER_SIZE))) { fprintf(stderr, "exim: failed to get store for log buffer\n"); - exim_exit(EXIT_FAILURE); + exim_exit(EXIT_FAILURE, NULL); } /* If we haven't already done so, inspect the setting of log_file_path to @@ -758,12 +789,14 @@ if (!path_inspected) int sep = ':'; /* Fixed separator - outside use */ uschar *s; const uschar *ss = log_file_path; + logging_mode = 0; while ((s = string_nextinlist(&ss, &sep, log_buffer, LOG_BUFFER_SIZE))) { if (Ustrcmp(s, "syslog") == 0) logging_mode |= LOG_MODE_SYSLOG; - else if ((logging_mode & LOG_MODE_FILE) != 0) multiple = TRUE; + else if (logging_mode & LOG_MODE_FILE) + multiple = TRUE; else { logging_mode |= LOG_MODE_FILE; @@ -793,7 +826,7 @@ if (!path_inspected) /* Set up the ultimate default if necessary. Then revert to the old store pool, and record that we've sorted out the path. */ - if ((logging_mode & LOG_MODE_FILE) != 0 && file_path[0] == 0) + if (logging_mode & LOG_MODE_FILE && !file_path[0]) file_path = string_sprintf("%s/log/%%slog", spool_directory); store_pool = old_pool; path_inspected = TRUE; @@ -830,14 +863,13 @@ DEBUG(D_any|D_v) } } - sprintf(CS ptr, "%s%s%s%s\n ", - ((flags & LOG_MAIN) != 0)? " MAIN" : "", - ((flags & LOG_PANIC) != 0)? " PANIC" : "", - ((flags & LOG_PANIC_DIE) == LOG_PANIC_DIE)? " DIE" : "", - ((flags & LOG_REJECT) != 0)? " REJECT" : ""); + ptr += sprintf(CS ptr, "%s%s%s%s\n ", + flags & LOG_MAIN ? " MAIN" : "", + flags & LOG_PANIC ? " PANIC" : "", + (flags & LOG_PANIC_DIE) == LOG_PANIC_DIE ? " DIE" : "", + flags & LOG_REJECT ? " REJECT" : ""); - while(*ptr) ptr++; - if ((flags & LOG_CONFIG) != 0) ptr = log_config_info(ptr, flags); + if (flags & LOG_CONFIG) ptr = log_config_info(ptr, flags); va_start(ap, format); if (!string_vformat(ptr, LOG_BUFFER_SIZE - (ptr-log_buffer)-1, format, ap)) @@ -851,7 +883,7 @@ DEBUG(D_any|D_v) /* If no log file is specified, we are in a mess. */ -if ((flags & (LOG_MAIN|LOG_PANIC|LOG_REJECT)) == 0) +if (!(flags & (LOG_MAIN|LOG_PANIC|LOG_REJECT))) log_write(0, LOG_MAIN|LOG_PANIC_DIE, "log_write called with no log " "flags set"); @@ -871,22 +903,19 @@ if (!write_rejectlog) flags &= ~LOG_REJECT; when called by a utility. */ ptr = log_buffer; -sprintf(CS ptr, "%s ", tod_stamp(tod_log)); -while(*ptr) ptr++; +ptr += sprintf(CS ptr, "%s ", tod_stamp(tod_log)); if (LOGGING(pid)) { - sprintf(CS ptr, "[%d] ", (int)getpid()); - while (*ptr) ptr++; + if (!syslog_pid) pid_position[0] = ptr - log_buffer; /* remember begin … */ + ptr += sprintf(CS ptr, "[%d] ", (int)getpid()); + if (!syslog_pid) pid_position[1] = ptr - log_buffer; /* … and end+1 of the PID */ } if (really_exim && message_id[0] != 0) - { - sprintf(CS ptr, "%s ", message_id); - while(*ptr) ptr++; - } + ptr += sprintf(CS ptr, "%s ", message_id); -if ((flags & LOG_CONFIG) != 0) ptr = log_config_info(ptr, flags); +if (flags & LOG_CONFIG) ptr = log_config_info(ptr, flags); va_start(ap, format); if (!string_vformat(ptr, LOG_BUFFER_SIZE - (ptr-log_buffer)-1, format, ap)) @@ -897,34 +926,29 @@ va_end(ap); /* Add the raw, unrewritten, sender to the message if required. This is done this way because it kind of fits with LOG_RECIPIENTS. */ -if ((flags & LOG_SENDER) != 0 && - ptr < log_buffer + LOG_BUFFER_SIZE - 10 - Ustrlen(raw_sender)) - { - sprintf(CS ptr, " from <%s>", raw_sender); - while (*ptr) ptr++; - } +if ( flags & LOG_SENDER + && ptr < log_buffer + LOG_BUFFER_SIZE - 10 - Ustrlen(raw_sender)) + ptr += sprintf(CS ptr, " from <%s>", raw_sender); /* Add list of recipients to the message if required; the raw list, before rewriting, was saved in raw_recipients. There may be none, if an ACL discarded them all. */ -if ((flags & LOG_RECIPIENTS) != 0 && ptr < log_buffer + LOG_BUFFER_SIZE - 6 && - raw_recipients_count > 0) +if ( flags & LOG_RECIPIENTS + && ptr < log_buffer + LOG_BUFFER_SIZE - 6 + && raw_recipients_count > 0) { int i; - sprintf(CS ptr, " for"); - while (*ptr) ptr++; + ptr += sprintf(CS ptr, " for"); for (i = 0; i < raw_recipients_count; i++) { - uschar *s = raw_recipients[i]; + uschar * s = raw_recipients[i]; if (log_buffer + LOG_BUFFER_SIZE - ptr < Ustrlen(s) + 3) break; - sprintf(CS ptr, " %s", s); - while (*ptr) ptr++; + ptr += sprintf(CS ptr, " %s", s); } } -sprintf(CS ptr, "\n"); -while(*ptr) ptr++; +ptr += sprintf(CS ptr, "\n"); length = ptr - log_buffer; /* Handle loggable errors when running a utility, or when address testing. @@ -933,15 +957,16 @@ or unless there is no log_stderr (expn called from daemon, for example). */ if (!really_exim || log_testing_mode) { - if (debug_selector == 0 && log_stderr != NULL && - (selector == 0 || (selector & log_selector[0]) != 0)) - { + if ( !debug_selector + && log_stderr + && (selector == 0 || (selector & log_selector[0]) != 0) + ) if (host_checking) fprintf(log_stderr, "LOG: %s", CS(log_buffer + 20)); /* no timestamp */ else fprintf(log_stderr, "%s", CS log_buffer); - } - if ((flags & LOG_PANIC_DIE) == LOG_PANIC_DIE) exim_exit(EXIT_FAILURE); + + if ((flags & LOG_PANIC_DIE) == LOG_PANIC_DIE) exim_exit(EXIT_FAILURE, US""); return; } @@ -951,14 +976,14 @@ been opened, but we don't want to keep on writing to it for too long after it has been renamed. Therefore, do a stat() and see if the inode has changed, and if so, re-open. */ -if ((flags & LOG_MAIN) != 0 && - (selector == 0 || (selector & log_selector[0]) != 0)) +if ( flags & LOG_MAIN + && (!selector || selector & log_selector[0])) { - if ((logging_mode & LOG_MODE_SYSLOG) != 0 && - (syslog_duplication || (flags & (LOG_REJECT|LOG_PANIC)) == 0)) + if ( logging_mode & LOG_MODE_SYSLOG + && (syslog_duplication || !(flags & (LOG_REJECT|LOG_PANIC)))) write_syslog(LOG_INFO, log_buffer); - if ((logging_mode & LOG_MODE_FILE) != 0) + if (logging_mode & LOG_MODE_FILE) { struct stat statbuf; @@ -966,7 +991,7 @@ if ((flags & LOG_MAIN) != 0 && operation. This happens at midnight, at which point we want to roll over the file. Closing it has the desired effect. */ - if (mainlog_datestamp != NULL) + if (mainlog_datestamp) { uschar *nowstamp = tod_stamp(string_datestamp_type); if (Ustrncmp (mainlog_datestamp, nowstamp, Ustrlen(nowstamp)) != 0) @@ -984,14 +1009,8 @@ if ((flags & LOG_MAIN) != 0 && happening. */ if (mainlogfd >= 0) - { if (Ustat(mainlog_name, &statbuf) < 0 || statbuf.st_ino != mainlog_inode) - { - (void)close(mainlogfd); - mainlogfd = -1; - mainlog_inode = 0; - } - } + mainlog_close(); /* If the log is closed, open it. Then write the line. */ @@ -1017,11 +1036,11 @@ which case the flags are altered above. If there are any header lines (i.e. if the rejection is happening after the DATA phase), log the recipients and the headers. */ -if ((flags & LOG_REJECT) != 0) +if (flags & LOG_REJECT) { header_line *h; - if (header_list != NULL && LOGGING(rejected_header)) + if (header_list && LOGGING(rejected_header)) { if (recipients_count > 0) { @@ -1056,11 +1075,9 @@ if ((flags & LOG_REJECT) != 0) /* A header with a NULL text is an unfilled in Received: header */ - for (h = header_list; h != NULL; h = h->next) + for (h = header_list; h; h = h->next) if (h->text) { - BOOL fitted; - if (h->text == NULL) continue; - fitted = string_format(ptr, LOG_BUFFER_SIZE - (ptr-log_buffer), + BOOL fitted = string_format(ptr, LOG_BUFFER_SIZE - (ptr-log_buffer), "%c %s", h->type, h->text); while(*ptr) ptr++; if (!fitted) /* Buffer is full; truncate */ @@ -1078,19 +1095,19 @@ if ((flags & LOG_REJECT) != 0) /* Write to syslog or to a log file */ - if ((logging_mode & LOG_MODE_SYSLOG) != 0 && - (syslog_duplication || (flags & LOG_PANIC) == 0)) + if ( logging_mode & LOG_MODE_SYSLOG + && (syslog_duplication || !(flags & LOG_PANIC))) write_syslog(LOG_NOTICE, log_buffer); /* Check for a change to the rejectlog file name when datestamping is in operation. This happens at midnight, at which point we want to roll over the file. Closing it has the desired effect. */ - if ((logging_mode & LOG_MODE_FILE) != 0) + if (logging_mode & LOG_MODE_FILE) { struct stat statbuf; - if (rejectlog_datestamp != NULL) + if (rejectlog_datestamp) { uschar *nowstamp = tod_stamp(string_datestamp_type); if (Ustrncmp (rejectlog_datestamp, nowstamp, Ustrlen(nowstamp)) != 0) @@ -1108,7 +1125,6 @@ if ((flags & LOG_REJECT) != 0) happening. */ if (rejectlogfd >= 0) - { if (Ustat(rejectlog_name, &statbuf) < 0 || statbuf.st_ino != rejectlog_inode) { @@ -1116,7 +1132,6 @@ if ((flags & LOG_REJECT) != 0) rejectlogfd = -1; rejectlog_inode = 0; } - } /* Open the file if necessary, and write the data */ @@ -1141,26 +1156,24 @@ open, there will be a recursive call to log_write(). We detect this above and attempt to write to the system log as a last-ditch try at telling somebody. In all cases except mua_wrapper, try to write to log_stderr. */ -if ((flags & LOG_PANIC) != 0) +if (flags & LOG_PANIC) { - if (log_stderr != NULL && log_stderr != debug_file && !mua_wrapper) + if (log_stderr && log_stderr != debug_file && !mua_wrapper) fprintf(log_stderr, "%s", CS log_buffer); - if ((logging_mode & LOG_MODE_SYSLOG) != 0) - { + if (logging_mode & LOG_MODE_SYSLOG) write_syslog(LOG_ALERT, log_buffer); - } /* If this panic logging was caused by a failure to open the main log, the original log line is in panic_save_buffer. Make an attempt to write it. */ - if ((logging_mode & LOG_MODE_FILE) != 0) + if (logging_mode & LOG_MODE_FILE) { panic_recurseflag = TRUE; open_log(&paniclogfd, lt_panic, NULL); /* Won't return on failure */ panic_recurseflag = FALSE; - if (panic_save_buffer != NULL) + if (panic_save_buffer) { int i = write(paniclogfd, panic_save_buffer, Ustrlen(panic_save_buffer)); i = i; /* compiler quietening */