tor-commits January 2021

tor-commits@lists.torproject.org

16 participants
2244 discussions

[tor/release-0.4.5] relay: Don't trigger an address discovery without an ORPort
by nickm＠torproject.org 27 Jan '21

27 Jan '21

commit 2e600019ea32277525c46809244491970869b084 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Jan 22 10:35:32 2021 -0500 relay: Don't trigger an address discovery without an ORPort We would before do an address discovery and then a lookup in the cache if not found which is now simplified by calling relay_find_addr_to_publish() directly which does all those combined. Furthermore, by doing so, we won't trigger an address discovery every minute if we have no ORPort configured for the family. Fixes #40254 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40254 | 4 ++++ src/feature/relay/router.c | 17 +++++------------ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/changes/ticket40254 b/changes/ticket40254 new file mode 100644 index 0000000000..9945e3d3b8 --- /dev/null +++ b/changes/ticket40254 @@ -0,0 +1,4 @@ + o Minor bugfixes (relay, configuration): + - Don't attempt to discover address (IPv4 or IPv6) if no ORPort for it can + be found in the configuration. Fixes bug 40254; bugfix on 0.4.5.1-alpha. + diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index e5111acd65..4bc71eb486 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -2671,18 +2671,11 @@ check_descriptor_ipaddress_changed(time_t now) previous = &my_ri->ipv6_addr; } - /* Ignore returned value because we want to notice not only an address - * change but also if an address is lost (current == UNSPEC). */ - bool found = find_my_address(get_options(), family, LOG_INFO, &current, - &method, &hostname); - if (!found) { - /* Address was possibly not found because it is simply not configured or - * discoverable. Fallback to our cache, which includes any suggestion - * sent by a trusted directory server. */ - found = relay_find_addr_to_publish(get_options(), family, - RELAY_FIND_ADDR_CACHE_ONLY, - &current); - } + /* Attempt to discovery the publishable address for the family which will + * actively attempt to discover the address if we are configured with a + * port for the family. */ + relay_find_addr_to_publish(get_options(), family, RELAY_FIND_ADDR_NO_FLAG, + &current); /* The "current" address might be UNSPEC meaning it was not discovered nor * found in our current cache. If we had an address before and we have

1 0

[tor/release-0.4.5] Merge branch 'mr_274_squashed' into maint-0.4.5
by nickm＠torproject.org 27 Jan '21

27 Jan '21

commit 3c0d3988473b51b776207fdc8d1b0d332fed2284 Merge: af5250b1df f03047332c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 27 09:36:29 2021 -0500 Merge branch 'mr_274_squashed' into maint-0.4.5 changes/ticket40254 | 4 ++++ src/feature/relay/relay_find_addr.c | 24 +++++++++++++++++++++++ src/feature/relay/router.c | 39 ++++++++++++------------------------- src/test/test_relay.c | 33 ++++++++++++++++++++++--------- 4 files changed, 64 insertions(+), 36 deletions(-)

1 0

[tor/release-0.4.5] Merge branch 'maint-0.4.5' into release-0.4.5
by nickm＠torproject.org 27 Jan '21

27 Jan '21

commit 65d268c77bedef363b786924a0ec7e254af9945f Merge: 9e6a276c26 3c0d398847 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 27 09:36:39 2021 -0500 Merge branch 'maint-0.4.5' into release-0.4.5 changes/ticket40254 | 4 ++++ src/feature/relay/relay_find_addr.c | 24 +++++++++++++++++++++++ src/feature/relay/router.c | 39 ++++++++++++------------------------- src/test/test_relay.c | 33 ++++++++++++++++++++++--------- 4 files changed, 64 insertions(+), 36 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/272'
by asn＠torproject.org 27 Jan '21

27 Jan '21

commit 05a762426681ce5e37c7f222c2337a4a1915286c Merge: dbbd603313 62f5114c09 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Jan 27 15:47:10 2021 +0200 Merge remote-tracking branch 'tor-gitlab/mr/272' src/app/config/fallback_dirs.inc | 2 ++ 1 file changed, 2 insertions(+)

