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

[tor/maint-0.3.4] Stop reinstalling identical packages in our Windows CI
by nickm＠torproject.org 12 Sep '18

12 Sep '18

commit d6779a9013f2a4ca3073a5282323513606e36d20 Author: teor <teor(a)torproject.org> Date: Wed Sep 5 21:23:28 2018 +1000 Stop reinstalling identical packages in our Windows CI Fixes bug 27464; bugfix on 0.3.4.1-alpha. --- .appveyor.yml | 2 +- changes/bug27464 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index d1d8d7c45..bf51727fe 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -26,7 +26,7 @@ install: { Execute-Command 'c:\msys64\usr\bin\bash' '-e' '-c' $args } - Execute-Command "C:\msys64\usr\bin\pacman" -Sy --noconfirm openssl-devel openssl libevent-devel libevent mingw-w64-i686-libevent mingw-w64-x86_64-libevent mingw-w64-i686-openssl mingw-w64-x86_64-openssl mingw-w64-i686-zstd mingw-w64-x86_64-zstd + Execute-Command "C:\msys64\usr\bin\pacman" -Sy --needed --noconfirm openssl-devel openssl libevent-devel libevent mingw-w64-i686-libevent mingw-w64-x86_64-libevent mingw-w64-i686-openssl mingw-w64-x86_64-openssl mingw-w64-i686-zstd mingw-w64-x86_64-zstd build_script: - ps: >- diff --git a/changes/bug27464 b/changes/bug27464 new file mode 100644 index 000000000..9dedd06f4 --- /dev/null +++ b/changes/bug27464 @@ -0,0 +1,3 @@ + o Minor bugfixes (continuous integration): + - Stop reinstalling identical packages in our Windows CI. + Fixes bug 27464; bugfix on 0.3.4.1-alpha.

1 0

[tor/master] Stop reinstalling identical packages in our Windows CI
by nickm＠torproject.org 12 Sep '18

12 Sep '18

commit d6779a9013f2a4ca3073a5282323513606e36d20 Author: teor <teor(a)torproject.org> Date: Wed Sep 5 21:23:28 2018 +1000 Stop reinstalling identical packages in our Windows CI Fixes bug 27464; bugfix on 0.3.4.1-alpha. --- .appveyor.yml | 2 +- changes/bug27464 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index d1d8d7c45..bf51727fe 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -26,7 +26,7 @@ install: { Execute-Command 'c:\msys64\usr\bin\bash' '-e' '-c' $args } - Execute-Command "C:\msys64\usr\bin\pacman" -Sy --noconfirm openssl-devel openssl libevent-devel libevent mingw-w64-i686-libevent mingw-w64-x86_64-libevent mingw-w64-i686-openssl mingw-w64-x86_64-openssl mingw-w64-i686-zstd mingw-w64-x86_64-zstd + Execute-Command "C:\msys64\usr\bin\pacman" -Sy --needed --noconfirm openssl-devel openssl libevent-devel libevent mingw-w64-i686-libevent mingw-w64-x86_64-libevent mingw-w64-i686-openssl mingw-w64-x86_64-openssl mingw-w64-i686-zstd mingw-w64-x86_64-zstd build_script: - ps: >- diff --git a/changes/bug27464 b/changes/bug27464 new file mode 100644 index 000000000..9dedd06f4 --- /dev/null +++ b/changes/bug27464 @@ -0,0 +1,3 @@ + o Minor bugfixes (continuous integration): + - Stop reinstalling identical packages in our Windows CI. + Fixes bug 27464; bugfix on 0.3.4.1-alpha.

1 0

[tor/master] Merge branch 'maint-0.3.4'
by nickm＠torproject.org 12 Sep '18

12 Sep '18

commit 0dbd4fe30961bb56539d3e2853244bd2e19f19b8 Merge: 8294c40c9 73ba308d3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 12 08:17:45 2018 -0400 Merge branch 'maint-0.3.4' .appveyor.yml | 2 +- changes/bug27464 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge remote-tracking branch 'teor/bug27464-034' into maint-0.3.4
by nickm＠torproject.org 12 Sep '18

12 Sep '18

