dirserv: Improve returned message when relay is rejected

Explicitly inform the operator of the rejected relay to set a valid email
address in the ContactInfo field and contact bad-relays@ mailing list.

Fixes #25170

Signed-off-by: David Goulet <dgoulet@torproject.org>

diff --git a/changes/ticket25170 b/changes/ticket25170
new file mode 100644 (file)
index 0000000..0652139
--- /dev/null
+++ b/changes/ticket25170
@@ -0,0 +1,5 @@
+  o Minor bugfix (directory authority, documentation):
+    - When a fingerprint or network address is marked as rejected, the
+      returned message by the authority now explicitly mention to set a valid
+      ContactInfo address and contact the bad-relays@ mailing list. Fixes bug
+      25170; bugfix on 0.2.9.1.

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index da34c196f4ed202e4da53e06938d4e1c71310a60..41c6bf3dc8d063d370986922fc36b262e27a3f3e 100644 (file)
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -401,7 +401,10 @@ dirserv_get_status_impl(const char *id_digest, const char *nickname,
 
   if (result & FP_REJECT) {
     if (msg)
-      *msg = "Fingerprint is marked rejected -- please contact us?";
+      *msg = "Fingerprint is marked rejected -- if you think this is a "
+             "mistake please set a valid email address in ContactInfo and "
+             "send an email to bad-relays@lists.torproject.org mentioning "
+             "your fingerprint(s)?";
     return FP_REJECT;
   } else if (result & FP_INVALID) {
     if (msg)
@@ -419,7 +422,10 @@ dirserv_get_status_impl(const char *id_digest, const char *nickname,
     log_fn(severity, LD_DIRSERV, "Rejecting '%s' because of address '%s'",
                nickname, fmt_addr32(addr));
     if (msg)
-      *msg = "Suspicious relay address range -- please contact us?";
+      *msg = "Suspicious relay address range -- if you think this is a "
+             "mistake please set a valid email address in ContactInfo and "
+             "send an email to bad-relays@lists.torproject.org mentioning "
+             "your address(es) and fingerprint(s)?";
     return FP_REJECT;
   }
   if (!authdir_policy_valid_address(addr, or_port)) {