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

[tor/maint-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3
by teor＠torproject.org 12 Feb '20

12 Feb '20

commit 0e00d9369fa159bf0c44d0862e3d1f6b0c40ef50 Merge: de31c4757 ff5220536 Author: teor <teor(a)torproject.org> Date: Wed Feb 12 14:13:15 2020 +1000 Merge branch 'maint-0.4.2' into maint-0.4.3 "ours" merge, because simiar BridgeDistribution fixes have already been merged to maint-0.4.3. (See 32753.) The stem changes in 33075 have already been merged to maint-0.4.3, so this "ours" merge does not affect them.

1 0

[tor/maint-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.1
by teor＠torproject.org 12 Feb '20

12 Feb '20

commit 5298113da98f13cfaad4a9ab7b5ac8baa6c37279 Merge: 0ff3e8f4a b9c7c61ea Author: teor <teor(a)torproject.org> Date: Wed Feb 12 12:21:57 2020 +1000 Merge branch 'maint-0.3.5' into maint-0.4.1 .travis.yml | 2 -- changes/bug32753 | 3 +++ changes/ticket33075 | 4 ++++ src/app/config/config.c | 2 +- src/feature/relay/router.c | 15 ++++++++++----- src/test/test_config.c | 22 +++++++++++++++++++--- 6 files changed, 37 insertions(+), 11 deletions(-)

1 0

[tor/maint-0.4.2] Merge branch 'maint-0.4.1' into maint-0.4.2
by teor＠torproject.org 12 Feb '20

12 Feb '20

commit ff52205362f5d60c209f298a3e3679bc65bdf539 Merge: 00fe21472 5298113da Author: teor <teor(a)torproject.org> Date: Wed Feb 12 12:22:04 2020 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2 .travis.yml | 2 -- changes/bug32753 | 3 +++ changes/ticket33075 | 4 ++++ src/app/config/config.c | 2 +- src/feature/relay/router.c | 15 ++++++++++----- src/test/test_config.c | 22 +++++++++++++++++++--- 6 files changed, 37 insertions(+), 11 deletions(-)

1 0

[tor/maint-0.4.2] Travis: Stop allowing stem test failures
by teor＠torproject.org 12 Feb '20

12 Feb '20

commit 9d771ccc86a7b8f04a40d619b78f7d99f67c176f Author: teor <teor(a)torproject.org> Date: Tue Jan 28 19:55:35 2020 +1000 Travis: Stop allowing stem test failures Stop allowing failures on the Travis CI stem tests job. It looks like all the stem hangs we were seeing are now fixed, but let's make sure we see them if they happen again. Closes ticket 33075. --- .travis.yml | 2 -- changes/ticket33075 | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7f7e7a572..28a45788b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -93,8 +93,6 @@ matrix: os: osx - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" os: osx - ## test-stem sometimes hangs on Travis - - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes" ## (Linux only) Use a recent Linux image (Ubuntu Bionic) dist: bionic diff --git a/changes/ticket33075 b/changes/ticket33075 new file mode 100644 index 000000000..69698d90b --- /dev/null +++ b/changes/ticket33075 @@ -0,0 +1,4 @@ + o Testing: + - Stop allowing failures on the Travis CI stem tests job. It looks like all + the stem hangs we were seeing are now fixed, but let's make sure we see + them if they happen again. Closes ticket 33075.

1 0

[tor/maint-0.4.2] Lowercase the BridgeDistribution value from torrc in descriptors.
by teor＠torproject.org 12 Feb '20

12 Feb '20

commit b9c7c61ea5233854ff83257a8bc530b7e0a50351 Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Jan 15 17:18:30 2020 +0000 Lowercase the BridgeDistribution value from torrc in descriptors. This patch ensures that we always lowercase the BridgeDistribution from torrc in descriptors before submitting it. See: https://bugs.torproject.org/32753 --- changes/bug32753 | 3 +++ src/app/config/config.c | 2 +- src/feature/relay/router.c | 15 ++++++++++----- src/test/test_config.c | 22 +++++++++++++++++++--- 4 files changed, 33 insertions(+), 9 deletions(-) diff --git a/changes/bug32753 b/changes/bug32753 new file mode 100644 index 000000000..6f59c7729 --- /dev/null +++ b/changes/bug32753 @@ -0,0 +1,3 @@ + o Minor bugfixes (bridges): + - Lowercase the value of BridgeDistribution from torrc before adding it to + the descriptor. Fixes bug 32753; bugfix on 0.3.2.3-alpha. diff --git a/src/app/config/config.c b/src/app/config/config.c index 0b1b758d9..cbca7d389 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -6839,7 +6839,7 @@ check_bridge_distribution_setting(const char *bd) }; unsigned i; for (i = 0; i < ARRAY_LENGTH(RECOGNIZED); ++i) { - if (!strcmp(bd, RECOGNIZED[i])) + if (!strcasecmp(bd, RECOGNIZED[i])) return 0; } diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index 1dbaf2ed6..e91550a78 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -2635,15 +2635,20 @@ router_dump_router_to_string(routerinfo_t *router, } if (options->BridgeRelay) { - const char *bd; + char *bd = NULL; + if (options->BridgeDistribution && strlen(options->BridgeDistribution)) { - bd = options->BridgeDistribution; + bd = tor_strdup(options->BridgeDistribution); } else { - bd = "any"; + bd = tor_strdup("any"); } - if (strchr(bd, '\n') || strchr(bd, '\r')) - bd = escaped(bd); + + // Make sure our value is lowercased in the descriptor instead of just + // forwarding what the user wrote in their torrc directly. + tor_strlower(bd); + smartlist_add_asprintf(chunks, "bridge-distribution-request %s\n", bd); + tor_free(bd); } if (router->onion_curve25519_pkey) { diff --git a/src/test/test_config.c b/src/test/test_config.c index 8f011ce1f..855725411 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -5620,11 +5620,27 @@ test_config_check_bridge_distribution_setting_not_a_bridge(void *arg) static void test_config_check_bridge_distribution_setting_valid(void *arg) { - int ret = check_bridge_distribution_setting("https"); - (void)arg; - tt_int_op(ret, OP_EQ, 0); + // Check all the possible values we support right now. + tt_int_op(check_bridge_distribution_setting("none"), OP_EQ, 0); + tt_int_op(check_bridge_distribution_setting("any"), OP_EQ, 0); + tt_int_op(check_bridge_distribution_setting("https"), OP_EQ, 0); + tt_int_op(check_bridge_distribution_setting("email"), OP_EQ, 0); + tt_int_op(check_bridge_distribution_setting("moat"), OP_EQ, 0); + + // Check all the possible values we support right now with weird casing. + tt_int_op(check_bridge_distribution_setting("NoNe"), OP_EQ, 0); + tt_int_op(check_bridge_distribution_setting("anY"), OP_EQ, 0); + tt_int_op(check_bridge_distribution_setting("hTTps"), OP_EQ, 0); + tt_int_op(check_bridge_distribution_setting("emAIl"), OP_EQ, 0); + tt_int_op(check_bridge_distribution_setting("moAt"), OP_EQ, 0); + + // Invalid values. + tt_int_op(check_bridge_distribution_setting("x\rx"), OP_EQ, -1); + tt_int_op(check_bridge_distribution_setting("x\nx"), OP_EQ, -1); + tt_int_op(check_bridge_distribution_setting("\t\t\t"), OP_EQ, -1); + done: return; }

1 0

[tor/maint-0.4.2] Merge remote-tracking branch 'tor-github/pr/1689' into maint-0.3.5
by teor＠torproject.org 12 Feb '20

12 Feb '20

commit 88723ad1694a96bdbb713ccb5bb47a9f5acdc8bd Merge: 2b6df3da2 9d771ccc8 Author: teor <teor(a)torproject.org> Date: Wed Feb 12 12:18:59 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1689' into maint-0.3.5 .travis.yml | 2 -- changes/ticket33075 | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.4.1] Travis: Stop allowing stem test failures
by teor＠torproject.org 12 Feb '20

12 Feb '20

commit 9d771ccc86a7b8f04a40d619b78f7d99f67c176f Author: teor <teor(a)torproject.org> Date: Tue Jan 28 19:55:35 2020 +1000 Travis: Stop allowing stem test failures Stop allowing failures on the Travis CI stem tests job. It looks like all the stem hangs we were seeing are now fixed, but let's make sure we see them if they happen again. Closes ticket 33075. --- .travis.yml | 2 -- changes/ticket33075 | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7f7e7a572..28a45788b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -93,8 +93,6 @@ matrix: os: osx - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" os: osx - ## test-stem sometimes hangs on Travis - - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes" ## (Linux only) Use a recent Linux image (Ubuntu Bionic) dist: bionic diff --git a/changes/ticket33075 b/changes/ticket33075 new file mode 100644 index 000000000..69698d90b --- /dev/null +++ b/changes/ticket33075 @@ -0,0 +1,4 @@ + o Testing: + - Stop allowing failures on the Travis CI stem tests job. It looks like all + the stem hangs we were seeing are now fixed, but let's make sure we see + them if they happen again. Closes ticket 33075.

1 0

[tor/maint-0.4.1] Merge remote-tracking branch 'tor-github/pr/1689' into maint-0.3.5
by teor＠torproject.org 12 Feb '20

12 Feb '20

commit 88723ad1694a96bdbb713ccb5bb47a9f5acdc8bd Merge: 2b6df3da2 9d771ccc8 Author: teor <teor(a)torproject.org> Date: Wed Feb 12 12:18:59 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1689' into maint-0.3.5 .travis.yml | 2 -- changes/ticket33075 | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.1
by teor＠torproject.org 12 Feb '20

12 Feb '20

commit 5298113da98f13cfaad4a9ab7b5ac8baa6c37279 Merge: 0ff3e8f4a b9c7c61ea Author: teor <teor(a)torproject.org> Date: Wed Feb 12 12:21:57 2020 +1000 Merge branch 'maint-0.3.5' into maint-0.4.1 .travis.yml | 2 -- changes/bug32753 | 3 +++ changes/ticket33075 | 4 ++++ src/app/config/config.c | 2 +- src/feature/relay/router.c | 15 ++++++++++----- src/test/test_config.c | 22 +++++++++++++++++++--- 6 files changed, 37 insertions(+), 11 deletions(-)

1 0

[tor/maint-0.4.1] Lowercase the BridgeDistribution value from torrc in descriptors.
by teor＠torproject.org 12 Feb '20

12 Feb '20

commit b9c7c61ea5233854ff83257a8bc530b7e0a50351 Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Jan 15 17:18:30 2020 +0000 Lowercase the BridgeDistribution value from torrc in descriptors. This patch ensures that we always lowercase the BridgeDistribution from torrc in descriptors before submitting it. See: https://bugs.torproject.org/32753 --- changes/bug32753 | 3 +++ src/app/config/config.c | 2 +- src/feature/relay/router.c | 15 ++++++++++----- src/test/test_config.c | 22 +++++++++++++++++++--- 4 files changed, 33 insertions(+), 9 deletions(-) diff --git a/changes/bug32753 b/changes/bug32753 new file mode 100644 index 000000000..6f59c7729 --- /dev/null +++ b/changes/bug32753 @@ -0,0 +1,3 @@ + o Minor bugfixes (bridges): + - Lowercase the value of BridgeDistribution from torrc before adding it to + the descriptor. Fixes bug 32753; bugfix on 0.3.2.3-alpha. diff --git a/src/app/config/config.c b/src/app/config/config.c index 0b1b758d9..cbca7d389 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -6839,7 +6839,7 @@ check_bridge_distribution_setting(const char *bd) }; unsigned i; for (i = 0; i < ARRAY_LENGTH(RECOGNIZED); ++i) { - if (!strcmp(bd, RECOGNIZED[i])) + if (!strcasecmp(bd, RECOGNIZED[i])) return 0; } diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index 1dbaf2ed6..e91550a78 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -2635,15 +2635,20 @@ router_dump_router_to_string(routerinfo_t *router, } if (options->BridgeRelay) { - const char *bd; + char *bd = NULL; + if (options->BridgeDistribution && strlen(options->BridgeDistribution)) { - bd = options->BridgeDistribution; + bd = tor_strdup(options->BridgeDistribution); } else { - bd = "any"; + bd = tor_strdup("any"); } - if (strchr(bd, '\n') || strchr(bd, '\r')) - bd = escaped(bd); + + // Make sure our value is lowercased in the descriptor instead of just + // forwarding what the user wrote in their torrc directly. + tor_strlower(bd); + smartlist_add_asprintf(chunks, "bridge-distribution-request %s\n", bd); + tor_free(bd); } if (router->onion_curve25519_pkey) { diff --git a/src/test/test_config.c b/src/test/test_config.c index 8f011ce1f..855725411 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -5620,11 +5620,27 @@ test_config_check_bridge_distribution_setting_not_a_bridge(void *arg) static void test_config_check_bridge_distribution_setting_valid(void *arg) { - int ret = check_bridge_distribution_setting("https"); - (void)arg; - tt_int_op(ret, OP_EQ, 0); + // Check all the possible values we support right now. + tt_int_op(check_bridge_distribution_setting("none"), OP_EQ, 0); + tt_int_op(check_bridge_distribution_setting("any"), OP_EQ, 0); + tt_int_op(check_bridge_distribution_setting("https"), OP_EQ, 0); + tt_int_op(check_bridge_distribution_setting("email"), OP_EQ, 0); + tt_int_op(check_bridge_distribution_setting("moat"), OP_EQ, 0); + + // Check all the possible values we support right now with weird casing. + tt_int_op(check_bridge_distribution_setting("NoNe"), OP_EQ, 0); + tt_int_op(check_bridge_distribution_setting("anY"), OP_EQ, 0); + tt_int_op(check_bridge_distribution_setting("hTTps"), OP_EQ, 0); + tt_int_op(check_bridge_distribution_setting("emAIl"), OP_EQ, 0); + tt_int_op(check_bridge_distribution_setting("moAt"), OP_EQ, 0); + + // Invalid values. + tt_int_op(check_bridge_distribution_setting("x\rx"), OP_EQ, -1); + tt_int_op(check_bridge_distribution_setting("x\nx"), OP_EQ, -1); + tt_int_op(check_bridge_distribution_setting("\t\t\t"), OP_EQ, -1); + done: return; }

1 0