From: Karsten Loesing <karsten.loesing@gmx.net>
Date: Wed, 13 May 2009 16:14:29 +0000 (+0200)
Subject: Prevent bridges from publishing router descriptors.
X-Git-Tag: tor-0.2.1.15-rc~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e97067b2fc4032bce658d73cf21ee54573186bb;p=thirdparty%2Ftor.git

Prevent bridges from publishing router descriptors.

Bridges are not supposed to publish router descriptors to the directory
authorities. It defeats the point of bridges when they are included in the
public relay directory.

This patch puts out a warning and exits when the node is configured as
a bridge and to publish v1, v2, or v3 descriptors at the same time.

Also fixes part of bug 932.
---

diff --git a/src/or/config.c b/src/or/config.c
index 3d757c1bbb..7c1b60dcf4 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3238,6 +3238,15 @@ options_validate(or_options_t *old_options, or_options_t *options,
     return -1;
   }
 
+  if ((options->BridgeRelay
+        || options->_PublishServerDescriptor & BRIDGE_AUTHORITY)
+      && options->_PublishServerDescriptor
+        & (V1_AUTHORITY + V2_AUTHORITY + V3_AUTHORITY)) {
+    REJECT("Bridges are not supposed to publish router descriptors to the "
+           "directory authorities. Please correct your "
+           "PublishServerDescriptor line.");
+  }
+
   if (options->MinUptimeHidServDirectoryV2 < 0) {
     log_warn(LD_CONFIG, "MinUptimeHidServDirectoryV2 option must be at "
                         "least 0 seconds. Changing to 0.");