Prevent bridge relays from serving their 'extrainfo' document

to anybody who asks, now that extrainfo docs include potentially
sensitive aggregated client geoip summaries.

svn:r17958

diff --git a/ChangeLog b/ChangeLog
index 1a86ec4c28a339b60ffcf7fc0472d1f14b406f1a..97cb628afce83708f922ffba8788879fd34ce026 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@ Changes in version 0.2.1.10-alpha - 2009-01-0?
       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

diff --git a/src/or/directory.c b/src/or/directory.c
index 4baee04045b8eb261fe624e86eb1667a36c7cbf0..f72ab41bf6d3635613ddefd3a11374406f1c9c29 100644 (file)
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -2698,7 +2698,8 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers,
   }
 
   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;