commit 73ba308d3d568eac81da358c4df29fda3f32e921 Merge: affbe376f d6779a901 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 12 08:17:42 2018 -0400 Merge remote-tracking branch 'teor/bug27464-034' into maint-0.3.4 .appveyor.yml | 2 +- changes/bug27464 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.4] Stop reinstalling identical packages in our Windows CI
by nickm＠torproject.org 12 Sep '18

12 Sep '18

commit d6779a9013f2a4ca3073a5282323513606e36d20 Author: teor <teor(a)torproject.org> Date: Wed Sep 5 21:23:28 2018 +1000 Stop reinstalling identical packages in our Windows CI Fixes bug 27464; bugfix on 0.3.4.1-alpha. --- .appveyor.yml | 2 +- changes/bug27464 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index d1d8d7c45..bf51727fe 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -26,7 +26,7 @@ install: { Execute-Command 'c:\msys64\usr\bin\bash' '-e' '-c' $args } - Execute-Command "C:\msys64\usr\bin\pacman" -Sy --noconfirm openssl-devel openssl libevent-devel libevent mingw-w64-i686-libevent mingw-w64-x86_64-libevent mingw-w64-i686-openssl mingw-w64-x86_64-openssl mingw-w64-i686-zstd mingw-w64-x86_64-zstd + Execute-Command "C:\msys64\usr\bin\pacman" -Sy --needed --noconfirm openssl-devel openssl libevent-devel libevent mingw-w64-i686-libevent mingw-w64-x86_64-libevent mingw-w64-i686-openssl mingw-w64-x86_64-openssl mingw-w64-i686-zstd mingw-w64-x86_64-zstd build_script: - ps: >- diff --git a/changes/bug27464 b/changes/bug27464 new file mode 100644 index 000000000..9dedd06f4 --- /dev/null +++ b/changes/bug27464 @@ -0,0 +1,3 @@ + o Minor bugfixes (continuous integration): + - Stop reinstalling identical packages in our Windows CI. + Fixes bug 27464; bugfix on 0.3.4.1-alpha.

1 0

[tor/master] string: add string_is_utf8() helper
by nickm＠torproject.org 12 Sep '18

12 Sep '18

commit d32b08af6f38d76d609edfddd44159446b5f25b6 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Wed Aug 29 03:22:30 2018 +0000 string: add string_is_utf8() helper Ticket #27373. --- src/lib/string/util_string.c | 90 ++++++++++++++++++++++++++++++++++++++++++++ src/lib/string/util_string.h | 2 + src/test/test_util.c | 48 +++++++++++++++++++++++ 3 files changed, 140 insertions(+) diff --git a/src/lib/string/util_string.c b/src/lib/string/util_string.c index a6b0a3d68..b2b85d151 100644 --- a/src/lib/string/util_string.c +++ b/src/lib/string/util_string.c @@ -451,3 +451,93 @@ string_is_C_identifier(const char *string) return 1; } + +/** A byte with the top x bits set. */ +#define TOP_BITS(x) ((uint8_t)(0xFF << (8 - (x)))) +/** A byte with the lowest x bits set. */ +#define LOW_BITS(x) ((uint8_t)(0xFF >> (8 - (x)))) + +/** Given the leading byte b, return the total number of bytes in the + * UTF-8 character. Returns 0 if it's an invalid leading byte. + */ +static uint8_t +bytes_in_char(uint8_t b) +{ + if ((TOP_BITS(1) & b) == 0x00) + return 1; // a 1-byte UTF-8 char, aka ASCII + if ((TOP_BITS(3) & b) == TOP_BITS(2)) + return 2; // a 2-byte UTF-8 char + if ((TOP_BITS(4) & b) == TOP_BITS(3)) + return 3; // a 3-byte UTF-8 char + if ((TOP_BITS(5) & b) == TOP_BITS(4)) + return 4; // a 4-byte UTF-8 char + + // Invalid: either the top 2 bits are 10, or the top 5 bits are 11111. + return 0; +} + +/** Returns true iff b is a UTF-8 continuation byte. */ +static bool +is_continuation_byte(uint8_t b) +{ + uint8_t top2bits = b & TOP_BITS(2); + return top2bits == TOP_BITS(1); +} + +/** Returns true iff the len bytes in c are a valid UTF-8 + * character. + */ +static bool +validate_char(const uint8_t *c, uint8_t len) +{ + if (len == 1) + return true; // already validated this is an ASCII char earlier. + + uint8_t mask = LOW_BITS(7 - len); // bitmask for the leading byte. + uint32_t codepoint = c[0] & mask; + + mask = LOW_BITS(6); // bitmask for continuation bytes. + for (uint8_t i = 1; i < len; i++) { + if (!is_continuation_byte(c[i])) + return false; + codepoint <<= 6; + codepoint |= (c[i] & mask); + } + + if (len == 2 && codepoint <= 0x7f) + return false; // Invalid, overly long encoding, should have fit in 1 byte. + + if (len == 3 && codepoint <= 0x7ff) + return false; // Invalid, overly long encoding, should have fit in 2 bytes. + + if (len == 4 && codepoint <= 0xffff) + return false; // Invalid, overly long encoding, should have fit in 3 bytes. + + if (codepoint >= 0xd800 && codepoint <= 0xdfff) + return false; // Invalid, reserved for UTF-16 surrogate pairs. + + return codepoint <= 0x10ffff; // Check if within maximum. +} + +/** Returns true iff the first len bytes in str are a + valid UTF-8 string. */ +int +string_is_utf8(const char *str, size_t len) +{ + for (size_t i = 0; i < len;) { + uint8_t num_bytes = bytes_in_char(str[i]); + if (num_bytes == 0) // Invalid leading byte found. + return false; + + size_t next_char = i + num_bytes; + if (next_char > len) + return false; + + // Validate the continuation bytes in this multi-byte character, + // and advance to the next character in the string. + if (!validate_char((const uint8_t*)&str[i], num_bytes)) + return false; + i = next_char; + } + return true; +} diff --git a/src/lib/string/util_string.h b/src/lib/string/util_string.h index 471613462..746ece0d3 100644 --- a/src/lib/string/util_string.h +++ b/src/lib/string/util_string.h @@ -52,4 +52,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); + #endif /* !defined(TOR_UTIL_STRING_H) */ diff --git a/src/test/test_util.c b/src/test/test_util.c index 6cbd504e3..bdf8b5daf 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -4012,6 +4012,53 @@ test_util_string_is_C_identifier(void *ptr) } static void +test_util_string_is_utf8(void *ptr) +{ + (void)ptr; + + tt_int_op(1, OP_EQ, string_is_utf8(NULL, 0)); + tt_int_op(1, OP_EQ, string_is_utf8("", 1)); + tt_int_op(1, OP_EQ, string_is_utf8("\uFEFF", 3)); + tt_int_op(1, OP_EQ, string_is_utf8("\uFFFE", 3)); + 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)); + + // 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)); + + // Reject sequences with missing bytes. + tt_int_op(0, OP_EQ, string_is_utf8("\x80", 1)); + tt_int_op(0, OP_EQ, string_is_utf8("\xc2", 1)); + tt_int_op(0, OP_EQ, string_is_utf8("\xc2 ", 2)); + tt_int_op(0, OP_EQ, string_is_utf8("\xe1\x80", 2)); + tt_int_op(0, OP_EQ, string_is_utf8("\xe1\x80 ", 3)); + tt_int_op(0, OP_EQ, string_is_utf8("\xf1\x80\x80", 3)); + tt_int_op(0, OP_EQ, string_is_utf8("\xf1\x80\x80 ", 4)); + + // Reject encodings that are overly long. + tt_int_op(0, OP_EQ, string_is_utf8("\xc1\xbf", 2)); + tt_int_op(1, OP_EQ, string_is_utf8("\xc2\x80", 2)); + tt_int_op(0, OP_EQ, string_is_utf8("\xe0\x9f\xbf", 3)); + tt_int_op(1, OP_EQ, string_is_utf8("\xe0\xa0\x80", 3)); + tt_int_op(0, OP_EQ, string_is_utf8("\xf0\x8f\xbf\xbf", 4)); + tt_int_op(1, OP_EQ, string_is_utf8("\xf0\x90\x80\x80", 4)); + + // Reject UTF-16 surrogate halves. + tt_int_op(1, OP_EQ, string_is_utf8("\xed\x9f\xbf", 3)); + tt_int_op(0, OP_EQ, string_is_utf8("\xed\xa0\x80", 3)); + tt_int_op(0, OP_EQ, string_is_utf8("\xed\xbf\xbf", 3)); + tt_int_op(1, OP_EQ, string_is_utf8("\xee\x80\x80", 3)); + + // The maximum legal codepoint, 10FFFF. + tt_int_op(1, OP_EQ, string_is_utf8("\xf4\x8f\xbf\xbf", 4)); + tt_int_op(0, OP_EQ, string_is_utf8("\xf4\x90\x80\x80", 4)); + + done: + ; +} + +static void test_util_asprintf(void *ptr) { #define LOREMIPSUM \ @@ -6398,6 +6445,7 @@ struct testcase_t util_tests[] = { UTIL_TEST(clamp_double_to_int64, 0), UTIL_TEST(find_str_at_start_of_line, 0), UTIL_TEST(string_is_C_identifier, 0), + UTIL_TEST(string_is_utf8, 0), UTIL_TEST(asprintf, 0), UTIL_TEST(listdir, 0), UTIL_TEST(parent_dir, 0),

1 0

[tor/master] app/config: reject non-UTF-8 ContactInfo
by nickm＠torproject.org 12 Sep '18

12 Sep '18

commit f8c0f694b7f335358f612b0a26aae8b48110fa50 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Mon Sep 3 13:51:29 2018 +0000 app/config: reject non-UTF-8 ContactInfo Closes ticket #27428. --- changes/bug27428 | 3 +++ src/app/config/config.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/changes/bug27428 b/changes/bug27428 new file mode 100644 index 000000000..86e00c7db --- /dev/null +++ b/changes/bug27428 @@ -0,0 +1,3 @@ + o Minor bugfixes (torrc): + - Tor now validates that the ContactInfo config option is valid UTF-8 + when parsing torrc. Fixes bug 27428; bugfix on 0.0.8pre1. diff --git a/src/app/config/config.c b/src/app/config/config.c index 339f8e247..cd76efd45 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -3381,6 +3381,9 @@ options_validate(or_options_t *old_options, or_options_t *options, log_notice(LD_CONFIG, "Your ContactInfo config option is not set. " "Please consider setting it, so we can contact you if your server is " "misconfigured or something else goes wrong."); + const char *ContactInfo = options->ContactInfo; + if (ContactInfo && !string_is_utf8(ContactInfo, strlen(ContactInfo))) + REJECT("ContactInfo config option must be UTF-8."); /* Special case on first boot if no Log options are given. */ if (!options->Logs && !options->RunAsDaemon && !from_setconf) {

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/318'
by nickm＠torproject.org 12 Sep '18

12 Sep '18

commit 8294c40c96a9ec59ff3e0a3ce2f4926c275ab114 Merge: 5a2374b07 f8c0f694b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 12 08:12:19 2018 -0400 Merge remote-tracking branch 'tor-github/pr/318' changes/bug27428 | 3 ++ src/app/config/config.c | 3 ++ src/lib/string/util_string.c | 90 ++++++++++++++++++++++++++++++++++++++++++++ src/lib/string/util_string.h | 2 + src/test/test_util.c | 48 +++++++++++++++++++++++ 5 files changed, 146 insertions(+)

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 12 Sep '18

12 Sep '18

commit 0cd2e51ad560aa3c6d65d6fe64410727566fccf6 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 12 12:15:52 2018 +0000 Update translations for tails-misc --- ar.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ar.po b/ar.po index 4f1d11b01..8546d962c 100644 --- a/ar.po +++ b/ar.po @@ -30,8 +30,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-04 11:37+0200\n" -"PO-Revision-Date: 2018-09-10 23:00+0000\n" -"Last-Translator: ButterflyOfFire ButterflyOfFire\n" +"PO-Revision-Date: 2018-09-12 11:48+0000\n" +"Last-Translator: Khaled Hosny\n" "Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -68,13 +68,13 @@ msgstr "<h1>ساعدنا لإصلاح المشكلة!</h1>\nاقرأ <a href= msgid "" "You can install additional software automatically from your persistent " "storage when starting Tails." -msgstr "" +msgstr "يمكنك تنصيب برمجيات إضافية تلقائيا من مساحة التخزين الدائم عند استخدامك تيلز." #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:77 msgid "" "The following software is installed automatically from your persistent " "storage when starting Tails." -msgstr "" +msgstr "نصبت البرمجيات التالية تلقائيا من مساحة التخزين الدائم عند بدأ تشغيل تيلز." #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:132 #: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:169

