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

iolog_pwfilt_run: apply regex on ttyout even if we disabled filtering.

Browse Source 
The heuristic used to decide when to disable filtering is when we
see another ttyout buffer or find a cr or nl in the ttyin buffer.
However, we should also check the buffer that caused us to disable
filtering for a matching regex that would re-enable filtering.
Programs that prompt for a password twice might otherwise not have
the second password filtered.
This commit is contained in:
Todd C. Miller 2022-02-18 09:14:35 -07:00
parent 9f5615e5b1
commit b19bd98531
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/iolog/iolog_filter.c
View File

@ -193,10 +193,8 @@ iolog_pwfilt_run(void *vhandle, int event, const char *buf,
switch (event) { switch (event) {
case IO_EVENT_TTYOUT: case IO_EVENT_TTYOUT:
/* If filtering passwords and we receive output, disable it. */ /* If filtering passwords and we receive output, disable it. */
if (handle->is_filtered) { if (handle->is_filtered)
handle->is_filtered = false; handle->is_filtered = false;
break;
}
/* Make a copy of buf that is NUL-terminated. */ /* Make a copy of buf that is NUL-terminated. */
copy = malloc(len + 1); copy = malloc(len + 1);
@ -222,8 +220,10 @@ iolog_pwfilt_run(void *vhandle, int event, const char *buf,
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
/* We will stop filtering after reaching cr/nl. */ /* We will stop filtering after reaching cr/nl. */
if (buf[i] == '\r' || buf[i] == '\n') if (buf[i] == '\r' || buf[i] == '\n') {
handle->is_filtered = false;
break; break;
}
} }
if (i != 0) { if (i != 0) {
/* Filtered, replace buffer with '*' chars. */ /* Filtered, replace buffer with '*' chars. */
@ -237,7 +237,6 @@ iolog_pwfilt_run(void *vhandle, int event, const char *buf,
if (i != len) { if (i != len) {
/* Done filtering, copy cr/nl and subsequent characters. */ /* Done filtering, copy cr/nl and subsequent characters. */
memcpy(copy + i, buf + i, len - i); memcpy(copy + i, buf + i, len - i);
handle->is_filtered = false;
} }
*newbuf = copy; *newbuf = copy;
} }