X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=logging.c;h=2b329683f187c73c59073c17efa4be9673d51ad1;hb=599b9cba883f6308232ec634819df2a3a20fc731;hp=1e1b997be6ad701bf2a03afe568039609fd5f60d;hpb=c2b0b328d4a66431e671fb26b47997033feb5e29;p=debian%2Fsudo diff --git a/logging.c b/logging.c index 1e1b997..2b32968 100644 --- a/logging.c +++ b/logging.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994-1996,1998-2004 Todd C. Miller + * Copyright (c) 1994-1996, 1998-2010 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -22,11 +22,12 @@ # include #endif -#include "config.h" +#include #include #include #include +#include #include #include #ifdef STDC_HEADERS @@ -39,36 +40,28 @@ #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H # include -#else -# ifdef HAVE_STRINGS_H -# include -# endif #endif /* HAVE_STRING_H */ +#ifdef HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_ERR_H -# include -#else -# include "emul/err.h" -#endif /* HAVE_ERR_H */ #include +#include #include #include #include +#include #include "sudo.h" -#ifndef lint -static const char rcsid[] = "$Sudo: logging.c,v 1.168 2004/05/17 20:08:46 millert Exp $"; -#endif /* lint */ - static void do_syslog __P((int, char *)); static void do_logfile __P((char *)); -static void send_mail __P((char *)); -static void mail_auth __P((int, char *)); -static char *get_timestr __P((void)); +static void send_mail __P((const char *fmt, ...)); +static int should_mail __P((int)); static void mysyslog __P((int, const char *, ...)); +static char *new_logline __P((const char *, int)); #define MAXSYSLOGTRIES 16 /* num of retries for broken syslogs */ @@ -123,6 +116,9 @@ mysyslog(pri, fmt, va_alist) closelog(); } +#define FMT_FIRST "%8s : %s" +#define FMT_CONTD "%8s : (command continued) %s" + /* * Log a message to syslog, pre-pending the username and splitting the * message into parts if it is longer than MAXSYSLOGLEN. @@ -132,46 +128,43 @@ do_syslog(pri, msg) int pri; char *msg; { - size_t count; - char *p; - char *tmp; - char save; + size_t len, maxlen; + char *p, *tmp, save; + const char *fmt; /* * Log the full line, breaking into multiple syslog(3) calls if necessary */ - for (p = msg, count = 0; *p && count < strlen(msg) / MAXSYSLOGLEN + 1; - count++) { - if (strlen(p) > MAXSYSLOGLEN) { + fmt = FMT_FIRST; + maxlen = MAXSYSLOGLEN - (sizeof(FMT_FIRST) - 6 + strlen(user_name)); + for (p = msg; *p != '\0'; ) { + len = strlen(p); + if (len > maxlen) { /* * Break up the line into what will fit on one syslog(3) line - * Try to break on a word boundary if possible. + * Try to avoid breaking words into several lines if possible. */ - for (tmp = p + MAXSYSLOGLEN; tmp > p && *tmp != ' '; tmp--) - ; - if (tmp <= p) - tmp = p + MAXSYSLOGLEN; + tmp = memrchr(p, ' ', maxlen); + if (tmp == NULL) + tmp = p + maxlen; /* NULL terminate line, but save the char to restore later */ save = *tmp; *tmp = '\0'; - if (count == 0) - mysyslog(pri, "%8s : %s", user_name, p); - else - mysyslog(pri, "%8s : (command continued) %s", user_name, p); + mysyslog(pri, fmt, user_name, p); *tmp = save; /* restore saved character */ - /* Eliminate leading whitespace */ - for (p = tmp; *p != ' ' && *p !='\0'; p++) + /* Advance p and eliminate leading whitespace */ + for (p = tmp; *p == ' '; p++) ; } else { - if (count == 0) - mysyslog(pri, "%8s : %s", user_name, p); - else - mysyslog(pri, "%8s : (command continued) %s", user_name, p); + mysyslog(pri, fmt, user_name, p); + p += len; } + fmt = FMT_CONTD; + maxlen = MAXSYSLOGLEN - (sizeof(FMT_CONTD) - 6 + strlen(user_name)); } } @@ -190,31 +183,28 @@ do_logfile(msg) fp = fopen(def_logfile, "a"); (void) umask(oldmask); if (fp == NULL) { - easprintf(&full_line, "Can't open log file: %s: %s", - def_logfile, strerror(errno)); - send_mail(full_line); - free(full_line); + send_mail("Can't open log file: %s: %s", def_logfile, strerror(errno)); } else if (!lock_file(fileno(fp), SUDO_LOCK)) { - easprintf(&full_line, "Can't lock log file: %s: %s", - def_logfile, strerror(errno)); - send_mail(full_line); - free(full_line); + send_mail("Can't lock log file: %s: %s", def_logfile, strerror(errno)); } else { + time_t now; + + now = time(NULL); if (def_loglinelen == 0) { /* Don't pretty-print long log file lines (hard to grep) */ if (def_log_host) - (void) fprintf(fp, "%s : %s : HOST=%s : %s\n", get_timestr(), - user_name, user_shost, msg); + (void) fprintf(fp, "%s : %s : HOST=%s : %s\n", + get_timestr(now, def_log_year), user_name, user_shost, msg); else - (void) fprintf(fp, "%s : %s : %s\n", get_timestr(), - user_name, msg); + (void) fprintf(fp, "%s : %s : %s\n", + get_timestr(now, def_log_year), user_name, msg); } else { if (def_log_host) - easprintf(&full_line, "%s : %s : HOST=%s : %s", get_timestr(), - user_name, user_shost, msg); + easprintf(&full_line, "%s : %s : HOST=%s : %s", + get_timestr(now, def_log_year), user_name, user_shost, msg); else - easprintf(&full_line, "%s : %s : %s", get_timestr(), - user_name, msg); + easprintf(&full_line, "%s : %s : %s", + get_timestr(now, def_log_year), user_name, msg); /* * Print out full_line with word wrap @@ -263,7 +253,7 @@ do_logfile(msg) beg = NULL; /* exit condition */ } } - free(full_line); + efree(full_line); } (void) fflush(fp); (void) lock_file(fileno(fp), SUDO_UNLOCK); @@ -272,43 +262,31 @@ do_logfile(msg) } /* - * Two main functions, log_error() to log errors and log_auth() to - * log allow/deny messages. + * Log and mail the denial message, optionally informing the user. */ void -log_auth(status, inform_user) +log_denial(status, inform_user) int status; int inform_user; { char *message; char *logline; - int pri; - if (ISSET(status, VALIDATE_OK)) - pri = def_syslog_goodpri; - else - pri = def_syslog_badpri; - - /* Set error message, if any. */ - if (ISSET(status, VALIDATE_OK)) - message = ""; - else if (ISSET(status, FLAG_NO_USER)) - message = "user NOT in sudoers ; "; + /* Set error message. */ + if (ISSET(status, FLAG_NO_USER)) + message = "user NOT in sudoers"; else if (ISSET(status, FLAG_NO_HOST)) - message = "user NOT authorized on host ; "; - else if (ISSET(status, VALIDATE_NOT_OK)) - message = "command not allowed ; "; + message = "user NOT authorized on host"; else - message = "unknown error ; "; + message = "command not allowed"; - easprintf(&logline, "%sTTY=%s ; PWD=%s ; USER=%s ; COMMAND=%s%s%s", - message, user_tty, user_cwd, *user_runas, user_cmnd, - user_args ? " " : "", user_args ? user_args : ""); + logline = new_logline(message, 0); - mail_auth(status, logline); /* send mail based on status */ + if (should_mail(status)) + send_mail("%s", logline); /* send mail based on status */ /* Inform the user if they failed to authenticate. */ - if (inform_user && ISSET(status, VALIDATE_NOT_OK)) { + if (inform_user) { if (ISSET(status, FLAG_NO_USER)) (void) fprintf(stderr, "%s is not in the sudoers file. %s", user_name, "This incident will be reported.\n"); @@ -320,27 +298,57 @@ log_auth(status, inform_user) user_name, user_shost); else (void) fprintf(stderr, - "Sorry, user %s is not allowed to execute '%s%s%s' as %s on %s.\n", + "Sorry, user %s is not allowed to execute '%s%s%s' as %s%s%s on %s.\n", user_name, user_cmnd, user_args ? " " : "", - user_args ? user_args : "", *user_runas, user_host); + user_args ? user_args : "", + list_pw ? list_pw->pw_name : runas_pw ? + runas_pw->pw_name : user_name, runas_gr ? ":" : "", + runas_gr ? runas_gr->gr_name : "", user_host); } /* * Log via syslog and/or a file. */ if (def_syslog) - do_syslog(pri, logline); + do_syslog(def_syslog_badpri, logline); + if (def_logfile) + do_logfile(logline); + + efree(logline); +} + +/* + * Log and potentially mail the allowed command. + */ +void +log_allowed(status) + int status; +{ + char *logline; + + logline = new_logline(NULL, 0); + + if (should_mail(status)) + send_mail("%s", logline); /* send mail based on status */ + + /* + * Log via syslog and/or a file. + */ + if (def_syslog) + do_syslog(def_syslog_goodpri, logline); if (def_logfile) do_logfile(logline); - free(logline); + efree(logline); } void #ifdef __STDC__ log_error(int flags, const char *fmt, ...) #else -log_error(va_alist) +log_error(flags, fmt, va_alist) + int flags; + const char *fmt; va_dcl #endif { @@ -351,60 +359,38 @@ log_error(va_alist) #ifdef __STDC__ va_start(ap, fmt); #else - int flags; - const char *fmt; - va_start(ap); - flags = va_arg(ap, int); - fmt = va_arg(ap, const char *); #endif - /* Become root if we are not already to avoid user control */ - if (geteuid() != 0) - set_perms(PERM_ROOT); + /* Become root if we are not already to avoid user interference */ + set_perms(PERM_ROOT|PERM_NOEXIT); /* Expand printf-style format + args. */ evasprintf(&message, fmt, ap); va_end(ap); - if (flags & MSG_ONLY) + if (ISSET(flags, MSG_ONLY)) logline = message; - else if (flags & USE_ERRNO) { - if (user_args) { - easprintf(&logline, - "%s: %s ; TTY=%s ; PWD=%s ; USER=%s ; COMMAND=%s %s", - message, strerror(serrno), user_tty, user_cwd, *user_runas, - user_cmnd, user_args); - } else { - easprintf(&logline, - "%s: %s ; TTY=%s ; PWD=%s ; USER=%s ; COMMAND=%s", message, - strerror(serrno), user_tty, user_cwd, *user_runas, user_cmnd); - } - } else { - if (user_args) { - easprintf(&logline, - "%s ; TTY=%s ; PWD=%s ; USER=%s ; COMMAND=%s %s", message, - user_tty, user_cwd, *user_runas, user_cmnd, user_args); - } else { - easprintf(&logline, - "%s ; TTY=%s ; PWD=%s ; USER=%s ; COMMAND=%s", message, - user_tty, user_cwd, *user_runas, user_cmnd); - } - } + else + logline = new_logline(message, ISSET(flags, USE_ERRNO) ? serrno : 0); /* * Tell the user. */ - if (flags & USE_ERRNO) - warn("%s", message); - else - warnx("%s", message); + if (!ISSET(flags, NO_STDERR)) { + if (ISSET(flags, USE_ERRNO)) + warning("%s", message); + else + warningx("%s", message); + } + if (logline != message) + efree(message); /* * Send a copy of the error via mail. */ - if (!(flags & NO_MAIL)) - send_mail(logline); + if (!ISSET(flags, NO_MAIL)) + send_mail("%s", logline); /* * Log to syslog and/or a file. @@ -414,12 +400,12 @@ log_error(va_alist) if (def_logfile) do_logfile(logline); - free(message); - if (logline != message) - free(logline); + efree(logline); - if (!(flags & NO_EXIT)) + if (!ISSET(flags, NO_EXIT)) { + cleanup(0); exit(1); + } } #define MAX_MAILFLAGS 63 @@ -428,19 +414,26 @@ log_error(va_alist) * Send a message to MAILTO user */ static void -send_mail(line) - char *line; +#ifdef __STDC__ +send_mail(const char *fmt, ...) +#else +send_mail(fmt, va_alist) + const char *fmt; + va_dcl +#endif { FILE *mail; char *p; - int pfd[2]; - pid_t pid; - sigset_t set, oset; + int fd, pfd[2], status; + pid_t pid, rv; + sigaction_t sa; + va_list ap; #ifndef NO_ROOT_MAILER static char *root_envp[] = { "HOME=/", - "PATH=/usr/bin:/bin", + "PATH=/usr/bin:/bin:/usr/sbin:/sbin", "LOGNAME=root", + "USERNAME=root", "USER=root", NULL }; @@ -450,17 +443,71 @@ send_mail(line) if (!def_mailerpath || !def_mailto) return; - (void) sigemptyset(&set); - (void) sigaddset(&set, SIGCHLD); - (void) sigprocmask(SIG_BLOCK, &set, &oset); + /* Fork and return, child will daemonize. */ + switch (pid = fork()) { + case -1: + /* Error. */ + error(1, "cannot fork"); + break; + case 0: + /* Child. */ + switch (pid = fork()) { + case -1: + /* Error. */ + mysyslog(LOG_ERR, "cannot fork: %m"); + _exit(1); + case 0: + /* Grandchild continues below. */ + break; + default: + /* Parent will wait for us. */ + _exit(0); + } + break; + default: + /* Parent. */ + do { +#ifdef HAVE_WAITPID + rv = waitpid(pid, &status, 0); +#else + rv = wait(&status); +#endif + } while (rv == -1 && errno == EINTR); + return; + } - if (pipe(pfd) == -1) - err(1, "cannot open pipe"); + /* Daemonize - disassociate from session/tty. */ + if (setsid() == -1) + warning("setsid"); + (void) chdir("/"); + if ((fd = open(_PATH_DEVNULL, O_RDWR, 0644)) != -1) { + (void) dup2(fd, STDIN_FILENO); + (void) dup2(fd, STDOUT_FILENO); + (void) dup2(fd, STDERR_FILENO); + } + + /* Close password, group and other fds so we don't leak. */ + sudo_endpwent(); + sudo_endgrent(); + closefrom(STDERR_FILENO + 1); + + /* Ignore SIGPIPE in case mailer exits prematurely (or is missing). */ + zero_bytes(&sa, sizeof(sa)); + sigemptyset(&sa.sa_mask); + sa.sa_flags = SA_INTERRUPT; + sa.sa_handler = SIG_IGN; + (void) sigaction(SIGPIPE, &sa, NULL); + + if (pipe(pfd) == -1) { + mysyslog(LOG_ERR, "cannot open pipe: %m"); + _exit(1); + } switch (pid = fork()) { case -1: /* Error. */ - err(1, "cannot fork"); + mysyslog(LOG_ERR, "cannot fork: %m"); + _exit(1); break; case 0: { @@ -470,12 +517,15 @@ send_mail(line) /* Child, set stdin to output side of the pipe */ if (pfd[0] != STDIN_FILENO) { - (void) dup2(pfd[0], STDIN_FILENO); + if (dup2(pfd[0], STDIN_FILENO) == -1) { + mysyslog(LOG_ERR, "cannot dup stdin: %m"); + _exit(127); + } (void) close(pfd[0]); } (void) close(pfd[1]); - /* Build up an argv based the mailer path and flags */ + /* Build up an argv based on the mailer path and flags */ mflags = estrdup(def_mailerflags); mpath = estrdup(def_mailerpath); if ((argv[0] = strrchr(mpath, ' '))) @@ -491,20 +541,18 @@ send_mail(line) } argv[i] = NULL; - /* Close password file so we don't leak the fd. */ - endpwent(); - /* * Depending on the config, either run the mailer as root * (so user cannot kill it) or as the user (for the paranoid). */ #ifndef NO_ROOT_MAILER - set_perms(PERM_FULL_ROOT); + set_perms(PERM_ROOT|PERM_NOEXIT); execve(mpath, argv, root_envp); #else - set_perms(PERM_FULL_USER); + set_perms(PERM_FULL_USER|PERM_NOEXIT); execv(mpath, argv); #endif /* NO_ROOT_MAILER */ + mysyslog(LOG_ERR, "cannot execute %s: %m", mpath); _exit(127); } break; @@ -513,9 +561,9 @@ send_mail(line) (void) close(pfd[0]); mail = fdopen(pfd[1], "w"); - /* Pipes are all setup, send message via sendmail. */ - (void) fprintf(mail, "To: %s\nFrom: %s\nSubject: ", - def_mailto, user_name); + /* Pipes are all setup, send message. */ + (void) fprintf(mail, "To: %s\nFrom: %s\nAuto-Submitted: %s\nSubject: ", + def_mailto, def_mailfrom ? def_mailfrom : user_name, "auto-generated"); for (p = def_mailsub; *p; p++) { /* Expand escapes in the subject */ if (*p == '%' && *(p+1) != '%') { @@ -533,94 +581,157 @@ send_mail(line) } else (void) fputc(*p, mail); } - (void) fprintf(mail, "\n\n%s : %s : %s : %s\n\n", user_host, - get_timestr(), user_name, line); - fclose(mail); - /* If mailer is done, wait for it now. If not, we'll get it later. */ - reapchild(SIGCHLD); - (void) sigprocmask(SIG_SETMASK, &oset, NULL); + (void) fprintf(mail, "\n\n%s : %s : %s : ", user_host, + get_timestr(time(NULL), def_log_year), user_name); +#ifdef __STDC__ + va_start(ap, fmt); +#else + va_start(ap); +#endif + (void) vfprintf(mail, fmt, ap); + va_end(ap); + fputs("\n\n", mail); + + fclose(mail); + do { +#ifdef HAVE_WAITPID + rv = waitpid(pid, &status, 0); +#else + rv = wait(&status); +#endif + } while (rv == -1 && errno == EINTR); + _exit(0); } /* - * Send mail based on the value of "status" and compile-time options. + * Determine whether we should send mail based on "status" and defaults options. */ -static void -mail_auth(status, line) +static int +should_mail(status) int status; - char *line; { - int mail_mask; - - /* If any of these bits are set in status, we send mail. */ - if (def_mail_always) - mail_mask = - VALIDATE_ERROR|VALIDATE_OK|FLAG_NO_USER|FLAG_NO_HOST|VALIDATE_NOT_OK; - else { - mail_mask = VALIDATE_ERROR; - if (def_mail_no_user) - SET(mail_mask, FLAG_NO_USER); - if (def_mail_no_host) - SET(mail_mask, FLAG_NO_HOST); - if (def_mail_no_perms) - SET(mail_mask, VALIDATE_NOT_OK); - } - if ((status & mail_mask) != 0) - send_mail(line); + return(def_mail_always || ISSET(status, VALIDATE_ERROR) || + (def_mail_no_user && ISSET(status, FLAG_NO_USER)) || + (def_mail_no_host && ISSET(status, FLAG_NO_HOST)) || + (def_mail_no_perms && !ISSET(status, VALIDATE_OK))); } -/* - * SIGCHLD sig handler--wait for children as they die. - */ -RETSIGTYPE -reapchild(sig) - int sig; -{ - int status, serrno = errno; -#ifdef sudo_waitpid - pid_t pid; - - do { - pid = sudo_waitpid(-1, &status, WNOHANG); - } while (pid != 0 && (pid != -1 || errno == EINTR)); -#else - (void) wait(&status); -#endif - errno = serrno; -} +#define LL_TTY_STR "TTY=" +#define LL_CWD_STR "PWD=" /* XXX - should be CWD= */ +#define LL_USER_STR "USER=" +#define LL_GROUP_STR "GROUP=" +#define LL_ENV_STR "ENV=" +#define LL_CMND_STR "COMMAND=" +#define LL_TSID_STR "TSID=" /* - * Return an ascii string with the current date + time - * Uses strftime() if available, else falls back to ctime(). + * Allocate and fill in a new logline. */ static char * -get_timestr() +new_logline(message, serrno) + const char *message; + int serrno; { - char *s; - time_t now = time((time_t) 0); -#ifdef HAVE_STRFTIME - static char buf[128]; - struct tm *timeptr; - - timeptr = localtime(&now); - if (def_log_year) - s = "%h %e %T %Y"; - else - s = "%h %e %T"; + size_t len = 0; + char *evstr = NULL; + char *errstr = NULL; + char *line; - /* strftime() does not guarantee to NUL-terminate so we must check. */ - buf[sizeof(buf) - 1] = '\0'; - if (strftime(buf, sizeof(buf), s, timeptr) && buf[sizeof(buf) - 1] == '\0') - return(buf); + /* + * Compute line length + */ + if (message != NULL) + len += strlen(message) + 3; + if (serrno) { + errstr = strerror(serrno); + len += strlen(errstr) + 3; + } + len += sizeof(LL_TTY_STR) + 2 + strlen(user_tty); + len += sizeof(LL_CWD_STR) + 2 + strlen(user_cwd); + if (runas_pw != NULL) + len += sizeof(LL_USER_STR) + 2 + strlen(runas_pw->pw_name); + if (runas_gr != NULL) + len += sizeof(LL_GROUP_STR) + 2 + strlen(runas_gr->gr_name); + if (sudo_user.sessid[0] != '\0') + len += sizeof(LL_TSID_STR) + 2 + strlen(sudo_user.sessid); + if (sudo_user.env_vars != NULL) { + size_t evlen = 0; + struct list_member *cur; + for (cur = sudo_user.env_vars; cur != NULL; cur = cur->next) + evlen += strlen(cur->value) + 1; + evstr = emalloc(evlen); + evstr[0] = '\0'; + for (cur = sudo_user.env_vars; cur != NULL; cur = cur->next) { + strlcat(evstr, cur->value, evlen); + strlcat(evstr, " ", evlen); /* NOTE: last one will fail */ + } + len += sizeof(LL_ENV_STR) + 2 + evlen; + } + len += sizeof(LL_CMND_STR) - 1 + strlen(user_cmnd); + if (user_args != NULL) + len += strlen(user_args) + 1; -#endif /* HAVE_STRFTIME */ + /* + * Allocate and build up the line. + */ + line = emalloc(++len); + line[0] = '\0'; - s = ctime(&now) + 4; /* skip day of the week */ - if (def_log_year) - s[20] = '\0'; /* avoid the newline */ - else - s[15] = '\0'; /* don't care about year */ + if (message != NULL) { + if (strlcat(line, message, len) >= len || + strlcat(line, errstr ? " : " : " ; ", len) >= len) + goto toobig; + } + if (serrno) { + if (strlcat(line, errstr, len) >= len || + strlcat(line, " ; ", len) >= len) + goto toobig; + } + if (strlcat(line, LL_TTY_STR, len) >= len || + strlcat(line, user_tty, len) >= len || + strlcat(line, " ; ", len) >= len) + goto toobig; + if (strlcat(line, LL_CWD_STR, len) >= len || + strlcat(line, user_cwd, len) >= len || + strlcat(line, " ; ", len) >= len) + goto toobig; + if (runas_pw != NULL) { + if (strlcat(line, LL_USER_STR, len) >= len || + strlcat(line, runas_pw->pw_name, len) >= len || + strlcat(line, " ; ", len) >= len) + goto toobig; + } + if (runas_gr != NULL) { + if (strlcat(line, LL_GROUP_STR, len) >= len || + strlcat(line, runas_gr->gr_name, len) >= len || + strlcat(line, " ; ", len) >= len) + goto toobig; + } + if (sudo_user.sessid[0] != '\0') { + if (strlcat(line, LL_TSID_STR, len) >= len || + strlcat(line, sudo_user.sessid, len) >= len || + strlcat(line, " ; ", len) >= len) + goto toobig; + } + if (evstr != NULL) { + if (strlcat(line, LL_ENV_STR, len) >= len || + strlcat(line, evstr, len) >= len || + strlcat(line, " ; ", len) >= len) + goto toobig; + efree(evstr); + } + if (strlcat(line, LL_CMND_STR, len) >= len || + strlcat(line, user_cmnd, len) >= len) + goto toobig; + if (user_args != NULL) { + if (strlcat(line, " ", len) >= len || + strlcat(line, user_args, len) >= len) + goto toobig; + } - return(s); + return (line); +toobig: + errorx(1, "internal error: insufficient space for log line"); }