diff options
| author | David Goulet <dgoulet@torproject.org> | 2018-02-08 09:42:26 -0500 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2018-02-08 09:42:26 -0500 |
| commit | 211fe44e0735e33182fecb1582e4b8c9b59e256a (patch) | |
| tree | bb3e20411ff68afe89c370f69d84d79036c3e89e /src/or/dirserv.c | |
| parent | bf91da75abf84a6a61aa92adc5156ba1d5c15998 (diff) | |
| download | tor-211fe44e0735e33182fecb1582e4b8c9b59e256a.tar.gz tor-211fe44e0735e33182fecb1582e4b8c9b59e256a.zip | |
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>
Diffstat (limited to 'src/or/dirserv.c')
| -rw-r--r-- | src/or/dirserv.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c index fc6358a72a..0f47a83986 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -417,7 +417,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) @@ -435,7 +438,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)) { |