nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.4.7'

Browse Source
This commit is contained in:
David Goulet 2023-01-10 11:15:36 -05:00
commit ce7476cb59
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/ticket40729 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (sandbox, authority):
- With the sandbox enabled, allow to write "my-consensus-{ns|microdesc}" and
to rename them as well. Fixes bug 40729; bugfix on 0.3.5.1-alpha.

9
src/app/main/main.c
View File

@ -924,8 +924,8 @@ sandbox_init_filter(void)
if (authdir_mode(options)) {
OPEN_DATADIR("approved-routers");
OPEN_CACHEDIR_SUFFIX("my-consensus-microdesc", ".tmp");
OPEN_CACHEDIR_SUFFIX("my-consensus-ns", ".tmp");
OPEN_DATADIR_SUFFIX("my-consensus-microdesc", ".tmp");
OPEN_DATADIR_SUFFIX("my-consensus-ns", ".tmp");
}
if (options->ServerDNSResolvConfFile)
@ -1004,6 +1004,11 @@ sandbox_init_filter(void)
if (options->BridgeAuthoritativeDir)
RENAME_SUFFIX("networkstatus-bridges", ".tmp");
if (authdir_mode(options)) {
RENAME_SUFFIX("my-consensus-microdesc", ".tmp");
RENAME_SUFFIX("my-consensus-ns", ".tmp");
}
#define STAT_DATADIR(name) \
sandbox_cfg_allow_stat_filename(&cfg, get_datadir_fname(name))