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

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 02 May '17

02 May '17

commit 735f56548c68acc643b30cd01cb14d38522bdd0c Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 2 04:15:33 2017 +0000 Update translations for tails-persistence-setup --- es_AR/es_AR.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/es_AR/es_AR.po b/es_AR/es_AR.po index 77c9285..2548530 100644 --- a/es_AR/es_AR.po +++ b/es_AR/es_AR.po @@ -3,16 +3,17 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Joaquín Serna, 2017 # ezemelano <melanoeze(a)gmail.com>, 2014 # Pablo Di Noto <pdinoto(a)gmail.com>, 2016 -# psss <FacundoAcevedo(a)users.noreply.github.com>, 2016 +# psss <facevedo(a)openmailbox.org>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2016-05-25 02:27+0200\n" -"PO-Revision-Date: 2016-08-16 12:03+0000\n" -"Last-Translator: psss <FacundoAcevedo(a)users.noreply.github.com>\n" +"PO-Revision-Date: 2017-05-02 03:53+0000\n" +"Last-Translator: Joaquín Serna\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/otf/torproject/language/es_AR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -94,7 +95,7 @@ msgstr "" #: ../lib/Tails/Persistence/Configuration/Presets.pm:138 msgid "Bitcoin client" -msgstr "" +msgstr "Cliente de Bitcoin" #: ../lib/Tails/Persistence/Configuration/Presets.pm:140 msgid "Electrum's bitcoin wallet and configuration" @@ -118,7 +119,7 @@ msgstr "Listas descargadas por APT" #: ../lib/Tails/Persistence/Configuration/Presets.pm:168 msgid "Dotfiles" -msgstr "" +msgstr "Dotfiles" #: ../lib/Tails/Persistence/Configuration/Presets.pm:170 msgid "" @@ -323,4 +324,4 @@ msgstr "Borrando..." #: ../lib/Tails/Persistence/Step/Delete.pm:114 msgid "Deleting the persistent volume..." -msgstr "" +msgstr "Eliminando el volumen persistente..."

1 0

[tor/master] hs: Trigger control event when client can't pick HSDir
by nickm＠torproject.org 01 May '17

01 May '17

