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

Store raw sudoers lines in the debug log.

Browse Source 
Also add a "sudoerslex" prefix to the token debug info in
sudoers_trace_print().
This commit is contained in:
Todd C. Miller
2022-11-01 09:32:14 -06:00
parent 966731311d
commit d242261dd4
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/sudoers/toke.c
View File

@@ -5916,7 +5916,7 @@ sudoers_trace_print(const char *msg)
{ {
/* We already parsed the newline so sudolineno is off by one. */ /* We already parsed the newline so sudolineno is off by one. */
sudo_debug_printf2(NULL, NULL, 0, SUDOERS_DEBUG_PARSER|SUDO_DEBUG_DEBUG, sudo_debug_printf2(NULL, NULL, 0, SUDOERS_DEBUG_PARSER|SUDO_DEBUG_DEBUG,
"%s:%d: %s", sudoers, sudolineno - 1, trace_lbuf.buf); "sudoerslex: %s:%d: %s", sudoers, sudolineno - 1, trace_lbuf.buf);
trace_lbuf.len = 0; trace_lbuf.len = 0;
} }
return 0; return 0;
@@ -5934,6 +5934,7 @@ sudoers_input(char *buf, yy_size_t max_size)
{ {
char *cp; char *cp;
size_t avail = sudolinebuf.len - sudolinebuf.off; size_t avail = sudolinebuf.len - sudolinebuf.off;
debug_decl(sudoers_input, SUDOERS_DEBUG_PARSER);
/* Refill line buffer if needed. */ /* Refill line buffer if needed. */
if (avail == 0) { if (avail == 0) {
@@ -5978,6 +5979,9 @@ sudoers_eof:
sudolinebuf.buf[avail] = '\0'; sudolinebuf.buf[avail] = '\0';
} }
sudo_debug_printf(SUDO_DEBUG_DEBUG, "%s:%d: %.*s", sudoers, sudolineno,
(int)(avail -1), sudolinebuf.buf);
sudolinebuf.len = avail; sudolinebuf.len = avail;
sudolinebuf.off = 0; sudolinebuf.off = 0;
sudolinebuf.toke_start = sudolinebuf.toke_end = 0; sudolinebuf.toke_start = sudolinebuf.toke_end = 0;
@@ -5988,6 +5992,6 @@ sudoers_eof:
memcpy(buf, sudolinebuf.buf + sudolinebuf.off, avail); memcpy(buf, sudolinebuf.buf + sudolinebuf.off, avail);
sudolinebuf.off += avail; sudolinebuf.off += avail;
return avail; debug_return_size_t(avail);
} }

8
plugins/sudoers/toke.l
View File

@@ -1369,7 +1369,7 @@ sudoers_trace_print(const char *msg)
{ {
/* We already parsed the newline so sudolineno is off by one. */ /* We already parsed the newline so sudolineno is off by one. */
sudo_debug_printf2(NULL, NULL, 0, SUDOERS_DEBUG_PARSER|SUDO_DEBUG_DEBUG, sudo_debug_printf2(NULL, NULL, 0, SUDOERS_DEBUG_PARSER|SUDO_DEBUG_DEBUG,
"%s:%d: %s", sudoers, sudolineno - 1, trace_lbuf.buf); "sudoerslex: %s:%d: %s", sudoers, sudolineno - 1, trace_lbuf.buf);
trace_lbuf.len = 0; trace_lbuf.len = 0;
} }
return 0; return 0;
@@ -1387,6 +1387,7 @@ sudoers_input(char *buf, yy_size_t max_size)
{ {
char *cp; char *cp;
size_t avail = sudolinebuf.len - sudolinebuf.off; size_t avail = sudolinebuf.len - sudolinebuf.off;
debug_decl(sudoers_input, SUDOERS_DEBUG_PARSER);
/* Refill line buffer if needed. */ /* Refill line buffer if needed. */
if (avail == 0) { if (avail == 0) {
@@ -1431,6 +1432,9 @@ sudoers_eof:
sudolinebuf.buf[avail] = '\0'; sudolinebuf.buf[avail] = '\0';
} }
sudo_debug_printf(SUDO_DEBUG_DEBUG, "%s:%d: %.*s", sudoers, sudolineno,
(int)(avail -1), sudolinebuf.buf);
sudolinebuf.len = avail; sudolinebuf.len = avail;
sudolinebuf.off = 0; sudolinebuf.off = 0;
sudolinebuf.toke_start = sudolinebuf.toke_end = 0; sudolinebuf.toke_start = sudolinebuf.toke_end = 0;
@@ -1441,5 +1445,5 @@ sudoers_eof:
memcpy(buf, sudolinebuf.buf + sudolinebuf.off, avail); memcpy(buf, sudolinebuf.buf + sudolinebuf.off, avail);
sudolinebuf.off += avail; sudolinebuf.off += avail;
return avail; debug_return_size_t(avail);
} }