October 2019 - tor-commits - lists.torproject.org

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 09 Oct '19

09 Oct '19

commit 43c7f48fa77271c12e69e2ca036688d4188a1d5b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 9 20:45:18 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- pl/LC_MESSAGES/bridgedb.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pl/LC_MESSAGES/bridgedb.po b/pl/LC_MESSAGES/bridgedb.po index c7c0778f9..096f6447f 100644 --- a/pl/LC_MESSAGES/bridgedb.po +++ b/pl/LC_MESSAGES/bridgedb.po @@ -10,6 +10,7 @@ # Dawid Job <hoek(a)tuta.io>, 2014 # Rikson <Ers(a)mail2tor.com>, 2014 # Karol Obartuch <kobartuch(a)luc.edu>, 2015 +# Konrad Wila <360kon(a)gmail.com>, 2019 # Krzysztof Łojowski <maxxxrally(a)gmail.com>, 2014 # oirpos <kuba2707(a)gmail.com>, 2015 # sebx, 2014-2015 @@ -18,8 +19,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2019-10-03 15:04-0700\n" -"PO-Revision-Date: 2019-10-04 00:54+0000\n" -"Last-Translator: erinm\n" +"PO-Revision-Date: 2019-10-09 20:30+0000\n" +"Last-Translator: Konrad Wila <360kon(a)gmail.com>\n" "Language-Team: Polish (http://www.transifex.com/otf/torproject/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -301,7 +302,7 @@ msgstr "Moje mostki nie działają! Potrzebuję pomocy!" #: bridgedb/strings.py:117 #, python-format msgid "If your Tor cannot connect, please take a look at the %s and our %s." -msgstr "" +msgstr "Jeżeli Tor nie może podłączyć proszę zobaczyć na %s i nasze 1%s" #: bridgedb/strings.py:121 msgid "Here are your bridge lines:"

1 0

[tor/master] tls: Log TLS read buffer length bugs once
by nickm＠torproject.org 09 Oct '19

09 Oct '19

