mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2025-02-26 15:42:34 +01:00
15490816da
When processing a %included folder, a bug caused the pointer to the last element of the options list to be set to NULL when processing a file with only comments or whitepace. This could cause options from other files on the same folder to be discarded depending on the lines after the affected %include.
176 lines
6 KiB
C
176 lines
6 KiB
C
/* Copyright (c) 2001 Matej Pfajfar.
|
|
* Copyright (c) 2001-2004, Roger Dingledine.
|
|
* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
|
|
* Copyright (c) 2007-2019, The Tor Project, Inc. */
|
|
/* See LICENSE for licensing information */
|
|
|
|
/**
|
|
* \file conffile.h
|
|
*
|
|
* \brief Read configuration files from disk, with full `%include` support.
|
|
**/
|
|
|
|
#include "lib/fs/conffile.h"
|
|
|
|
#include "lib/container/smartlist.h"
|
|
#include "lib/encoding/confline.h"
|
|
#include "lib/fs/dir.h"
|
|
#include "lib/fs/files.h"
|
|
#include "lib/fs/path.h"
|
|
#include "lib/log/log.h"
|
|
#include "lib/malloc/malloc.h"
|
|
#include "lib/string/printf.h"
|
|
|
|
static smartlist_t *config_get_file_list(const char *path,
|
|
smartlist_t *opened_files);
|
|
static int config_get_included_config(const char *path, int recursion_level,
|
|
int extended, config_line_t **config,
|
|
config_line_t **config_last,
|
|
smartlist_t *opened_lst);
|
|
static int config_process_include(const char *path, int recursion_level,
|
|
int extended, config_line_t **list,
|
|
config_line_t **list_last,
|
|
smartlist_t *opened_lst);
|
|
|
|
/** Helper: parse the config string and strdup into key/value
|
|
* strings. Set *result to the list, or NULL if parsing the string
|
|
* failed. Set *has_include to 1 if <b>result</b> has values from
|
|
* %included files. <b>opened_lst</b> will have a list of opened files if
|
|
* provided. Return 0 on success, -1 on failure. Warn and ignore any
|
|
* misformatted lines.
|
|
*
|
|
* If <b>extended</b> is set, then treat keys beginning with / and with + as
|
|
* indicating "clear" and "append" respectively. */
|
|
int
|
|
config_get_lines_include(const char *string, config_line_t **result,
|
|
int extended, int *has_include,
|
|
smartlist_t *opened_lst)
|
|
{
|
|
return config_get_lines_aux(string, result, extended, 1, has_include,
|
|
opened_lst, 1, NULL, config_process_include);
|
|
}
|
|
|
|
/** Adds a list of configuration files present on <b>path</b> to
|
|
* <b>file_list</b>. <b>path</b> can be a file or a directory. If it is a file,
|
|
* only that file will be added to <b>file_list</b>. If it is a directory,
|
|
* all paths for files on that directory root (no recursion) except for files
|
|
* whose name starts with a dot will be added to <b>file_list</b>.
|
|
* <b>opened_files</b> will have a list of files opened by this function
|
|
* if provided. Return 0 on success, -1 on failure. Ignores empty files.
|
|
*/
|
|
static smartlist_t *
|
|
config_get_file_list(const char *path, smartlist_t *opened_files)
|
|
{
|
|
smartlist_t *file_list = smartlist_new();
|
|
|
|
if (opened_files) {
|
|
smartlist_add_strdup(opened_files, path);
|
|
}
|
|
|
|
file_status_t file_type = file_status(path);
|
|
if (file_type == FN_FILE) {
|
|
smartlist_add_strdup(file_list, path);
|
|
return file_list;
|
|
} else if (file_type == FN_DIR) {
|
|
smartlist_t *all_files = tor_listdir(path);
|
|
if (!all_files) {
|
|
smartlist_free(file_list);
|
|
return NULL;
|
|
}
|
|
smartlist_sort_strings(all_files);
|
|
SMARTLIST_FOREACH_BEGIN(all_files, char *, f) {
|
|
if (f[0] == '.') {
|
|
tor_free(f);
|
|
continue;
|
|
}
|
|
|
|
char *fullname;
|
|
tor_asprintf(&fullname, "%s"PATH_SEPARATOR"%s", path, f);
|
|
tor_free(f);
|
|
|
|
if (opened_files) {
|
|
smartlist_add_strdup(opened_files, fullname);
|
|
}
|
|
|
|
if (file_status(fullname) != FN_FILE) {
|
|
tor_free(fullname);
|
|
continue;
|
|
}
|
|
smartlist_add(file_list, fullname);
|
|
} SMARTLIST_FOREACH_END(f);
|
|
smartlist_free(all_files);
|
|
return file_list;
|
|
} else if (file_type == FN_EMPTY) {
|
|
return file_list;
|
|
} else {
|
|
smartlist_free(file_list);
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
/** Creates a list of config lines present on included <b>path</b>.
|
|
* Set <b>config</b> to the list and <b>config_last</b> to the last element of
|
|
* <b>config</b>. <b>opened_lst</b> will have a list of opened files if
|
|
* provided. Return 0 on success, -1 on failure. */
|
|
static int
|
|
config_get_included_config(const char *path, int recursion_level, int extended,
|
|
config_line_t **config, config_line_t **config_last,
|
|
smartlist_t *opened_lst)
|
|
{
|
|
char *included_conf = read_file_to_str(path, 0, NULL);
|
|
if (!included_conf) {
|
|
return -1;
|
|
}
|
|
|
|
if (config_get_lines_aux(included_conf, config, extended, 1, NULL,
|
|
opened_lst, recursion_level+1, config_last,
|
|
config_process_include) < 0) {
|
|
tor_free(included_conf);
|
|
return -1;
|
|
}
|
|
|
|
tor_free(included_conf);
|
|
return 0;
|
|
}
|
|
|
|
/** Process an %include <b>path</b> in a config file. Set <b>list</b> to the
|
|
* list of configuration settings obtained and <b>list_last</b> to the last
|
|
* element of the same list. <b>opened_lst</b> will have a list of opened
|
|
* files if provided. Return 0 on success, -1 on failure. */
|
|
static int
|
|
config_process_include(const char *path, int recursion_level, int extended,
|
|
config_line_t **list, config_line_t **list_last,
|
|
smartlist_t *opened_lst)
|
|
{
|
|
config_line_t *ret_list = NULL;
|
|
config_line_t **next = &ret_list;
|
|
|
|
smartlist_t *config_files = config_get_file_list(path, opened_lst);
|
|
if (!config_files) {
|
|
return -1;
|
|
}
|
|
|
|
int rv = -1;
|
|
SMARTLIST_FOREACH_BEGIN(config_files, const char *, config_file) {
|
|
config_line_t *included_config = NULL;
|
|
config_line_t *included_config_last = NULL;
|
|
if (config_get_included_config(config_file, recursion_level, extended,
|
|
&included_config, &included_config_last,
|
|
opened_lst) < 0) {
|
|
goto done;
|
|
}
|
|
|
|
*next = included_config;
|
|
if (included_config_last) {
|
|
next = &included_config_last->next;
|
|
*list_last = included_config_last;
|
|
}
|
|
} SMARTLIST_FOREACH_END(config_file);
|
|
*list = ret_list;
|
|
rv = 0;
|
|
|
|
done:
|
|
SMARTLIST_FOREACH(config_files, char *, f, tor_free(f));
|
|
smartlist_free(config_files);
|
|
return rv;
|
|
}
|