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

[tor/maint-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6
by dgoulet＠torproject.org 07 May '21

07 May '21

commit b1b4c05fb32b1f5a5306a16e9b61b7a4912c9209 Merge: cf6e72b702 80c404c4b7 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri May 7 09:03:39 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6

1 0

[tor/maint-0.4.6] Log warning when connecting to soon-to-be-deprecated v2 onions.
by dgoulet＠torproject.org 07 May '21

07 May '21

commit 80c404c4b79f3bcba3fc4585d4c62a62a04f3ed9 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed May 5 10:50:29 2021 +0300 Log warning when connecting to soon-to-be-deprecated v2 onions. --- changes/ticket40373 | 3 +++ src/core/or/connection_edge.c | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/changes/ticket40373 b/changes/ticket40373 new file mode 100644 index 0000000000..e2ea297bc2 --- /dev/null +++ b/changes/ticket40373 @@ -0,0 +1,3 @@ + o Minor features (onion services): + - Add warning message when connecting to soon-to-be-deprecated v2 onions. + Closes ticket 40373. diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c index a33c64fe19..7f260ba185 100644 --- a/src/core/or/connection_edge.c +++ b/src/core/or/connection_edge.c @@ -2582,6 +2582,16 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, tor_assert(addresstype == ONION_V2_HOSTNAME || addresstype == ONION_V3_HOSTNAME); tor_assert(!automap); + + if (addresstype == ONION_V2_HOSTNAME) { + log_warn(LD_PROTOCOL, + "Warning! You've just connected to a v2 onion address. These " + "addresses are deprecated for security reasons, and are no " + "longer supported in Tor. Please encourage the site operator " + "to upgrade. For more information see " + "https://blog.torproject.org/v2-deprecation-timeline"); + } + return connection_ap_handle_onion(conn, socks, circ, addresstype); }

1 0

[tor/maint-0.4.6] Prepare for #40373: Re-introduce parsing for v2 onion addresses.
by dgoulet＠torproject.org 07 May '21

07 May '21

commit f230beadf469e300c783791847a346c593033dd0 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed May 5 11:05:09 2021 +0300 Prepare for #40373: Re-introduce parsing for v2 onion addresses. Welcome back ONION_V2_HOSTNAME! :) --- src/core/or/connection_edge.c | 28 +++++++++++++++++++++++++++- src/core/or/connection_edge.h | 1 + src/test/test_hs_common.c | 10 ++++++++++ 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c index b89f3336dc..8e13161348 100644 --- a/src/core/or/connection_edge.c +++ b/src/core/or/connection_edge.c @@ -1612,6 +1612,23 @@ consider_plaintext_ports(entry_connection_t *conn, uint16_t port) return 0; } +/** Return true iff <b>query</b> is a syntactically valid service ID (as + * generated by rend_get_service_id). */ +static int +rend_valid_v2_service_id(const char *query) +{ + /** Length of 'y' portion of 'y.onion' URL. */ +#define REND_SERVICE_ID_LEN_BASE32 16 + + if (strlen(query) != REND_SERVICE_ID_LEN_BASE32) + return 0; + + if (strspn(query, BASE32_CHARS) != REND_SERVICE_ID_LEN_BASE32) + return 0; + + return 1; +} + /** Parse the given hostname in address. Returns true if the parsing was * successful and type_out contains the type of the hostname. Else, false is * returned which means it was not recognized and type_out is set to @@ -1675,6 +1692,14 @@ parse_extended_hostname(char *address, hostname_type_t *type_out) if (q != address) { memmove(address, q, strlen(q) + 1 /* also get \0 */); } + /* v2 onion address check. */ + if (strlen(query) == REND_SERVICE_ID_LEN_BASE32) { + *type_out = ONION_V2_HOSTNAME; + if (rend_valid_v2_service_id(query)) { + goto success; + } + goto failed; + } /* v3 onion address check. */ if (strlen(query) == HS_SERVICE_ADDR_LEN_BASE32) { @@ -1694,7 +1719,8 @@ parse_extended_hostname(char *address, hostname_type_t *type_out) failed: /* otherwise, return to previous state and return 0 */ *s = '.'; - const bool is_onion = (*type_out == ONION_V3_HOSTNAME); + const bool is_onion = (*type_out == ONION_V2_HOSTNAME) || + (*type_out == ONION_V3_HOSTNAME); log_warn(LD_APP, "Invalid %shostname %s; rejecting", is_onion ? "onion " : "", safe_str_client(address)); diff --git a/src/core/or/connection_edge.h b/src/core/or/connection_edge.h index 966a9391d8..72869f348b 100644 --- a/src/core/or/connection_edge.h +++ b/src/core/or/connection_edge.h @@ -80,6 +80,7 @@ typedef enum hostname_type_t { BAD_HOSTNAME, EXIT_HOSTNAME, NORMAL_HOSTNAME, + ONION_V2_HOSTNAME, ONION_V3_HOSTNAME, } hostname_type_t; diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c index 08e0b9b703..7cb6a36f8e 100644 --- a/src/test/test_hs_common.c +++ b/src/test/test_hs_common.c @@ -789,6 +789,8 @@ test_parse_extended_hostname(void *arg) char address1[] = "fooaddress.onion"; char address3[] = "fooaddress.exit"; char address4[] = "www.torproject.org"; + char address5[] = "foo.abcdefghijklmnop.onion"; + char address6[] = "foo.bar.abcdefghijklmnop.onion"; char address7[] = ".abcdefghijklmnop.onion"; char address8[] = "www.25njqamcweflpvkl73j4szahhihoc4xt3ktcgjnpaingr5yhkenl5sid.onion"; @@ -806,6 +808,14 @@ test_parse_extended_hostname(void *arg) tt_assert(parse_extended_hostname(address4, &type)); tt_int_op(type, OP_EQ, NORMAL_HOSTNAME); + tt_assert(parse_extended_hostname(address5, &type)); + tt_int_op(type, OP_EQ, ONION_V2_HOSTNAME); + tt_str_op(address5, OP_EQ, "abcdefghijklmnop"); + + tt_assert(parse_extended_hostname(address6, &type)); + tt_int_op(type, OP_EQ, ONION_V2_HOSTNAME); + tt_str_op(address6, OP_EQ, "abcdefghijklmnop"); + tt_assert(!parse_extended_hostname(address7, &type)); tt_int_op(type, OP_EQ, BAD_HOSTNAME);

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 07 May '21

07 May '21

commit faf759bc13b9ee5f571a333b57a8b9651469c7c3 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 7 11:48:41 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+zh-CN.po | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 4e1d93bc8f..d0fde8c720 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -16,10 +16,10 @@ # 忻然李 <2544304894(a)qq.com>, 2020 # Runzhe Liang <18051080098(a)163.com>, 2020 # Feng Zi <admin(a)fengzi.ga>, 2021 -# Emma Peel, 2021 # Scott Rhodes <starring169(a)gmail.com>, 2021 # MD Rights <psychi2009(a)gmail.com>, 2021 # ff98sha, 2021 +# Emma Peel, 2021 # msgid "" msgstr "" @@ -27,7 +27,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-02 16:21+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: ff98sha, 2021\n" +"Last-Translator: Emma Peel, 2021\n" "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -350,6 +350,8 @@ msgid "" "hard time determining whether or not those requests are coming from humans " "or bots." msgstr "" +"[Tor](../tor-tor-network-core-tor) 用户经常被提供验证码，因为 Tor " +"[中继](../relay)发出的请求太多，有时网站很难确定这些请求是来自人类还是来自机器人。" #: https//support.torproject.org/glossary/captcha/ #: (content/glossary/captcha/contents+en.lrword.spelling) @@ -4527,14 +4529,14 @@ msgstr "”标准“等级允许JavaScript，但是”安全“与”最安全 #: https//support.torproject.org/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.title) msgid "Can you get rid of all the Captchas?" -msgstr "" +msgstr "如何避免那些验证码？" #: https//support.torproject.org/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) msgid "" "Unfortunately, some websites deliver Captchas to Tor users, and we are not " "able to remove Captchas from websites." -msgstr "" +msgstr "十分不幸，有些网站要求 Tor 用户填写验证码，我们对此无能为力。" #: https//support.torproject.org/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.description) @@ -4542,7 +4544,7 @@ msgid "" "The best thing to do in these cases is to contact the website owners, and " "inform them that their Captchas are preventing users such as yourself from " "using their services." -msgstr "" +msgstr "最有效的方法往往是联系网站管理员，告诉他们验证码给像你一样的用户带来的不便。" #: https//support.torproject.org/tbb/tbb-36/ #: (content/tbb/tbb-36/contents+en.lrquestion.title) @@ -4811,7 +4813,7 @@ msgstr "另一个方法是直接使用您的国家代码来访问谷歌。这可 #: https//support.torproject.org/tbb/tbb-44/ #: (content/tbb/tbb-44/contents+en.lrquestion.title) msgid "Google makes me solve a Captcha or tells me I have spyware installed" -msgstr "" +msgstr "谷歌让我进行 Captcha 验证，或告知我安装了间谍软件。" #: https//support.torproject.org/tbb/tbb-44/ #: (content/tbb/tbb-44/contents+en.lrquestion.description) @@ -9189,7 +9191,7 @@ msgstr "5. 点击正方形底部的那句话：验证账户" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "6. Fill out the Captcha that pops up, and click ok." -msgstr "" +msgstr "6. 填入弹出的CAPTCHA验证，然后点击确定。" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description)

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 07 May '21

07 May '21

commit f72bf8b158b32983c9231b179ecdf71c28391584 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 7 11:47:33 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+zh-CN.po | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 56413b16ff..191bef613b 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -7,10 +7,10 @@ # Runzhe Liang <18051080098(a)163.com>, 2020 # ヨイツの賢狼ホロ, 2021 # Gus, 2021 -# Emma Peel, 2021 # Scott Rhodes <starring169(a)gmail.com>, 2021 # MD Rights <psychi2009(a)gmail.com>, 2021 # ff98sha, 2021 +# Emma Peel, 2021 # msgid "" msgstr "" @@ -18,7 +18,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-02 09:17+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: ff98sha, 2021\n" +"Last-Translator: Emma Peel, 2021\n" "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -345,6 +345,8 @@ msgid "" "in the body of the message simply write “windows”, “osx”, or “linux”, " "(without quotation marks) depending on your operating system." msgstr "" +"发送一封电子邮件至 [gettor@torproject.org](mailto:gettor@torproject.org)。按照您欲使用 Tor " +"浏览器的电脑系统，在邮件内容填写“windows”、“osx”或“linux”来指定平台版本（不含引号）。" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -372,6 +374,8 @@ msgid "" "message to [gettor@torproject.org](mailto:gettor@torproject.org) with the " "words \"linux zh\" in it." msgstr "" +"若要获取可于 Linux 平台上使用的中文版 Tor 浏览器下载链接，可以将“linux zh”字串写在电子邮件里并发送到 " +"[gettor@torproject.org](mailto:gettor@torproject.org)。" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.title) @@ -1009,7 +1013,7 @@ msgstr "" msgid "" "Complete the Captcha and click \"Submit.\" Click \"Connect\" to save your " "settings." -msgstr "" +msgstr "完成验证码并点击“提交”。点击“连接”以保存你的设定。" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -1026,7 +1030,7 @@ msgstr "" msgid "" "Complete the Captcha and click \"Submit.\" Your setting will automatically " "be saved once you close the tab." -msgstr "" +msgstr "完成验证码并点击“提交”。当你关闭标签页以后你的设置将被自动保存。" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body)

1 0