commit 90562fc23a7ce61f3660b507d9991a27af2eae37 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Apr 25 11:55:44 2017 -0400 hs: Trigger control event when client can't pick HSDir Inform the control port with an HS_DESC failed event when the client is unable to pick an HSDir. It's followed by an empty HS_DESC_CONTENT event. In order to achieve that, some control port code had to be modified to accept a NULL HSDir identity digest. This commit also adds a trigger of a failed event when we are unable to base64-decode the descriptor cookie. Fixes #22042 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug22042 | 5 +++++ src/or/control.c | 36 +++++++++++++++++++----------------- src/or/rendclient.c | 6 ++++++ 3 files changed, 30 insertions(+), 17 deletions(-) diff --git a/changes/bug22042 b/changes/bug22042 new file mode 100644 index 0000000..c1188df --- /dev/null +++ b/changes/bug22042 @@ -0,0 +1,5 @@ + o Minor bugfixes (control, hidden service client): + - Trigger HS descriptor events on the control port when the client is + unable to pick a suitable hidden service directory. This can happen if + they are all in the ExcludeNodes list or they all have been queried + inside the allowed 15 minutes. Fixes bug 22042. diff --git a/src/or/control.c b/src/or/control.c index 56f1329..ed72d6f 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -7013,10 +7013,9 @@ control_event_hs_descriptor_receive_end(const char *action, char desc_id_base32[REND_DESC_ID_V2_LEN_BASE32 + 1]; const char *desc_id = NULL; - if (!action || !id_digest || !rend_data || !onion_address) { - log_warn(LD_BUG, "Called with action==%p, id_digest==%p, " - "rend_data==%p, onion_address==%p", action, id_digest, - rend_data, onion_address); + if (!action || !rend_data || !onion_address) { + log_warn(LD_BUG, "Called with action==%p, rend_data==%p, " + "onion_address==%p", action, rend_data, onion_address); return; } @@ -7039,7 +7038,8 @@ control_event_hs_descriptor_receive_end(const char *action, rend_hsaddress_str_or_unknown(onion_address), rend_auth_type_to_string( TO_REND_DATA_V2(rend_data)->auth_type), - node_describe_longname_by_id(id_digest), + id_digest ? + node_describe_longname_by_id(id_digest) : "UNKNOWN", desc_id_field ? desc_id_field : "", reason_field ? reason_field : ""); @@ -7119,19 +7119,18 @@ control_event_hs_descriptor_uploaded(const char *id_digest, id_digest, NULL); } -/** Send HS_DESC event to inform controller that query rend_query - * failed to retrieve hidden service descriptor identified by - * id_digest. If reason is not NULL, add it to REASON= - * field. +/** Send HS_DESC event to inform controller that query rend_data + * failed to retrieve hidden service descriptor from directory identified by + * id_digest. If NULL, "UNKNOWN" is used. If reason is not NULL, + * add it to REASON= field. */ void control_event_hs_descriptor_failed(const rend_data_t *rend_data, const char *id_digest, const char *reason) { - if (!rend_data || !id_digest) { - log_warn(LD_BUG, "Called with rend_data==%p, id_digest==%p", - rend_data, id_digest); + if (!rend_data) { + log_warn(LD_BUG, "Called with rend_data==%p", rend_data); return; } control_event_hs_descriptor_receive_end("FAILED", @@ -7140,7 +7139,8 @@ control_event_hs_descriptor_failed(const rend_data_t *rend_data, } /** send HS_DESC_CONTENT event after completion of a successful fetch from - * hs directory. */ + * hs directory. If hsdir_id_digest is NULL, it is replaced by + * "UNKNOWN". */ void control_event_hs_descriptor_content(const char *onion_address, const char *desc_id, @@ -7150,9 +7150,9 @@ control_event_hs_descriptor_content(const char *onion_address, static const char *event_name = "HS_DESC_CONTENT"; char *esc_content = NULL; - if (!onion_address || !desc_id || !hsdir_id_digest) { - log_warn(LD_BUG, "Called with onion_address==%p, desc_id==%p, " - "hsdir_id_digest==%p", onion_address, desc_id, hsdir_id_digest); + if (!onion_address || !desc_id) { + log_warn(LD_BUG, "Called with onion_address==%p, desc_id==%p, ", + onion_address, desc_id); return; } @@ -7167,7 +7167,9 @@ control_event_hs_descriptor_content(const char *onion_address, event_name, rend_hsaddress_str_or_unknown(onion_address), desc_id, - node_describe_longname_by_id(hsdir_id_digest), + hsdir_id_digest ? + node_describe_longname_by_id(hsdir_id_digest) : + "UNKNOWN", esc_content); tor_free(esc_content); } diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 8d2ae03..88bd5cd 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -724,6 +724,9 @@ directory_get_from_hs_dir(const char *desc_id, hs_dir = pick_hsdir(desc_id, desc_id_base32); if (!hs_dir) { /* No suitable hs dir can be found, stop right now. */ + control_event_hs_descriptor_failed(rend_query, NULL, "QUERY_NO_HSDIR"); + control_event_hs_descriptor_content(rend_data_get_address(rend_query), + desc_id_base32, NULL, NULL); return 0; } } @@ -744,6 +747,9 @@ directory_get_from_hs_dir(const char *desc_id, REND_DESC_COOKIE_LEN, 0)<0) { log_warn(LD_BUG, "Could not base64-encode descriptor cookie."); + control_event_hs_descriptor_failed(rend_query, hsdir_fp, "BAD_DESC"); + control_event_hs_descriptor_content(rend_data_get_address(rend_query), + desc_id_base32, hsdir_fp, NULL); return 0; } /* Remove == signs. */

1 0

[tor/master] control: Fix comment of control_event_hs_descriptor_content
by nickm＠torproject.org 01 May '17

01 May '17

