[or-cvs] r9050: backport a little bit of r9041 (in tor/branches/tor-0_1_1-patches: . src/or)

[arma at seul.org]

Author: arma
Date: 2006-12-07 15:16:22 -0500 (Thu, 07 Dec 2006)
New Revision: 9050

Modified:
   tor/branches/tor-0_1_1-patches/ChangeLog
   tor/branches/tor-0_1_1-patches/src/or/rendservice.c
Log:
backport a little bit of r9041


Modified: tor/branches/tor-0_1_1-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_1_1-patches/ChangeLog	2006-12-07 20:14:29 UTC (rev 9049)
+++ tor/branches/tor-0_1_1-patches/ChangeLog	2006-12-07 20:16:22 UTC (rev 9050)
@@ -1,4 +1,8 @@
 Changes in version 0.1.1.26 - 200?-??-??
+  o Security bugfixes:
+    - Do not log introduction points for hidden services if SafeLogging
+      is set.
+
   o Minor bugfixes:
     - Fix an assert failure when a directory authority sets
       AuthDirRejectUnlisted and then receives a descriptor from an

Modified: tor/branches/tor-0_1_1-patches/src/or/rendservice.c
===================================================================
--- tor/branches/tor-0_1_1-patches/src/or/rendservice.c	2006-12-07 20:14:29 UTC (rev 9049)
+++ tor/branches/tor-0_1_1-patches/src/or/rendservice.c	2006-12-07 20:16:22 UTC (rev 9050)
@@ -305,8 +305,8 @@
   for (i=0; i < n; ++i) {
     router = router_get_by_nickname(smartlist_get(service->intro_nodes, i),1);
     if (!router) {
-      log_info(LD_REND,"Router '%s' not found. Skipping.",
-               (char*)smartlist_get(service->intro_nodes, i));
+      log_info(LD_REND,"Router '%s' not found for intro point %d. Skipping.",
+               safe_str((char*)smartlist_get(service->intro_nodes, i)), i);
       continue;
     }
     circ = find_intro_circuit(router, service->pk_digest);
@@ -534,7 +534,7 @@
     router = router_get_by_nickname(rp_nickname, 0);
     if (!router) {
       log_info(LD_REND, "Couldn't find router %s named in rendezvous cell.",
-               escaped(rp_nickname));
+               escaped_safe_str(rp_nickname));
       goto err;
     }
 
@@ -579,14 +579,14 @@
   }
   if (!launched) { /* give up */
     log_warn(LD_REND, "Giving up launching first hop of circuit to rendezvous "
-             "point '%s' for service %s.",
-             extend_info->nickname, serviceid);
+             "point %s for service %s.",
+             escaped_safe_str(extend_info->nickname), serviceid);
     goto err;
   }
   log_info(LD_REND,
-           "Accepted intro; launching circuit to '%s' "
+           "Accepted intro; launching circuit to %s "
            "(cookie %s) for service %s.",
-           extend_info->nickname, hexcookie, serviceid);
+           escaped_safe_str(extend_info->nickname), hexcookie, serviceid);
   tor_assert(launched->build_state);
   /* Fill in the circuit's state. */
   memcpy(launched->rend_pk_digest, circuit->rend_pk_digest,
@@ -1085,7 +1085,7 @@
   int i,j;
   routerinfo_t *router;
   rend_service_t *service;
-  char *nickname;
+  const char *nickname;
   circuit_t *circ;
 
   for (i=0; i < smartlist_len(rend_service_list); ++i) {
@@ -1094,7 +1094,8 @@
         service->directory);
     for (j=0; j < smartlist_len(service->intro_nodes); ++j) {
       nickname = smartlist_get(service->intro_nodes, j);
-      router = router_get_by_nickname(smartlist_get(service->intro_nodes,j),1);
+      router = router_get_by_nickname(nickname, 1);
+      nickname = safe_str(nickname);
       if (!router) {
         log(severity, LD_GENERAL, "  Intro point at %s: unrecognized router",
             nickname);