[or-cvs] r17961: {tor} backport r17958 (in tor/branches/tor-0_2_0-patches: . src/or)

[arma at seul.org]

Author: arma
Date: 2009-01-06 11:14:13 -0500 (Tue, 06 Jan 2009)
New Revision: 17961

Modified:
   tor/branches/tor-0_2_0-patches/ChangeLog
   tor/branches/tor-0_2_0-patches/src/or/directory.c
Log:
backport r17958


Modified: tor/branches/tor-0_2_0-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_2_0-patches/ChangeLog	2009-01-06 16:11:10 UTC (rev 17960)
+++ tor/branches/tor-0_2_0-patches/ChangeLog	2009-01-06 16:14:13 UTC (rev 17961)
@@ -18,6 +18,10 @@
       get a recent networkstatus but would get descriptors from up to
       18 hours earlier, meaning most of the descriptors were obsolete
       already. Reported by Tas; bugfix on 0.2.0.13-alpha.
+    - Prevent bridge relays from serving their 'extrainfo' document
+      to anybody who asks, now that extrainfo docs include potentially
+      sensitive aggregated client geoip summaries. Bugfix on
+      0.2.0.13-alpha.
 
   o Minor bugfixes:
     - Do not mark smartlist_bsearch_idx() function as ATTR_PURE. This bug

Modified: tor/branches/tor-0_2_0-patches/src/or/directory.c
===================================================================
--- tor/branches/tor-0_2_0-patches/src/or/directory.c	2009-01-06 16:11:10 UTC (rev 17960)
+++ tor/branches/tor-0_2_0-patches/src/or/directory.c	2009-01-06 16:14:13 UTC (rev 17961)
@@ -2468,7 +2468,9 @@
   }
 
   if (!strcmpstart(url,"/tor/server/") ||
-      (!options->BridgeAuthoritativeDir && !strcmpstart(url,"/tor/extra/"))) {
+      (!options->BridgeAuthoritativeDir &&
+       !options->BridgeRelay &&
+       !strcmpstart(url,"/tor/extra/"))) {
     int res;
     const char *msg;
     const char *request_type = NULL;