nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 21:44:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Also check if the sandbox is configured as well as if it's active; sandbox_init() runs rather late in the startup process

Browse Source
This commit is contained in:
Andrea Shepard 2016-06-30 09:37:23 +00:00
parent 34d9dabed1
commit 13a16e0011
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/or/routerparse.c
View File

@ -1073,7 +1073,11 @@ dump_desc(const char *desc, const char *type)
DESC_DUMP_BASE_FILENAME ".%s", digest_sha256_hex); DESC_DUMP_BASE_FILENAME ".%s", digest_sha256_hex);
debugfile = get_datadir_fname2(DESC_DUMP_DATADIR_SUBDIR, debugfile_base); debugfile = get_datadir_fname2(DESC_DUMP_DATADIR_SUBDIR, debugfile_base);
if (!sandbox_is_active()) { /*
* Check if the sandbox is active or will become active; see comment
* below at the log message for why.
*/
if (!(sandbox_is_active() || get_options()->Sandbox)) {
if (len <= get_options()->MaxUnparseableDescSizeToLog) { if (len <= get_options()->MaxUnparseableDescSizeToLog) {
if (!dump_desc_fifo_bump_hash(digest_sha256)) { if (!dump_desc_fifo_bump_hash(digest_sha256)) {
/* Create the directory if needed */ /* Create the directory if needed */
@ -1128,7 +1132,7 @@ dump_desc(const char *desc, const char *type)
log_info(LD_DIR, log_info(LD_DIR,
"Unable to parse descriptor of type %s with hash %s and " "Unable to parse descriptor of type %s with hash %s and "
"length %lu. Descriptor not dumped because the sandbox is " "length %lu. Descriptor not dumped because the sandbox is "
"active", "configured",
type, digest_sha256_hex, (unsigned long)len); type, digest_sha256_hex, (unsigned long)len);
} }
@ -6001,7 +6005,12 @@ rend_parse_client_keys(strmap_t *parsed_clients, const char *ckstr)
void void
routerparse_init(void) routerparse_init(void)
{ {
if (!(sandbox_is_active())) { /*
* Check both if the sandbox is active and whether it's configured; no
* point in loading all that if we won't be able to use it after the
* sandbox becomes active.
*/
if (!(sandbox_is_active() || get_options()->Sandbox)) {
dump_desc_init(); dump_desc_init();
} }
} }