summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-09-02 09:59:50 -0400
committerNick Mathewson <nickm@torproject.org>2015-09-02 09:59:50 -0400
commitf6bd8fbb806abaf4015d8b8e08a737bc09ec63f6 (patch)
treec5330b0f462876f4389a901b846edadf3cefbf65 /src
parent910e25358a148268815a23ff2040599291100a97 (diff)
downloadtor-f6bd8fbb806abaf4015d8b8e08a737bc09ec63f6.tar.gz
tor-f6bd8fbb806abaf4015d8b8e08a737bc09ec63f6.zip
Let recent relays run with the chutney sandbox.
Fixes 16965
Diffstat (limited to 'src')
-rw-r--r--src/or/main.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/or/main.c b/src/or/main.c
index 915b3e23ca..5dca9bce1d 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -3034,6 +3034,7 @@ sandbox_init_filter(void)
OPEN_DATADIR_SUFFIX("state", ".tmp");
OPEN_DATADIR_SUFFIX("unparseable-desc", ".tmp");
OPEN_DATADIR_SUFFIX("v3-status-votes", ".tmp");
+ OPEN_DATADIR("key-pinning-journal");
OPEN("/dev/srandom");
OPEN("/dev/urandom");
OPEN("/dev/random");
@@ -3157,6 +3158,13 @@ sandbox_init_filter(void)
OPEN_DATADIR2("keys", "secret_onion_key.old");
OPEN_DATADIR2("keys", "secret_onion_key_ntor.old");
+ OPEN_DATADIR2_SUFFIX("keys", "ed25519_master_id_secret_key", ".tmp");
+ OPEN_DATADIR2_SUFFIX("keys", "ed25519_master_id_secret_key_encrypted",
+ ".tmp");
+ OPEN_DATADIR2_SUFFIX("keys", "ed25519_master_id_public_key", ".tmp");
+ OPEN_DATADIR2_SUFFIX("keys", "ed25519_signing_secret_key", ".tmp");
+ OPEN_DATADIR2_SUFFIX("keys", "ed25519_signing_cert", ".tmp");
+
OPEN_DATADIR2_SUFFIX("stats", "bridge-stats", ".tmp");
OPEN_DATADIR2_SUFFIX("stats", "dirreq-stats", ".tmp");
@@ -3187,6 +3195,12 @@ sandbox_init_filter(void)
RENAME_SUFFIX("hashed-fingerprint", ".tmp");
RENAME_SUFFIX("router-stability", ".tmp");
+ RENAME_SUFFIX2("keys", "ed25519_master_id_secret_key", ".tmp");
+ RENAME_SUFFIX2("keys", "ed25519_master_id_secret_key_encrypted", ".tmp");
+ RENAME_SUFFIX2("keys", "ed25519_master_id_public_key", ".tmp");
+ RENAME_SUFFIX2("keys", "ed25519_signing_secret_key", ".tmp");
+ RENAME_SUFFIX2("keys", "ed25519_signing_cert", ".tmp");
+
sandbox_cfg_allow_rename(&cfg,
get_datadir_fname2("keys", "secret_onion_key"),
get_datadir_fname2("keys", "secret_onion_key.old"));