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

[webwml/master] Update torbrowser changelog urls
by boklm＠torproject.org 23 Jan '18

23 Jan '18

commit 4db67fabfd74d8ffe6ac68339f57c40964017b65 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jan 23 21:18:34 2018 +0100 Update torbrowser changelog urls --- projects/en/torbrowser.wml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml index a799034b..c5da8497 100644 --- a/projects/en/torbrowser.wml +++ b/projects/en/torbrowser.wml @@ -740,9 +740,9 @@ <a href="https://www.torproject.org/projects/torbrowser/design/">design document</a>, the <a - href="https://gitweb.torproject.org/builders/tor-browser-bundle.git/tree/Bundle-D…<version-torbrowserdevelopbranch>">ChangeLog + href="https://gitweb.torproject.org/builders/tor-browser-build.git/tree/projects/…<version-torbrowserdevelopbranch>">ChangeLog for the branch <version-torbrowserdevelopbranch></a>, and the <a - href="https://gitweb.torproject.org/builders/tor-browser-bundle.git/tree/Bundle-D…">ChangeLog + href="https://gitweb.torproject.org/builders/tor-browser-build.git/tree/projects/…">ChangeLog for the alpha branch</a>. How can I make my own bundle?

1 0

[tor/master] openssl_mutexes code belongs in openssl_mgt.c
by nickm＠torproject.org 23 Jan '18

23 Jan '18

commit 23473f5e747a2d9fa2a2a4637283eb53a8c84ca6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 23 14:43:06 2018 -0500 openssl_mutexes code belongs in openssl_mgt.c --- src/common/crypto.c | 14 -------------- src/common/crypto_openssl_mgt.c | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index 3ff3a98e0..107b53ad2 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -3352,20 +3352,6 @@ crypto_global_cleanup(void) CONF_modules_unload(1); CRYPTO_cleanup_all_ex_data(); -#ifndef NEW_THREAD_API - if (n_openssl_mutexes_) { - int n = n_openssl_mutexes_; - tor_mutex_t **ms = openssl_mutexes_; - int i; - openssl_mutexes_ = NULL; - n_openssl_mutexes_ = 0; - for (i=0;i<n;++i) { - tor_mutex_free(ms[i]); - } - tor_free(ms); - } -#endif /* !defined(NEW_THREAD_API) */ - crypto_openssl_free_all(); crypto_early_initialized_ = 0; diff --git a/src/common/crypto_openssl_mgt.c b/src/common/crypto_openssl_mgt.c index db5a52726..bc8f71798 100644 --- a/src/common/crypto_openssl_mgt.c +++ b/src/common/crypto_openssl_mgt.c @@ -143,5 +143,19 @@ crypto_openssl_free_all(void) { tor_free(crypto_openssl_version_str); tor_free(crypto_openssl_header_version_str); + +#ifndef NEW_THREAD_API + if (n_openssl_mutexes_) { + int n = n_openssl_mutexes_; + tor_mutex_t **ms = openssl_mutexes_; + int i; + openssl_mutexes_ = NULL; + n_openssl_mutexes_ = 0; + for (i=0;i<n;++i) { + tor_mutex_free(ms[i]); + } + tor_free(ms); + } +#endif /* !defined(NEW_THREAD_API) */ }

1 0

[tor/master] add a missing "compat_openssl.h"
by nickm＠torproject.org 23 Jan '18

23 Jan '18

commit fa694f5af38d183471aeeba2799aa82bd4fc0a65 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 23 14:41:46 2018 -0500 add a missing "compat_openssl.h" --- src/common/crypto_openssl_mgt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/common/crypto_openssl_mgt.c b/src/common/crypto_openssl_mgt.c index 0720ef032..db5a52726 100644 --- a/src/common/crypto_openssl_mgt.c +++ b/src/common/crypto_openssl_mgt.c @@ -10,6 +10,7 @@ * \brief Block of functions related to operations from OpenSSL. **/ +#include "compat_openssl.h" #include "crypto_openssl_mgt.h" DISABLE_GCC_WARNING(redundant-decls)

1 0

[tor/master] perhaps this was the missing include?
by nickm＠torproject.org 23 Jan '18

23 Jan '18