1 0

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

12 Sep '18

commit 13020aa65825276798dd60b89b3de4f4f97e6137 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 12 11:48:54 2018 +0000 Update translations for support-portal --- contents+id.po | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/contents+id.po b/contents+id.po index 4996b49bf..46ad9dab8 100644 --- a/contents+id.po +++ b/contents+id.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-09-08 10:58+CET\n" +"POT-Creation-Date: 2018-09-07 17:41+CET\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: sirsyarif, 2018\n" "Language-Team: Indonesian (https://www.transifex.com/otf/teams/1519/id/)\n" @@ -310,7 +310,7 @@ msgstr "Sayangnya, kami belum memiliki versi Tor Browser untuk ChromeOS." #: http//localhost/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.description) msgid "<img class=\"\" src=\"/static/images/image5.png\" alt=\"New release alert\">" -msgstr "" +msgstr "<img class=\"\" src=\"/static/images/image5.png\" alt=\"New release alert\">" #: http//localhost/misc/misc-5/ #: (content/misc/misc-5/contents+en.lrquestion.title) @@ -575,6 +575,8 @@ msgid "" "<img class=\"\" src=\"/static/images/padlock-onion.png\" alt=\"Green onion " "with a padlock\">" msgstr "" +"<img class=\"\" src=\"/static/images/padlock-onion.png\" alt=\"Green onion " +"with a padlock\">" #: http//localhost/tbb/tbb-18/ #: (content/tbb/tbb-18/contents+en.lrquestion.description) @@ -1068,13 +1070,15 @@ msgid "" "Both options are located in the Menu, but you can also access the New " "Circuit option inside the site information menu, in the URL bar." msgstr "" +"Kedua pilihan berada pada Menu, tetapi Anda juga bisa mengakses pilihan " +"Sirkuit Baru di dalam menu informasi situs, pada kolom URL." #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "Using bridges will likely fix this." -msgstr "" +msgstr "Menggunakan bridges mungkin akan memperbaiki ini." #: http//localhost/misc/misc-1/ #: (content/misc/misc-1/contents+en.lrquestion.description) @@ -1618,7 +1622,7 @@ msgstr "connecting-to-tor " #: http//localhost/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.description) msgid "<img class=\"\" src=\"/static/images/image3.png\" alt=\"New release alert\">" -msgstr "" +msgstr "<img class=\"\" src=\"/static/images/image3.png\" alt=\"New release alert\">" #: http//localhost/misc/misc-5/ #: (content/misc/misc-5/contents+en.lrquestion.description) @@ -1666,6 +1670,8 @@ msgid "" "<img class=\"\" src=\"/static/images/new-circuit-display.png\" alt=\"New " "Circuit for this Site\">" msgstr "" +"<img class=\"\" src=\"/static/images/new-circuit-display.png\" alt=\"New " +"Circuit for this Site\">" #: http//localhost/tbb/tbb-28/ #: (content/tbb/tbb-28/contents+en.lrquestion.description) @@ -2326,6 +2332,10 @@ msgid "" "at the URL bar an icon of a little green onion displaying the state of your " "connection: secure and using an onion service." msgstr "" +"Saat mengakses sebuah situs web yang menggunakan layanan onion, Peramban Tor" +" akan menunjukkan pada kolom URL sebuah ikon onion kecil berwarna hijau yang" +" menampilkan keadaan koneksi anda: aman dan menggunakan sebiuah layanan " +"onion." #: http//localhost/misc/misc-9/ #: (content/misc/misc-9/contents+en.lrquestion.description)

1 0