diff options
| author | Alexander Færøy <ahf@torproject.org> | 2020-06-30 14:03:04 +0000 |
|---|---|---|
| committer | Alexander Færøy <ahf@torproject.org> | 2020-06-30 14:03:04 +0000 |
| commit | c9c4a3d0f60580b7deeadc59a845e272ab8aa949 (patch) | |
| tree | 165ab95a0705546a435b4907067bc22627d862f1 | |
| parent | 483082b57bfb2535477530fe84d8c92c70be2fa1 (diff) | |
| parent | 8444fbe904141d7954efe221b663efee1774df41 (diff) | |
| download | tor-c9c4a3d0f60580b7deeadc59a845e272ab8aa949.tar.gz tor-c9c4a3d0f60580b7deeadc59a845e272ab8aa949.zip | |
Merge branch 'maint-0.3.5' into maint-0.4.2
| -rw-r--r-- | changes/ticket33361 | 3 | ||||
| -rw-r--r-- | src/app/config/config.c | 13 | ||||
| -rw-r--r-- | src/test/test_options.c | 19 |
3 files changed, 24 insertions, 11 deletions
diff --git a/changes/ticket33361 b/changes/ticket33361 new file mode 100644 index 0000000000..bc9715d6a1 --- /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 8c635ab848..f27fcd3108 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -3439,10 +3439,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."); diff --git a/src/test/test_options.c b/src/test/test_options.c index 69407a999b..a2641425fe 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -494,7 +494,8 @@ test_options_validate__uname_for_server(void *ignored) #endif options_test_data_t *tdata = get_options_test_data( - "ORPort 127.0.0.1:5555"); + "ORPort 127.0.0.1:5555\n" + "ContactInfo nobody@example.com"); setup_capture_of_logs(LOG_WARN); MOCK(get_uname, fixed_get_uname); @@ -642,9 +643,11 @@ test_options_validate__contactinfo(void *ignored) ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, -1); expect_log_msg( - "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.\n"); + "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.\n"); tor_free(msg); free_options_test_data(tdata); @@ -654,9 +657,11 @@ test_options_validate__contactinfo(void *ignored) ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, -1); expect_no_log_msg( - "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.\n"); + "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.\n"); tor_free(msg); done: |