isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Log the short version of the tty in sudoers-format logs.

Browse Source 
This is consistent with historical practice.
This commit is contained in:
Todd C. Miller
2020-10-26 16:10:40 -06:00
parent 4416bd5977
commit 39b540ff33
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/eventlog/eventlog.c
View File

@@ -87,8 +87,8 @@ new_logline(int flags, const char *message, const char *errstr,
{ {
char *line = NULL, *evstr = NULL; char *line = NULL, *evstr = NULL;
const char *iolog_file = details->iolog_file; const char *iolog_file = details->iolog_file;
const char *tty, *tsid = NULL;
char sessid[7]; char sessid[7];
const char *tsid = NULL;
size_t len = 0; size_t len = 0;
int i; int i;
debug_decl(new_logline, SUDO_DEBUG_UTIL); debug_decl(new_logline, SUDO_DEBUG_UTIL);
@@ -120,6 +120,12 @@ new_logline(int flags, const char *message, const char *errstr,
} }
} }
/* Sudo-format logs use the short form of the ttyname. */
if ((tty = details->ttyname) != NULL) {
if (strncmp(tty, _PATH_DEV, sizeof(_PATH_DEV) - 1) == 0)
tty += sizeof(_PATH_DEV) - 1;
}
/* /*
* Compute line length * Compute line length
*/ */
@@ -129,8 +135,8 @@ new_logline(int flags, const char *message, const char *errstr,
len += strlen(errstr) + 3; len += strlen(errstr) + 3;
if (details->submithost != NULL && !evl_conf.omit_hostname) if (details->submithost != NULL && !evl_conf.omit_hostname)
len += sizeof(LL_HOST_STR) + 2 + strlen(details->submithost); len += sizeof(LL_HOST_STR) + 2 + strlen(details->submithost);
if (details->ttyname != NULL) if (tty != NULL)
len += sizeof(LL_TTY_STR) + 2 + strlen(details->ttyname); len += sizeof(LL_TTY_STR) + 2 + strlen(tty);
if (details->runchroot != NULL) if (details->runchroot != NULL)
len += sizeof(LL_CHROOT_STR) + 2 + strlen(details->runchroot); len += sizeof(LL_CHROOT_STR) + 2 + strlen(details->runchroot);
if (details->runcwd != NULL) if (details->runcwd != NULL)
@@ -190,9 +196,9 @@ new_logline(int flags, const char *message, const char *errstr,
strlcat(line, " ; ", len) >= len) strlcat(line, " ; ", len) >= len)
goto toobig; goto toobig;
} }
if (details->ttyname != NULL) { if (tty != NULL) {
if (strlcat(line, LL_TTY_STR, len) >= len || if (strlcat(line, LL_TTY_STR, len) >= len ||
strlcat(line, details->ttyname, len) >= len || strlcat(line, tty, len) >= len ||
strlcat(line, " ; ", len) >= len) strlcat(line, " ; ", len) >= len)
goto toobig; goto toobig;
} }

3
plugins/sudoers/logging.c
View File

@@ -490,8 +490,7 @@ sudoers_to_eventlog(struct eventlog *evlog)
evlog->submithost = user_host; evlog->submithost = user_host;
evlog->submituser = user_name; evlog->submituser = user_name;
/* TODO - submitgroup */ /* TODO - submitgroup */
/* XXX - use ttypath for JSON logs */ evlog->ttyname = user_ttypath;
evlog->ttyname = user_tty;
evlog->argv = NewArgv; evlog->argv = NewArgv;
evlog->env_add = (char **)sudo_user.env_vars; evlog->env_add = (char **)sudo_user.env_vars;
evlog->envp = env_get(); evlog->envp = env_get();