1 0

[tor/master] Add IPv6 to mdfnet fallbackdirs
by asn＠torproject.org 27 Jan '21

27 Jan '21

commit 62f5114c094e180271432605195b5039cf8ce1cb Author: MarkusK <markus(a)best-practice.se> Date: Fri Jan 22 07:50:47 2021 +0100 Add IPv6 to mdfnet fallbackdirs --- src/app/config/fallback_dirs.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/app/config/fallback_dirs.inc b/src/app/config/fallback_dirs.inc index a7ef39bb96..83834890ce 100644 --- a/src/app/config/fallback_dirs.inc +++ b/src/app/config/fallback_dirs.inc @@ -354,6 +354,7 @@ URL: https:onionoo.torproject.orguptime?typerelay&first_seen_days90-&last_seen_d /* ===== */ , "193.11.114.45:9031 orport=9002 id=80AAF8D5956A43C197104CEF2550CD42D165C6FB" +" ipv6=[2001:6b0:30:1000::100]:9050" /* nickname=mdfnet2 */ /* extrainfo=0 */ /* ===== */ @@ -552,6 +553,7 @@ URL: https:onionoo.torproject.orguptime?typerelay&first_seen_days90-&last_seen_d /* ===== */ , "193.11.114.46:9032 orport=9003 id=B83DC1558F0D34353BB992EF93AFEAFDB226A73E" +" ipv6=[2001:6b0:30:1000::101]:9050" /* nickname=mdfnet3 */ /* extrainfo=0 */ /* ===== */

1 0

[tor/master] Do not require a valid torrc for
by asn＠torproject.org 27 Jan '21

27 Jan '21

commit 3d993d4d8569617acf8059a6d6f7702aaf41bba4 Author: Neel Chauhan <neel(a)neelc.org> Date: Wed Jan 6 10:41:27 2021 -0800 Do not require a valid torrc for --- changes/bug40235 | 5 +++++ src/app/config/config.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/bug40235 b/changes/bug40235 new file mode 100644 index 0000000000..baf72c3da7 --- /dev/null +++ b/changes/bug40235 @@ -0,0 +1,5 @@ + o Minor bugfixes (key generation): + - Do not require a valid torrc when using the `--keygen` argument + to generate a signing key. This allows us to generate keys on + systems or users which may not run Tor. Fixes bug 40235; bugfix + on 0.2.7.2-alpha. Patch by Neel Chauhan. diff --git a/src/app/config/config.c b/src/app/config/config.c index bf2f49ead4..e6fde2d62f 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -4338,6 +4338,7 @@ find_torrc_filename(const config_line_t *cmd_arg, const config_line_t *p_index; const char *fname_opt = defaults_file ? "--defaults-torrc" : "-f"; const char *ignore_opt = defaults_file ? NULL : "--ignore-missing-torrc"; + const char *keygen_opt = "--keygen"; if (defaults_file) *ignore_missing_torrc = 1; @@ -4359,7 +4360,8 @@ find_torrc_filename(const config_line_t *cmd_arg, } *using_default_fname = 0; - } else if (ignore_opt && !strcmp(p_index->key,ignore_opt)) { + } else if ((ignore_opt && !strcmp(p_index->key, ignore_opt)) || + (keygen_opt && !strcmp(p_index->key, keygen_opt))) { *ignore_missing_torrc = 1; } }

1 0

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/248'
by asn＠torproject.org 27 Jan '21

27 Jan '21

commit dbbd60331352da8f985ddfc988fbe5f97e3f23af Merge: a7ca089343 3d993d4d85 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Jan 27 15:43:01 2021 +0200 Merge remote-tracking branch 'tor-gitlab/mr/248' changes/bug40235 | 5 +++++ src/app/config/config.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/master] Downgrade the severity of a few rendezvous circuit-related warnings.
by asn＠torproject.org 27 Jan '21