commit aadb99e5f906a7b8aed8b6c0d995690699bdbfee Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Apr 25 13:04:47 2017 -0400 control: Fix comment of control_event_hs_descriptor_content Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/control.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index ed72d6f..9b0d7c0 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -7138,9 +7138,11 @@ control_event_hs_descriptor_failed(const rend_data_t *rend_data, rend_data, id_digest, reason); } -/** send HS_DESC_CONTENT event after completion of a successful fetch from - * hs directory. If hsdir_id_digest is NULL, it is replaced by - * "UNKNOWN". */ +/** Send HS_DESC_CONTENT event after completion of a successful fetch from hs + * directory. If hsdir_id_digest is NULL, it is replaced by "UNKNOWN". + * If content is NULL, it is replaced by an empty string. The + * onion_address or desc_id set to NULL will no trigger the + * control event. */ void control_event_hs_descriptor_content(const char *onion_address, const char *desc_id,

1 0

[tor/master] Merge branch 'dgoulet_bug22042_031_01_squashed'
by nickm＠torproject.org 01 May '17

01 May '17

commit 465448e659e6cbaecc1494b5cf270f556e104bd4 Merge: c486ef5 aadb99e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 1 16:08:23 2017 -0400 Merge branch 'dgoulet_bug22042_031_01_squashed' changes/bug22042 | 5 +++++ src/or/control.c | 40 ++++++++++++++++++++++------------------ src/or/rendclient.c | 6 ++++++ 3 files changed, 33 insertions(+), 18 deletions(-)

1 0

[tor/master] Only compare the first 3 bytes when trying to detect LZMA compression.
by nickm＠torproject.org 01 May '17

01 May '17

commit e5122b91a951d44702b11a70862ec99e851a2578 Author: Alexander Færøy <ahf(a)torproject.org> Date: Thu Apr 27 20:07:08 2017 +0200 Only compare the first 3 bytes when trying to detect LZMA compression. This patch changes the logic in `detect_compression_method()` to only use the 3 first bytes when checking if a given input is LZMA encoded. --- src/common/compress.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/compress.c b/src/common/compress.c index 8502dee..738df9f 100644 --- a/src/common/compress.c +++ b/src/common/compress.c @@ -255,8 +255,8 @@ detect_compression_method(const char *in, size_t in_len) } else if (in_len > 2 && (in[0] & 0x0f) == 8 && (ntohs(get_uint16(in)) % 31) == 0) { return ZLIB_METHOD; - } else if (in_len > 3 && - fast_memeq(in, "\x5d\x00\x00\x00", 4)) { + } else if (in_len > 2 && + fast_memeq(in, "\x5d\x00\x00", 3)) { return LZMA_METHOD; } else if (in_len > 3 && fast_memeq(in, "\x28\xb5\x2f\xfd", 4)) {

1 0

[tor/master] Enforce 16 MB upper bound of memory usage in LZMA decoder.
by nickm＠torproject.org 01 May '17

01 May '17

commit 0672b33f1e0ca160563841aaf7af87adbacd95d3 Author: Alexander Færøy <ahf(a)torproject.org> Date: Thu Apr 27 20:09:20 2017 +0200 Enforce 16 MB upper bound of memory usage in LZMA decoder. This patch changes two things in our LZMA compression backend: - We lower the preset values for all `compression_level_t` values to ensure that we can run the LZMA decoder with less than 65 MB of memory available. This seems to have a small impact on the real world usage and fits well with our needs. - We set the upper bound of memory usage for the LZMA decoder to 16 MB. See: https://bugs.torproject.org/21665 --- src/common/compress_lzma.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/common/compress_lzma.c b/src/common/compress_lzma.c index b721bae..b5393a6 100644 --- a/src/common/compress_lzma.c +++ b/src/common/compress_lzma.c @@ -22,6 +22,9 @@ #include <lzma.h> #endif +/** The maximum amount of memory we allow the LZMA decoder to use, in bytes. */ +#define MEMORY_LIMIT (16 * 1024 * 1024) + /** Total number of bytes allocated for LZMA state. */ static atomic_counter_t total_lzma_allocation; @@ -33,9 +36,9 @@ memory_level(compression_level_t level) switch (level) { default: case BEST_COMPRESSION: - case HIGH_COMPRESSION: return 9; - case MEDIUM_COMPRESSION: return 6; - case LOW_COMPRESSION: return 3; + case HIGH_COMPRESSION: return 6; + case MEDIUM_COMPRESSION: return 4; + case LOW_COMPRESSION: return 2; } } @@ -191,9 +194,7 @@ tor_lzma_compress_new(int compress, goto err; } } else { - // FIXME(ahf): This should be something more sensible than - // UINT64_MAX: See #21665. - retval = lzma_alone_decoder(&result->stream, UINT64_MAX); + retval = lzma_alone_decoder(&result->stream, MEMORY_LIMIT); if (retval != LZMA_OK) { log_warn(LD_GENERAL, "Error from LZMA decoder: %s (%u).",

1 0

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

01 May '17

commit 4837421d7cb6bcc52d5ffd09527ac786759b3b0a Merge: d6dd05f 0672b33 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 1 14:22:49 2017 -0400 Merge remote-tracking branch 'ahf/bugs/21665' src/common/compress.c | 4 ++-- src/common/compress_lzma.c | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-)

1 0

[tor/master] Rename x-lzma to x-tor-lzma
by nickm＠torproject.org 01 May '17

01 May '17

commit c486ef57a320b840fb50b184ee4ee806d9715888 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 1 15:31:28 2017 -0400 Rename x-lzma to x-tor-lzma We shouldn't call it lzma, because we are imposing a limit on the memory needed for decoding. --- src/common/compress.c | 4 +++- src/test/test_buffers.c | 2 +- src/test/test_dir_handle_get.c | 7 ++++--- src/test/test_util.c | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/common/compress.c b/src/common/compress.c index 738df9f..047f904 100644 --- a/src/common/compress.c +++ b/src/common/compress.c @@ -313,7 +313,9 @@ static const struct { } compression_method_names[] = { { "gzip", GZIP_METHOD }, { "deflate", ZLIB_METHOD }, - { "x-lzma", LZMA_METHOD }, + // We call this "x-tor-lzma" rather than "x-lzma", because we impose a + // lower maximum memory usage on the decoding side. + { "x-tor-lzma", LZMA_METHOD }, { "x-zstd" , ZSTD_METHOD }, { "identity", NO_METHOD }, diff --git a/src/test/test_buffers.c b/src/test/test_buffers.c index ce5ac97..c0e222b 100644 --- a/src/test/test_buffers.c +++ b/src/test/test_buffers.c @@ -854,7 +854,7 @@ struct testcase_t buffer_tests[] = { { "compress/zstd", test_buffers_compress, TT_FORK, &passthrough_setup, (char*)"x-zstd" }, { "compress/lzma", test_buffers_compress, TT_FORK, - &passthrough_setup, (char*)"x-lzma" }, + &passthrough_setup, (char*)"x-tor-lzma" }, END_OF_TESTCASES }; diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c index 7794bd7..6e96391 100644 --- a/src/test/test_dir_handle_get.c +++ b/src/test/test_dir_handle_get.c @@ -2530,13 +2530,14 @@ test_dir_handle_get_parse_accept_encoding(void *arg) encodings = parse_accept_encoding_header("gzip"); tt_uint_op(B_NONE|B_GZIP, OP_EQ, encodings); - encodings = parse_accept_encoding_header("x-zstd, deflate, x-lzma"); + encodings = parse_accept_encoding_header("x-zstd, deflate, x-tor-lzma"); tt_uint_op(B_NONE|B_ZLIB|B_ZSTD|B_LZMA, OP_EQ, encodings); - encodings = parse_accept_encoding_header("x-zstd, deflate, x-lzma, gzip"); + encodings = parse_accept_encoding_header( + "x-zstd, deflate, x-tor-lzma, gzip"); tt_uint_op(B_NONE|B_ZLIB|B_ZSTD|B_LZMA|B_GZIP, OP_EQ, encodings); - encodings = parse_accept_encoding_header("x-zstd,deflate,x-lzma,gzip"); + encodings = parse_accept_encoding_header("x-zstd,deflate,x-tor-lzma,gzip"); tt_uint_op(B_NONE|B_ZLIB|B_ZSTD|B_LZMA|B_GZIP, OP_EQ, encodings); done: diff --git a/src/test/test_util.c b/src/test/test_util.c index dec1d52..022f29c 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -5753,7 +5753,7 @@ struct testcase_t util_tests[] = { UTIL_LEGACY(pow2), COMPRESS(zlib, "deflate"), COMPRESS(gzip, "gzip"), - COMPRESS(lzma, "x-lzma"), + COMPRESS(lzma, "x-tor-lzma"), COMPRESS(zstd, "x-zstd"), UTIL_TEST(gzip_compression_bomb, TT_FORK), UTIL_LEGACY(datadir),

1 0

[tor/master] Bug 22114: Fix wrong values in torrc_format.txt comments
by nickm＠torproject.org 01 May '17

01 May '17

commit d6dd05f6d8171191cfc2ea331ef6e1a89318decf Author: Georg Koppen <gk(a)torproject.org> Date: Mon May 1 17:44:07 2017 +0000 Bug 22114: Fix wrong values in torrc_format.txt comments --- doc/torrc_format.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/torrc_format.txt b/doc/torrc_format.txt index 7a80990..b175b9f 100644 --- a/doc/torrc_format.txt +++ b/doc/torrc_format.txt @@ -175,7 +175,7 @@ and\ friends # Backslashes in the middle of a line are included as-is. The key of -# this one is "Too" and the value is "Many\\Backsl\ashes here" (with +# this one is "Too" and the value is "Many\\Backsl\ashes \here" (with # backslashes in that last string as-is) Too \ Many\\\ @@ -185,7 +185,7 @@ here # And here's the really yucky part. If a comment appears in a multi-line # entry, the entry is still able to continue on the next line, as in the # following, where the key is "This" and the value is -# "entry and some are silly" +# "entry and some are silly" This entry \ # has comments \ and some \

1 0

[tor/master] Fix help message for --enable-lzma
by nickm＠torproject.org 01 May '17

01 May '17

commit 5a2f1a836f3a7632d15154555d716509b6dcb93f Author: Taylor Yu <catalyst(a)torproject.org> Date: Mon May 1 11:15:49 2017 -0400 Fix help message for --enable-lzma Fixes #22111. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ff91735..aa1eda6 100644 --- a/configure.ac +++ b/configure.ac @@ -746,7 +746,7 @@ dnl ------------------------------------------------------ dnl Where we do we find lzma? AC_ARG_ENABLE(lzma, - AS_HELP_STRING(--enable-lzma, [enable support for the Zstandard compression scheme.]), + AS_HELP_STRING(--enable-lzma, [enable support for the LZMA compression scheme.]), [case "${enableval}" in "yes") lzma=true ;; "no") lzma=false ;;

1 0