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

On SIGHUP, deregister the old debug instance before registering a new one.

Browse Source 
Otherwise, if debugging is enabled we will get an extra log instance
each time sudo_logsrvd reeives SIGHUP which results in duplicate
lines in the debug log.
This commit is contained in:
Todd C. Miller
2020-11-10 19:36:55 -07:00
parent 72df19088b
commit deb217adf9
3 changed files with 91 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
lib/util/sudo_conf.c
View File

@@ -99,7 +99,27 @@ static struct sudo_conf_table sudo_conf_var_table[] = {
#define SUDO_CONF_PATH_PLUGIN_DIR 3
#define SUDO_CONF_PATH_DEVSEARCH 4
#define SUDO_CONF_DATA_INITIALIZER { \
false, \
false, \
true, \
true, \
GROUP_SOURCE_ADAPTIVE, \
-1, \
TAILQ_HEAD_INITIALIZER(sudo_conf_data.debugging), \
TAILQ_HEAD_INITIALIZER(sudo_conf_data.plugins), \
{ \
{ "askpass", sizeof("askpass") - 1, false, _PATH_SUDO_ASKPASS }, \
{ "sesh", sizeof("sesh") - 1, false, _PATH_SUDO_SESH }, \
{ "noexec", sizeof("noexec") - 1, false, _PATH_SUDO_NOEXEC }, \
{ "plugin_dir", sizeof("plugin_dir") - 1, false, _PATH_SUDO_PLUGIN_DIR }, \
{ "devsearch", sizeof("devsearch") - 1, false, _PATH_SUDO_DEVSEARCH }, \
{ NULL } \
} \
}
static struct sudo_conf_data {
bool updated;
bool developer_mode;
bool disable_coredump;
bool probe_interfaces;
@@ -108,23 +128,7 @@ static struct sudo_conf_data {
struct sudo_conf_debug_list debugging;
struct plugin_info_list plugins;
struct sudo_conf_path_table path_table[6];
} sudo_conf_data = {
false,
true,
true,
GROUP_SOURCE_ADAPTIVE,
-1,
TAILQ_HEAD_INITIALIZER(sudo_conf_data.debugging),
TAILQ_HEAD_INITIALIZER(sudo_conf_data.plugins),
{
{ "askpass", sizeof("askpass") - 1, false, _PATH_SUDO_ASKPASS },
{ "sesh", sizeof("sesh") - 1, false, _PATH_SUDO_SESH },
{ "noexec", sizeof("noexec") - 1, false, _PATH_SUDO_NOEXEC },
{ "plugin_dir", sizeof("plugin_dir") - 1, false, _PATH_SUDO_PLUGIN_DIR },
{ "devsearch", sizeof("devsearch") - 1, false, _PATH_SUDO_DEVSEARCH },
{ NULL }
}
};
} sudo_conf_data = SUDO_CONF_DATA_INITIALIZER;
/*
* "Set variable_name value"
@@ -554,7 +558,56 @@ sudo_conf_probe_interfaces_v1(void)
}
/*
* Reads in /etc/sudo.conf and populates sudo_conf_data.
* Free dynamically allocated parts of sudo_conf_data and
* reset to initial values.
*/
static void
sudo_conf_init(void)
{
struct sudo_conf_data sudo_conf_initial = SUDO_CONF_DATA_INITIALIZER;
struct sudo_conf_debug *debug_spec;
struct sudo_debug_file *debug_file;
struct plugin_info *plugin_info;
int i;
debug_decl(sudo_conf_init, SUDO_DEBUG_UTIL);
/* Free paths. */
sudo_conf_clear_paths();
/* Free debug settings. */
while ((debug_spec = TAILQ_FIRST(&sudo_conf_data.debugging))) {
TAILQ_REMOVE(&sudo_conf_data.debugging, debug_spec, entries);
free(debug_spec->progname);
while ((debug_file = TAILQ_FIRST(&debug_spec->debug_files))) {
TAILQ_REMOVE(&debug_spec->debug_files, debug_file, entries);
free(debug_file->debug_file);
free(debug_file->debug_flags);
free(debug_file);
}
free(debug_spec);
}
/* Free plugins. */
while ((plugin_info = TAILQ_FIRST(&sudo_conf_data.plugins))) {
TAILQ_REMOVE(&sudo_conf_data.plugins, plugin_info, entries);
free(plugin_info->symbol_name);
free(plugin_info->path);
if (plugin_info->options != NULL) {
for (i = 0; plugin_info->options[i] != NULL; i++)
free(plugin_info->options[i]);
free(plugin_info->options);
}
free(plugin_info);
}
/* Set to initial values. */
sudo_conf_data = sudo_conf_initial;
debug_return;
}
/*
* Read in /etc/sudo.conf and populates sudo_conf_data.
*/
int
sudo_conf_read_v1(const char *conf_file, int conf_types)
@@ -615,6 +668,10 @@ sudo_conf_read_v1(const char *conf_file, int conf_types)
goto done;
}
/* Reset to initial values if necessary. */
if (sudo_conf_data.updated)
sudo_conf_init();
while (sudo_parseln(&line, &linesize, &conf_lineno, fp, 0) != -1) {
struct sudo_conf_table *cur;
unsigned int i;
@@ -631,9 +688,16 @@ sudo_conf_read_v1(const char *conf_file, int conf_types)
while (isblank((unsigned char)*cp))
cp++;
ret = cur->parser(cp, conf_file, conf_lineno);
if (ret == -1)
switch (ret) {
case true:
sudo_conf_data.updated = true;
break;
case false:
break;
default:
goto done;
}
}
break;
}
}

