r18068@catbus: nickm | 2008-02-13 11:33:19 -0500

 Patch from karsten: make hidden service code respect SafeLogging.


svn:r13493

6 files changed, 33 insertions, 26 deletions

diff --git a/ChangeLog b/ChangeLog
index 02e62c578..c478676e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,8 @@ Changes in version 0.2.0.20-?? - 2008-02-??
       network; it was producing too many wrong guesses.
     - We were leaking a file descriptor if Tor started with a zero-length
       cached-descriptors file. Patch by freddy77; bugfix on 0.1.2.
+    - Have the new hidden service code respect the SafeLogging setting.
+      Bugfix on 0.2.0.x.  Patch from Karsten.
 
 
 Changes in version 0.2.0.19-alpha - 2008-02-09
diff --git a/src/or/command.c b/src/or/command.c
index 5b1425718..86b865d59 100644
--- a/src/or/command.c
+++ b/src/or/command.c
@@ -445,10 +445,11 @@ command_process_destroy_cell(cell_t *cell, or_connection_t *conn)
   }
 }
 
-/** Process a 'versions' cell.  The current link protocol version must be 0 to
- * indicate that no version has yet been negotiated.  We compare the versions
- * cell to the list of versions we support, pick the highest version we have
- * in common, and continue the negotiation from there.
+/** Process a 'versions' cell.  The current link protocol version must be 0
+ * to indicate that no version has yet been negotiated.  We compare the
+ * versions in the cell to the list of versions we support, pick the
+ * highest version we have in common, and continue the negotiation from
+ * there.
  */
 static void
 command_process_versions_cell(var_cell_t *cell, or_connection_t *conn)
diff --git a/src/or/directory.c b/src/or/directory.c
index 3eee6fa1c..96cf156ce 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -2570,7 +2570,7 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers,
     const char *query = url + strlen("/tor/rendezvous2/");
     if (strlen(query) == REND_DESC_ID_V2_LEN_BASE32) {
       log_info(LD_REND, "Got a v2 rendezvous descriptor request for ID '%s'",
-               query);
+               safe_str(query));
       switch (rend_cache_lookup_v2_desc_as_dir(query, &descp)) {
         case 1: /* valid */
           write_http_response_header(conn, strlen(descp), 0, 0);
diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index 4efb3a021..b30be2310 100644
--- a/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@ -385,7 +385,8 @@ directory_get_from_hs_dir(const char *desc_id, const char *query)
   log_info(LD_REND, "Sending fetch request for v2 descriptor for "
                     "service '%s' with descriptor ID '%s' to hidden "
                     "service directory '%s' on port %d.",
-           query, desc_id_base32, hs_dir->nickname, hs_dir->dir_port);
+           safe_str(query), safe_str(desc_id_base32), hs_dir->nickname,
+           hs_dir->dir_port);
   return 1;
 }
 
@@ -398,7 +399,8 @@ rend_client_refetch_renddesc(const char *query)
 {
   if (!get_options()->FetchHidServDescriptors)
     return;
-  log_info(LD_REND, "Fetching rendezvous descriptor for service %s", query);
+  log_info(LD_REND, "Fetching rendezvous descriptor for service %s",
+           escaped_safe_str(query));
   if (connection_get_by_type_state_rendquery(CONN_TYPE_DIR, 0, query)) {
     log_info(LD_REND,"Would fetch a new renddesc here (for %s), but one is "
              "already in progress.", escaped_safe_str(query));
@@ -428,7 +430,7 @@ rend_client_refetch_v2_renddesc(const char *query)
     return;
   }
   log_debug(LD_REND, "Fetching v2 rendezvous descriptor for service %s",
-            query);
+            safe_str(query));
   /* Randomly iterate over the replicas until a descriptor can be fetched
    * from one of the consecutive nodes, or no options are left. */
   tries_left = REND_NUMBER_OF_NON_CONSECUTIVE_REPLICAS;
diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c
index d5ed2f888..2cb7c9d79 100644
--- a/src/or/rendcommon.c
+++ b/src/or/rendcommon.c
@@ -124,7 +124,7 @@ rend_compute_v2_desc_id(char *desc_id_out, const char *service_id,
   if (!service_id ||
       strlen(service_id) != REND_SERVICE_ID_LEN_BASE32) {
     log_warn(LD_REND, "Could not compute v2 descriptor ID: "
-                      "Illegal service ID: %s", service_id);
+                      "Illegal service ID: %s", safe_str(service_id));
     return -1;
   }
   if (replica >= REND_NUMBER_OF_NON_CONSECUTIVE_REPLICAS) {
@@ -137,7 +137,7 @@ rend_compute_v2_desc_id(char *desc_id_out, const char *service_id,
                     service_id, REND_SERVICE_ID_LEN_BASE32) < 0) {
     log_warn(LD_REND, "Could not compute v2 descriptor ID: "
                       "Illegal characters in service ID: %s",
-             service_id);
+             safe_str(service_id));
     return -1;
   }
   /* Calculate current time-period. */
@@ -695,7 +695,7 @@ rend_cache_clean_v2_descs_as_dir(void)
       char key_base32[REND_DESC_ID_V2_LEN_BASE32 + 1];
       base32_encode(key_base32, sizeof(key_base32), key, DIGEST_LEN);
       log_info(LD_REND, "Removing descriptor with ID '%s' from cache",
-               key_base32);
+               safe_str(key_base32));
       iter = digestmap_iter_next_rmv(rend_cache_v2_dir, iter);
       _rend_cache_entry_free(ent);
     } else {
@@ -810,7 +810,7 @@ rend_cache_lookup_v2_desc_as_dir(const char *desc_id, const char **desc)
   if (base32_decode(desc_id_digest, DIGEST_LEN,
                     desc_id, REND_DESC_ID_V2_LEN_BASE32) < 0) {
     log_warn(LD_REND, "Descriptor ID contains illegal characters: %s",
-             desc_id);
+             safe_str(desc_id));
     return -1;
   }
   /* Determine if we are responsible. */
