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

Merge remote-tracking branch 'tor-gitlab/mr/405'

Browse Source
This commit is contained in:
Nick Mathewson 2021-07-01 09:56:35 -04:00
commit e71db3a4be
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/issue40338 Normal file
View File

@ -0,0 +1,3 @@
o Minor features (testing configuration):
- When TestingTorNetwork is enabled, skip the permission check on
the hidden service directory. Closes ticket 40338.

22
src/feature/hs/hs_config.c
View File

@ -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