prop224: Sandbox support for service

Signed-off-by: David Goulet <dgoulet@torproject.org>

diff --git a/src/or/hs_cache.c b/src/or/hs_cache.c
index 29681b42b5b6a803bd04a59e4743ae7bbf0f0fb2..30215d8681a146da2217487d022f338fea9eb046 100644 (file)
--- a/src/or/hs_cache.c
+++ b/src/or/hs_cache.c
@@ -124,8 +124,10 @@ cache_store_v3_as_dir(hs_cache_dir_descriptor_t *desc)
     if (cache_entry->plaintext_data->revision_counter >=
         desc->plaintext_data->revision_counter) {
       log_info(LD_REND, "Descriptor revision counter in our cache is "
-                        "greater or equal than the one we received. "
-                        "Rejecting!");
+               "greater or equal than the one we received (%d/%d). "
+               "Rejecting!",
+               (int)cache_entry->plaintext_data->revision_counter,
+               (int)desc->plaintext_data->revision_counter);
       goto err;
     }
     /* We now know that the descriptor we just received is a new one so

diff --git a/src/or/hs_service.c b/src/or/hs_service.c
index 16ffc94b59891a2d642d5d96776e7e5868af24f6..760ba1bc3dc9a891e6413bf7dcfcd02a360c2d0a 100644 (file)
--- a/src/or/hs_service.c
+++ b/src/or/hs_service.c
@@ -2360,10 +2360,56 @@ consider_hsdir_retry(const hs_service_t *service,
   smartlist_free(responsible_dirs);
 }
 
+/* Add to list every filename used by service. This is used by the sandbox
+ * subsystem. */
+static void
+service_add_fnames_to_list(const hs_service_t *service, smartlist_t *list)
+{
+  const char *s_dir;
+  char fname[128] = {0};
+
+  tor_assert(service);
+  tor_assert(list);
+
+  /* Ease our life. */
+  s_dir = service->config.directory_path;
+  /* The hostname file. */
+  smartlist_add(list, hs_path_from_filename(s_dir, fname_hostname));
+  /* The key files splitted in two. */
+  tor_snprintf(fname, sizeof(fname), "%s_secret_key", fname_keyfile_prefix);
+  smartlist_add(list, hs_path_from_filename(s_dir, fname));
+  tor_snprintf(fname, sizeof(fname), "%s_public_key", fname_keyfile_prefix);
+  smartlist_add(list, hs_path_from_filename(s_dir, fname));
+}
+
 /* ========== */
 /* Public API */
 /* ========== */
 
+/* Add to file_list every filename used by a configured hidden service, and to
+ * dir_list every directory path used by a configured hidden service. This is
+ * used by the sandbox subsystem to whitelist those. */
+void
+hs_service_lists_fnames_for_sandbox(smartlist_t *file_list,
+                                    smartlist_t *dir_list)
+{
+  tor_assert(file_list);
+  tor_assert(dir_list);
+
+  /* Add files and dirs for legacy services. */
+  rend_services_add_filenames_to_lists(file_list, dir_list);
+
+  /* Add files and dirs for v3+. */
+  FOR_EACH_SERVICE_BEGIN(service) {
+    /* Skip ephemeral service, they don't touch the disk. */
+    if (service->config.is_ephemeral) {
+      continue;
+    }
+    service_add_fnames_to_list(service, file_list);
+    smartlist_add_strdup(dir_list, service->config.directory_path);
+  } FOR_EACH_DESCRIPTOR_END;
+}
+
 /* Called when our internal view of the directory has changed. We might have
  * new descriptors for hidden service directories that we didn't have before
  * so try them if it's the case. */

diff --git a/src/or/hs_service.h b/src/or/hs_service.h
index be24bb4e317386e8388e71da19072bbc372de29c..7d026fb3542b000058949dd88af002f75dee681b 100644 (file)
--- a/src/or/hs_service.h
+++ b/src/or/hs_service.h
@@ -254,6 +254,8 @@ void hs_service_free(hs_service_t *service);
 
 void hs_service_stage_services(const smartlist_t *service_list);
 int hs_service_load_all_keys(void);
+void hs_service_lists_fnames_for_sandbox(smartlist_t *file_list,
+                                         smartlist_t *dir_list);
 
 void hs_service_dir_info_changed(void);
 void hs_service_run_scheduled_events(time_t now);

diff --git a/src/or/main.c b/src/or/main.c
index a45e64929f2a1aee63adc0d66cdd199a16ba02ee..95b0ce6ef7f8b55cd82ff744739bdf4b064db14c 100644 (file)
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -3572,7 +3572,7 @@ sandbox_init_filter(void)
   {
     smartlist_t *files = smartlist_new();
     smartlist_t *dirs = smartlist_new();
-    rend_services_add_filenames_to_lists(files, dirs);
+    hs_service_lists_fnames_for_sandbox(files, dirs);
     SMARTLIST_FOREACH(files, char *, file_name, {
       char *tmp_name = NULL;
       tor_asprintf(&tmp_name, "%s.tmp", file_name);
@@ -3581,6 +3581,7 @@ sandbox_init_filter(void)
       /* steals references */
       sandbox_cfg_allow_open_filename(&cfg, file_name);
       sandbox_cfg_allow_open_filename(&cfg, tmp_name);
+      tor_free(file_name);
     });
     SMARTLIST_FOREACH(dirs, char *, dir, {
       /* steals reference */