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

[tor/master] Add unit tests for current tor version git tags
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit e34a209df1652be5f15083ff8d6e44316fe1a599 Author: teor <teor2345(a)gmail.com> Date: Sun Feb 19 22:44:07 2017 +1100 Add unit tests for current tor version git tags Related to #21470 --- src/test/test_dir.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/src/test/test_dir.c b/src/test/test_dir.c index cc95f5b..a16aa2f 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -1165,6 +1165,33 @@ test_dir_versions(void *arg) "Tor 0.2.1.0-dev (r99)")); tt_int_op(1,OP_EQ, tor_version_as_new_as("Tor 0.2.1.1", "Tor 0.2.1.0-dev (r99)")); + /* And git revisions */ + tt_int_op(1,OP_EQ, tor_version_as_new_as( + "Tor 0.2.9.9 (git-56788a2489127072)", + "Tor 0.2.9.9 (git-56788a2489127072)")); + /* a git revision is newer than no git revision */ + tt_int_op(1,OP_EQ, tor_version_as_new_as( + "Tor 0.2.9.9 (git-56788a2489127072)", + "Tor 0.2.9.9")); + /* a longer git revision is newer than a shorter git revision + * this should be true if they prefix-match, but if they don't, they are + * incomparable, because hashes aren't ordered (but we compare their bytes + * anyway) */ + tt_int_op(1,OP_EQ, tor_version_as_new_as( + "Tor 0.2.9.9 (git-56788a2489127072d513cf4baf35a8ff475f3c7b)", + "Tor 0.2.9.9 (git-56788a2489127072)")); + tt_int_op(1,OP_EQ, tor_version_as_new_as( + "Tor 0.2.9.9 (git-0102)", + "Tor 0.2.9.9 (git-03)")); + tt_int_op(1,OP_EQ, tor_version_as_new_as( + "Tor 0.2.9.9 (git-0102)", + "Tor 0.2.9.9 (git-00)")); + tt_int_op(1,OP_EQ, tor_version_as_new_as( + "Tor 0.2.9.9 (git-01)", + "Tor 0.2.9.9 (git-00)")); + tt_int_op(0,OP_EQ, tor_version_as_new_as( + "Tor 0.2.9.9 (git-00)", + "Tor 0.2.9.9 (git-01)")); /* Now try git revisions */ tt_int_op(0,OP_EQ, tor_version_parse("0.5.6.7 (git-ff00ff)", &ver1)); @@ -1174,9 +1201,22 @@ test_dir_versions(void *arg) tt_int_op(7,OP_EQ, ver1.patchlevel); tt_int_op(3,OP_EQ, ver1.git_tag_len); tt_mem_op(ver1.git_tag,OP_EQ, "\xff\x00\xff", 3); + /* reject bad hex digits */ tt_int_op(-1,OP_EQ, tor_version_parse("0.5.6.7 (git-ff00xx)", &ver1)); + /* reject odd hex digit count */ tt_int_op(-1,OP_EQ, tor_version_parse("0.5.6.7 (git-ff00fff)", &ver1)); + /* ignore "git " */ tt_int_op(0,OP_EQ, tor_version_parse("0.5.6.7 (git ff00fff)", &ver1)); + /* standard length is 16 hex digits */ + tt_int_op(0,OP_EQ, tor_version_parse("0.5.6.7 (git-0010203040506070)", + &ver1)); + /* length limit is 40 hex digits */ + tt_int_op(0,OP_EQ, tor_version_parse( + "0.5.6.7 (git-000102030405060708090a0b0c0d0e0f10111213)", + &ver1)); + tt_int_op(-1,OP_EQ, tor_version_parse( + "0.5.6.7 (git-000102030405060708090a0b0c0d0e0f1011121314)", + &ver1)); done: ; }

1 0

[tor/master] Merge remote-tracking branch 'teor/test21470-029'
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit aa50758777ed4370f07e45a082dbeaa8c94620da Merge: ef61046 2c45e58 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 11:31:07 2017 -0500 Merge remote-tracking branch 'teor/test21470-029' changes/test21470 | 5 ++ src/test/test_dir.c | 135 +++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 139 insertions(+), 1 deletion(-)

1 0

[tor/master] Add unit tests that ensure out of range versions are rejected
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit 6d0b1a89971e1ee104ab758cb6aabeab70a7ffd9 Author: teor <teor2345(a)gmail.com> Date: Sun Feb 19 22:46:42 2017 +1100 Add unit tests that ensure out of range versions are rejected Unit tests for #21278. Part of #21470. --- src/test/test_dir.c | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/src/test/test_dir.c b/src/test/test_dir.c index d72977d..d3ec9be 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -1119,6 +1119,10 @@ test_dir_versions(void *arg) tt_str_op("", OP_EQ, ver1.status_tag); tt_int_op(-1, OP_EQ, tor_version_parse("0.2147483648.0", &ver1)); tt_int_op(-1, OP_EQ, tor_version_parse("0.4294967295.0", &ver1)); + /* In #21278, we reject negative version components */ + tt_int_op(-1, OP_EQ, tor_version_parse("0.-1.0", &ver1)); + tt_int_op(-1, OP_EQ, tor_version_parse("0.-2147483648.0", &ver1)); + tt_int_op(-1, OP_EQ, tor_version_parse("0.-4294967295.0", &ver1)); #define tt_versionstatus_op(vs1, op, vs2) \ tt_assert_test_type(vs1,vs2,#vs1" "#op" "#vs2,version_status_t, \ @@ -1204,6 +1208,43 @@ test_dir_versions(void *arg) tt_int_op(0,OP_EQ, tor_version_as_new_as( "Tor 0.2.9.9 (git-00)", "Tor 0.2.9.9 (git-01)")); + /* In #21278, we comapre without integer overflows. + * But since #21450 limits version components to [0, INT32_MAX], it is no + * longer possible to cause an integer overflow in tor_version_compare() */ + tt_int_op(0,OP_EQ, tor_version_as_new_as( + "Tor 0.0.0.0", + "Tor 2147483647.0.0.0")); + tt_int_op(1,OP_EQ, tor_version_as_new_as( + "Tor 2147483647.0.0.0", + "Tor 0.0.0.0")); + /* These versions used to cause an overflow, now they don't parse + * (and authorities reject their descriptors), and log a BUG message */ + setup_full_capture_of_logs(LOG_WARN); + tt_int_op(0,OP_EQ, tor_version_as_new_as( + "Tor 0.0.0.0", + "Tor 0.-2147483648.0.0")); + expect_single_log_msg_containing("unparseable"); + mock_clean_saved_logs(); + tt_int_op(0,OP_EQ, tor_version_as_new_as( + "Tor 0.2147483647.0.0", + "Tor 0.-1.0.0")); + expect_single_log_msg_containing("unparseable"); + mock_clean_saved_logs(); + tt_int_op(0,OP_EQ, tor_version_as_new_as( + "Tor 0.2147483647.0.0", + "Tor 0.-2147483648.0.0")); + expect_single_log_msg_containing("unparseable"); + mock_clean_saved_logs(); + tt_int_op(1,OP_EQ, tor_version_as_new_as( + "Tor 4294967295.0.0.0", + "Tor 0.0.0.0")); + expect_no_log_entry(); + tt_int_op(0,OP_EQ, tor_version_as_new_as( + "Tor 0.4294967295.0.0", + "Tor 0.-4294967295.0.0")); + expect_single_log_msg_containing("unparseable"); + mock_clean_saved_logs(); + teardown_capture_of_logs(); /* Now try git revisions */ tt_int_op(0,OP_EQ, tor_version_parse("0.5.6.7 (git-ff00ff)", &ver1)); @@ -1230,7 +1271,7 @@ test_dir_versions(void *arg) "0.5.6.7 (git-000102030405060708090a0b0c0d0e0f1011121314)", &ver1)); done: - ; + teardown_capture_of_logs(); } /** Run unit tests for directory fp_pair functions. */

