September 2018 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'nss_27664'
by nickm＠torproject.org 14 Sep '18

14 Sep '18

commit 0e4fcd39966ac6f5273920a6a19a8527d891d78e Merge: e43ae24e7 75d6609eb Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 14 10:24:46 2018 -0400 Merge branch 'nss_27664' src/app/config/config.c | 2 ++ src/lib/process/daemon.c | 10 ++++++++++ src/lib/process/daemon.h | 4 ++++ 3 files changed, 16 insertions(+)

1 0

[tor/master] Merge branch 'nss_27451'
by nickm＠torproject.org 14 Sep '18

14 Sep '18

commit e43ae24e7d8cc96eaed41b8e135232248ac39721 Merge: dbb0abc9f 9f5f67bda Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 14 10:22:38 2018 -0400 Merge branch 'nss_27451' src/core/mainloop/connection.c | 15 +++++++++++++-- src/lib/tls/tortls.h | 1 + src/lib/tls/tortls_nss.c | 37 +++++++++++++++++++++++++++++++++++++ src/lib/tls/tortls_openssl.c | 24 +++++++++++++++++++++++- 4 files changed, 74 insertions(+), 3 deletions(-)

1 0

[tor/master] Add a tor_tls_release_socket() function.
by nickm＠torproject.org 14 Sep '18

14 Sep '18