@@ -968,33 +968,34 @@ rend_cache_store_v2_desc_as_dir(const char *desc)
     if (!hid_serv_responsible_for_desc_id(desc_id)) {
       log_info(LD_REND, "Service descriptor with desc ID %s is not in "
                         "interval that we are responsible for.",
-               desc_id_base32);
+               safe_str(desc_id_base32));
       goto skip;
     }
     /* Is descriptor too old? */
     if (parsed->timestamp < now - REND_CACHE_MAX_AGE-REND_CACHE_MAX_SKEW) {
       log_info(LD_REND, "Service descriptor with desc ID %s is too old.",
-               desc_id_base32);
+               safe_str(desc_id_base32));
       goto skip;
     }
     /* Is descriptor too far in the future? */
     if (parsed->timestamp > now + REND_CACHE_MAX_SKEW) {
       log_info(LD_REND, "Service descriptor with desc ID %s is too far in the "
                         "future.",
-               desc_id_base32);
+               safe_str(desc_id_base32));
       goto skip;
     }
     /* Do we already have a newer descriptor? */
     e = digestmap_get(rend_cache_v2_dir, desc_id);
     if (e && e->parsed->timestamp > parsed->timestamp) {
       log_info(LD_REND, "We already have a newer service descriptor with the "
-                        "same desc ID %s and version.", desc_id_base32);
+                        "same desc ID %s and version.",
+               safe_str(desc_id_base32));
       goto skip;
     }
     /* Do we already have this descriptor? */
     if (e && !strcmp(desc, e->desc)) {
       log_info(LD_REND, "We already have this service descriptor with desc "
-                        "ID %s.", desc_id_base32);
+                        "ID %s.", safe_str(desc_id_base32));
       e->received = time(NULL);
       goto skip;
     }
@@ -1011,7 +1012,8 @@ rend_cache_store_v2_desc_as_dir(const char *desc)
     e->desc = tor_strndup(current_desc, encoded_size);
     e->len = encoded_size;
     log_info(LD_REND, "Successfully stored service descriptor with desc ID "
-                      "'%s' and len %d.", desc_id_base32, (int)encoded_size);
+                      "'%s' and len %d.",
+             safe_str(desc_id_base32), (int)encoded_size);
     number_stored++;
     goto advance;
   skip:
@@ -1110,14 +1112,14 @@ rend_cache_store_v2_desc_as_client(const char *desc,
   /* Is descriptor too old? */
   if (parsed->timestamp < now - REND_CACHE_MAX_AGE-REND_CACHE_MAX_SKEW) {
     log_warn(LD_REND, "Service descriptor with service ID %s is too old.",
-             service_id);
+             safe_str(service_id));
     rend_service_descriptor_free(parsed);
     return -2;
   }
   /* Is descriptor too far in the future? */
   if (parsed->timestamp > now + REND_CACHE_MAX_SKEW) {
     log_warn(LD_REND, "Service descriptor with service ID %s is too far in "
-                      "the future.", service_id);
+                      "the future.", safe_str(service_id));
     rend_service_descriptor_free(parsed);
     return -2;
   }
@@ -1125,7 +1127,7 @@ rend_cache_store_v2_desc_as_client(const char *desc,
   tor_snprintf(key, sizeof(key), "0%s", service_id);
   if (strmap_get_lc(rend_cache, key)) {
     log_info(LD_REND, "We already have a v0 descriptor for service ID %s.",
-             service_id);
+             safe_str(service_id));
     return -1;
   }
   /* Do we already have a newer descriptor? */
@@ -1134,14 +1136,14 @@ rend_cache_store_v2_desc_as_client(const char *desc,
   if (e && e->parsed->timestamp > parsed->timestamp) {
     log_info(LD_REND, "We already have a newer service descriptor for "
                       "service ID %s with the same desc ID and version.",
-             service_id);
+             safe_str(service_id));
     rend_service_descriptor_free(parsed);
     return 0;
   }
   /* Do we already have this descriptor? */
   if (e && !strcmp(desc, e->desc)) {
     log_info(LD_REND,"We already have this service descriptor %s.",
-             service_id);
+             safe_str(service_id));
     e->received = time(NULL);
     rend_service_descriptor_free(parsed);
     return 0;
@@ -1159,7 +1161,7 @@ rend_cache_store_v2_desc_as_client(const char *desc,
   strlcpy(e->desc, desc, encoded_size + 1);
   e->len = encoded_size;
   log_debug(LD_REND,"Successfully stored rend desc '%s', len %d.",
-            service_id, (int)encoded_size);
+            safe_str(service_id), (int)encoded_size);
   return 1;
 }
 
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index 2891fc1e7..28c1e912f 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -1076,8 +1076,8 @@ directory_post_to_hs_dir(smartlist_t *descs, const char *service_id,
                         "service '%s' with descriptor ID '%s' with validity "
                         "of %d seconds to hidden service directory '%s' on "
                         "port %d.",
-               service_id,
-               desc_id_base32,
+               safe_str(service_id),
+               safe_str(desc_id_base32),
                seconds_valid,
                hs_dir->nickname,
                hs_dir->dir_port);