[translation/tails-onioncircuits_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-onioncircuits_release
by translation＠torproject.org 07 May '21

07 May '21

commit 0ca74ff6c6306fbac80120baf499d9995b231fb5 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 7 10:18:09 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-onioncircuits… --- pt_PT/onioncircuits.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt_PT/onioncircuits.po b/pt_PT/onioncircuits.po index 037b7d89f4..05a91c30cb 100644 --- a/pt_PT/onioncircuits.po +++ b/pt_PT/onioncircuits.po @@ -3,8 +3,8 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Manuela Silva <manuelarodsilva(a)gmail.com>, 2020 -# Manuela Silva <manuelarodsilva(a)gmail.com>, 2018 +# Manuela Silva <mmsrs(a)sky.com>, 2020 +# Manuela Silva <mmsrs(a)sky.com>, 2018 # Rui <xymarior(a)yandex.com>, 2019 msgid "" msgstr ""

1 0

[translation/tails-openpgp-applet_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-openpgp-applet_release
by translation＠torproject.org 07 May '21

07 May '21

commit 18cfcccea2d5666a0bd5533421fe417aeb4decc9 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 7 10:18:00 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-openpgp-apple… --- pt_PT/openpgp-applet.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt_PT/openpgp-applet.po b/pt_PT/openpgp-applet.po index f19fbc30d0..24530d968c 100644 --- a/pt_PT/openpgp-applet.po +++ b/pt_PT/openpgp-applet.po @@ -3,8 +3,8 @@ # This file is distributed under the same license as the OpenPGP_Applet package. # # Translators: -# Manuela Silva <manuelarodsilva(a)gmail.com>, 2018 -# Manuela Silva <manuelarodsilva(a)gmail.com>, 2019 +# Manuela Silva <mmsrs(a)sky.com>, 2018 +# Manuela Silva <mmsrs(a)sky.com>, 2019 # Rui <xymarior(a)yandex.com>, 2019 msgid "" msgstr "" @@ -12,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2017-08-05 15:07-0400\n" "PO-Revision-Date: 2019-05-22 13:14+0000\n" -"Last-Translator: Manuela Silva <manuelarodsilva(a)gmail.com>\n" +"Last-Translator: Manuela Silva <mmsrs(a)sky.com>\n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/otf/torproject/language/pt_PT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 07 May '21

07 May '21

commit aa7ebadf46699239f6f7cf7fc9caaacc0060bfe5 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 7 10:17:49 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- pt_PT.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt_PT.po b/pt_PT.po index 16b0dab654..03ec4d46c9 100644 --- a/pt_PT.po +++ b/pt_PT.po @@ -6,8 +6,8 @@ # A Russo <quisquiliarum2001-habitica(a)yahoo.co.uk>, 2021 # Hugo Costa <hugoncosta(a)gmail.com>, 2020-2021 # Hugo Costa <hugoncosta(a)gmail.com>, 2019-2020 -# Manuela Silva <manuelarodsilva(a)gmail.com>, 2019 -# Manuela Silva <manuelarodsilva(a)gmail.com>, 2018 +# Manuela Silva <mmsrs(a)sky.com>, 2019 +# Manuela Silva <mmsrs(a)sky.com>, 2018 # Nuno Rego <nuno.rego(a)outlook.com>, 2019 # Rui <xymarior(a)yandex.com>, 2019 msgid ""

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 07 May '21

07 May '21

commit b1f0543cab6666d0c4e82186c162a470101e04e5 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 7 09:15:11 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+ca.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contents+ca.po b/contents+ca.po index 1a8b856276..6367b8fd4b 100644 --- a/contents+ca.po +++ b/contents+ca.po @@ -4,12 +4,12 @@ # Marc Ripoll <markripesp(a)gmail.com>, 2020 # Giovanni Pellerano <giovanni.pellerano(a)evilaliv3.org>, 2020 # Miquel Bosch, 2021 -# Emma Peel, 2021 # Assumpta, 2021 # Antonela D <antonela(a)torproject.org>, 2021 -# jmontane, 2021 +# Joan Montané, 2021 # erinm, 2021 # Ecron <ecron_89(a)hotmail.com>, 2021 +# Emma Peel, 2021 # msgid "" msgstr "" @@ -17,7 +17,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-04-07 12:21+CET\n" "PO-Revision-Date: 2019-12-11 10:50+0000\n" -"Last-Translator: Ecron <ecron_89(a)hotmail.com>, 2021\n" +"Last-Translator: Emma Peel, 2021\n" "Language-Team: Catalan (https://www.transifex.com/otf/teams/1519/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2621,7 +2621,7 @@ msgid "" "Coduct](https://community.torproject.org/training/code-of-conduct/)" msgstr "" "* He llegit i accepto el [codi de " -"conducta]https://community.torproject.org/training/code-of-conduct/) de la " +"conducta](https://community.torproject.org/training/code-of-conduct/) de la " "projecte Tor" #: https//community.torproject.org/training/checklist/

1 0

[translation/support-portal_completed] https://gitweb.torproject.org/translation.git/commit/?h=support-portal_completed
by translation＠torproject.org 07 May '21

07 May '21

commit 32c8fdfe17003ed2f5bf739c8c36554cc3ba2c58 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 7 08:48:35 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal_comp… --- contents+pt-BR.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index 98b9efecff..f45f44addd 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -22,8 +22,8 @@ # Gus, 2021 # André Marcelo Alvarenga <alvarenga(a)kde.org>, 2021 # Daniel, 2021 -# Emma Peel, 2021 # Eduardo Addad de Oliveira <eduardoaddad(a)hotmail.com>, 2021 +# Emma Peel, 2021 # msgid "" msgstr "" @@ -31,7 +31,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-02 16:21+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Eduardo Addad de Oliveira <eduardoaddad(a)hotmail.com>, 2021\n" +"Last-Translator: Emma Peel, 2021\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0