27 Jan '21

commit 1811bded77015efde34294a94884495e796efcba Author: Neel Chauhan <neel(a)neelc.org> Date: Thu Dec 24 11:32:03 2020 -0800 Downgrade the severity of a few rendezvous circuit-related warnings. --- changes/bug40207 | 4 ++++ src/feature/hs/hs_circuit.c | 2 +- src/feature/hs/hs_client.c | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/bug40207 b/changes/bug40207 new file mode 100644 index 0000000000..ca633f88db --- /dev/null +++ b/changes/bug40207 @@ -0,0 +1,4 @@ + o Minor bugfixes (onion services, logging): + - Downgrade the severity of a few rendezvous circuit-related + warnings from warning to info. Fixes bug 40207; bugfix on + 0.3.2.1-alpha. Patch by Neel Chauhan. diff --git a/src/feature/hs/hs_circuit.c b/src/feature/hs/hs_circuit.c index eaf99cf8b2..f0059a1a7c 100644 --- a/src/feature/hs/hs_circuit.c +++ b/src/feature/hs/hs_circuit.c @@ -1181,7 +1181,7 @@ hs_circ_send_introduce1(origin_circuit_t *intro_circ, /* We should never select an invalid rendezvous point in theory but if we * do, this function will fail to populate the introduce data. */ if (setup_introduce1_data(ip, exit_node, subcredential, &intro1_data) < 0) { - log_warn(LD_REND, "Unable to setup INTRODUCE1 data. The chosen rendezvous " + log_info(LD_REND, "Unable to setup INTRODUCE1 data. The chosen rendezvous " "point is unusable. Closing circuit."); goto close; } diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c index 7cec2e0dce..9721909fa5 100644 --- a/src/feature/hs/hs_client.c +++ b/src/feature/hs/hs_client.c @@ -1130,7 +1130,7 @@ handle_introduce_ack_success(origin_circuit_t *intro_circ) rend_circ = hs_circuitmap_get_established_rend_circ_client_side(rendezvous_cookie); if (rend_circ == NULL) { - log_warn(LD_REND, "Can't find any rendezvous circuit. Stopping"); + log_info(LD_REND, "Can't find any rendezvous circuit. Stopping"); goto end; }

1 0

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/247'
by asn＠torproject.org 27 Jan '21

27 Jan '21

commit a7ca08934341deab05d48fa0f074543116a29c38 Merge: 37ea6cd9eb 1811bded77 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Jan 27 15:39:29 2021 +0200 Merge remote-tracking branch 'tor-gitlab/mr/247' changes/bug40207 | 4 ++++ src/feature/hs/hs_circuit.c | 2 +- src/feature/hs/hs_client.c | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-)

1 0

[tor-browser-bundle-testsuite/master] Bug 40014: Update tests for 85
by gk＠torproject.org 27 Jan '21

27 Jan '21

commit 17d1464de523a8c4972f237bad9f7d376073fa2a Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Jan 26 12:52:19 2021 +0100 Bug 40014: Update tests for 85 --- marionette/tor_browser_tests/test_dom-objects-enumeration.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/marionette/tor_browser_tests/test_dom-objects-enumeration.py b/marionette/tor_browser_tests/test_dom-objects-enumeration.py index 66fc8be..26ff945 100644 --- a/marionette/tor_browser_tests/test_dom-objects-enumeration.py +++ b/marionette/tor_browser_tests/test_dom-objects-enumeration.py @@ -764,6 +764,8 @@ class Test(testsuite.TorBrowserTest): expectedObjects = expectedObjects.union({"onbeforeinput"}) if self.get_version() >= 84: expectedObjects = expectedObjects.union({"PerformancePaintTiming"}).difference({"Sanitizer"}) + if self.get_version() >= 85: + expectedObjects = expectedObjects.difference({"onshow", "HTMLMenuItemElement"}) with self.marionette.using_context('content'): self.marionette.navigate(self.test_page_file_url)

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits January 2021