1
lib/util/sudo_debug.c
View File

@@ -137,6 +137,7 @@ sudo_debug_free_output(struct sudo_debug_output *output)
/*
* Create a new output file for the specified debug instance.
* Returns NULL if the file cannot be opened or memory cannot be allocated.
* XXX - check for duplicates
*/
static struct sudo_debug_output *
sudo_debug_new_output(struct sudo_debug_instance *instance,

11
logsrvd/logsrvd.c
View File

@@ -82,6 +82,7 @@
/*
* Sudo I/O audit server.
*/
static int logsrvd_debug_instance = SUDO_DEBUG_INSTANCE_INITIALIZER;
TAILQ_HEAD(connection_list, connection_closure);
static struct connection_list connections = TAILQ_HEAD_INITIALIZER(connections);
static struct listener_list listeners = TAILQ_HEAD_INITIALIZER(listeners);
@@ -1773,10 +1774,12 @@ server_reload(struct sudo_event_base *base)
if (!server_setup(base))
sudo_fatalx("%s", U_("unable setup listen socket"));
/* Re-initialize debugging. */
/* Re-read sudo.conf and re-initialize debugging. */
sudo_debug_deregister(logsrvd_debug_instance);
logsrvd_debug_instance = SUDO_DEBUG_INSTANCE_INITIALIZER;
if (sudo_conf_read(NULL, SUDO_CONF_DEBUG) != -1) {
sudo_debug_register(getprogname(), NULL, NULL,
sudo_conf_debug_files(getprogname()));
logsrvd_debug_instance = sudo_debug_register(getprogname(),
NULL, NULL, sudo_conf_debug_files(getprogname()));
}
}
@@ -1962,7 +1965,7 @@ main(int argc, char *argv[])
/* Read sudo.conf and initialize the debug subsystem. */
if (sudo_conf_read(NULL, SUDO_CONF_DEBUG) == -1)
exit(EXIT_FAILURE);
sudo_debug_register(getprogname(), NULL, NULL,
logsrvd_debug_instance = sudo_debug_register(getprogname(), NULL, NULL,
sudo_conf_debug_files(getprogname()));
if (protobuf_c_version_number() < 1003000)