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

[tor/release-0.4.4] hs-v3: Remove a possible BUG() condition
by asn＠torproject.org 09 Jul '20

09 Jul '20

commit 63a54858c3b44f68d89590a992e3120f92c1b6ac Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jul 9 07:55:46 2020 -0400 hs-v3: Remove a possible BUG() condition When receiving an introduction NACK, the client either decides to close or re-extend the circuit to another intro point. In order to do this, the service descriptor needs to exists but it is possible that it gets removed from the cache between the establishement of the introduction circuit and the reception of the (N)ACK. For that reason, the BUG(desc == NULL) is removed because it is a possible normal use case. Tor recovers gracefully already. Fixes #34087 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket34087 | 3 +++ src/feature/hs/hs_client.c | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/changes/ticket34087 b/changes/ticket34087 new file mode 100644 index 000000000..16990c305 --- /dev/null +++ b/changes/ticket34087 @@ -0,0 +1,3 @@ + o Minor bugfix (onion service v3 client): + - Remove a BUG() warning that can occur naturally. Fixes bug 34087; bugfix + on 0.3.2.1-alpha. diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c index 7f4d5385e..892f69a3a 100644 --- a/src/feature/hs/hs_client.c +++ b/src/feature/hs/hs_client.c @@ -1065,8 +1065,10 @@ close_or_reextend_intro_circ(origin_circuit_t *intro_circ) tor_assert(intro_circ); desc = hs_cache_lookup_as_client(&intro_circ->hs_ident->identity_pk); - if (BUG(desc == NULL)) { - /* We can't continue without a descriptor. */ + if (desc == NULL) { + /* We can't continue without a descriptor. This is possible if the cache + * was cleaned up between the intro point established and the reception of + * the introduce ack. */ goto close; } /* We still have the descriptor, great! Let's try to see if we can

1 0

[tor/release-0.4.4] Merge branch 'tor-github/pr/1989' into maint-0.4.4
by asn＠torproject.org 09 Jul '20

09 Jul '20

commit e500ea2eae0652dad94e16cf2765044146740ce3 Merge: 8dd89e433 63a54858c Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Jul 9 17:08:07 2020 +0300 Merge branch 'tor-github/pr/1989' into maint-0.4.4 changes/ticket34087 | 3 +++ src/feature/hs/hs_client.c | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-)

1 0

[tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4
by asn＠torproject.org 09 Jul '20

09 Jul '20

commit 7bc4afdd96d51fefc16d0931743a95207ffb54cb Merge: 3a5c9487d e500ea2ea Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Jul 9 17:08:34 2020 +0300 Merge branch 'maint-0.4.4' into release-0.4.4 changes/ticket34087 | 3 +++ src/feature/hs/hs_client.c | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-)

1 0

[tor/release-0.4.4] fold in changelog entry for 33796
by nickm＠torproject.org 09 Jul '20

09 Jul '20

commit 3a5c9487d75d23295eab57dc0a0e2977d7f6601d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 9 10:06:41 2020 -0400 fold in changelog entry for 33796 --- changes/ticket33796 | 7 ------- 1 file changed, 7 deletions(-) diff --git a/changes/ticket33796 b/changes/ticket33796 deleted file mode 100644 index 9a98bf2d9..000000000 --- a/changes/ticket33796 +++ /dev/null @@ -1,7 +0,0 @@ - o Removed features (IPv6, revert): - - Revert the client port prefer IPv6 feature because it breaks the - torsocks use case. The SOCKS resolve command is lacking a mechanism to - ask for a specific address family (v4 or v6) thus prioritizing IPv6 when - an IPv4 address is asked on the resolve SOCKS interface resulting in a - failure. Tor Browser explicitly set PreferIPv6 so this should not affect - the majority of our users. Closes ticket 33796; bugfix on 0.4.4.1-alpha.

1 0

[tor/maint-0.4.4] Merge remote-tracking branch 'dgoulet/ticket33796_044_01' into maint-0.4.4
by nickm＠torproject.org 09 Jul '20

09 Jul '20

commit 8dd89e433078245778924ce67403673e9d35a5c3 Merge: 0f39cc10f 66d5292ee Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 9 09:59:45 2020 -0400 Merge remote-tracking branch 'dgoulet/ticket33796_044_01' into maint-0.4.4 changes/ticket33796 | 7 +++++++ doc/tor.1.txt | 16 +++++++--------- src/app/config/config.c | 2 +- src/test/test_config.c | 2 -- 4 files changed, 15 insertions(+), 12 deletions(-)

1 0

[tor/maint-0.4.4] Revert "config: Make clients tell dual-stack exits they prefer IPv6"
by nickm＠torproject.org 09 Jul '20

09 Jul '20