commit a172f02dfb5720c338acbe46200939f843435bd0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 23 14:19:25 2018 -0500 perhaps this was the missing include? --- src/common/crypto_openssl_mgt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/crypto_openssl_mgt.c b/src/common/crypto_openssl_mgt.c index 055e46876..0720ef032 100644 --- a/src/common/crypto_openssl_mgt.c +++ b/src/common/crypto_openssl_mgt.c @@ -24,7 +24,7 @@ DISABLE_GCC_WARNING(redundant-decls) #include <openssl/dh.h> #include <openssl/conf.h> #include <openssl/hmac.h> -#include <openssl/opensslv.h> +#include <openssl/crypto.h> ENABLE_GCC_WARNING(redundant-decls)

1 0

[tor/master] Add a missing include for openssl 1.0.2
by nickm＠torproject.org 23 Jan '18

23 Jan '18

commit a34629fa28a1173edc16770a1f586b79aff828f6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 23 14:16:53 2018 -0500 Add a missing include for openssl 1.0.2 --- src/common/crypto_openssl_mgt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/common/crypto_openssl_mgt.c b/src/common/crypto_openssl_mgt.c index ca91e12d1..055e46876 100644 --- a/src/common/crypto_openssl_mgt.c +++ b/src/common/crypto_openssl_mgt.c @@ -24,6 +24,7 @@ DISABLE_GCC_WARNING(redundant-decls) #include <openssl/dh.h> #include <openssl/conf.h> #include <openssl/hmac.h> +#include <openssl/opensslv.h> ENABLE_GCC_WARNING(redundant-decls)

1 0

[tor/master] Merge remote-tracking branch 'mikeperry/bug24946'
by nickm＠torproject.org 23 Jan '18

23 Jan '18

commit 6f4ee6e5e78112f78687fa0617e2cdeb2899f7d6 Merge: 58f4aee90 db5b670d8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 23 14:08:47 2018 -0500 Merge remote-tracking branch 'mikeperry/bug24946' changes/bug24946 | 5 +++++ src/or/circuituse.c | 2 ++ src/or/connection_edge.c | 3 +++ src/or/hs_circuit.c | 6 +++++- src/or/rendservice.c | 7 ++++++- 5 files changed, 21 insertions(+), 2 deletions(-)

1 0

[tor/master] Bug 24946: Fix a warning message caused by a missed purpose check.
by nickm＠torproject.org 23 Jan '18

23 Jan '18