commit ff304f3be7d6b5753d2066a0af9772b451f7f442 Author: teor <teor(a)torproject.org> Date: Fri Oct 4 12:33:34 2019 +1000 tls: Log TLS read buffer length bugs once Rather than filling the logs with similar warnings. Fixes bug 31939; bugfix on 0.3.0.4-rc. --- changes/bug31939 | 3 +++ src/lib/tls/buffers_tls.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/bug31939 b/changes/bug31939 new file mode 100644 index 000000000..a36ea495d --- /dev/null +++ b/changes/bug31939 @@ -0,0 +1,3 @@ + o Minor bugfixes (tls, logging): + - Log TLS read buffer length bugs once, rather than filling the logs + with similar warnings. Fixes bug 31939; bugfix on 0.3.0.4-rc. diff --git a/src/lib/tls/buffers_tls.c b/src/lib/tls/buffers_tls.c index c176162c3..e92cb9163 100644 --- a/src/lib/tls/buffers_tls.c +++ b/src/lib/tls/buffers_tls.c @@ -68,9 +68,9 @@ buf_read_from_tls(buf_t *buf, tor_tls_t *tls, size_t at_most) check_no_tls_errors(); - if (BUG(buf->datalen >= INT_MAX)) + IF_BUG_ONCE(buf->datalen >= INT_MAX) return -1; - if (BUG(buf->datalen >= INT_MAX - at_most)) + IF_BUG_ONCE(buf->datalen >= INT_MAX - at_most) return -1; while (at_most > total_read) {

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1394'
by nickm＠torproject.org 09 Oct '19

09 Oct '19

commit 0d82a8be77ae8d7fb06c8702bfbf1ebbaf370c94 Merge: ab064cf76 ff304f3be Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 16:44:12 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1394' changes/bug31939 | 3 +++ src/lib/tls/buffers_tls.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1399'
by nickm＠torproject.org 09 Oct '19

09 Oct '19

commit ab064cf762f0049913ae346dc9b500bc9580395a Merge: 755f00160 081bd3731 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 16:37:47 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1399' changes/bug31995 | 3 +++ src/test/test_hs_service.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/master] Fix flapping of test_service_intro_point() unittest.
by nickm＠torproject.org 09 Oct '19

09 Oct '19

commit 081bd37315a57616144a8e6272a2ea796ace989e Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Oct 8 18:59:27 2019 +0300 Fix flapping of test_service_intro_point() unittest. --- changes/bug31995 | 3 +++ src/test/test_hs_service.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug31995 b/changes/bug31995 new file mode 100644 index 000000000..c7ddd437a --- /dev/null +++ b/changes/bug31995 @@ -0,0 +1,3 @@ + o Minor bugfixes (testing): + - Avoid intermittent test failures due to a test that had relied on + inconsistent timing sources. Fixes bug 31995; bugfix on 0.3.1.3-alpha. diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index c5854f0ff..8993ce3fe 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -674,9 +674,11 @@ test_service_intro_point(void *arg) (void) arg; + update_approx_time(1481621834); + /* Test simple creation of an object. */ { - time_t now = time(NULL); + time_t now = approx_time(); ip = helper_create_service_ip(); tt_assert(ip); /* Make sure the authentication keypair is not zeroes. */

1 0

[tor/master] hs-v3: Do not remove intro point if circuit exists
by nickm＠torproject.org 09 Oct '19

09 Oct '19

commit f50de3a91872014f03856cf4c889f029ec5a1892 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Sep 10 14:40:40 2019 -0400 hs-v3: Do not remove intro point if circuit exists When considering introduction point of a service's descriptor, do not remove an intro point that has an established or pending circuit. Fixes #31652 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug31652 | 5 +++ src/feature/hs/hs_service.c | 87 +++++++++++++++++++++++++++++++++------------ src/test/test_hs_service.c | 1 + 3 files changed, 70 insertions(+), 23 deletions(-) diff --git a/changes/bug31652 b/changes/bug31652 new file mode 100644 index 000000000..c4eca7994 --- /dev/null +++ b/changes/bug31652 @@ -0,0 +1,5 @@ + o Minor bugfixes (onion services): + - When we clean up intro circuits for a v3 onion service, don't remove + circuits that have an established or pending circuit even if ran out of + retries. This way, we don't cleanup the circuit of the last retry. Fixes + bug 31652; bugfix on 0.3.2.1-alpha. diff --git a/src/feature/hs/hs_service.c b/src/feature/hs/hs_service.c index f81987f69..18c38ebc0 100644 --- a/src/feature/hs/hs_service.c +++ b/src/feature/hs/hs_service.c @@ -2333,15 +2333,70 @@ intro_point_should_expire(const hs_service_intro_point_t *ip, return 1; } -/* Go over the given set of intro points for each service and remove any - * invalid ones. The conditions for removal are: +/* Return true iff we should remove the intro point ip from its service. * - * - The node doesn't exists anymore (not in consensus) - * OR - * - The intro point maximum circuit retry count has been reached and no - * circuit can be found associated with it. - * OR - * - The intro point has expired and we should pick a new one. + * We remove an intro point from the service descriptor list if one of + * these criteria is met: + * - It has expired (either in INTRO2 count or in time). + * - No node was found (fell off the consensus). + * - We are over the maximum amount of retries. + * + * If an established or pending circuit is found for the given ip object, this + * return false indicating it should not be removed. */ +static bool +should_remove_intro_point(hs_service_intro_point_t *ip, time_t now) +{ + bool ret = false; + + tor_assert(ip); + + /* Any one of the following needs to be True to furfill the criteria to + * remove an intro point. */ + bool has_no_retries = (ip->circuit_retries > + MAX_INTRO_POINT_CIRCUIT_RETRIES); + bool has_no_node = (get_node_from_intro_point(ip) == NULL); + bool has_expired = intro_point_should_expire(ip, now); + + /* If the node fell off the consensus or the IP has expired, we have to + * remove it now. */ + if (has_no_node || has_expired) { + ret = true; + goto end; + } + + /* Pass this point, even though we might be over the retry limit, we check + * if a circuit (established or pending) exists. In that case, we should not + * remove it because it might simply be valid and opened at the previous + * scheduled event for the last retry. */ + + /* Did we established already? */ + if (ip->circuit_established) { + goto end; + } + /* Do we simply have an existing circuit regardless of its state? */ + if (hs_circ_service_get_intro_circ(ip)) { + goto end; + } + + /* Getting here means we have _no_ circuits so then return if we have any + * remaining retries. */ + ret = has_no_retries; + + end: + /* Meaningful log in case we are about to remove the IP. */ + if (ret) { + log_info(LD_REND, "Intro point %s%s (retried: %u times). " + "Removing it.", + describe_intro_point(ip), + has_expired ? " has expired" : + (has_no_node) ? " fell off the consensus" : "", + ip->circuit_retries); + } + return ret; +} + +/* Go over the given set of intro points for each service and remove any + * invalid ones. * * If an intro point is removed, the circuit (if any) is immediately close. * If a circuit can't be found, the intro point is kept if it hasn't reached @@ -2366,21 +2421,7 @@ cleanup_intro_points(hs_service_t *service, time_t now) * valid and remove any of them that aren't. */ DIGEST256MAP_FOREACH_MODIFY(desc->intro_points.map, key, hs_service_intro_point_t *, ip) { - const node_t *node = get_node_from_intro_point(ip); - int has_expired = intro_point_should_expire(ip, now); - - /* We cleanup an intro point if it has expired or if we do not know the - * node_t anymore (removed from our latest consensus) or if we've - * reached the maximum number of retry with a non existing circuit. */ - if (has_expired || node == NULL || - ip->circuit_retries > MAX_INTRO_POINT_CIRCUIT_RETRIES) { - log_info(LD_REND, "Intro point %s%s (retried: %u times). " - "Removing it.", - describe_intro_point(ip), - has_expired ? " has expired" : - (node == NULL) ? " fell off the consensus" : "", - ip->circuit_retries); - + if (should_remove_intro_point(ip, now)) { /* We've retried too many times, remember it as a failed intro point * so we don't pick it up again for INTRO_CIRC_RETRY_PERIOD sec. */ if (ip->circuit_retries > MAX_INTRO_POINT_CIRCUIT_RETRIES) { diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index c5854f0ff..a2594ed6a 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -1300,6 +1300,7 @@ test_service_event(void *arg) OP_EQ, 1); /* Remove the IP object at once for the next test. */ ip->circuit_retries = MAX_INTRO_POINT_CIRCUIT_RETRIES + 1; + ip->circuit_established = 0; run_housekeeping_event(now); tt_int_op(digest256map_size(service->desc_current->intro_points.map), OP_EQ, 0);

1 0

[tor/master] test: New behavior on IP retry for HSv3
by nickm＠torproject.org 09 Oct '19

09 Oct '19

commit 7c1b2fceb7d46aed8945d86806dc791f97c47125 Author: Neel Chauhan <neel(a)neelc.org> Date: Wed Sep 18 11:40:10 2019 -0400 test: New behavior on IP retry for HSv3 Unit test for #31652 where if we are over the retry limit for the IP but we have an established circuit, we don't remove the IP. Part of #31652 --- src/test/test_hs_service.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index a2594ed6a..efe4166bf 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -1298,6 +1298,11 @@ test_service_event(void *arg) run_housekeeping_event(now); tt_int_op(digest256map_size(service->desc_current->intro_points.map), OP_EQ, 1); + /* No removal if we have an established circuit after retries. */ + ip->circuit_retries = MAX_INTRO_POINT_CIRCUIT_RETRIES + 1; + run_housekeeping_event(now); + tt_int_op(digest256map_size(service->desc_current->intro_points.map), + OP_EQ, 1); /* Remove the IP object at once for the next test. */ ip->circuit_retries = MAX_INTRO_POINT_CIRCUIT_RETRIES + 1; ip->circuit_established = 0;

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1401'
by nickm＠torproject.org 09 Oct '19

09 Oct '19

commit 755f0016009424935f3b9216cad79d54129614cc Merge: 99809834a 7c1b2fceb Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 16:29:46 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1401' changes/bug31652 | 5 +++ src/feature/hs/hs_service.c | 87 +++++++++++++++++++++++++++++++++------------ src/test/test_hs_service.c | 6 ++++ 3 files changed, 75 insertions(+), 23 deletions(-)

1 0

[tor/master] Merge branch 'bug30344_squashed_035'
by nickm＠torproject.org 09 Oct '19

09 Oct '19

commit 99809834a7aac5239b4b1bd7c74215d53856663b Merge: 1f60337da 841cff6e4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 16:26:31 2019 -0400 Merge branch 'bug30344_squashed_035' changes/bug30344 | 4 ++++ src/core/mainloop/connection.c | 18 ++++++++++++------ src/core/mainloop/mainloop.c | 10 ++++++++++ 3 files changed, 26 insertions(+), 6 deletions(-)

1 0

[tor/master] Stop libevent from reading data from closed connections.
by nickm＠torproject.org 09 Oct '19

09 Oct '19

commit 841cff6e4fe1cdd370cd51019e69c6c564e8059c Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Sep 30 18:29:00 2019 +0300 Stop libevent from reading data from closed connections. Code adapted from Rob's proposed patch in #30344. Also add a comment in connection_mark_for_close_internal_() on why we should not be adding extra code there without a very good reason. --- changes/bug30344 | 4 ++++ src/core/mainloop/connection.c | 18 ++++++++++++------ src/core/mainloop/mainloop.c | 10 ++++++++++ 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/changes/bug30344 b/changes/bug30344 new file mode 100644 index 000000000..37561bf94 --- /dev/null +++ b/changes/bug30344 @@ -0,0 +1,4 @@ + o Minor bugfixes (connection): + - Avoid reading data from closed connections, which can cause needless + loops in libevent and infinite loops in Shadow. Fixes bug 30344; bugfix + on 0.1.1.1-alpha. diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index 2f03d919a..3595bba85 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -897,13 +897,19 @@ connection_mark_for_close_(connection_t *conn, int line, const char *file) } /** Mark <b>conn</b> to be closed next time we loop through - * conn_close_if_marked() in main.c; the _internal version bypasses the - * CONN_TYPE_OR checks; this should be called when you either are sure that - * if this is an or_connection_t the controlling channel has been notified - * (e.g. with connection_or_notify_error()), or you actually are the + * conn_close_if_marked() in main.c. + * + * This _internal version bypasses the CONN_TYPE_OR checks; this should be + * called when you either are sure that if this is an or_connection_t the + * controlling channel has been notified (e.g. with + * connection_or_notify_error()), or you actually are the * connection_or_close_for_error() or connection_or_close_normally() function. - * For all other cases, use connection_mark_and_flush() instead, which - * checks for or_connection_t properly, instead. See below. + * For all other cases, use connection_mark_and_flush() which checks for + * or_connection_t properly, instead. See below. + * + * We want to keep this function simple and quick, since it can be called from + * quite deep in the call chain, and hence it should avoid having side-effects + * that interfere with its callers view of the connection. */ MOCK_IMPL(void, connection_mark_for_close_internal_, (connection_t *conn, diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c index 6e2b300fb..4b3c3bf6a 100644 --- a/src/core/mainloop/mainloop.c +++ b/src/core/mainloop/mainloop.c @@ -879,6 +879,16 @@ conn_read_callback(evutil_socket_t fd, short event, void *_conn) /* assert_connection_ok(conn, time(NULL)); */ + /* Handle marked for close connections early */ + if (conn->marked_for_close && connection_is_reading(conn)) { + /* Libevent says we can read, but we are marked for close so we will never + * try to read again. We will try to close the connection below inside of + * close_closeable_connections(), but let's make sure not to cause Libevent + * to spin on conn_read_callback() while we wait for the socket to let us + * flush to it.*/ + connection_stop_reading(conn); + } + if (connection_handle_read(conn) < 0) { if (!conn->marked_for_close) { #ifndef _WIN32

1 0