commit 66d5292ee6a173b21e5a54a669e8e584c6781e3a Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Jul 7 12:05:27 2020 -0400 Revert "config: Make clients tell dual-stack exits they prefer IPv6" This reverts commit bf2a399fc0d90df76e091fa3259f7c1b8fb87781. Don't set by default the prefer IPv6 feature on client ports because it breaks the torsocks use case. The SOCKS resolve command is lacking a mechanism to ask for a specific address family (v4 or v6) thus prioritizing IPv6 when an IPv4 address is asked on the resolve SOCKS interface resulting in a failure. Tor Browser explicitly set PreferIPv6 so this should not affect the majority of our users. Closes #33796 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket33796 | 7 +++++++ doc/tor.1.txt | 16 +++++++--------- src/app/config/config.c | 2 +- src/test/test_config.c | 2 -- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/changes/ticket33796 b/changes/ticket33796 new file mode 100644 index 000000000..9a98bf2d9 --- /dev/null +++ b/changes/ticket33796 @@ -0,0 +1,7 @@ + o Removed features (IPv6, revert): + - Revert the client port prefer IPv6 feature because it breaks the + torsocks use case. The SOCKS resolve command is lacking a mechanism to + ask for a specific address family (v4 or v6) thus prioritizing IPv6 when + an IPv4 address is asked on the resolve SOCKS interface resulting in a + failure. Tor Browser explicitly set PreferIPv6 so this should not affect + the majority of our users. Closes ticket 33796; bugfix on 0.4.4.1-alpha. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 7b3150e2a..9d073635a 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1492,16 +1492,14 @@ The following options are useful only for clients (that is, if Other recognized __flags__ for a SocksPort are: **NoIPv4Traffic**;; Tell exits to not connect to IPv4 addresses in response to SOCKS - requests on this connection. (Allowing IPv4 is the default.) - **NoIPv6Traffic**;; - Tell exits to not connect to IPv6 addresses in response to SOCKS - requests on this connection. This option is only relevant when SOCKS5 - is in use, because SOCKS4 can't handle IPv6. (Allowing IPv6 is the - default.) - **NoPreferIPv6**;; + requests on this connection. + **IPv6Traffic**;; + Tell exits to allow IPv6 addresses in response to SOCKS requests on + this connection, so long as SOCKS5 is in use. (SOCKS4 can't handle + IPv6.) + **PreferIPv6**;; Tells exits that, if a host has both an IPv4 and an IPv6 address, - we would prefer to connect to it via IPv4. (IPv6 is the default in - recent versions of Tor.) + we would prefer to connect to it via IPv6. (IPv4 is the default.) **NoDNSRequest**;; Do not ask exits to resolve DNS addresses in SOCKS5 requests. Tor will connect to IPv4 addresses, IPv6 addresses (if IPv6Traffic is set) and diff --git a/src/app/config/config.c b/src/app/config/config.c index 71f8c18ca..ba2cecd9a 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -5610,7 +5610,7 @@ port_cfg_new(size_t namelen) /* entry_cfg flags */ cfg->entry_cfg.ipv4_traffic = 1; cfg->entry_cfg.ipv6_traffic = 1; - cfg->entry_cfg.prefer_ipv6 = 1; + cfg->entry_cfg.prefer_ipv6 = 0; cfg->entry_cfg.dns_request = 1; cfg->entry_cfg.onion_traffic = 1; cfg->entry_cfg.prefer_ipv6_virtaddr = 1; diff --git a/src/test/test_config.c b/src/test/test_config.c index 095eb24c4..cb0d9bba2 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -4160,8 +4160,6 @@ test_config_parse_port_config__ports__ports_given(void *data) /* Test entry port defaults as initialised in port_parse_config */ tt_int_op(port_cfg->entry_cfg.dns_request, OP_EQ, 1); tt_int_op(port_cfg->entry_cfg.ipv4_traffic, OP_EQ, 1); - tt_int_op(port_cfg->entry_cfg.ipv6_traffic, OP_EQ, 1); - tt_int_op(port_cfg->entry_cfg.prefer_ipv6, OP_EQ, 1); tt_int_op(port_cfg->entry_cfg.onion_traffic, OP_EQ, 1); tt_int_op(port_cfg->entry_cfg.cache_ipv4_answers, OP_EQ, 0); tt_int_op(port_cfg->entry_cfg.prefer_ipv6_virtaddr, OP_EQ, 1);

1 0

[tor/release-0.4.4] Merge remote-tracking branch 'dgoulet/ticket33796_044_01' into maint-0.4.4
by nickm＠torproject.org 09 Jul '20

09 Jul '20

commit 8dd89e433078245778924ce67403673e9d35a5c3 Merge: 0f39cc10f 66d5292ee Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 9 09:59:45 2020 -0400 Merge remote-tracking branch 'dgoulet/ticket33796_044_01' into maint-0.4.4 changes/ticket33796 | 7 +++++++ doc/tor.1.txt | 16 +++++++--------- src/app/config/config.c | 2 +- src/test/test_config.c | 2 -- 4 files changed, 15 insertions(+), 12 deletions(-)

1 0

[tor/release-0.4.4] Revert "config: Make clients tell dual-stack exits they prefer IPv6"
by nickm＠torproject.org 09 Jul '20

09 Jul '20

commit 66d5292ee6a173b21e5a54a669e8e584c6781e3a Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Jul 7 12:05:27 2020 -0400 Revert "config: Make clients tell dual-stack exits they prefer IPv6" This reverts commit bf2a399fc0d90df76e091fa3259f7c1b8fb87781. Don't set by default the prefer IPv6 feature on client ports because it breaks the torsocks use case. The SOCKS resolve command is lacking a mechanism to ask for a specific address family (v4 or v6) thus prioritizing IPv6 when an IPv4 address is asked on the resolve SOCKS interface resulting in a failure. Tor Browser explicitly set PreferIPv6 so this should not affect the majority of our users. Closes #33796 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket33796 | 7 +++++++ doc/tor.1.txt | 16 +++++++--------- src/app/config/config.c | 2 +- src/test/test_config.c | 2 -- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/changes/ticket33796 b/changes/ticket33796 new file mode 100644 index 000000000..9a98bf2d9 --- /dev/null +++ b/changes/ticket33796 @@ -0,0 +1,7 @@ + o Removed features (IPv6, revert): + - Revert the client port prefer IPv6 feature because it breaks the + torsocks use case. The SOCKS resolve command is lacking a mechanism to + ask for a specific address family (v4 or v6) thus prioritizing IPv6 when + an IPv4 address is asked on the resolve SOCKS interface resulting in a + failure. Tor Browser explicitly set PreferIPv6 so this should not affect + the majority of our users. Closes ticket 33796; bugfix on 0.4.4.1-alpha. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 7b3150e2a..9d073635a 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1492,16 +1492,14 @@ The following options are useful only for clients (that is, if Other recognized __flags__ for a SocksPort are: **NoIPv4Traffic**;; Tell exits to not connect to IPv4 addresses in response to SOCKS - requests on this connection. (Allowing IPv4 is the default.) - **NoIPv6Traffic**;; - Tell exits to not connect to IPv6 addresses in response to SOCKS - requests on this connection. This option is only relevant when SOCKS5 - is in use, because SOCKS4 can't handle IPv6. (Allowing IPv6 is the - default.) - **NoPreferIPv6**;; + requests on this connection. + **IPv6Traffic**;; + Tell exits to allow IPv6 addresses in response to SOCKS requests on + this connection, so long as SOCKS5 is in use. (SOCKS4 can't handle + IPv6.) + **PreferIPv6**;; Tells exits that, if a host has both an IPv4 and an IPv6 address, - we would prefer to connect to it via IPv4. (IPv6 is the default in - recent versions of Tor.) + we would prefer to connect to it via IPv6. (IPv4 is the default.) **NoDNSRequest**;; Do not ask exits to resolve DNS addresses in SOCKS5 requests. Tor will connect to IPv4 addresses, IPv6 addresses (if IPv6Traffic is set) and diff --git a/src/app/config/config.c b/src/app/config/config.c index 71f8c18ca..ba2cecd9a 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -5610,7 +5610,7 @@ port_cfg_new(size_t namelen) /* entry_cfg flags */ cfg->entry_cfg.ipv4_traffic = 1; cfg->entry_cfg.ipv6_traffic = 1; - cfg->entry_cfg.prefer_ipv6 = 1; + cfg->entry_cfg.prefer_ipv6 = 0; cfg->entry_cfg.dns_request = 1; cfg->entry_cfg.onion_traffic = 1; cfg->entry_cfg.prefer_ipv6_virtaddr = 1; diff --git a/src/test/test_config.c b/src/test/test_config.c index 095eb24c4..cb0d9bba2 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -4160,8 +4160,6 @@ test_config_parse_port_config__ports__ports_given(void *data) /* Test entry port defaults as initialised in port_parse_config */ tt_int_op(port_cfg->entry_cfg.dns_request, OP_EQ, 1); tt_int_op(port_cfg->entry_cfg.ipv4_traffic, OP_EQ, 1); - tt_int_op(port_cfg->entry_cfg.ipv6_traffic, OP_EQ, 1); - tt_int_op(port_cfg->entry_cfg.prefer_ipv6, OP_EQ, 1); tt_int_op(port_cfg->entry_cfg.onion_traffic, OP_EQ, 1); tt_int_op(port_cfg->entry_cfg.cache_ipv4_answers, OP_EQ, 0); tt_int_op(port_cfg->entry_cfg.prefer_ipv6_virtaddr, OP_EQ, 1);

1 0

[tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4
by nickm＠torproject.org 09 Jul '20

09 Jul '20

commit ff38a077e108cc04f9638db4b5e3ecdfa3dd5bcb Merge: 781dd1bd8 8dd89e433 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 9 09:59:54 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 changes/ticket33796 | 7 +++++++ doc/tor.1.txt | 16 +++++++--------- src/app/config/config.c | 2 +- src/test/test_config.c | 2 -- 4 files changed, 15 insertions(+), 12 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.4.4'
by nickm＠torproject.org 09 Jul '20

09 Jul '20

commit be6b30e642eafc8ad9552e08ab117ac2a9900623 Merge: b0399c602 8dd89e433 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 9 09:59:54 2020 -0400 Merge branch 'maint-0.4.4' changes/ticket33796 | 7 +++++++ doc/tor.1.txt | 16 +++++++--------- src/app/config/config.c | 2 +- src/test/test_config.c | 2 -- 4 files changed, 15 insertions(+), 12 deletions(-)

1 0