commit ae5692994fc31cc5fa25fb5681e59e326e6c5dbe Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 12 11:02:59 2018 -0400 Add a tor_tls_release_socket() function. This function tells the underlying TLS object that it shouldn't close the fd on exit. Mostly, we hope not to have to use it, since the NSS implementation is kludgey, but it should allow us to fix --- src/lib/tls/tortls.h | 1 + src/lib/tls/tortls_nss.c | 37 +++++++++++++++++++++++++++++++++++++ src/lib/tls/tortls_openssl.c | 24 +++++++++++++++++++++++- 3 files changed, 61 insertions(+), 1 deletion(-) diff --git a/src/lib/tls/tortls.h b/src/lib/tls/tortls.h index 459192708..3f1098bba 100644 --- a/src/lib/tls/tortls.h +++ b/src/lib/tls/tortls.h @@ -94,6 +94,7 @@ void tor_tls_set_renegotiate_callback(tor_tls_t *tls, void (*cb)(tor_tls_t *, void *arg), void *arg); int tor_tls_is_server(tor_tls_t *tls); +void tor_tls_release_socket(tor_tls_t *tls); void tor_tls_free_(tor_tls_t *tls); #define tor_tls_free(tls) FREE_AND_NULL(tor_tls_t, tor_tls_free_, (tls)) int tor_tls_peer_has_cert(tor_tls_t *tls); diff --git a/src/lib/tls/tortls_nss.c b/src/lib/tls/tortls_nss.c index 53adfedf3..1b2032764 100644 --- a/src/lib/tls/tortls_nss.c +++ b/src/lib/tls/tortls_nss.c @@ -414,6 +414,43 @@ tor_tls_set_renegotiate_callback(tor_tls_t *tls, /* We don't support renegotiation-based TLS with NSS. */ } +/** + * Tell the TLS library that the underlying socket for tls has been + * closed, and the library should not attempt to free that socket itself. + */ +void +tor_tls_release_socket(tor_tls_t *tls) +{ + if (! tls) + return; + + /* NSS doesn't have the equivalent of BIO_NO_CLOSE. If you replace the + * fd with something that's invalid, it causes a memory leak in PR_Close. + * + * If there were a way to put the PRFileDesc into the CLOSED state, that + * would prevent it from closing its fd -- but there doesn't seem to be a + * supported way to do that either. + * + * So instead: we make a new sacrificial socket, and replace the original + * socket with that one. This seems to be the best we can do, until we + * redesign the mainloop code enough to make this function unnecessary. + */ + tor_socket_t sock = + tor_open_socket_nonblocking(AF_INET, SOCK_STREAM, IPPROTO_TCP); + if (!sock) { + log_warn(LD_NET, "Out of sockets when trying to shut down an NSS " + "connection"); + return; + } + + PRFileDesc *tcp = PR_GetIdentitiesLayer(tls->ssl, PR_NSPR_IO_LAYER); + if (BUG(! tcp)) { + return; + } + + PR_ChangeFileDescNativeHandle(tcp, sock); +} + void tor_tls_impl_free_(tor_tls_impl_t *tls) { diff --git a/src/lib/tls/tortls_openssl.c b/src/lib/tls/tortls_openssl.c index dc6c0bee9..534a90de5 100644 --- a/src/lib/tls/tortls_openssl.c +++ b/src/lib/tls/tortls_openssl.c @@ -1048,7 +1048,7 @@ tor_tls_new(tor_socket_t sock, int isServer) goto err; } result->socket = sock; - bio = BIO_new_socket(sock, BIO_NOCLOSE); + bio = BIO_new_socket(sock, BIO_CLOSE); if (! bio) { tls_log_errors(NULL, LOG_WARN, LD_NET, "opening BIO"); #ifdef SSL_set_tlsext_host_name @@ -1154,6 +1154,28 @@ tor_tls_assert_renegotiation_unblocked(tor_tls_t *tls) #endif /* defined(SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION) && ... */ } +/** + * Tell the TLS library that the underlying socket for tls has been + * closed, and the library should not attempt to free that socket itself. + */ +void +tor_tls_release_socket(tor_tls_t *tls) +{ + if (! tls) + return; + + BIO *rbio, *wbio; + rbio = SSL_get_rbio(tls->ssl); + wbio = SSL_get_wbio(tls->ssl); + + if (rbio) { + BIO_set_close(rbio, BIO_NOCLOSE); + } + if (wbio && wbio != rbio) { + BIO_set_close(wbio, BIO_NOCLOSE); + } +} + void tor_tls_impl_free_(tor_tls_impl_t *ssl) {

1 0

[tor/master] Use tor_tls_release_socket() to avoid double-closed sockets on NSS
by nickm＠torproject.org 14 Sep '18

14 Sep '18

commit 9f5f67bda26979bb75e10a0ce0080997b1b72603 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 12 11:32:15 2018 -0400 Use tor_tls_release_socket() to avoid double-closed sockets on NSS Closes ticket 27451; bug not in any released Tor. --- src/core/mainloop/connection.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index ffc9010fb..16ce8b3f2 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -638,8 +638,19 @@ connection_free_minimal(connection_t *conn) if (connection_speaks_cells(conn)) { or_connection_t *or_conn = TO_OR_CONN(conn); - tor_tls_free(or_conn->tls); - or_conn->tls = NULL; + if (or_conn->tls) { + if (! SOCKET_OK(conn->s)) { + /* The socket has been closed by somebody else; we must tell the + * TLS object not to close it. */ + tor_tls_release_socket(or_conn->tls); + } else { + /* The tor_tls_free() call below will close the socket; we must tell + * the code below not to close it a second time. */ + conn->s = TOR_INVALID_SOCKET; + } + tor_tls_free(or_conn->tls); + or_conn->tls = NULL; + } or_handshake_state_free(or_conn->handshake_state); or_conn->handshake_state = NULL; tor_free(or_conn->nickname);

1 0

[translation/support-portal_completed] Update translations for support-portal_completed
by translation＠torproject.org 14 Sep '18

14 Sep '18

commit 7a6802d142b6f090014bf54b464a837151bc355a Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 14 13:49:00 2018 +0000 Update translations for support-portal_completed --- contents+ga.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/contents+ga.po b/contents+ga.po index b272cd177..348666c71 100644 --- a/contents+ga.po +++ b/contents+ga.po @@ -170,8 +170,8 @@ msgid "" "Our website is blocked by a censor. Can Tor Browser help users access our " "website?" msgstr "" -"Rinneadh cinsireacht ar ár suíomh Gréasáin. An féidir lenár gcuid " -"húsáideoirí Brabhsálaí Tor a úsáid chun teacht air?" +"Rinneadh cinsireacht ar ár suíomh Gréasáin. An féidir lenár gcuid úsáideoirí" +" Brabhsálaí Tor a úsáid chun teacht air?" #: http//localhost/tbb/tbb-42/ #: (content/tbb/tbb-42/contents+en.lrquestion.description) @@ -2223,7 +2223,7 @@ msgstr "" #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.title) msgid "Can you get rid of all the captchas?" -msgstr "An bhfaighidh sibh réidh leis na captchas?" +msgstr "An bhfaighidh sibh réidh leis na CAPTCHAnna?" #: http//localhost/misc/misc-5/ #: (content/misc/misc-5/contents+en.lrquestion.description) @@ -2523,7 +2523,7 @@ msgid "" "and the steps for making it the default browser are unreliable." msgstr "" "Déanann Brabhsálaí Tor a dhícheall a bheith neamhspleách ar an gcuid eile de" -" do chóras, agus ní féidir leat muinín a chur sna céimeanna a dhéanann " +" do chóras, agus ní féidir leat muinín a chur sna céimeanna a dhéanfadh " "brabhsálaí réamhshocraithe de." #: http//localhost/operators/operators-3/ @@ -3595,7 +3595,7 @@ msgid "" "common for anti-virus / anti-malware software to cause this type of issue." msgstr "" "Má tá bogearra frithvíris ar do ríomhaire, féach ar <a " -"href=\"http://support.torproject.org/#tbb-10\">Cuireann mo bhogearra " +"href=\"http://support.torproject.org/ga/#tbb-10\">Cuireann mo bhogearra " "frithvíris cosc ar Bhrabhsálaí Tor.</a>; is minic go mbíonn bogearra " "frithvíris ina chúis le fadhbanna den sórt seo." @@ -3812,7 +3812,7 @@ msgid "" "activity from being linkable to what you were doing before." msgstr "" "Tá an rogha seo úsáideach má tá tú ag iarraidh aon cheangal idir do " -"ghníomhaíocht sa todhchaí agus na rudaí a bhí ag déanamh níos luaithe a " +"ghníomhaíocht sa todhchaí agus na rudaí a bhí tú ag déanamh níos luaithe a " "bhriseadh." #: http//localhost/misc/misc-10/

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 14 Sep '18

14 Sep '18

commit b65ecee3031eb389cc064f74cab7b078018dc1b1 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 14 13:48:54 2018 +0000 Update translations for support-portal --- contents+ga.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/contents+ga.po b/contents+ga.po index b272cd177..348666c71 100644 --- a/contents+ga.po +++ b/contents+ga.po @@ -170,8 +170,8 @@ msgid "" "Our website is blocked by a censor. Can Tor Browser help users access our " "website?" msgstr "" -"Rinneadh cinsireacht ar ár suíomh Gréasáin. An féidir lenár gcuid " -"húsáideoirí Brabhsálaí Tor a úsáid chun teacht air?" +"Rinneadh cinsireacht ar ár suíomh Gréasáin. An féidir lenár gcuid úsáideoirí" +" Brabhsálaí Tor a úsáid chun teacht air?" #: http//localhost/tbb/tbb-42/ #: (content/tbb/tbb-42/contents+en.lrquestion.description) @@ -2223,7 +2223,7 @@ msgstr "" #: http//localhost/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.title) msgid "Can you get rid of all the captchas?" -msgstr "An bhfaighidh sibh réidh leis na captchas?" +msgstr "An bhfaighidh sibh réidh leis na CAPTCHAnna?" #: http//localhost/misc/misc-5/ #: (content/misc/misc-5/contents+en.lrquestion.description) @@ -2523,7 +2523,7 @@ msgid "" "and the steps for making it the default browser are unreliable." msgstr "" "Déanann Brabhsálaí Tor a dhícheall a bheith neamhspleách ar an gcuid eile de" -" do chóras, agus ní féidir leat muinín a chur sna céimeanna a dhéanann " +" do chóras, agus ní féidir leat muinín a chur sna céimeanna a dhéanfadh " "brabhsálaí réamhshocraithe de." #: http//localhost/operators/operators-3/ @@ -3595,7 +3595,7 @@ msgid "" "common for anti-virus / anti-malware software to cause this type of issue." msgstr "" "Má tá bogearra frithvíris ar do ríomhaire, féach ar <a " -"href=\"http://support.torproject.org/#tbb-10\">Cuireann mo bhogearra " +"href=\"http://support.torproject.org/ga/#tbb-10\">Cuireann mo bhogearra " "frithvíris cosc ar Bhrabhsálaí Tor.</a>; is minic go mbíonn bogearra " "frithvíris ina chúis le fadhbanna den sórt seo." @@ -3812,7 +3812,7 @@ msgid "" "activity from being linkable to what you were doing before." msgstr "" "Tá an rogha seo úsáideach má tá tú ag iarraidh aon cheangal idir do " -"ghníomhaíocht sa todhchaí agus na rudaí a bhí ag déanamh níos luaithe a " +"ghníomhaíocht sa todhchaí agus na rudaí a bhí tú ag déanamh níos luaithe a " "bhriseadh." #: http//localhost/misc/misc-10/

1 0

[tor/master] Merge remote-tracking branch 'neel/b21530'
by nickm＠torproject.org 14 Sep '18

14 Sep '18

commit 12320e7f3ed181f8eb0af4b02507ac3abb7fe6ea Merge: 0582f678e 2c093c96b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 14 09:27:03 2018 -0400 Merge remote-tracking branch 'neel/b21530' changes/bug21530 | 7 +++++++ src/core/or/policies.c | 44 +++++++++++++++----------------------------- 2 files changed, 22 insertions(+), 29 deletions(-)

1 0

[tor/master] Tweak changes file: call this a major feature.
by nickm＠torproject.org 14 Sep '18

14 Sep '18

commit dbb0abc9f1a174efdb65d581f5dbe46dbad2ebb5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 14 09:32:53 2018 -0400 Tweak changes file: call this a major feature. --- changes/bug21530 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/changes/bug21530 b/changes/bug21530 index 93a54907c..24d981d82 100644 --- a/changes/bug21530 +++ b/changes/bug21530 @@ -1,7 +1,7 @@ - o Minor bugfixes (relay): - - If we are a relay where ExitRelay is auto and we have not specified - an exit policy, whether through ExitPolicy lines or ReducedExitPolicy, - emulate the behavior of ExitRelay as 0. Previously, we allowed exit - traffic if ExitRelay is auto and logged a warning message. Fixes bug - 21530; bugfix on 0.3.5.1-alpha. Patch by Neel Chauhan. - + o Major features (relay): + - Relays no longer run as exits by default. If the "ExitRelay" option is + auto (or unset), and no exit policy is specified with ExitPolicy or + ReducedExitPolicy, we now treat ExitRelay as 0. Previously in this + case, we allowed exit + traffic and logged a warning message. Closes ticket + 21530. Patch by Neel Chauhan.

1 0

[tor/master] If ExitRelay is not specified, emulate the behavior of "ExitRelay 0"
by nickm＠torproject.org 14 Sep '18

14 Sep '18

commit eb2b130ad9636a9e8c7fc6dd04f6283dcee6c9d5 Author: Neel Chauhan <neel(a)neelc.org> Date: Mon Aug 20 20:25:23 2018 -0400 If ExitRelay is not specified, emulate the behavior of "ExitRelay 0" --- changes/bug21530 | 7 +++++++ src/core/or/policies.c | 37 ++++++------------------------------- 2 files changed, 13 insertions(+), 31 deletions(-) diff --git a/changes/bug21530 b/changes/bug21530 new file mode 100644 index 000000000..93a54907c --- /dev/null +++ b/changes/bug21530 @@ -0,0 +1,7 @@ + o Minor bugfixes (relay): + - If we are a relay where ExitRelay is auto and we have not specified + an exit policy, whether through ExitPolicy lines or ReducedExitPolicy, + emulate the behavior of ExitRelay as 0. Previously, we allowed exit + traffic if ExitRelay is auto and logged a warning message. Fixes bug + 21530; bugfix on 0.3.5.1-alpha. Patch by Neel Chauhan. + diff --git a/src/core/or/policies.c b/src/core/or/policies.c index e01415f95..5413ad0eb 100644 --- a/src/core/or/policies.c +++ b/src/core/or/policies.c @@ -1155,33 +1155,6 @@ validate_addr_policies(const or_options_t *options, char **msg) REJECT("Error in ExitPolicy entry."); } - static int warned_about_exitrelay = 0; - - const int exitrelay_setting_is_auto = options->ExitRelay == -1; - const int policy_accepts_something = - ! (policy_is_reject_star(addr_policy, AF_INET, 1) && - policy_is_reject_star(addr_policy, AF_INET6, 1)); - - if (server_mode(options) && - ! warned_about_exitrelay && - exitrelay_setting_is_auto && - policy_accepts_something) { - /* Policy accepts something */ - warned_about_exitrelay = 1; - log_warn(LD_CONFIG, - "Tor is running as an exit relay%s. If you did not want this " - "behavior, please set the ExitRelay option to 0. If you do " - "want to run an exit Relay, please set the ExitRelay option " - "to 1 to disable this warning, and for forward compatibility.", - options->ExitPolicy == NULL ? - " with the default exit policy" : ""); - if (options->ExitPolicy == NULL && options->ReducedExitPolicy == 0) { - log_warn(LD_CONFIG, - "In a future version of Tor, ExitRelay 0 may become the " - "default when no ExitPolicy is given."); - } - } - /* The rest of these calls *append* to addr_policy. So don't actually * use the results for anything other than checking if they parse! */ if (parse_addr_policy(options->DirPolicy, &addr_policy, -1)) @@ -2117,8 +2090,8 @@ policies_copy_outbound_addresses_to_smartlist(smartlist_t *addr_list, * If or_options->BridgeRelay is false, append entries of default * Tor exit policy into result smartlist. * - * If or_options->ExitRelay is false, then make our exit policy into - * "reject *:*" regardless. + * If or_options->ExitRelay is false, or is auto without specifying an exit + * policy, then make our exit policy into "reject *:*" regardless. */ int policies_parse_exit_policy_from_options(const or_options_t *or_options, @@ -2130,8 +2103,10 @@ policies_parse_exit_policy_from_options(const or_options_t *or_options, smartlist_t *configured_addresses = NULL; int rv = 0; - /* Short-circuit for non-exit relays */ - if (or_options->ExitRelay == 0) { + /* Short-circuit for non-exit relays, or for relays where we didn't specify + * ExitPolicy or ReducedExitPolicy and ExitRelay is auto. */ + if (or_options->ExitRelay == 0 || (or_options->ExitPolicy == NULL && + or_options->ExitRelay == -1 && or_options->ReducedExitPolicy == 0)) { append_exit_policy_string(result, "reject *4:*"); append_exit_policy_string(result, "reject *6:*"); return 0;

1 0

[tor/master] Tweak message; only log it on a relay.
by nickm＠torproject.org 14 Sep '18

14 Sep '18

commit 1ca03633fe47273e95595d03a9fd086fbf9d9c71 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 14 09:32:39 2018 -0400 Tweak message; only log it on a relay. --- src/core/or/policies.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/core/or/policies.c b/src/core/or/policies.c index 1c9c9b075..3cb5e5359 100644 --- a/src/core/or/policies.c +++ b/src/core/or/policies.c @@ -1165,13 +1165,14 @@ validate_addr_policies(const or_options_t *options, char **msg) static int warned_about_nonexit = 0; - if (!warned_about_nonexit && options->ExitPolicy == NULL && + if (public_server_mode(options) && + !warned_about_nonexit && options->ExitPolicy == NULL && options->ExitRelay == -1 && options->ReducedExitPolicy == 0) { warned_about_nonexit = 1; log_notice(LD_CONFIG, "By default, Tor does not run as an exit relay. " - "The reason is to prevent your relay from appearing as the " - "source of abusive traffic. If you want to be an exit relay, " - "set ExitRelay to 1."); + "If you want to be an exit relay, " + "set ExitRelay to 1. To suppress this message in the future, " + "set ExitRelay to 0."); } /* The rest of these calls *append* to addr_policy. So don't actually

1 0