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

Initialize the debug subsystem in sudoers early. Currently this

Browse Source 
means iterating over the settings list twice.
This commit is contained in:
Todd C. Miller
2014-10-24 12:50:12 -06:00
parent fd8cf2c89b
commit 34d9cfe1cf
2 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/sudoers/iolog.c
View File

@@ -590,9 +590,7 @@ sudoers_io_open(unsigned int version, sudo_conv_t conversation,
sudo_setpwent(); sudo_setpwent();
sudo_setgrent(); sudo_setgrent();
/* /* Initialize the debug subsystem. */
* Check for debug flags in settings list.
*/
for (cur = settings; *cur != NULL; cur++) { for (cur = settings; *cur != NULL; cur++) {
if (strncmp(*cur, "debug_flags=", sizeof("debug_flags=") - 1) == 0) { if (strncmp(*cur, "debug_flags=", sizeof("debug_flags=") - 1) == 0) {
sudoers_debug_parse_flags(&debug_files, sudoers_debug_parse_flags(&debug_files,

31
plugins/sudoers/policy.c
View File

@@ -90,8 +90,6 @@ sudoers_policy_deserialize_info(void *v, char **runas_user, char **runas_group)
char * const *cur; char * const *cur;
const char *p, *errstr, *groups = NULL; const char *p, *errstr, *groups = NULL;
const char *remhost = NULL; const char *remhost = NULL;
const char *plugin_path = NULL;
struct sudo_conf_debug_file_list debug_files = TAILQ_HEAD_INITIALIZER(debug_files);
int flags = 0; int flags = 0;
debug_decl(sudoers_policy_deserialize_info, SUDOERS_DEBUG_PLUGIN, sudoers_debug_instance) debug_decl(sudoers_policy_deserialize_info, SUDOERS_DEBUG_PLUGIN, sudoers_debug_instance)
@@ -155,11 +153,6 @@ sudoers_policy_deserialize_info(void *v, char **runas_user, char **runas_group)
} }
continue; continue;
} }
if (MATCHES(*cur, "debug_flags=")) {
sudoers_debug_parse_flags(&debug_files,
*cur + sizeof("debug_flags=") - 1);
continue;
}
if (MATCHES(*cur, "runas_user=")) { if (MATCHES(*cur, "runas_user=")) {
*runas_user = *cur + sizeof("runas_user=") - 1; *runas_user = *cur + sizeof("runas_user=") - 1;
sudo_user.flags |= RUNAS_USER_SPECIFIED; sudo_user.flags |= RUNAS_USER_SPECIFIED;
@@ -276,10 +269,6 @@ sudoers_policy_deserialize_info(void *v, char **runas_user, char **runas_group)
remhost = *cur + sizeof("remote_host=") - 1; remhost = *cur + sizeof("remote_host=") - 1;
continue; continue;
} }
if (MATCHES(*cur, "plugin_path=")) {
plugin_path = *cur + sizeof("plugin_path=") - 1;
continue;
}
} }
for (cur = info->user_info; *cur != NULL; cur++) { for (cur = info->user_info; *cur != NULL; cur++) {
@@ -374,9 +363,6 @@ sudoers_policy_deserialize_info(void *v, char **runas_user, char **runas_group)
user_umask = umask(SUDO_UMASK); user_umask = umask(SUDO_UMASK);
umask(user_umask); umask(user_umask);
/* Setup debugging if indicated. (XXX - do earlier) */
sudoers_debug_register(&debug_files, plugin_path);
/* Dump settings and user info (XXX - plugin args) */ /* Dump settings and user info (XXX - plugin args) */
for (cur = info->settings; *cur != NULL; cur++) for (cur = info->settings; *cur != NULL; cur++)
sudo_debug_printf(SUDO_DEBUG_INFO, "settings: %s", *cur); sudo_debug_printf(SUDO_DEBUG_INFO, "settings: %s", *cur);
@@ -537,7 +523,10 @@ sudoers_policy_open(unsigned int version, sudo_conv_t conversation,
sudo_printf_t plugin_printf, char * const settings[], sudo_printf_t plugin_printf, char * const settings[],
char * const user_info[], char * const envp[], char * const args[]) char * const user_info[], char * const envp[], char * const args[])
{ {
struct sudo_conf_debug_file_list debug_files = TAILQ_HEAD_INITIALIZER(debug_files);
struct sudoers_policy_open_info info; struct sudoers_policy_open_info info;
const char *plugin_path = NULL;
char * const *cur;
debug_decl(sudoers_policy_open, SUDOERS_DEBUG_PLUGIN, sudoers_debug_instance) debug_decl(sudoers_policy_open, SUDOERS_DEBUG_PLUGIN, sudoers_debug_instance)
sudo_version = version; sudo_version = version;
@@ -548,6 +537,20 @@ sudoers_policy_open(unsigned int version, sudo_conv_t conversation,
if (sudo_version < SUDO_API_MKVERSION(1, 2)) if (sudo_version < SUDO_API_MKVERSION(1, 2))
args = NULL; args = NULL;
/* Initialize the debug subsystem. */
for (cur = settings; *cur != NULL; cur++) {
if (strncmp(*cur, "debug_flags=", sizeof("debug_flags=") - 1) == 0) {
sudoers_debug_parse_flags(&debug_files,
*cur + sizeof("debug_flags=") - 1);
continue;
}
if (strncmp(*cur, "plugin_path=", sizeof("plugin_path=") - 1) == 0) {
plugin_path = *cur + sizeof("plugin_path=") - 1;
continue;
}
}
sudoers_debug_register(&debug_files, plugin_path);
/* Call the sudoers init function. */ /* Call the sudoers init function. */
info.settings = settings; info.settings = settings;
info.user_info = user_info; info.user_info = user_info;