mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-22 18:08:23 +00:00
Code Issues Releases Wiki Activity

We cannot reuse last_time for the I/O log info file now that it is

Browse Source 
a monotonic timer.  Just call time(3) in write_info_log() directly.
This commit is contained in:
Todd C. Miller 2018-08-23 13:50:00 -06:00
parent 59e5e379be
commit 0d36ea9325
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
plugins/sudoers/iolog.c
View File

@ -778,12 +778,13 @@ iolog_deserialize_info(struct iolog_details *details, char * const user_info[],
*/ */
static bool static bool
write_info_log(char *pathbuf, size_t len, struct iolog_details *details, write_info_log(char *pathbuf, size_t len, struct iolog_details *details,
char * const argv[], struct timespec *now) char * const argv[])
{ {
time_t now;
char * const *av; char * const *av;
FILE *fp; FILE *fp;
int fd; int fd;
bool ret; bool ret = true;
debug_decl(write_info_log, SUDOERS_DEBUG_UTIL) debug_decl(write_info_log, SUDOERS_DEBUG_UTIL)
pathbuf[len] = '\0'; pathbuf[len] = '\0';
@ -799,7 +800,7 @@ write_info_log(char *pathbuf, size_t len, struct iolog_details *details,
(int)iolog_uid, (int)iolog_gid, pathbuf); (int)iolog_uid, (int)iolog_gid, pathbuf);
} }
fprintf(fp, "%lld:%s:%s:%s:%s:%d:%d\n%s\n%s", (long long)now->tv_sec, fprintf(fp, "%lld:%s:%s:%s:%s:%d:%d\n%s\n%s", (long long)time(&now),
details->user ? details->user : "unknown", details->runas_pw->pw_name, details->user ? details->user : "unknown", details->runas_pw->pw_name,
details->runas_gr ? details->runas_gr->gr_name : "", details->runas_gr ? details->runas_gr->gr_name : "",
details->tty ? details->tty : "unknown", details->lines, details->cols, details->tty ? details->tty : "unknown", details->lines, details->cols,
@ -811,8 +812,12 @@ write_info_log(char *pathbuf, size_t len, struct iolog_details *details,
} }
fputc('\n', fp); fputc('\n', fp);
fflush(fp); fflush(fp);
if (ferror(fp)) {
ret = !ferror(fp); log_warning(SLOG_SEND_MAIL,
N_("unable to write to I/O log file: %s"), strerror(errno));
warned = true;
ret = false;
}
fclose(fp); fclose(fp);
debug_return_bool(ret); debug_return_bool(ret);
} }
@ -951,12 +956,8 @@ sudoers_io_open(unsigned int version, sudo_conv_t conversation,
goto done; goto done;
/* Write log file with user and command details. */ /* Write log file with user and command details. */
if (sudo_gettime_awake(&last_time) == -1) { if (!write_info_log(pathbuf, len, &iolog_details, argv))
sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_ERRNO,
"%s: unable to get time of day", __func__);
goto done; goto done;
}
write_info_log(pathbuf, len, &iolog_details, argv, &last_time);
/* Create the timing and I/O log files. */ /* Create the timing and I/O log files. */
for (i = 0; i < IOFD_MAX; i++) { for (i = 0; i < IOFD_MAX; i++) {
@ -978,6 +979,12 @@ sudoers_io_open(unsigned int version, sudo_conv_t conversation,
if (!io_log_files[IOFD_TTYOUT].enabled) if (!io_log_files[IOFD_TTYOUT].enabled)
sudoers_io.log_ttyout = NULL; sudoers_io.log_ttyout = NULL;
if (sudo_gettime_awake(&last_time) == -1) {
sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_ERRNO,
"%s: unable to get time of day", __func__);
goto done;
}
ret = true; ret = true;
done: done: