Don't answer "/tor/networkstatus-bridges" directory requests if

the request isn't encrypted.

svn:r13175

diff --git a/ChangeLog b/ChangeLog
index f1372131691cdbbb2d37df8d94d13ebedafdf57c..5955f1e5c7a51de136512a94ac1f863102550ddf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@ Changes in version 0.2.0.18-alpha - 2008-01-??
       relay, if you haven't found yourself reachable yet or if you've
       decided not to advertise your dirport yet. Addresses bug 556.
 
+  o Minor features:
+    - Don't answer "/tor/networkstatus-bridges" directory requests if
+      the request isn't encrypted.
+
 
 Changes in version 0.2.0.17-alpha - 2008-01-17
   o Compile fixes:

diff --git a/src/or/directory.c b/src/or/directory.c
index 6e5c82bd791e1c28c16df75011070fa443109cec..5b29756a9da430514ef8a567af0614bf64507788 100644 (file)
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -2337,7 +2337,7 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers,
         smartlist_add(items, (char*)item);
     } else if (!current && !strcmp(url, "consensus-signatures")) {
       /* XXXX020 the spec says that we should implement
-       * currrent/consensus-signatures too.  Why? */
+       * current/consensus-signatures too.  Why? -NM */
       const char *item;
       if ((item=dirvote_get_pending_detached_signatures()))
         smartlist_add(items, (char*)item);
@@ -2620,6 +2620,7 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers,
 
   if (options->BridgeAuthoritativeDir &&
       options->BridgePassword &&
+      connection_dir_is_encrypted(conn) &&
       !strcmp(url,"/tor/networkstatus-bridges")) {
     char *status;
     char decoded[64];