1 0

[tor/master] Changes file for 21470
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit 2c45e58bf1128af742d9d12800e969136d21320d Author: teor <teor2345(a)gmail.com> Date: Sun Feb 19 22:51:50 2017 +1100 Changes file for 21470 --- changes/test21470 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/test21470 b/changes/test21470 new file mode 100644 index 0000000..8bb78df --- /dev/null +++ b/changes/test21470 @@ -0,0 +1,5 @@ + o Minor enhancements (unit tests): + - Improve version parsing tests: add tests for typical version components, + add tests for invalid versions, including numeric range and non-numeric + prefixes. + Unit tests 21278, 21450, and 21507. Partially implements 21470.

1 0

[tor/master] Add unit tests for version parsing integer size inconsistencies
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit b3e139581ba7918668bd32bd7ef64a16eff2b9d2 Author: teor <teor2345(a)gmail.com> Date: Sun Feb 19 22:45:25 2017 +1100 Add unit tests for version parsing integer size inconsistencies Unit tests for #21450. Part of #21470. --- src/test/test_dir.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/test/test_dir.c b/src/test/test_dir.c index a16aa2f..d72977d 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -1107,6 +1107,18 @@ test_dir_versions(void *arg) tt_int_op(9, OP_EQ, ver1.patchlevel); tt_int_op(VER_RELEASE, OP_EQ, ver1.status); tt_str_op("dev", OP_EQ, ver1.status_tag); + /* In #21450, we fixed an inconsistency in parsing versions > INT32_MAX + * between i386 and x86_64, as we used tor_parse_long, and then cast to int + */ + tt_int_op(0, OP_EQ, tor_version_parse("0.2147483647.0", &ver1)); + tt_int_op(0, OP_EQ, ver1.major); + tt_int_op(2147483647, OP_EQ, ver1.minor); + tt_int_op(0, OP_EQ, ver1.micro); + tt_int_op(0, OP_EQ, ver1.patchlevel); + tt_int_op(VER_RELEASE, OP_EQ, ver1.status); + tt_str_op("", OP_EQ, ver1.status_tag); + tt_int_op(-1, OP_EQ, tor_version_parse("0.2147483648.0", &ver1)); + tt_int_op(-1, OP_EQ, tor_version_parse("0.4294967295.0", &ver1)); #define tt_versionstatus_op(vs1, op, vs2) \ tt_assert_test_type(vs1,vs2,#vs1" "#op" "#vs2,version_status_t, \

1 0

[tor/master] Reject versions that have non-numeric prefixes
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit 590bfe3d6df3c2cdcd8acde7444ec1a8e9ac8344 Author: teor <teor2345(a)gmail.com> Date: Sun Feb 19 22:47:47 2017 +1100 Reject versions that have non-numeric prefixes Unit tests #21507. Part of #21470. --- src/test/test_dir.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/test/test_dir.c b/src/test/test_dir.c index d3ec9be..696d61c 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -1123,6 +1123,16 @@ test_dir_versions(void *arg) tt_int_op(-1, OP_EQ, tor_version_parse("0.-1.0", &ver1)); tt_int_op(-1, OP_EQ, tor_version_parse("0.-2147483648.0", &ver1)); tt_int_op(-1, OP_EQ, tor_version_parse("0.-4294967295.0", &ver1)); + /* In #21507, we reject version components with non-numeric prefixes */ + tt_int_op(-1, OP_EQ, tor_version_parse("0.-0.0", &ver1)); + tt_int_op(-1, OP_EQ, tor_version_parse("+1.0.0", &ver1)); + /* use the list in isspace() */ + tt_int_op(-1, OP_EQ, tor_version_parse("0.\t0.0", &ver1)); + tt_int_op(-1, OP_EQ, tor_version_parse("0.\n0.0", &ver1)); + tt_int_op(-1, OP_EQ, tor_version_parse("0.\v0.0", &ver1)); + tt_int_op(-1, OP_EQ, tor_version_parse("0.\f0.0", &ver1)); + tt_int_op(-1, OP_EQ, tor_version_parse("0.\r0.0", &ver1)); + tt_int_op(-1, OP_EQ, tor_version_parse("0. 0.0", &ver1)); #define tt_versionstatus_op(vs1, op, vs2) \ tt_assert_test_type(vs1,vs2,#vs1" "#op" "#vs2,version_status_t, \

