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

hs-v3: Don't BUG() on directory permission check failure

Browse Source 
In hs_config.c, we do validate the permission of the hidden service directory
but we do not try to create it. So, in the event that the directory doesn't
exists, we end up in the loading key code path which checks for the
permission and possibly creates the directory. On failure, don't BUG() since
there is a perfectly valid use case for that function to fail.

Fixes #27335

Signed-off-by: David Goulet <dgoulet@torproject.org>
This commit is contained in:
David Goulet 2018-09-14 10:56:34 -04:00 committed by Nick Mathewson
parent 9697c2da46
commit 0971b3ce4d
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug27335 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (hidden service v3):
- In case the hidden service directory can't be created or has wrong
permissions, do not BUG() on it which lead to a non fatal stacktrace.
Fixes bug 27335; bugfix on 0.3.2.1.

6
src/or/hs_service.c
View File

@ -974,9 +974,9 @@ load_service_keys(hs_service_t *service)
* files to that directory so make sure it exists and has the right * files to that directory so make sure it exists and has the right
* permissions. We do this here because at this stage we know that Tor is * permissions. We do this here because at this stage we know that Tor is
* actually running and the service we have has been validated. */ * actually running and the service we have has been validated. */
if (BUG(hs_check_service_private_dir(get_options()->User, if (hs_check_service_private_dir(get_options()->User,
config->directory_path, config->directory_path,
config->dir_group_readable, 1) < 0)) { config->dir_group_readable, 1) < 0) {
goto end; goto end;
} }