Commit e71db3a4 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

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

parents 48ee6865 f944e463
Loading
Loading
Loading
Loading

changes/issue40338

0 → 100644
+3 −0
Original line number Original line Diff line number Diff line
  o Minor features (testing configuration):
    - When TestingTorNetwork is enabled, skip the permission check on
      the hidden service directory. Closes ticket 40338.
+13 −9
Original line number Original line Diff line number Diff line
@@ -544,16 +544,20 @@ config_service(config_line_t *line, const or_options_t *options,


  tor_assert(service->config.version <= HS_VERSION_MAX);
  tor_assert(service->config.version <= HS_VERSION_MAX);


  /* Check permission on service directory that was just parsed. And this must
  /* If we're running with TestingTorNetwork enabled, we relax the permissions
   * be done regardless of the service version. Do not ask for the directory
   * check on the hs directory. */
   * to be created, this is done when the keys are loaded because we could be
  if (!options->TestingTorNetwork) {
   * in validation mode right now. */
    /* 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,
    if (hs_check_service_private_dir(options->User,
                                     service->config.directory_path,
                                     service->config.directory_path,
                                     service->config.dir_group_readable,
                                     service->config.dir_group_readable,
                                     0) < 0) {
                                     0) < 0) {
      goto err;
      goto err;
    }
    }
  }


  /* We'll try to learn the service version here by loading the key(s) if
  /* We'll try to learn the service version here by loading the key(s) if
   * present and we did not set HiddenServiceVersion. Depending on the key
   * present and we did not set HiddenServiceVersion. Depending on the key