tor-commits March 2018

tor-commits@lists.torproject.org

15 participants
1430 discussions

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 03 Mar '18

03 Mar '18

commit 10206b25d390720d0a5a5904ee6cbc3cc5552af2 Merge: 1bc35c59f 15f6201a5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 1 16:44:31 2018 -0500 Merge branch 'maint-0.3.3' into release-0.3.3 configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 03 Mar '18

03 Mar '18

commit 5b0ae084008eac13d051026c013862b239212807 Merge: d01abb934 c527a8a9c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 1 16:43:10 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 "ours" to avoid version bump.

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 03 Mar '18

03 Mar '18

commit bffa1584144131564b4317cf6caaa2c031e5e140 Merge: c0c487073 f7eff2f8c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 1 16:10:47 2018 -0500 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug25249 | 3 + changes/bug25249.2 | 3 + changes/trove-2018-001.1 | 6 ++ changes/trove-2018-004 | 8 +++ src/or/protover.c | 35 ++++++++-- src/test/test_protover.c | 171 +++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 220 insertions(+), 6 deletions(-)

1 0

[tor/release-0.3.3] Add a changelog entry for 25250.
by nickm＠torproject.org 03 Mar '18

03 Mar '18

commit 5c6b706c6168d874c131a5e142eefeac7fbc4163 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 1 16:52:44 2018 -0500 Add a changelog entry for 25250. --- ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index 1b7d29319..b2fb95fc8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -72,6 +72,11 @@ Changes in version 0.3.3.3-alpha - 2018-03-?? - Forbid UINT32_MAX as a protocol version. Fixes part of bug 25249; bugfix on 0.2.9.4-alpha. + o Minor bugfixes (spec conformance, rust): + - Resolve a denial-of-service issue caused by an infinite loop in + the rust protover code. Fixes bug 25250, bugfix on 0.3.3.1-alpha. + Also tracked as TROVE-2018-003. + o Code simplification and refactoring: - Update the "rust dependencies" submodule to be a project-level repository, rather than a user repository. Closes ticket 25323.

1 0

[tor/release-0.3.3] final (?) changelog tweaks
by nickm＠torproject.org 03 Mar '18

03 Mar '18

commit d15a7a27bb9e49bda7b3ec562e137ef3c50d64f6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 3 07:48:53 2018 -0500 final (?) changelog tweaks --- ChangeLog | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index b2fb95fc8..2a09df9a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in version 0.3.3.3-alpha - 2018-03-?? +Changes in version 0.3.3.3-alpha - 2018-03-03 Tor 0.3.3.3-alpha is the third alpha release for the 0.3.3.x series. It includes an important security fix for a remote crash attack against directory authorities tracked as TROVE-2018-001. @@ -13,9 +13,10 @@ Changes in version 0.3.3.3-alpha - 2018-03-?? This release also fixes several minor bugs and annoyances from earlier releases. - All directory authorities should upgrade to one of the versions - released today. All relays not already running Tor 0.3.3.2-alpha or - later should upgrade to one of the versions released today. + Relays running 0.3.2.x should upgrade to one of the versions released + today, for the fix to TROVE-2018-002. Directory authorities should + also upgrade. (Relays on earlier versions might want to update too for + the DoS mitigations.) o Major bugfixes (denial-of-service, directory authority): - Fix a protocol-list handling bug that could be used to remotely crash

1 0

[tor/maint-0.2.9] version bump to 0.2.9.15
by nickm＠torproject.org 03 Mar '18

03 Mar '18

commit 35753c077457da66d1dac990379727dd443826cc Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 1 16:42:17 2018 -0500 version bump to 0.2.9.15 --- 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 73470f214..baf6ea3ca 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.2.9.14-dev]) +AC_INIT([tor],[0.2.9.15]) 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 83c6d5c5e..f8e571cb0 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.2.9.14-dev" +!define VERSION "0.2.9.15" !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 bfe026296..fc6366535 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.2.9.14-dev" +#define VERSION "0.2.9.15"

1 0

[tor/maint-0.3.1] Correctly handle NULL returns from parse_protocol_list when voting.
by nickm＠torproject.org 03 Mar '18

03 Mar '18

