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

Don't hard-code path to logging/__init__.py or line numbers.

Browse Source 
Allows python plugin tests to success on versions other than 3.7.
This commit is contained in:
Todd C. Miller
2020-03-11 17:18:10 -06:00
parent 6c1b155fed
commit ec78f06890
4 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/python/regress/iohelpers.h
View File

@@ -27,6 +27,7 @@
#include <string.h> #include <string.h>
#include <stdarg.h> #include <stdarg.h>
#include <signal.h> #include <signal.h>
#include <ctype.h>
#include <pwd.h> #include <pwd.h>
#include <stdbool.h> #include <stdbool.h>

4
plugins/python/regress/testdata/check_example_debugging_c_calls@info.log vendored
View File

@@ -2,9 +2,9 @@ __init__ @ SRC_DIR/example_debugging.py:58 calls C function:
sudo.debug was called with arguments: (<DEBUG.ERROR: 2>, 'My demo purpose plugin shows this ERROR level debug message') sudo.debug was called with arguments: (<DEBUG.ERROR: 2>, 'My demo purpose plugin shows this ERROR level debug message')
__init__ @ SRC_DIR/example_debugging.py:63 calls C function: __init__ @ SRC_DIR/example_debugging.py:63 calls C function:
sudo.debug was called with arguments: (<DEBUG.INFO: 6>, 'My demo purpose plugin shows this INFO level debug message') sudo.debug was called with arguments: (<DEBUG.INFO: 6>, 'My demo purpose plugin shows this INFO level debug message')
handle @ /usr/lib/python3.7/logging/__init__.py:894 calls C function: handle @ logging/__init__.py calls C function:
LogHandler.emit was called with arguments: (<sudo.LogHandler <stderr> (NOTSET)>, <LogRecord: root, 40, SRC_DIR/example_debugging.py, 72, "Python log system shows this ERROR level debug message">) LogHandler.emit was called with arguments: (<sudo.LogHandler <stderr> (NOTSET)>, <LogRecord: root, 40, SRC_DIR/example_debugging.py, 72, "Python log system shows this ERROR level debug message">)
handle @ /usr/lib/python3.7/logging/__init__.py:894 calls C function: handle @ logging/__init__.py calls C function:
LogHandler.emit was called with arguments: (<sudo.LogHandler <stderr> (NOTSET)>, <LogRecord: root, 20, SRC_DIR/example_debugging.py, 73, "Python log system shows this INFO level debug message">) LogHandler.emit was called with arguments: (<sudo.LogHandler <stderr> (NOTSET)>, <LogRecord: root, 20, SRC_DIR/example_debugging.py, 73, "Python log system shows this INFO level debug message">)
__init__ @ SRC_DIR/example_debugging.py:85 calls C function: __init__ @ SRC_DIR/example_debugging.py:85 calls C function:
sudo.options_as_dict was called with arguments: (('ModulePath=SRC_DIR/example_debugging.py', 'ClassName=DebugDemoPlugin'),) sudo.options_as_dict was called with arguments: (('ModulePath=SRC_DIR/example_debugging.py', 'ClassName=DebugDemoPlugin'),)

4
plugins/python/regress/testdata/check_example_debugging_plugin@info.log vendored
View File

@@ -2,7 +2,7 @@ __init__ @ SRC_DIR/example_debugging.py:58 debugs:
My demo purpose plugin shows this ERROR level debug message My demo purpose plugin shows this ERROR level debug message
__init__ @ SRC_DIR/example_debugging.py:63 debugs: __init__ @ SRC_DIR/example_debugging.py:63 debugs:
My demo purpose plugin shows this INFO level debug message My demo purpose plugin shows this INFO level debug message
handle @ /usr/lib/python3.7/logging/__init__.py:894 debugs: handle @ logging/__init__.py debugs:
Python log system shows this ERROR level debug message Python log system shows this ERROR level debug message
handle @ /usr/lib/python3.7/logging/__init__.py:894 debugs: handle @ logging/__init__.py debugs:
Python log system shows this INFO level debug message Python log system shows this INFO level debug message

18
plugins/python/regress/testhelpers.c
View File

@@ -191,10 +191,26 @@ verify_log_lines(const char *reference_path)
char line[1024] = ""; char line[1024] = "";
char stored_str[MAX_OUTPUT] = ""; char stored_str[MAX_OUTPUT] = "";
while(fgets(line, sizeof(line), file) != NULL) { while(fgets(line, sizeof(line), file) != NULL) {
const char *line_data = strstr(line, "] "); // this skips the timestamp and pid at the beginning char *line_data = strstr(line, "] "); // this skips the timestamp and pid at the beginning
VERIFY_NOT_NULL(line_data); // malformed log line VERIFY_NOT_NULL(line_data); // malformed log line
line_data += 2; line_data += 2;
/* handle @ /usr/lib/python3.7/logging/__init__.py:894 ... */
if (strncmp(line_data, "handle @ /", sizeof("handle @ /") - 1) == 0) {
/* Remove python path and line number */
char *cp = line_data + sizeof("handle @ ") - 1;
char *ep = strstr(cp, "logging/");
if (ep != NULL) {
memmove(cp, ep, strlen(ep) + 1);
if ((cp = strstr(cp, "py:")) != NULL) {
cp += 2;
for (ep = cp + 1; isdigit((unsigned char)*ep); ep++)
continue;
memmove(cp, ep, strlen(ep) + 1);
}
}
}
char *line_end = strstr(line_data, " object at "); // this skips checking the pointer hex char *line_end = strstr(line_data, " object at "); // this skips checking the pointer hex
if (line_end) if (line_end)
sprintf(line_end, " object>\n"); sprintf(line_end, " object>\n");