commit b755a489bdcdf56429c2c7e4fd313b2594dc68c0 Author: David Goulet dgoulet@torproject.org Date: Tue Feb 18 09:43:13 2020 -0500
config: Warn if ContactInfo is not set
Closes #33361
Signed-off-by: David Goulet dgoulet@torproject.org --- changes/ticket33361 | 3 +++ src/app/config/config.c | 13 +++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/changes/ticket33361 b/changes/ticket33361 new file mode 100644 index 000000000..bc9715d6a --- /dev/null +++ b/changes/ticket33361 @@ -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. diff --git a/src/app/config/config.c b/src/app/config/config.c index cbca7d389..1d61b7631 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -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.");