commit db5b670d85febc6e3011932f8f0c7d383d4b9bea Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Jan 20 03:16:24 2018 +0000 Bug 24946: Fix a warning message caused by a missed purpose check. Also fix three other checks (found by inspection of all CIRCUIT_PURPOSE_C_GENERAL occurrences). --- changes/bug24946 | 5 +++++ src/or/circuituse.c | 2 ++ src/or/connection_edge.c | 3 +++ src/or/hs_circuit.c | 6 +++++- src/or/rendservice.c | 7 ++++++- 5 files changed, 21 insertions(+), 2 deletions(-) diff --git a/changes/bug24946 b/changes/bug24946 new file mode 100644 index 000000000..7f8acfe5d --- /dev/null +++ b/changes/bug24946 @@ -0,0 +1,5 @@ + o Minor bugfixes (hidden services): + - Fix a warning caused by differentiating hsdir circuits from general + circuits. Also address three similar checks in the codebase that + were related to reuse and rate limiting of circuits. Fixes bug 24946; + bugfix on 0.3.3.0-alpha-dev; not in any released version of tor. diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 5f9567ea1..41ef08825 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -134,6 +134,8 @@ circuit_is_acceptable(const origin_circuit_t *origin_circ, } if (purpose == CIRCUIT_PURPOSE_C_GENERAL || + purpose == CIRCUIT_PURPOSE_C_HSDIR_GET || + purpose == CIRCUIT_PURPOSE_S_HSDIR_POST || purpose == CIRCUIT_PURPOSE_HS_VANGUARDS || purpose == CIRCUIT_PURPOSE_C_REND_JOINED) { if (circ->timestamp_dirty && diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 4021ca9e0..a47f044e0 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -792,7 +792,10 @@ connection_ap_expire_beginning(void) } continue; } + if (circ->purpose != CIRCUIT_PURPOSE_C_GENERAL && + circ->purpose != CIRCUIT_PURPOSE_C_HSDIR_GET && + circ->purpose != CIRCUIT_PURPOSE_S_HSDIR_POST && circ->purpose != CIRCUIT_PURPOSE_C_MEASURE_TIMEOUT && circ->purpose != CIRCUIT_PURPOSE_PATH_BIAS_TESTING) { log_warn(LD_BUG, "circuit->purpose == CIRCUIT_PURPOSE_C_GENERAL failed. " diff --git a/src/or/hs_circuit.c b/src/or/hs_circuit.c index 753c0fcd6..2a41c1ccc 100644 --- a/src/or/hs_circuit.c +++ b/src/or/hs_circuit.c @@ -824,7 +824,11 @@ hs_circ_service_intro_has_opened(hs_service_t *service, /* Cleaning up the hidden service identifier and repurpose. */ hs_ident_circuit_free(circ->hs_ident); circ->hs_ident = NULL; - circuit_change_purpose(TO_CIRCUIT(circ), CIRCUIT_PURPOSE_C_GENERAL); + if (circuit_should_use_vanguards(TO_CIRCUIT(circ)->purpose)) + circuit_change_purpose(TO_CIRCUIT(circ), CIRCUIT_PURPOSE_HS_VANGUARDS); + else + circuit_change_purpose(TO_CIRCUIT(circ), CIRCUIT_PURPOSE_C_GENERAL); + /* Inform that this circuit just opened for this new purpose. */ circuit_has_opened(circ); /* This return value indicate to the caller that the IP object should be diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 52bd6683f..f38895d5f 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -3222,7 +3222,12 @@ rend_service_intro_has_opened(origin_circuit_t *circuit) "circuit, but we already have enough. Redefining purpose to " "general; leaving as internal."); - circuit_change_purpose(TO_CIRCUIT(circuit), CIRCUIT_PURPOSE_C_GENERAL); + if (circuit_should_use_vanguards(TO_CIRCUIT(circuit)->purpose)) { + circuit_change_purpose(TO_CIRCUIT(circuit), + CIRCUIT_PURPOSE_HS_VANGUARDS); + } else { + circuit_change_purpose(TO_CIRCUIT(circuit), CIRCUIT_PURPOSE_C_GENERAL); + } { rend_data_free(circuit->rend_data);

1 0

[tor/master] Add onion service activity information to our heartbeat logs.
by nickm＠torproject.org 23 Jan '18

23 Jan '18

commit 17daab76b87a9cc7491bdfdc46dd10c9d5d7023f Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Jan 23 12:31:06 2018 +0200 Add onion service activity information to our heartbeat logs. --- changes/bug24896 | 3 +++ src/or/circuituse.c | 6 ++++++ src/or/hs_service.c | 3 +++ src/or/hs_stats.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/or/hs_stats.h | 14 +++++++++++++ src/or/include.am | 2 ++ src/or/status.c | 25 +++++++++++++++++++++++ 7 files changed, 111 insertions(+) diff --git a/changes/bug24896 b/changes/bug24896 new file mode 100644 index 000000000..7d2dd7477 --- /dev/null +++ b/changes/bug24896 @@ -0,0 +1,3 @@ + o Minor features (heartbeat): + - Add onion service information to our heartbeat logs, displaying stats + about the activity of configured onion services. Closes ticket 24896. \ No newline at end of file diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 5f9567ea1..259968596 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -45,6 +45,7 @@ #include "hs_client.h" #include "hs_circuit.h" #include "hs_ident.h" +#include "hs_stats.h" #include "nodelist.h" #include "networkstatus.h" #include "policies.h" @@ -2026,6 +2027,11 @@ circuit_launch_by_extend_info(uint8_t purpose, int have_path = have_enough_path_info(! (flags & CIRCLAUNCH_IS_INTERNAL) ); int need_specific_rp = 0; + /* Keep some stats about our attempts to launch HS rendezvous circuits */ + if (purpose == CIRCUIT_PURPOSE_S_CONNECT_REND) { + hs_stats_note_service_rendezvous_launch(); + } + if (!onehop_tunnel && (!router_have_minimum_dir_info() || !have_path)) { log_debug(LD_CIRC,"Haven't %s yet; canceling " "circuit launch.", diff --git a/src/or/hs_service.c b/src/or/hs_service.c index 0db22991c..64ab9c9ee 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -36,6 +36,7 @@ #include "hs_ident.h" #include "hs_intropoint.h" #include "hs_service.h" +#include "hs_stats.h" /* Trunnel */ #include "ed25519_cert.h" @@ -3304,8 +3305,10 @@ hs_service_receive_introduce2(origin_circuit_t *circ, const uint8_t *payload, if (circ->hs_ident) { ret = service_handle_introduce2(circ, payload, payload_len); + hs_stats_note_introduce2_cell(1); } else { ret = rend_service_receive_introduction(circ, payload, payload_len); + hs_stats_note_introduce2_cell(0); } done: diff --git a/src/or/hs_stats.c b/src/or/hs_stats.c new file mode 100644 index 000000000..3e183a5bf --- /dev/null +++ b/src/or/hs_stats.c @@ -0,0 +1,58 @@ +/* Copyright (c) 2016-2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file hs_stats.c + * \brief Keeps stats about the activity of our hidden service. + **/ + +#include "or.h" +#include "hs_stats.h" +#include "hs_service.h" + +/** Number of v3 INTRODUCE2 cells received */ +static uint32_t n_introduce2_v3 = 0; +/** Number of v2 INTRODUCE2 cells received */ +static uint32_t n_introduce2_v2 = 0; +/** Number of attempts to make a circuit to a rendezvous point */ +static uint32_t n_rendezvous_launches = 0; + +/** Note that we received another INTRODUCE2 cell. */ +void +hs_stats_note_introduce2_cell(int is_hsv3) +{ + if (is_hsv3) { + n_introduce2_v3++; + } else { + n_introduce2_v2++; + } +} + +/** Return the number of v3 INTRODUCE2 cells we have received. */ +uint32_t +hs_stats_get_n_introduce2_v3_cells(void) +{ + return n_introduce2_v3; +} + +/** Return the number of v2 INTRODUCE2 cells we have received. */ +uint32_t +hs_stats_get_n_introduce2_v2_cells(void) +{ + return n_introduce2_v2; +} + +/** Note that we attempted to launch another circuit to a rendezvous point */ +void +hs_stats_note_service_rendezvous_launch(void) +{ + n_rendezvous_launches++; +} + +/** Return the number of rendezvous circuits we have attempted to launch */ +uint32_t +hs_stats_get_n_rendezvous_launches(void) +{ + return n_rendezvous_launches; +} + diff --git a/src/or/hs_stats.h b/src/or/hs_stats.h new file mode 100644 index 000000000..a946ad75e --- /dev/null +++ b/src/or/hs_stats.h @@ -0,0 +1,14 @@ +/* Copyright (c) 2016-2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file hs_stats.h + * \brief Header file for hs_stats.c + **/ + +void hs_stats_note_introduce2_cell(int is_hsv3); +uint32_t hs_stats_get_n_introduce2_v3_cells(void); +uint32_t hs_stats_get_n_introduce2_v2_cells(void); +void hs_stats_note_service_rendezvous_launch(void); +uint32_t hs_stats_get_n_rendezvous_launches(void); + diff --git a/src/or/include.am b/src/or/include.am index 1c66cd2de..09be12561 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -66,6 +66,7 @@ LIBTOR_A_SOURCES = \ src/or/hs_intropoint.c \ src/or/hs_ntor.c \ src/or/hs_service.c \ + src/or/hs_stats.c \ src/or/keypin.c \ src/or/main.c \ src/or/microdesc.c \ @@ -207,6 +208,7 @@ ORHEADERS = \ src/or/hs_ident.h \ src/or/hs_intropoint.h \ src/or/hs_ntor.h \ + src/or/hs_stats.h \ src/or/hs_service.h \ src/or/keypin.h \ src/or/main.h \ diff --git a/src/or/status.c b/src/or/status.c index 1a8885e83..187dc4ad2 100644 --- a/src/or/status.c +++ b/src/or/status.c @@ -27,6 +27,8 @@ #include "hibernate.h" #include "rephist.h" #include "statefile.h" +#include "hs_stats.h" +#include "hs_service.h" static void log_accounting(const time_t now, const or_options_t *options); #include "geoip.h" @@ -85,6 +87,26 @@ bytes_to_usage(uint64_t bytes) return bw_string; } +/** Log some usage info about our hidden service */ +static void +log_onion_service_stats(void) +{ + unsigned int num_services = hs_service_get_num_services(); + + /* If there are no active hidden services, no need to print logs */ + if (num_services == 0) { + return; + } + + log_notice(LD_HEARTBEAT, + "Our hidden service%s received %u v2 and %u v3 INTRODUCE2 cells " + "and attempted to launch %d rendezvous circuits.", + num_services == 1 ? "" : "s", + hs_stats_get_n_introduce2_v2_cells(), + hs_stats_get_n_introduce2_v3_cells(), + hs_stats_get_n_rendezvous_launches()); +} + /** Log a "heartbeat" message describing Tor's status and history so that the * user can know that there is indeed a running Tor. Return 0 on success and * -1 on failure. */ @@ -171,6 +193,9 @@ log_heartbeat(time_t now) U64_PRINTF_ARG(main_loop_idle_count)); } + /** Now, if we are an HS service, log some stats about our usage */ + log_onion_service_stats(); + tor_free(uptime); tor_free(bw_sent); tor_free(bw_rcvd);

1 0

[tor/master] Merge remote-tracking branch 'asn/bug24896'
by nickm＠torproject.org 23 Jan '18

23 Jan '18

commit 58f4aee90b753aaa4bca51fd5ffe488fddbef577 Merge: 13a2acba3 17daab76b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 23 14:06:27 2018 -0500 Merge remote-tracking branch 'asn/bug24896' changes/bug24896 | 3 +++ src/or/circuituse.c | 6 ++++++ src/or/hs_service.c | 3 +++ src/or/hs_stats.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/or/hs_stats.h | 14 +++++++++++++ src/or/include.am | 2 ++ src/or/status.c | 25 +++++++++++++++++++++++ 7 files changed, 111 insertions(+)

1 0

[tor/master] Add free_openssl() to crypto_openssl module.
by nickm＠torproject.org 23 Jan '18

23 Jan '18

commit 7353c9496e4f67321fbeee594cb8c488cff20aaf Author: Fernando Fernandez Mancera <ffernandezmancera(a)gmail.com> Date: Mon Jan 8 15:31:41 2018 +0100 Add free_openssl() to crypto_openssl module. Add free_openssl() function to free the memory allocated for OpenSSL version management variables. It is required since OpenSSL management has been isolated from the crypto module. Follows #24658. Signed-off-by: Fernando Fernandez Mancera <ffernandezmancera(a)gmail.com> --- src/common/crypto.c | 3 +-- src/common/crypto_openssl.c | 8 ++++++++ src/common/crypto_openssl.h | 3 +++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index 0abb4a1af..12f4270cc 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -3348,8 +3348,7 @@ crypto_global_cleanup(void) } #endif /* !defined(NEW_THREAD_API) */ - tor_free(crypto_openssl_version_str); - tor_free(crypto_openssl_header_version_str); + free_openssl(); return 0; } diff --git a/src/common/crypto_openssl.c b/src/common/crypto_openssl.c index 03485c052..e7495f972 100644 --- a/src/common/crypto_openssl.c +++ b/src/common/crypto_openssl.c @@ -113,3 +113,11 @@ setup_openssl_threading(void) return 0; } +/** free OpenSSL variables */ +void +free_openssl(void) +{ + tor_free(crypto_openssl_version_str); + tor_free(crypto_openssl_header_version_str); +} + diff --git a/src/common/crypto_openssl.h b/src/common/crypto_openssl.h index 7b5545f69..0c6bccad4 100644 --- a/src/common/crypto_openssl.h +++ b/src/common/crypto_openssl.h @@ -101,5 +101,8 @@ void tor_set_openssl_thread_id(CRYPTO_THREADID *threadid); /* OpenSSL threading setup function */ int setup_openssl_threading(void); +/* Tor OpenSSL utility functions */ +void free_openssl(void); + #endif /* !defined(TOR_CRYPTO_OPENSSL_H) */

1 0