GitLab is used only for code review, issue tracking and project management. Canonical locations for source code are still https://gitweb.torproject.org/ https://git.torproject.org/ and git-rw.torproject.org.

Commit 8444fbe9 authored by Alexander Færøy's avatar Alexander Færøy 🍍

Merge branch 'tor-github/pr/1793' into maint-0.3.5

parents c3ad2a1d 8dc7ad12
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.
...@@ -3433,10 +3433,15 @@ options_validate(or_options_t *old_options, or_options_t *options, ...@@ -3433,10 +3433,15 @@ options_validate(or_options_t *old_options, or_options_t *options,
} }
} }
if (server_mode(options) && !options->ContactInfo) if (server_mode(options) && !options->ContactInfo) {
log_notice(LD_CONFIG, "Your ContactInfo config option is not set. " log_warn(LD_CONFIG,
"Please consider setting it, so we can contact you if your server is " "Your ContactInfo config option is not set. Please strongly "
"misconfigured or something else goes wrong."); "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; const char *ContactInfo = options->ContactInfo;
if (ContactInfo && !string_is_utf8(ContactInfo, strlen(ContactInfo))) if (ContactInfo && !string_is_utf8(ContactInfo, strlen(ContactInfo)))
REJECT("ContactInfo config option must be UTF-8."); REJECT("ContactInfo config option must be UTF-8.");
......
...@@ -485,7 +485,8 @@ test_options_validate__uname_for_server(void *ignored) ...@@ -485,7 +485,8 @@ test_options_validate__uname_for_server(void *ignored)
#endif #endif
options_test_data_t *tdata = get_options_test_data( 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); setup_capture_of_logs(LOG_WARN);
MOCK(get_uname, fixed_get_uname); MOCK(get_uname, fixed_get_uname);
...@@ -633,9 +634,11 @@ test_options_validate__contactinfo(void *ignored) ...@@ -633,9 +634,11 @@ test_options_validate__contactinfo(void *ignored)
ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg);
tt_int_op(ret, OP_EQ, -1); tt_int_op(ret, OP_EQ, -1);
expect_log_msg( expect_log_msg(
"Your ContactInfo config option is not" "Your ContactInfo config option is not set. Please strongly "
" set. Please consider setting it, so we can contact you if your" "consider setting it, so we can contact you if your relay is "
" server is misconfigured or something else goes wrong.\n"); "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); tor_free(msg);
free_options_test_data(tdata); free_options_test_data(tdata);
...@@ -645,9 +648,11 @@ test_options_validate__contactinfo(void *ignored) ...@@ -645,9 +648,11 @@ test_options_validate__contactinfo(void *ignored)
ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg);
tt_int_op(ret, OP_EQ, -1); tt_int_op(ret, OP_EQ, -1);
expect_no_log_msg( expect_no_log_msg(
"Your ContactInfo config option is not" "Your ContactInfo config option is not set. Please strongly "
" set. Please consider setting it, so we can contact you if your" "consider setting it, so we can contact you if your relay is "
" server is misconfigured or something else goes wrong.\n"); "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); tor_free(msg);
done: done:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment