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

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 07 Nov '18

07 Nov '18

commit 7542fe593d032e7d9405f42a463b4b3b81137126 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 7 06:45:06 2018 +0000 Update translations for abouttor-homepage --- sv/aboutTor.dtd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sv/aboutTor.dtd b/sv/aboutTor.dtd index 94cea14a8..899ec0e89 100644 --- a/sv/aboutTor.dtd +++ b/sv/aboutTor.dtd @@ -6,19 +6,19 @@ <!ENTITY aboutTor.title "Om Tor"> -<!ENTITY aboutTor.ready.label "Explore. Privately."> -<!ENTITY aboutTor.ready2.label "You’re ready for the world’s most private browsing experience."> +<!ENTITY aboutTor.ready.label "Utforska. Privat."> +<!ENTITY aboutTor.ready2.label "Du är redo för världens mest privata surfupplevelse."> <!ENTITY aboutTor.failure.label "Någonting gick fel!"> <!ENTITY aboutTor.failure2.label "Tor fungerar inte i den här webbläsaren."> -<!ENTITY aboutTor.search.label "Search with DuckDuckGo"> +<!ENTITY aboutTor.search.label "Sök med DuckDuckGo"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "Frågor?"> -<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "Kolla in Tor Browser-manualen »">  <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser-handbok"> <!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding."> <!ENTITY aboutTor.getInvolved.label "Get Involved »">

1 0

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

07 Nov '18

commit 210ffa6c85b87092d077efca3ece7d560285180a Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 7 00:49:57 2018 +0000 Update translations for support-portal_completed --- contents+es.po | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contents+es.po b/contents+es.po index f62edd61c..d2b352ce7 100644 --- a/contents+es.po +++ b/contents+es.po @@ -1,12 +1,13 @@ # Translators: # erinm, 2018 # Emma Peel, 2018 +# msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-27 19:20+CET\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2018\n" "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n" "MIME-Version: 1.0\n"

1 0

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

07 Nov '18

commit 219a43d3e93a7924afbba3b7462747a84c7dd8c5 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 7 00:49:51 2018 +0000 Update translations for support-portal --- contents+es.po | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contents+es.po b/contents+es.po index f62edd61c..d2b352ce7 100644 --- a/contents+es.po +++ b/contents+es.po @@ -1,12 +1,13 @@ # Translators: # erinm, 2018 # Emma Peel, 2018 +# msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-27 19:20+CET\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2018\n" "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n" "MIME-Version: 1.0\n"

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/466'
by nickm＠torproject.org 06 Nov '18

06 Nov '18

commit c8892b53ecaba5c14be6cf238baf4527098a8f1f Merge: 8020d6fb0 2f0744b3e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 6 15:35:45 2018 -0500 Merge remote-tracking branch 'tor-github/pr/466' changes/ticket28077 | 3 +++ src/rust/tor_util/strings.rs | 6 +----- 2 files changed, 4 insertions(+), 5 deletions(-)

1 0

[tor/master] rust/tor_util: drop unsafe block in cstr!
by nickm＠torproject.org 06 Nov '18

06 Nov '18

commit 2f0744b3e6f579f25db1ed6e048d0418ac2ab570 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Wed Oct 17 00:16:21 2018 +0000 rust/tor_util: drop unsafe block in cstr! This is unnecessary just to get an empty string, there's Default::default(). Fix on 8fff331bb095dc6f5e2fe2ecfc9ab08ea9e2fe97. --- changes/ticket28077 | 3 +++ src/rust/tor_util/strings.rs | 6 +----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/changes/ticket28077 b/changes/ticket28077 new file mode 100644 index 000000000..2b5afb167 --- /dev/null +++ b/changes/ticket28077 @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Remove unnecessarily unsafe code from the rust macro cstr!. Closes + ticket 28077. diff --git a/src/rust/tor_util/strings.rs b/src/rust/tor_util/strings.rs index d64275e06..71a908a58 100644 --- a/src/rust/tor_util/strings.rs +++ b/src/rust/tor_util/strings.rs @@ -105,11 +105,7 @@ macro_rules! cstr { ($($bytes:expr),*) => ( ::std::ffi::CStr::from_bytes_with_nul( concat!($($bytes),*, "\0").as_bytes() - ).unwrap_or( - unsafe{ - ::std::ffi::CStr::from_bytes_with_nul_unchecked(b"\0") - } - ) + ).unwrap_or_default() ) }

1 0

[tor/master] string: add BOM helper
by nickm＠torproject.org 06 Nov '18

06 Nov '18

