tor

commit 35e221688b2636c405332bc6140d6e5cc483b0bf
parent d456885dac3b5bdfff663ed502fd11f9e0d0e070
Author: David Goulet <dgoulet@torproject.org>
Date:   Tue, 10 Jan 2023 11:15:32 -0500

Merge branch 'tor-gitlab/mr/675' into maint-0.4.7

Diffstat:
A
changes/ticket40729
 | 
3
+++
M
src/app/main/main.c
 | 
9
+++++++--

2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/changes/ticket40729 b/changes/ticket40729
@@ -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.
diff --git a/src/app/main/main.c b/src/app/main/main.c
@@ -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))