commit 65f2eec694f18a64291cc85317b9f22dacc1d8e4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 1 16:33:52 2018 -0500 Correctly handle NULL returns from parse_protocol_list when voting. In some cases we had checked for it, but in others we had not. One of these cases could have been used to remotely cause denial-of-service against directory authorities while they attempted to vote. Fixes TROVE-2018-001. --- changes/trove-2018-001.1 | 6 ++++++ src/or/protover.c | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/changes/trove-2018-001.1 b/changes/trove-2018-001.1 new file mode 100644 index 000000000..f0ee92f40 --- /dev/null +++ b/changes/trove-2018-001.1 @@ -0,0 +1,6 @@ + o Major bugfixes (denial-of-service, directory authority): + - Fix a protocol-list handling bug that could be used to remotely crash + directory authorities with a null-pointer exception. Fixes bug 25074; + bugfix on 0.2.9.4-alpha. Also tracked as TROVE-2018-001. + + diff --git a/src/or/protover.c b/src/or/protover.c index 98957cabd..a75077462 100644 --- a/src/or/protover.c +++ b/src/or/protover.c @@ -554,6 +554,12 @@ protover_compute_vote(const smartlist_t *list_of_proto_strings, // First, parse the inputs and break them into singleton entries. SMARTLIST_FOREACH_BEGIN(list_of_proto_strings, const char *, vote) { smartlist_t *unexpanded = parse_protocol_list(vote); + if (! unexpanded) { + log_warn(LD_NET, "I failed with parsing a protocol list from " + "an authority. The offending string was: %s", + escaped(vote)); + continue; + } smartlist_t *this_vote = expand_protocol_list(unexpanded); if (this_vote == NULL) { log_warn(LD_NET, "When expanding a protocol list from an authority, I "

1 0

[tor/maint-0.2.9] Protover tests: disable some obsoleted tests
by nickm＠torproject.org 03 Mar '18

03 Mar '18

commit c1bb8836ff6b3abe32a17ffb3ae25cfdc770ceb4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 15 18:56:29 2018 -0500 Protover tests: disable some obsoleted tests These were meant to demonstrate old behavior, or old rust behavior. One of them _should_ work in Rust, but won't because of implementation details. We'll fix that up later. --- src/test/test_protover.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/test/test_protover.c b/src/test/test_protover.c index 8d061c69c..92ead3ca3 100644 --- a/src/test/test_protover.c +++ b/src/test/test_protover.c @@ -176,16 +176,6 @@ test_protover_vote(void *arg) /* Large protover lists that exceed the threshold */ - /* By adding two votes: Rust */ -#if 0 // XXXXX - smartlist_clear(lst); - smartlist_add(lst, (void*) "Sleen=1-500"); - smartlist_add(lst, (void*) "Sleen=1000"); - result = protover_compute_vote(lst, 1); - tt_str_op(result, OP_EQ, ""); - tor_free(result); -#endif - /* By adding two votes, C allows us to exceed the limit */ smartlist_add(lst, (void*) "Sleen=1-65536"); smartlist_add(lst, (void*) "Sleen=100000"); @@ -204,7 +194,7 @@ test_protover_vote(void *arg) smartlist_clear(lst); smartlist_add(lst, (void*) "Sleen=4294967295"); result = protover_compute_vote(lst, 1); - tt_str_op(result, OP_EQ, ""); // XXXX "Sleen=4294967295"); + tt_str_op(result, OP_EQ, ""); tor_free(result); smartlist_clear(lst); @@ -263,6 +253,9 @@ test_protover_all_supported(void *arg) tor_free(msg); /* If we get an unparseable list, we say "yes, that's supported." */ +#ifndef HAVE_RUST + // XXXX let's make this section unconditional: rust should behave the + // XXXX same as C here! tor_capture_bugs_(1); tt_assert(protover_all_supported("Fribble", &msg)); tt_ptr_op(msg, OP_EQ, NULL); @@ -275,6 +268,7 @@ test_protover_all_supported(void *arg) tt_ptr_op(msg, OP_EQ, NULL); tor_free(msg); tor_end_capture_bugs_(); +#endif done: tor_end_capture_bugs_();

1 0

[tor/maint-0.3.1] Add some protover vote round-trip tests from Teor.
by nickm＠torproject.org 03 Mar '18

03 Mar '18

commit d3a1bdbf56c7e41b54fdd1d3169287ca761698a6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 14 11:47:05 2018 -0500 Add some protover vote round-trip tests from Teor. I've refactored these to be a separate function, to avoid tricky merge conflicts. Some of these are disabled with "XXXX" comments; they should get fixed moving forward. --- src/test/test_protover.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/src/test/test_protover.c b/src/test/test_protover.c index f00955d1b..5e65c019e 100644 --- a/src/test/test_protover.c +++ b/src/test/test_protover.c @@ -182,6 +182,81 @@ test_protover_all_supported(void *arg) tor_free(msg); } +static void +test_protover_vote_roundtrip(void *args) +{ + (void) args; + static const struct { + const char *input; + const char *expected_output; + } examples[] = { + { "Fkrkljdsf", NULL }, + { "Zn=4294967295", NULL }, + { "Zn=4294967295-1", NULL }, + { "Zn=4294967293-4294967295", NULL }, + /* Will fail because of 4294967295. */ + { "Foo=1,3 Bar=3 Baz= Quux=9-12,14,15-16,900 Zn=0,4294967295", + NULL }, + { "Foo=1,3 Bar=3 Baz= Quux=9-12,14,15-16,900 Zn=0,4294967294", + "Bar=3 Foo=1,3 Quux=9-12,14-16,900 Zn=0,4294967294" }, + { "Zu16=0,65536", "Zu16=0,65536" }, + { "N-1=1,2", "N-1=1-2" }, + { "-1=4294967295", NULL }, + { "-1=3", "-1=3" }, + /* junk. */ + { "!!3@*", NULL }, + /* Missing equals sign */ + { "Link=4 Haprauxymatyve Desc=9", NULL }, + { "Link=4 Haprauxymatyve=7 Desc=9", + "Desc=9 Haprauxymatyve=7 Link=4" }, + { "=10-11", NULL }, + { "X=10-11", "X=10-11" }, + { "Link=4 =3 Desc=9", NULL }, + { "Link=4 Z=3 Desc=9", "Desc=9 Link=4 Z=3" }, + { "Link=fred", NULL }, + { "Link=1,fred", NULL }, + { "Link=1,fred,3", NULL }, + { "Link=1,9-8,3", NULL }, + // "These fail at the splitting stage in Rust, but the number parsing + // stage in C." + { "Faux=-1", NULL }, + { "Faux=-1-3", NULL }, + { "Faux=1--1", NULL }, + /* Large integers */ + { "Link=4294967296", NULL }, + /* Large range */ + { "Sleen=1-501", "Sleen=1-501" }, + { "Sleen=1-65537", NULL }, + /* CPU/RAM DoS Loop: Rust only. */ + { "Sleen=0-2147483648", NULL }, + /* Rust seems to experience an internal error here. */ + { "Sleen=0-4294967295", NULL }, + }; + unsigned u; + smartlist_t *votes = smartlist_new(); + char *result = NULL; + + for (u = 0; u < ARRAY_LENGTH(examples); ++u) { + const char *input = examples[u].input; + const char *expected_output = examples[u].expected_output; + + smartlist_add(votes, (void*)input); + result = protover_compute_vote(votes, 1); + if (expected_output != NULL) { + tt_str_op(result, OP_EQ, expected_output); + } else { + tt_str_op(result, OP_EQ, ""); + } + + smartlist_clear(votes); + tor_free(result); + } + + done: + smartlist_free(votes); + tor_free(result); +} + #define PV_TEST(name, flags) \ { #name, test_protover_ ##name, (flags), NULL, NULL } @@ -190,6 +265,7 @@ struct testcase_t protover_tests[] = { PV_TEST(parse_fail, 0), PV_TEST(vote, 0), PV_TEST(all_supported, 0), + PV_TEST(vote_roundtrip, 0), END_OF_TESTCASES };

1 0

[tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 03 Mar '18

03 Mar '18

commit d4a758e08373854639af6991ec95836fa7c15ca4 Merge: ac1942ac5 c1bb8836f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 1 16:07:59 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug25249 | 3 + changes/bug25249.2 | 3 + changes/trove-2018-001.1 | 6 ++ changes/trove-2018-004 | 8 +++ src/or/protover.c | 35 ++++++++-- src/test/test_protover.c | 171 +++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 220 insertions(+), 6 deletions(-)

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits March 2018