commit 3704c4a01219cca7273fa5fa0bc6751d98ad05ac Author: cypherpunks <cypherpunks(a)torproject.org> Date: Wed Aug 29 13:32:52 2018 +0000 string: add BOM helper --- src/lib/string/util_string.c | 13 +++++++++++++ src/lib/string/util_string.h | 1 + 2 files changed, 14 insertions(+) diff --git a/src/lib/string/util_string.c b/src/lib/string/util_string.c index b2b85d151..e76e73046 100644 --- a/src/lib/string/util_string.c +++ b/src/lib/string/util_string.c @@ -541,3 +541,16 @@ string_is_utf8(const char *str, size_t len) } return true; } + +/** As string_is_utf8(), but returns false if the string begins with a UTF-8 + * byte order mark (BOM). + */ +int +string_is_utf8_no_bom(const char *str, size_t len) +{ + if (len >= 3 && (!strcmpstart(str, "\uFEFF") || + !strcmpstart(str, "\uFFFE"))) { + return false; + } + return string_is_utf8(str, len); +} diff --git a/src/lib/string/util_string.h b/src/lib/string/util_string.h index 746ece0d3..99467a27c 100644 --- a/src/lib/string/util_string.h +++ b/src/lib/string/util_string.h @@ -53,5 +53,6 @@ const char *find_str_at_start_of_line(const char *haystack, int string_is_C_identifier(const char *string); int string_is_utf8(const char *str, size_t len); +int string_is_utf8_no_bom(const char *str, size_t len); #endif /* !defined(TOR_UTIL_STRING_H) */

1 0

[tor/master] Add tests for the string_is_utf8_no_bom() function.
by nickm＠torproject.org 06 Nov '18

06 Nov '18

commit da716fdfbb08952b971882eba1dabca2fef9c7f3 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Nov 1 12:55:04 2018 +0200 Add tests for the string_is_utf8_no_bom() function. --- src/test/test_util.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/test/test_util.c b/src/test/test_util.c index 7bc1b7921..067825113 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -4024,6 +4024,13 @@ test_util_string_is_utf8(void *ptr) tt_int_op(1, OP_EQ, string_is_utf8("ascii\x7f\n", 7)); tt_int_op(1, OP_EQ, string_is_utf8("Risqu\u00e9=1", 9)); + /* Test the utf8_no_bom function */ + tt_int_op(0, OP_EQ, string_is_utf8_no_bom("\uFEFF", 3)); + tt_int_op(0, OP_EQ, string_is_utf8_no_bom("\uFFFE", 3)); + tt_int_op(0, OP_EQ, string_is_utf8_no_bom("\uFEFFlove", 7)); + tt_int_op(1, OP_EQ, string_is_utf8_no_bom("loveandrespect", + strlen("loveandrespect"))); + // Validate exactly 'len' bytes. tt_int_op(0, OP_EQ, string_is_utf8("\0\x80", 2)); tt_int_op(0, OP_EQ, string_is_utf8("Risqu\u00e9=1", 6));

1 0

[tor/master] dircache: make dirauths reject non UTF-8 descriptors and extrainfo
by nickm＠torproject.org 06 Nov '18

06 Nov '18

commit f874ab26401ca269074963697ddcad879b3b4e3a Author: cypherpunks <cypherpunks(a)torproject.org> Date: Wed Aug 29 08:49:10 2018 +0000 dircache: make dirauths reject non UTF-8 descriptors and extrainfo Ticket #27367. --- changes/feature27367 | 4 ++++ src/feature/dirauth/process_descs.c | 12 +++++++++--- src/feature/dirauth/process_descs.h | 3 ++- src/feature/dircache/dircache.c | 4 ++-- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/changes/feature27367 b/changes/feature27367 new file mode 100644 index 000000000..99c083962 --- /dev/null +++ b/changes/feature27367 @@ -0,0 +1,4 @@ + o Minor features (parsing): + - Directory authorities now validate that router descriptors and ExtraInfo + documents are in a valid subset of UTF-8, and reject them if not. + Closes ticket 27367. diff --git a/src/feature/dirauth/process_descs.c b/src/feature/dirauth/process_descs.c index c379f25bd..dca87b3ea 100644 --- a/src/feature/dirauth/process_descs.c +++ b/src/feature/dirauth/process_descs.c @@ -519,7 +519,8 @@ WRA_MORE_SEVERE(was_router_added_t a, was_router_added_t b) /** As for dirserv_add_descriptor(), but accepts multiple documents, and * returns the most severe error that occurred for any one of them. */ was_router_added_t -dirserv_add_multiple_descriptors(const char *desc, uint8_t purpose, +dirserv_add_multiple_descriptors(const char *desc, size_t desclen, + uint8_t purpose, const char *source, const char **msg) { @@ -536,6 +537,11 @@ dirserv_add_multiple_descriptors(const char *desc, uint8_t purpose, r=ROUTER_ADDED_SUCCESSFULLY; /*Least severe return value. */ + if (!string_is_utf8_no_bom(desc, desclen)) { + *msg = "descriptor(s) or extrainfo(s) not valid UTF-8 or had BOM."; + return ROUTER_AUTHDIR_REJECTS; + } + format_iso_time(time_buf, now); if (tor_snprintf(annotation_buf, sizeof(annotation_buf), "@uploaded-at %s\n" @@ -552,7 +558,7 @@ dirserv_add_multiple_descriptors(const char *desc, uint8_t purpose, s = desc; list = smartlist_new(); - if (!router_parse_list_from_string(&s, NULL, list, SAVED_NOWHERE, 0, 0, + if (!router_parse_list_from_string(&s, s+desclen, list, SAVED_NOWHERE, 0, 0, annotation_buf, NULL)) { SMARTLIST_FOREACH(list, routerinfo_t *, ri, { msg_out = NULL; @@ -568,7 +574,7 @@ dirserv_add_multiple_descriptors(const char *desc, uint8_t purpose, smartlist_clear(list); s = desc; - if (!router_parse_list_from_string(&s, NULL, list, SAVED_NOWHERE, 1, 0, + if (!router_parse_list_from_string(&s, s+desclen, list, SAVED_NOWHERE, 1, 0, NULL, NULL)) { SMARTLIST_FOREACH(list, extrainfo_t *, ei, { msg_out = NULL; diff --git a/src/feature/dirauth/process_descs.h b/src/feature/dirauth/process_descs.h index ad9d5c3d4..5a0914acd 100644 --- a/src/feature/dirauth/process_descs.h +++ b/src/feature/dirauth/process_descs.h @@ -17,7 +17,8 @@ void dirserv_free_fingerprint_list(void); int dirserv_add_own_fingerprint(crypto_pk_t *pk); enum was_router_added_t dirserv_add_multiple_descriptors( - const char *desc, uint8_t purpose, + const char *desc, size_t desclen, + uint8_t purpose, const char *source, const char **msg); enum was_router_added_t dirserv_add_descriptor(routerinfo_t *ri, diff --git a/src/feature/dircache/dircache.c b/src/feature/dircache/dircache.c index 872a88018..930a8b87e 100644 --- a/src/feature/dircache/dircache.c +++ b/src/feature/dircache/dircache.c @@ -1608,8 +1608,8 @@ directory_handle_command_post,(dir_connection_t *conn, const char *headers, const char *msg = "[None]"; uint8_t purpose = authdir_mode_bridge(options) ? ROUTER_PURPOSE_BRIDGE : ROUTER_PURPOSE_GENERAL; - was_router_added_t r = dirserv_add_multiple_descriptors(body, purpose, - conn->base_.address, &msg); + was_router_added_t r = dirserv_add_multiple_descriptors(body, body_len, + purpose, conn->base_.address, &msg); tor_assert(msg); if (r == ROUTER_ADDED_SUCCESSFULLY) {

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/464'
by nickm＠torproject.org 06 Nov '18

06 Nov '18

commit 8020d6fb05d9477e77c6ca554dc1288873f6115c Merge: ba28704b2 da716fdfb Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 6 15:33:25 2018 -0500 Merge remote-tracking branch 'tor-github/pr/464' changes/feature27367 | 4 ++++ src/feature/dirauth/process_descs.c | 12 +++++++++--- src/feature/dirauth/process_descs.h | 3 ++- src/feature/dircache/dircache.c | 4 ++-- src/lib/string/util_string.c | 13 +++++++++++++ src/lib/string/util_string.h | 1 + src/test/test_util.c | 7 +++++++ 7 files changed, 38 insertions(+), 6 deletions(-)

1 0

[torspec/master] Prop 254: Describe token generation more clearly
by nickm＠torproject.org 06 Nov '18

06 Nov '18

commit acd4a89c1c81d0de37c57313e31ffca7413ae511 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Nov 5 23:17:14 2018 +0000 Prop 254: Describe token generation more clearly I hope... --- proposals/254-padding-negotiation.txt | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/proposals/254-padding-negotiation.txt b/proposals/254-padding-negotiation.txt index d950446..f166d5f 100644 --- a/proposals/254-padding-negotiation.txt +++ b/proposals/254-padding-negotiation.txt @@ -155,13 +155,14 @@ distribution that is encoded into bins of exponentially increasing width. The first bin of the histogram (bin 0) has 0 width, with a delay value of start_usec+rtt_estimate (from the machine definition, and rtt estimate above). -The bin before the "infinity bin" has a time value of -start_usec+rtt_estimate+range_sec*USEC_PER_SEC. - -The bins between these two points are exponentially spaced, so that smaller -bin indexes represent narrower time ranges, doubling up until the last bin -range of [(start_usec+rtt_estimate+range_sec*USEC_PER_SEC)/2, -start_usec+rtt_estimate+range_sec*USEC_PER_SEC). +The remaining bins are exponentially spaced, starting at this offset and +covering the range of the histogram, which is range_sec*USEC_PER_SEC. + +The intermediate bins thus divide the timespan range_sec*USEC_PER_SEC with +offset start_usec+rtt_estimate, so that smaller bin indexes represent narrower +time ranges, doubling up until the last bin. The last bin before the "infinity +bin" thus covers [start_usec+rtt_estimate+range_sec*USEC_PER_SEC/2, +CIRCPAD_DELAY_INFINITE). This exponentially increasing bin width allows the histograms to most accurately represent small interpacket delay (where accuracy is needed), and

1 0