nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 05:03:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

config: Warn if ContactInfo is not set

Browse Source 
Closes #33361

Signed-off-by: David Goulet <dgoulet@torproject.org>
This commit is contained in:
David Goulet 2020-02-18 09:43:13 -05:00 committed by Nick Mathewson
parent b9c7c61ea5
commit b755a489bd
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/ticket33361 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfix (relay, configuration):
- Now warn if the ContactInfo field is not set and mention that the relay
might get rejected if so. Fixes bug 33361; bugfix on 0.1.1.10-alpha.

13
src/app/config/config.c
View File

@ -3433,10 +3433,15 @@ options_validate(or_options_t *old_options, or_options_t *options,
}
}
if (server_mode(options) && !options->ContactInfo)
log_notice(LD_CONFIG, "Your ContactInfo config option is not set. "
"Please consider setting it, so we can contact you if your server is "
"misconfigured or something else goes wrong.");
if (server_mode(options) && !options->ContactInfo) {
log_warn(LD_CONFIG,
"Your ContactInfo config option is not set. Please strongly "
"consider setting it, so we can contact you if your relay is "
"misconfigured, end-of-life, or something else goes wrong. "
"It is also possible that your relay might get rejected from "
"the network due to a missing valid contact address.");
}
const char *ContactInfo = options->ContactInfo;
if (ContactInfo && !string_is_utf8(ContactInfo, strlen(ContactInfo)))
REJECT("ContactInfo config option must be UTF-8.");