[or-cvs] r17958: {tor} Prevent bridge relays from serving their 'extrainfo' documen (in tor/trunk: . src/or)

[arma@xxxxxxxx]

Author: arma
Date: 2009-01-06 11:03:38 -0500 (Tue, 06 Jan 2009)
New Revision: 17958

Modified:
   tor/trunk/ChangeLog
   tor/trunk/src/or/directory.c
Log:
Prevent bridge relays from serving their 'extrainfo' document
to anybody who asks, now that extrainfo docs include potentially
sensitive aggregated client geoip summaries.


Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2009-01-06 16:02:59 UTC (rev 17957)
+++ tor/trunk/ChangeLog	2009-01-06 16:03:38 UTC (rev 17958)
@@ -13,6 +13,9 @@
       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.
 
   o Minor features:
     - New controller event "clients_seen" to report a geoip-based summary

Modified: tor/trunk/src/or/directory.c
===================================================================
--- tor/trunk/src/or/directory.c	2009-01-06 16:02:59 UTC (rev 17957)
+++ tor/trunk/src/or/directory.c	2009-01-06 16:03:38 UTC (rev 17958)
@@ -2698,7 +2698,8 @@
   }
 
   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;