1 0

[tor/master] Add unit tests for the current range of tor version status tags
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit 3c39dab4333647a0ac331d912df209cdd144211d Author: teor <teor2345(a)gmail.com> Date: Sun Feb 19 22:42:44 2017 +1100 Add unit tests for the current range of tor version status tags Related to #21470. --- src/test/test_dir.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/test/test_dir.c b/src/test/test_dir.c index cdc56ac..cc95f5b 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -1064,6 +1064,7 @@ test_dir_versions(void *arg) tt_int_op(0, OP_EQ, ver1.patchlevel); tt_int_op(VER_RELEASE, OP_EQ, ver1.status); tt_str_op("alpha", OP_EQ, ver1.status_tag); + /* Go through the full set of status tags */ tt_int_op(0, OP_EQ, tor_version_parse("2.1.700-alpha", &ver1)); tt_int_op(2, OP_EQ, ver1.major); tt_int_op(1, OP_EQ, ver1.minor); @@ -1078,6 +1079,34 @@ test_dir_versions(void *arg) tt_int_op(0, OP_EQ, ver1.patchlevel); tt_int_op(VER_RELEASE, OP_EQ, ver1.status); tt_str_op("alpha-dev", OP_EQ, ver1.status_tag); + tt_int_op(0, OP_EQ, tor_version_parse("0.2.9.5-rc", &ver1)); + tt_int_op(0, OP_EQ, ver1.major); + tt_int_op(2, OP_EQ, ver1.minor); + tt_int_op(9, OP_EQ, ver1.micro); + tt_int_op(5, OP_EQ, ver1.patchlevel); + tt_int_op(VER_RELEASE, OP_EQ, ver1.status); + tt_str_op("rc", OP_EQ, ver1.status_tag); + tt_int_op(0, OP_EQ, tor_version_parse("0.2.9.6-rc-dev", &ver1)); + tt_int_op(0, OP_EQ, ver1.major); + tt_int_op(2, OP_EQ, ver1.minor); + tt_int_op(9, OP_EQ, ver1.micro); + tt_int_op(6, OP_EQ, ver1.patchlevel); + tt_int_op(VER_RELEASE, OP_EQ, ver1.status); + tt_str_op("rc-dev", OP_EQ, ver1.status_tag); + tt_int_op(0, OP_EQ, tor_version_parse("0.2.9.8", &ver1)); + tt_int_op(0, OP_EQ, ver1.major); + tt_int_op(2, OP_EQ, ver1.minor); + tt_int_op(9, OP_EQ, ver1.micro); + tt_int_op(8, OP_EQ, ver1.patchlevel); + tt_int_op(VER_RELEASE, OP_EQ, ver1.status); + tt_str_op("", OP_EQ, ver1.status_tag); + tt_int_op(0, OP_EQ, tor_version_parse("0.2.9.9-dev", &ver1)); + tt_int_op(0, OP_EQ, ver1.major); + tt_int_op(2, OP_EQ, ver1.minor); + tt_int_op(9, OP_EQ, ver1.micro); + tt_int_op(9, OP_EQ, ver1.patchlevel); + tt_int_op(VER_RELEASE, OP_EQ, ver1.status); + tt_str_op("dev", OP_EQ, ver1.status_tag); #define tt_versionstatus_op(vs1, op, vs2) \ tt_assert_test_type(vs1,vs2,#vs1" "#op" "#vs2,version_status_t, \ @@ -1097,6 +1126,7 @@ test_dir_versions(void *arg) test_v_i_o(VS_RECOMMENDED, "0.0.7rc2", "0.0.7,Tor 0.0.7rc2,Tor 0.0.8"); test_v_i_o(VS_OLD, "0.0.5.0", "0.0.5.1-cvs"); test_v_i_o(VS_NEW_IN_SERIES, "0.0.5.1-cvs", "0.0.5, 0.0.6"); + test_v_i_o(VS_NEW, "0.2.9.9-dev", "0.2.9.9"); /* Not on list, but newer than any in same series. */ test_v_i_o(VS_NEW_IN_SERIES, "0.1.0.3", "Tor 0.1.0.2,Tor 0.0.9.5,Tor 0.1.1.0");

