diff options
author | Steven Engler <opara@cs.georgetown.edu> | 2021-06-28 13:35:11 -0400 |
---|---|---|
committer | Steven Engler <opara@cs.georgetown.edu> | 2021-06-28 13:51:06 -0400 |
commit | f944e463995fa2e4c04e6d732ec77e66bb1a6f8a (patch) | |
tree | 05166ee704575ce6ab648ad9de034d30ced9fe05 /src/feature/hs | |
parent | 2b97c1dd341f71e6237c97ee73e0f02b7dc6d805 (diff) | |
download | tor-f944e463995fa2e4c04e6d732ec77e66bb1a6f8a.tar.gz tor-f944e463995fa2e4c04e6d732ec77e66bb1a6f8a.zip |
If TestingTorNetwork, skip perm check on the hs directory
Diffstat (limited to 'src/feature/hs')
-rw-r--r-- | src/feature/hs/hs_config.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/feature/hs/hs_config.c b/src/feature/hs/hs_config.c index 68ed932701..f9f71c78f2 100644 --- a/src/feature/hs/hs_config.c +++ b/src/feature/hs/hs_config.c @@ -544,15 +544,19 @@ config_service(config_line_t *line, const or_options_t *options, tor_assert(service->config.version <= HS_VERSION_MAX); - /* Check permission on service directory that was just parsed. And this must - * be done regardless of the service version. Do not ask for the directory - * to be created, this is done when the keys are loaded because we could be - * in validation mode right now. */ - if (hs_check_service_private_dir(options->User, - service->config.directory_path, - service->config.dir_group_readable, - 0) < 0) { - goto err; + /* If we're running with TestingTorNetwork enabled, we relax the permissions + * check on the hs directory. */ + if (!options->TestingTorNetwork) { + /* Check permission on service directory that was just parsed. And this + * must be done regardless of the service version. Do not ask for the + * directory to be created, this is done when the keys are loaded because + * we could be in validation mode right now. */ + if (hs_check_service_private_dir(options->User, + service->config.directory_path, + service->config.dir_group_readable, + 0) < 0) { + goto err; + } } /* We'll try to learn the service version here by loading the key(s) if |