June 2020 - tor-commits - lists.torproject.org

[tor/release-0.4.3] Merge branch 'tor-github/pr/1793' into maint-0.3.5
by ahf＠torproject.org 30 Jun '20

30 Jun '20

commit 8444fbe904141d7954efe221b663efee1774df41 Merge: c3ad2a1d2 8dc7ad127 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jun 30 13:55:39 2020 +0000 Merge branch 'tor-github/pr/1793' into maint-0.3.5 changes/ticket33361 | 3 +++ src/app/config/config.c | 13 +++++++++---- src/test/test_options.c | 19 ++++++++++++------- 3 files changed, 24 insertions(+), 11 deletions(-)

1 0

[tor/release-0.4.2] config: Warn if ContactInfo is not set
by ahf＠torproject.org 30 Jun '20

30 Jun '20

commit b755a489bdcdf56429c2c7e4fd313b2594dc68c0 Author: David Goulet <dgoulet(a)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(a)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.");

1 0

[tor/release-0.4.2] Fix unit tests that look at contactinfo logs.
by ahf＠torproject.org 30 Jun '20

30 Jun '20

commit 8dc7ad1275a53cfe490128e7fb25b759dd7d88b5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 13:42:17 2020 -0400 Fix unit tests that look at contactinfo logs. --- src/test/test_options.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/test/test_options.c b/src/test/test_options.c index 66b0e7ef1..0e52967a2 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -485,7 +485,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(a)example.com"); setup_capture_of_logs(LOG_WARN); MOCK(get_uname, fixed_get_uname); @@ -633,9 +634,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); @@ -645,9 +648,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:

1 0

[tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2
by ahf＠torproject.org 30 Jun '20

30 Jun '20

commit 1b106cdedf525546626124449ba90266edb2f2ee Merge: 19d9d0ee5 c9c4a3d0f Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jun 30 14:03:04 2020 +0000 Merge branch 'maint-0.4.2' into release-0.4.2 changes/ticket33361 | 3 +++ src/app/config/config.c | 13 +++++++++---- src/test/test_options.c | 19 ++++++++++++------- 3 files changed, 24 insertions(+), 11 deletions(-)

1 0

[tor/release-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.2
by ahf＠torproject.org 30 Jun '20

30 Jun '20

commit c9c4a3d0f60580b7deeadc59a845e272ab8aa949 Merge: 483082b57 8444fbe90 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jun 30 14:03:04 2020 +0000 Merge branch 'maint-0.3.5' into maint-0.4.2 changes/ticket33361 | 3 +++ src/app/config/config.c | 13 +++++++++---- src/test/test_options.c | 19 ++++++++++++------- 3 files changed, 24 insertions(+), 11 deletions(-)

1 0

[tor/release-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3
by ahf＠torproject.org 30 Jun '20

30 Jun '20

commit 38f3cf4103cc87d6de711e5495bdac01bbe47879 Merge: 2042ebe88 c9c4a3d0f Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jun 30 14:03:04 2020 +0000 Merge branch 'maint-0.4.2' into maint-0.4.3

1 0

[tor/release-0.4.3] Merge branch 'maint-0.4.3' into release-0.4.3
by ahf＠torproject.org 30 Jun '20

30 Jun '20

commit 0c714b2c55feaa9309ca52a4452e8c0b5b365835 Merge: 191a104af 38f3cf410 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jun 30 14:03:04 2020 +0000 Merge branch 'maint-0.4.3' into release-0.4.3

1 0

[tor/maint-0.3.5] config: Warn if ContactInfo is not set
by ahf＠torproject.org 30 Jun '20

30 Jun '20

commit b755a489bdcdf56429c2c7e4fd313b2594dc68c0 Author: David Goulet <dgoulet(a)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(a)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.");

1 0

[tor/maint-0.3.5] Merge branch 'tor-github/pr/1793' into maint-0.3.5
by ahf＠torproject.org 30 Jun '20

30 Jun '20

commit 8444fbe904141d7954efe221b663efee1774df41 Merge: c3ad2a1d2 8dc7ad127 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jun 30 13:55:39 2020 +0000 Merge branch 'tor-github/pr/1793' into maint-0.3.5 changes/ticket33361 | 3 +++ src/app/config/config.c | 13 +++++++++---- src/test/test_options.c | 19 ++++++++++++------- 3 files changed, 24 insertions(+), 11 deletions(-)

1 0

[tor/maint-0.3.5] Fix unit tests that look at contactinfo logs.
by ahf＠torproject.org 30 Jun '20

30 Jun '20

commit 8dc7ad1275a53cfe490128e7fb25b759dd7d88b5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 13:42:17 2020 -0400 Fix unit tests that look at contactinfo logs. --- src/test/test_options.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/test/test_options.c b/src/test/test_options.c index 66b0e7ef1..0e52967a2 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -485,7 +485,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(a)example.com"); setup_capture_of_logs(LOG_WARN); MOCK(get_uname, fixed_get_uname); @@ -633,9 +634,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); @@ -645,9 +648,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:

1 0