May 2017 - tor-commits - lists.torproject.org

[tor/master] bump to 0.3.1.1-alpha
by nickm＠torproject.org 22 May '17

22 May '17

commit 281f06a094434269bf4d62041c5683c1265a436f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 22 11:52:19 2017 -0400 bump to 0.3.1.1-alpha --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 4c23e47..516228a 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.1.0-alpha-dev]) +AC_INIT([tor],[0.3.1.1-alpha]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index c63f838..297b741 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.3.1.0-alpha-dev" +!define VERSION "0.3.1.1-alpha" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index f7f4f19..ee184db 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.3.1.0-alpha-dev" +#define VERSION "0.3.1.1-alpha"

1 0

[translation/tor-browser-manual_completed] Update translations for tor-browser-manual_completed
by translation＠torproject.org 22 May '17

22 May '17

commit f6b88e04c5ae1c56d9275ddc35e66105ad4d21cf Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 22 15:48:20 2017 +0000 Update translations for tor-browser-manual_completed --- pt_BR/pt_BR.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index 87d6728..c92c65d 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -1,6 +1,7 @@ # Translators: # Communia <ameaneantie(a)riseup.net>, 2016 # wasabicake <russel(a)protonmail.ch>, 2016 +# galdino <altgaldinovictor(a)gmail.com>, 2016 # Cesar Silva <cesarsilvabx(a)gmail.com>, 2016 msgid "" msgstr "" @@ -55,7 +56,7 @@ msgid "" "real Internet (IP) address, and will not know who you are unless you " "explicitly identify yourself." msgstr "" -"Os operadores de sites e de serviços que você utilizar, assim como qualquer " +"Os operadores de sites e de serviços que você usa, assim como qualquer " "pessoa que os monitore, verão uma conexão vindo da rede Tor, e não do seu " "real endereço de Internet (IP), e não saberão quem você é, ao menos que você" " se identifique expressamente." @@ -76,7 +77,7 @@ msgid "" "=\"managing-identities#new-identity\">New Identity</link> is requested)." msgstr "" "Por padrão, o Navegador Tor não armazena nenhum histórico da sua navegação. " -"Cookies são válidas durante uma única sessão (até que o Navegador Tor feche " +"Cookies são válidos durante uma única sessão (até que o Navegador Tor feche " "ou uma <link xref=\"managing-identities#new-identity\">Nova " "Identidade</link> seja solicitada)."

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 22 May '17

22 May '17

commit 2168005f9fc8f038b9041e4180d158cf0be8eab7 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 22 15:48:16 2017 +0000 Update translations for tor-browser-manual --- pt_BR/pt_BR.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index 87d6728..c92c65d 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -1,6 +1,7 @@ # Translators: # Communia <ameaneantie(a)riseup.net>, 2016 # wasabicake <russel(a)protonmail.ch>, 2016 +# galdino <altgaldinovictor(a)gmail.com>, 2016 # Cesar Silva <cesarsilvabx(a)gmail.com>, 2016 msgid "" msgstr "" @@ -55,7 +56,7 @@ msgid "" "real Internet (IP) address, and will not know who you are unless you " "explicitly identify yourself." msgstr "" -"Os operadores de sites e de serviços que você utilizar, assim como qualquer " +"Os operadores de sites e de serviços que você usa, assim como qualquer " "pessoa que os monitore, verão uma conexão vindo da rede Tor, e não do seu " "real endereço de Internet (IP), e não saberão quem você é, ao menos que você" " se identifique expressamente." @@ -76,7 +77,7 @@ msgid "" "=\"managing-identities#new-identity\">New Identity</link> is requested)." msgstr "" "Por padrão, o Navegador Tor não armazena nenhum histórico da sua navegação. " -"Cookies são válidas durante uma única sessão (até que o Navegador Tor feche " +"Cookies são válidos durante uma única sessão (até que o Navegador Tor feche " "ou uma <link xref=\"managing-identities#new-identity\">Nova " "Identidade</link> seja solicitada)."

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 22 May '17

22 May '17

commit 3d9ad4f28f8df252bc7863f79aa55569fd306c98 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 22 15:46:32 2017 +0000 Update translations for torbutton-torbuttonproperties --- pt_BR/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/torbutton.properties b/pt_BR/torbutton.properties index 5cfb0af..6c61a97 100644 --- a/pt_BR/torbutton.properties +++ b/pt_BR/torbutton.properties @@ -19,7 +19,7 @@ torbutton.popup.launch = Fazer o download do arquivo torbutton.popup.cancel = Cancelar torbutton.popup.dontask = Fazer o download dos arquivos automaticamente de agora em diante torbutton.popup.prompted_language = Para proporcionar-lhe mais privacidade, o Torbutton pode requisitar a versão em inglês das páginas da web. Isso pode fazer com que as páginas que você prefere ler na sua língua nativa apareçam em Inglês. -torbutton.popup.no_newnym = O Torbutton não pode dar-lhe uma nova identidade com segurança. Ele não tem acesso à Porta de Controle do Tor.\n\nVocê está usando o Pacote do Navegador Tor? +torbutton.popup.no_newnym = O Torbutton não pode lhe dar uma nova identidade com segurança. Ele não tem acesso à Porta de Controle do Tor.\n\nVocê está usando o Pacote do Navegador Tor? torbutton.title.prompt_torbrowser = Informação importante do Torbutton torbutton.popup.prompt_torbrowser = O Torbutton agora está funcionando de outra maneira: você não pode mais desligá-lo.\n\nNós fizemos esta mudança porque não é seguro usar o Torbutton em um navegador que também é usado para navegação não-Tor. Havia muitos bugs que nós não conseguíamos resolver de nenhum outro modo.\n\nSe você quiser continuar usando o Firefox normalmente, deverá desinstalar o Torbutton e fazer o download do Pacote do Navegador Tor. As configurações de privacidade do Navegador Tor também são superiores àquelas do Firefox comum, mesmo quando era usado com o Torbutton.\n\nPara remover o Torbutton, vá até Ferramentas->Complementos->Extensões e clique no botão Remover próximo ao Torbutton. torbutton.popup.short_torbrowser = Informação Importante do Torbutton!\n\nO Torbutton agora estará sempre habilitado.\n\nClique no Torbutton para mais informações.

1 0

[tor/master] Run format_changelog again
by nickm＠torproject.org 22 May '17

22 May '17

commit 363538e345df5654c5056c7eb167471898aedc4c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 22 11:41:25 2017 -0400 Run format_changelog again --- ChangeLog | 58 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2f72339..abc6db4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,10 +41,10 @@ Changes in version 0.3.1.1-alpha - 2017-05-?? o Major features (traffic analysis resistance): - Connections between clients and relays now send a padding cell in each direction every 1.5 to 9.5 seconds (tunable via consensus - parameters). This padding will - not resist specialized eavesdroppers, but it should be enough to - make many ISPs' routine network flow logging less useful in - traffic analysis against Tor users. + parameters). This padding will not resist specialized + eavesdroppers, but it should be enough to make many ISPs' routine + network flow logging less useful in traffic analysis against + Tor users. Padding is negotiated using Tor's link protocol, so both relays and clients must upgrade for this to take effect. Clients may @@ -74,9 +74,9 @@ Changes in version 0.3.1.1-alpha - 2017-05-?? Otherwise it is at info. o Major bugfixes (entry guards): - - Don't block bootstrapping when a primary bridge is offline and we can't - get its descriptor. Fixes bug 22325; fixes one case of bug 21969; - bugfix on 0.3.0.3-alpha. + - Don't block bootstrapping when a primary bridge is offline and we + can't get its descriptor. Fixes bug 22325; fixes one case of bug + 21969; bugfix on 0.3.0.3-alpha. o Major bugfixes (linux TPROXY support): - Fix a typo that had prevented TPROXY-based transparent proxying @@ -90,6 +90,16 @@ Changes in version 0.3.1.1-alpha - 2017-05-?? (PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION) which we believe doesn't affect us, but shouldn't do any harm. Closes ticket 21953. + o Minor features (config options): + - Allow "%include" directives in torrc configuration files. These + directives import the settings from other files, or from all the + files in a directory. Closes ticket 1922. Code by Daniel Pinto. + - Make SAVECONF return an error when overwriting a torrc that has + includes. Using SAVECONF with the FORCE option will allow it to + overwrite torrc even if includes are used. Related to ticket 1922. + - Add "GETINFO config-can-saveconf" to tell controllers if SAVECONF + will work without the FORCE option. Related to ticket 1922. + o Minor features (controller): - Warn the first time that a controller requests data in the long- deprecated 'GETINFO network-status' format. Closes ticket 21703. @@ -126,16 +136,6 @@ Changes in version 0.3.1.1-alpha - 2017-05-?? hidden service can be possibly harmful; for instance see ticket 14917 or 21155. Closes ticket 21155. - o Minor features (config options): - - Allow "%include" directives in torrc configuration files. These - directives import the settings from other files, or from all the - files in a directory. Closes ticket 1922. Code by Daniel Pinto. - - Make SAVECONF return an error when overwriting a torrc that has - includes. Using SAVECONF with the FORCE option will allow it to - overwrite torrc even if includes are used. Related to ticket 1922. - - Add "GETINFO config-can-saveconf" to tell controllers if SAVECONF - will work without the FORCE option. Related to ticket 1922. - o Minor features (linux seccomp2 sandbox): - We now have a document storage backend compatible with the Linux seccomp2 sandbox. This backend is used for consensus documents and @@ -156,8 +156,8 @@ Changes in version 0.3.1.1-alpha - 2017-05-?? o Minor features (performance): - Our Keccak (SHA-3) implementation now accesses memory more - efficiently, - especially on little-endian systems. Closes ticket 21737. + efficiently, especially on little-endian systems. Closes + ticket 21737. - Add an O(1) implementation of channel_find_by_global_id(), to speed some controller functions. @@ -217,8 +217,8 @@ Changes in version 0.3.1.1-alpha - 2017-05-?? a timeout before their orconn would expire. The initial testing rate was set back in the days of TAP and before the Tor Browser updater, when we had to be much more careful about new clients - making lots of circuits. With this change, a circuit build timeout is - learned in about 15-20 minutes, instead of 100-120 minutes. + making lots of circuits. With this change, a circuit build timeout + is learned in about 15-20 minutes, instead of 100-120 minutes. o Minor bugfixes (controller): - GETINFO onions/current and onions/detached no longer respond with @@ -256,9 +256,9 @@ Changes in version 0.3.1.1-alpha - 2017-05-?? selected. Fixes bug 20913; bugfix on 0.2.8.1-alpha. o Minor bugfixes (hidden services): - - Stop printing a cryptic warning when a hidden service gets a request - to connect to a virtual port that it hasn't configured. Fixes bug - 16706; bugfix on 0.2.6.3-alpha. + - Stop printing a cryptic warning when a hidden service gets a + request to connect to a virtual port that it hasn't configured. + Fixes bug 16706; bugfix on 0.2.6.3-alpha. - Simplify hidden service descriptor creation by using an existing flag to check if an introduction point is established. Fixes bug 21599; bugfix on 0.2.7.2-alpha. @@ -301,9 +301,9 @@ Changes in version 0.3.1.1-alpha - 2017-05-?? - Isolate our use of the openssl headers so that they are only included from our crypto wrapper modules, and from tests that examine those modules' internals. Closes ticket 21841. - - Simplify our API to launch directory requests, making it - more extensible and less error-prone. Now it's easier to add - extra headers to directory requests. Closes ticket 21646. + - Simplify our API to launch directory requests, making it more + extensible and less error-prone. Now it's easier to add extra + headers to directory requests. Closes ticket 21646. - Our base64 decoding functions no longer overestimate the output space that they need when parsing unpadded inputs. Closes ticket 17868. @@ -336,8 +336,8 @@ Changes in version 0.3.1.1-alpha - 2017-05-?? have any effect: AllowInvalidNodes, AllowSingleHopCircuits, AllowSingleHopExits, ExcludeSingleHopRelays, FastFirstHopPK, TLSECGroup, WarnUnsafeSocks. They were first marked as deprecated - in 0.2.9.2-alpha and have now been removed. The previous - default behavior is now always chosen; the previous (less secure) non- + in 0.2.9.2-alpha and have now been removed. The previous default + behavior is now always chosen; the previous (less secure) non- default behavior is now unavailable. - CloseHSClientCircuitsImmediatelyOnTimeout and CloseHSServiceRendCircuitsImmediatelyOnTimeout were deprecated in

1 0

[tor/master] Fold new entries into changelog
by nickm＠torproject.org 22 May '17

22 May '17

commit 94754c54145f62f6106f9c05563f3ba1f995ad84 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 22 11:40:52 2017 -0400 Fold new entries into changelog --- ChangeLog | 9 +++++++++ changes/bug20509 | 5 ----- changes/bug21969 | 3 --- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 08016bd..2f72339 100644 --- a/ChangeLog +++ b/ChangeLog @@ -73,6 +73,11 @@ Changes in version 0.3.1.1-alpha - 2017-05-?? relay is unexpectedly large, this log message is at notice level. Otherwise it is at info. + o Major bugfixes (entry guards): + - Don't block bootstrapping when a primary bridge is offline and we can't + get its descriptor. Fixes bug 22325; fixes one case of bug 21969; + bugfix on 0.3.0.3-alpha. + o Major bugfixes (linux TPROXY support): - Fix a typo that had prevented TPROXY-based transparent proxying from working under Linux. Fixes bug 18100; bugfix on 0.2.6.3-alpha. @@ -988,6 +993,10 @@ Changes in version 0.3.0.4-rc - 2017-03-01 - Reject version numbers with components that exceed INT32_MAX. Otherwise 32-bit and 64-bit platforms would behave inconsistently. Fixes bug 21450; bugfix on 0.0.8pre1. + - Directory authorities now reject relays running versions + 0.2.9.1-alpha through 0.2.9.4-alpha, because those relays + suffer from bug 20499 and don't keep their consensus cache + up-to-date. Resolves ticket 20509. o Minor features (geoip): - Update geoip and geoip6 to the February 8 2017 Maxmind GeoLite2 diff --git a/changes/bug20509 b/changes/bug20509 deleted file mode 100644 index a39ca9f..0000000 --- a/changes/bug20509 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor features: - - Directory authorities now reject relays running versions - 0.2.9.1-alpha through 0.2.9.4-alpha, because those relays - suffer from bug 20499 and don't keep their consensus cache - up-to-date. Resolves ticket 20509. diff --git a/changes/bug21969 b/changes/bug21969 deleted file mode 100644 index 5da8c4d..0000000 --- a/changes/bug21969 +++ /dev/null @@ -1,3 +0,0 @@ - o Major bugfixes (entry guards): - - Don't block bootstrapping when a primary bridge is offline and we can't - get its descriptor. Fixes one case of bug 21969; bugfix on 0.3.0.3-alpha.

1 0

[tor/master] Don't add "Accept-Encoding" header if directory connection is anonymous.
by nickm＠torproject.org 22 May '17

22 May '17

commit 26795da900d7b487b80e19b804475ad7b132188d Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon May 22 12:34:57 2017 +0000 Don't add "Accept-Encoding" header if directory connection is anonymous. See: https://bugs.torproject.org/22305 --- src/or/directory.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index ef74c0f..5aab8a7 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1677,6 +1677,7 @@ directory_send_command(dir_connection_t *conn, const char *payload = req->payload; const size_t payload_len = req->payload_len; const time_t if_modified_since = req->if_modified_since; + const int anonymized_connection = dirind_is_anon(req->indirection); char proxystring[256]; char hoststring[128]; @@ -1742,11 +1743,13 @@ directory_send_command(dir_connection_t *conn, proxystring[0] = 0; } - /* Add Accept-Encoding. */ - accept_encoding = accept_encoding_header(); - smartlist_add_asprintf(headers, "Accept-Encoding: %s\r\n", - accept_encoding); - tor_free(accept_encoding); + if (! anonymized_connection) { + /* Add Accept-Encoding. */ + accept_encoding = accept_encoding_header(); + smartlist_add_asprintf(headers, "Accept-Encoding: %s\r\n", + accept_encoding); + tor_free(accept_encoding); + } /* Add additional headers, if any */ {

1 0

[tor/master] Ensure that only GZip and Zlib compression is handled for anonymous connections.
by nickm＠torproject.org 22 May '17

22 May '17

commit 5a0eab68e1ca2c1f76ac3834b1e38938a5cb4546 Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon May 22 14:45:12 2017 +0000 Ensure that only GZip and Zlib compression is handled for anonymous connections. See: https://bugs.torproject.org/22305 --- src/or/directory.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++- src/or/directory.h | 1 + 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/src/or/directory.c b/src/or/directory.c index 495fd9c..c13a98b 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2219,6 +2219,10 @@ connection_dir_client_reached_eof(dir_connection_t *conn) conn->base_.purpose == DIR_PURPOSE_FETCH_EXTRAINFO || conn->base_.purpose == DIR_PURPOSE_FETCH_MICRODESC); size_t received_bytes; + const int anonymized_connection = + purpose_needs_anonymity(conn->base_.purpose, + conn->router_purpose, + conn->requested_resource); received_bytes = connection_get_inbuf_len(TO_CONN(conn)); @@ -2347,13 +2351,29 @@ connection_dir_client_reached_eof(dir_connection_t *conn) description2, (compression>0 && guessed>0)?" Trying both.":""); } + /* Try declared compression first if we can. - * tor_compress_supports_method() also returns true for NO_METHOD. */ + * tor_compress_supports_method() also returns true for NO_METHOD. + * Ensure that the server is not sending us data compressed using a + * compression method that is not allowed for anonymous connections. */ + if (anonymized_connection && + ! allowed_anonymous_connection_compression_method(compression)) { + rv = -1; + goto done; + } + if (tor_compress_supports_method(compression)) tor_uncompress(&new_body, &new_len, body, body_len, compression, !allow_partial, LOG_PROTOCOL_WARN); + /* Okay, if that didn't work, and we think that it was compressed * differently, try that. */ + if (anonymized_connection && + ! allowed_anonymous_connection_compression_method(guessed)) { + rv = -1; + goto done; + } + if (!new_body && tor_compress_supports_method(guessed) && compression != guessed) tor_uncompress(&new_body, &new_len, body, body_len, guessed, @@ -3339,6 +3359,14 @@ static compress_method_t srv_meth_pref_streaming_compression[] = { NO_METHOD }; +/** Array of allowed compression methods to use (if supported) when receiving a + * response from a request that was required to be anonymous. */ +static compress_method_t client_meth_allowed_anonymous_compression[] = { + ZLIB_METHOD, + GZIP_METHOD, + NO_METHOD +}; + /** Parse the compression methods listed in an Accept-Encoding header <b>h</b>, * and convert them to a bitfield where compression method x is supported if * and only if 1 << x is set in the bitfield. */ @@ -3838,6 +3866,29 @@ find_best_compression_method(unsigned compression_methods, int stream) return NO_METHOD; } +/** Check if the given compression method is allowed for a connection that is + * supposed to be anonymous. Returns 1 if the compression method is allowed, + * otherwise 0. */ +STATIC int +allowed_anonymous_connection_compression_method(compress_method_t method) +{ + unsigned u; + + for (u = 0; u < ARRAY_LENGTH(client_meth_allowed_anonymous_compression); + ++u) { + compress_method_t allowed_method = + client_meth_allowed_anonymous_compression[u]; + + if (! tor_compress_supports_method(allowed_method)) + continue; + + if (method == allowed_method) + return 1; + } + + return 0; +} + /** Encodes the results of parsing a consensus request to figure out what * consensus, and possibly what diffs, the user asked for. */ typedef struct { diff --git a/src/or/directory.h b/src/or/directory.h index a015c70..6dc7734 100644 --- a/src/or/directory.h +++ b/src/or/directory.h @@ -161,6 +161,7 @@ STATIC int handle_get_hs_descriptor_v3(dir_connection_t *conn, const struct get_handler_args_t *args); STATIC int directory_handle_command(dir_connection_t *conn); STATIC char *accept_encoding_header(void); +STATIC int allowed_anonymous_connection_compression_method(compress_method_t); #endif

1 0

[tor/master] Refactor error path handling in connection_dir_client_reached_eof().
by nickm＠torproject.org 22 May '17

22 May '17

commit 2b26ac139086c4ce3067b6d27644cb37808a9eb0 Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon May 22 14:42:18 2017 +0000 Refactor error path handling in connection_dir_client_reached_eof(). This patch lifts the return value, rv, variable to the beginning of the function, adds a 'done' label for clean-up and function exit and makes the rest of the function use the rv value + goto done; instead of cleaning up in multiple places. See: https://bugs.torproject.org/22305 --- src/or/directory.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 5aab8a7..495fd9c 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2204,8 +2204,8 @@ static int handle_response_upload_renddesc_v2(dir_connection_t *, static int connection_dir_client_reached_eof(dir_connection_t *conn) { - char *body; - char *headers; + char *body = NULL; + char *headers = NULL; char *reason = NULL; size_t body_len = 0; int status_code; @@ -2214,6 +2214,7 @@ connection_dir_client_reached_eof(dir_connection_t *conn) compress_method_t compression; int plausible; int skewed = 0; + int rv; int allow_partial = (conn->base_.purpose == DIR_PURPOSE_FETCH_SERVERDESC || conn->base_.purpose == DIR_PURPOSE_FETCH_EXTRAINFO || conn->base_.purpose == DIR_PURPOSE_FETCH_MICRODESC); @@ -2241,8 +2242,9 @@ connection_dir_client_reached_eof(dir_connection_t *conn) &compression, &reason) < 0) { log_warn(LD_HTTP,"Unparseable headers (server '%s:%d'). Closing.", conn->base_.address, conn->base_.port); - tor_free(body); tor_free(headers); - return -1; + + rv = -1; + goto done; } if (!reason) reason = tor_strdup("[no reason given]"); @@ -2316,8 +2318,8 @@ connection_dir_client_reached_eof(dir_connection_t *conn) if ((ds = router_get_fallback_dirserver_by_digest(id_digest))) ds->fake_status.last_dir_503_at = now; - tor_free(body); tor_free(headers); tor_free(reason); - return -1; + rv = -1; + goto done; } plausible = body_is_plausible(body, body_len, conn->base_.purpose); @@ -2362,8 +2364,8 @@ connection_dir_client_reached_eof(dir_connection_t *conn) log_fn(LOG_PROTOCOL_WARN, LD_HTTP, "Unable to decompress HTTP body (server '%s:%d').", conn->base_.address, conn->base_.port); - tor_free(body); tor_free(headers); tor_free(reason); - return -1; + rv = -1; + goto done; } if (new_body) { tor_free(body); @@ -2372,7 +2374,6 @@ connection_dir_client_reached_eof(dir_connection_t *conn) } } - int rv; response_handler_args_t args; memset(&args, 0, sizeof(args)); args.status_code = status_code; @@ -2421,6 +2422,8 @@ connection_dir_client_reached_eof(dir_connection_t *conn) rv = -1; break; } + + done: tor_free(body); tor_free(headers); tor_free(reason);

1 0

[tor/master] Merge remote-tracking branch 'ahf/bugs/22305'
by nickm＠torproject.org 22 May '17

22 May '17

commit 9a50c731040fea3b85b0c84726d56194993f09e9 Merge: cfe0a45 5a0eab6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 22 10:57:26 2017 -0400 Merge remote-tracking branch 'ahf/bugs/22305' src/or/directory.c | 87 ++++++++++++++++++++++++++++++++++++++++++++---------- src/or/directory.h | 1 + 2 files changed, 73 insertions(+), 15 deletions(-)

1 0