1 0

[tor/master] Merge remote-tracking branch 'teor/bug21507-029'
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit ef610467fa5122740cb7a964376a440f31c41696 Merge: 242f9b3 57154e7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 11:19:24 2017 -0500 Merge remote-tracking branch 'teor/bug21507-029' changes/bug21507 | 5 +++++ src/or/routerparse.c | 2 ++ 2 files changed, 7 insertions(+)

1 0

[tor/master] Reject Tor versions that contain non-numeric prefixes
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit 57154e71aa3b0ff205f2700e97f0ffe4531e1330 Author: teor <teor2345(a)gmail.com> Date: Sun Feb 19 22:38:06 2017 +1100 Reject Tor versions that contain non-numeric prefixes strto* and _atoi64 accept +, -, and various whitespace before numeric characters. And permitted whitespace is different between POSIX and Windows. Fixes bug 21507 and part of 21508; bugfix on 0.0.8pre1. --- changes/bug21507 | 5 +++++ src/or/routerparse.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/changes/bug21507 b/changes/bug21507 new file mode 100644 index 0000000..f83e291 --- /dev/null +++ b/changes/bug21507 @@ -0,0 +1,5 @@ + o Minor bugfixes (voting consistency): + - Reject version numbers with non-numeric prefixes (such as +, -, and + whitespace). Disallowing whitespace prevents differential version + parsing between POSIX-based and Windows platforms. + Fixes bug 21507 and part of 21508; bugfix on 0.0.8pre1. diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 2ee0d27..521e237 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -5621,6 +5621,8 @@ tor_version_parse(const char *s, tor_version_t *out) #define NUMBER(m) \ do { \ + if (!cp || *cp < '0' || *cp > '9') \ + return -1; \ out->m = (int)tor_parse_uint64(cp, 10, 0, INT32_MAX, &ok, &eos); \ if (!ok) \ return -1; \

1 0

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

28 Feb '17

commit 61b7ef9ee84a6ce7dfd9cda2e8bb5975bc2f1a51 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 28 16:18:33 2017 +0000 Update translations for tor-browser-manual --- pt/pt.po | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pt/pt.po b/pt/pt.po index 24a27e5..f03ced8 100644 --- a/pt/pt.po +++ b/pt/pt.po @@ -239,7 +239,7 @@ msgstr "" #: circumvention.page:22 msgid "Using pluggable transports" -msgstr "" +msgstr "A utilizar transportes ligáveis" #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -291,6 +291,8 @@ msgid "" "Select “Connect with provided bridges”. Tor Browser currently has six " "pluggable transport options to choose from." msgstr "" +"Selecione “Ligar com pontes fornecidas”. O Tor Browser tem atualmente seis " +"opções de transporte ligáveis para escolher." #: circumvention.page:60 msgid "Which transport should I use?" @@ -1418,12 +1420,16 @@ msgid "" "external ref='media/updating/update1.png' " "md5='9ff01eb653d92124746fc31efde2bf07'" msgstr "" +"ref. externa='media/updating/update1.png' " +"md5='9ff01eb653d92124746fc31efde2bf07'" #: updating.page:32 msgid "" "When you are prompted to update Tor Browser, click on the Torbutton icon, " "then select “Check for Tor Browser Update”." msgstr "" +"Quando lhe é pedido para atualizar o Tor Browser, clique no ícone Torbutton," +" depois selecione “Procurar por Atualização do Tor Browser”." #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to

1 0