March 2020 - tor-commits - lists.torproject.org

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 12 Mar '20

12 Mar '20

commit 0df891a3b197043399547fff53158d4c793b033b Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 12 17:53:51 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+pt-PT.po | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/contents+pt-PT.po b/contents+pt-PT.po index 2c69860d64..a1097f6017 100644 --- a/contents+pt-PT.po +++ b/contents+pt-PT.po @@ -122,7 +122,7 @@ msgstr "Repositório do Debian" #: https//support.torproject.org/rpm/ (content/rpm/contents+en.lrtopic.title) msgid "Tor rpm packages" -msgstr "" +msgstr "Tor rpm packages" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -136,7 +136,7 @@ msgstr "" #: https//support.torproject.org/glossary/little-t-tor/ #: (content/glossary/little-t-tor/contents+en.lrword.spelling) msgid "Some spelling notes" -msgstr "" +msgstr "Algumas notas sobre ortografia" #: https//support.torproject.org/faq/faq-1/ #: (content/faq/faq-1/contents+en.lrquestion.title) @@ -1120,7 +1120,7 @@ msgstr "" #: https//support.torproject.org/tbb/antivirus-false-positive/ #: (content/tbb/antivirus-false-positive/contents+en.lrquestion.title) msgid "Tor Browser and antivirus false positive warnings" -msgstr "" +msgstr "Tor Browser e avisos do antivirus falso positivos" #: https//support.torproject.org/tbb/antivirus-false-positive/ #: (content/tbb/antivirus-false-positive/contents+en.lrquestion.description) @@ -1128,6 +1128,8 @@ msgid "" "Some antivirus software will pop up malware and/or vulnerability warnings " "when Tor Browser is launched." msgstr "" +"Alguns antivirus vão mostrar avisos de malware e/ou de vulnerabilidade " +"quando o Tor Browser for lançado." #: https//support.torproject.org/tbb/antivirus-false-positive/ #: (content/tbb/antivirus-false-positive/contents+en.lrquestion.description) @@ -1138,6 +1140,11 @@ msgid "" "it](https://support.torproject.org/tbb/how-to-verify-signature/), these are " "false positives and you have nothing to worry about." msgstr "" +"Se descarregou o Tor Browser do [do noss website " +"principal](https://www.torproject.org/download/) ou através do " +"[GetTor](https://gettor.torproject.org/), e " +"[verificou-o](https://support.torproject.org/tbb/how-to-verify-signature/), " +"estes são falso positivos e não tem nada que se preocupar." #: https//support.torproject.org/tbb/antivirus-false-positive/ #: (content/tbb/antivirus-false-positive/contents+en.lrquestion.description) @@ -1145,6 +1152,8 @@ msgid "" "Some antiviruses consider that files that have not been seen by a lot of " "users as suspicious." msgstr "" +"Alguns antivirus consideram que ficheiros que não foram vistos por muitos " +"utilizadores são suspeitos." #: https//support.torproject.org/tbb/antivirus-false-positive/ #: (content/tbb/antivirus-false-positive/contents+en.lrquestion.description) @@ -1153,6 +1162,10 @@ msgid "" "and has not been modified by some attacker, you can [verify Tor Browser's " "signature](https://support.torproject.org/tbb/how-to-verify-signature/)." msgstr "" +"Para ter a certeza que o programa Tor que descarregou é o mesmo que nós " +"criámos e não foi modificado por alguém malicioso, pode [verificar a " +"assinatura do Tor Browser](https://support.torproject.org/tbb/how-to-verify-" +"signature/)." #: https//support.torproject.org/tbb/antivirus-false-positive/ #: (content/tbb/antivirus-false-positive/contents+en.lrquestion.description)

1 0

[tor/master] Merge branch 'ticket33361_035_01_squashed' into maint-0.4.3
by nickm＠torproject.org 12 Mar '20

12 Mar '20

commit 3e42004e54054b111068e0a83825b95b7c8ff585 Merge: e03bb35f9 8dc7ad127 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 13:42:42 2020 -0400 Merge branch 'ticket33361_035_01_squashed' into maint-0.4.3 src/test/test_options.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --cc src/test/test_options.c index 636d3c0e5,0e52967a2..9cd1d11d2 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@@ -633,24 -631,28 +634,28 @@@ test_options_validate__contactinfo(voi setup_capture_of_logs(LOG_DEBUG); tdata->opt->ContactInfo = NULL; - ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); - tt_int_op(ret, OP_EQ, -1); + ret = options_validate(NULL, tdata->opt, &msg); + tt_int_op(ret, OP_EQ, 0); expect_log_msg( - "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.\n"); + "Your ContactInfo config option is not set. Please strongly " + "consider setting it, so we can contact you if your relay is " + "misconfigured, end-of-life, or something else goes wrong. It " + "is also possible that your relay might get rejected from the " + "network due to a missing valid contact address.\n"); tor_free(msg); free_options_test_data(tdata); tdata = get_options_test_data("ORPort 127.0.0.1:5555\n" "ContactInfo hella(a)example.org"); mock_clean_saved_logs(); - ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); - tt_int_op(ret, OP_EQ, -1); + ret = options_validate(NULL, tdata->opt, &msg); + tt_int_op(ret, OP_EQ, 0); expect_no_log_msg( - "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.\n"); + "Your ContactInfo config option is not set. Please strongly " + "consider setting it, so we can contact you if your relay is " + "misconfigured, end-of-life, or something else goes wrong. It " + "is also possible that your relay might get rejected from the " + "network due to a missing valid contact address.\n"); tor_free(msg); done:

1 0

[tor/master] Fix unit tests that look at contactinfo logs.
by nickm＠torproject.org 12 Mar '20

12 Mar '20

commit 8dc7ad1275a53cfe490128e7fb25b759dd7d88b5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 13:42:17 2020 -0400 Fix unit tests that look at contactinfo logs. --- src/test/test_options.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/test/test_options.c b/src/test/test_options.c index 66b0e7ef1..0e52967a2 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -485,7 +485,8 @@ test_options_validate__uname_for_server(void *ignored) #endif options_test_data_t *tdata = get_options_test_data( - "ORPort 127.0.0.1:5555"); + "ORPort 127.0.0.1:5555\n" + "ContactInfo nobody(a)example.com"); setup_capture_of_logs(LOG_WARN); MOCK(get_uname, fixed_get_uname); @@ -633,9 +634,11 @@ test_options_validate__contactinfo(void *ignored) ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, -1); expect_log_msg( - "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.\n"); + "Your ContactInfo config option is not set. Please strongly " + "consider setting it, so we can contact you if your relay is " + "misconfigured, end-of-life, or something else goes wrong. It " + "is also possible that your relay might get rejected from the " + "network due to a missing valid contact address.\n"); tor_free(msg); free_options_test_data(tdata); @@ -645,9 +648,11 @@ test_options_validate__contactinfo(void *ignored) ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, -1); expect_no_log_msg( - "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.\n"); + "Your ContactInfo config option is not set. Please strongly " + "consider setting it, so we can contact you if your relay is " + "misconfigured, end-of-life, or something else goes wrong. It " + "is also possible that your relay might get rejected from the " + "network due to a missing valid contact address.\n"); tor_free(msg); done:

1 0

[tor/master] Merge branch 'maint-0.4.3'
by nickm＠torproject.org 12 Mar '20

12 Mar '20

commit 8bc4822ba60d154956e3def2128d0c4cfb403d16 Merge: 9ca7900e1 3e42004e5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 13:45:06 2020 -0400 Merge branch 'maint-0.4.3' src/test/test_options.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)

1 0

[tor/release-0.4.3] Fix unit tests that look at contactinfo logs.
by nickm＠torproject.org 12 Mar '20

12 Mar '20

commit 8dc7ad1275a53cfe490128e7fb25b759dd7d88b5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 13:42:17 2020 -0400 Fix unit tests that look at contactinfo logs. --- src/test/test_options.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/test/test_options.c b/src/test/test_options.c index 66b0e7ef1..0e52967a2 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -485,7 +485,8 @@ test_options_validate__uname_for_server(void *ignored) #endif options_test_data_t *tdata = get_options_test_data( - "ORPort 127.0.0.1:5555"); + "ORPort 127.0.0.1:5555\n" + "ContactInfo nobody(a)example.com"); setup_capture_of_logs(LOG_WARN); MOCK(get_uname, fixed_get_uname); @@ -633,9 +634,11 @@ test_options_validate__contactinfo(void *ignored) ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, -1); expect_log_msg( - "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.\n"); + "Your ContactInfo config option is not set. Please strongly " + "consider setting it, so we can contact you if your relay is " + "misconfigured, end-of-life, or something else goes wrong. It " + "is also possible that your relay might get rejected from the " + "network due to a missing valid contact address.\n"); tor_free(msg); free_options_test_data(tdata); @@ -645,9 +648,11 @@ test_options_validate__contactinfo(void *ignored) ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, -1); expect_no_log_msg( - "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.\n"); + "Your ContactInfo config option is not set. Please strongly " + "consider setting it, so we can contact you if your relay is " + "misconfigured, end-of-life, or something else goes wrong. It " + "is also possible that your relay might get rejected from the " + "network due to a missing valid contact address.\n"); tor_free(msg); done:

1 0

[tor/release-0.4.3] Merge branch 'ticket33361_035_01_squashed' into maint-0.4.3
by nickm＠torproject.org 12 Mar '20

12 Mar '20

commit 3e42004e54054b111068e0a83825b95b7c8ff585 Merge: e03bb35f9 8dc7ad127 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 13:42:42 2020 -0400 Merge branch 'ticket33361_035_01_squashed' into maint-0.4.3 src/test/test_options.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --cc src/test/test_options.c index 636d3c0e5,0e52967a2..9cd1d11d2 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@@ -633,24 -631,28 +634,28 @@@ test_options_validate__contactinfo(voi setup_capture_of_logs(LOG_DEBUG); tdata->opt->ContactInfo = NULL; - ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); - tt_int_op(ret, OP_EQ, -1); + ret = options_validate(NULL, tdata->opt, &msg); + tt_int_op(ret, OP_EQ, 0); expect_log_msg( - "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.\n"); + "Your ContactInfo config option is not set. Please strongly " + "consider setting it, so we can contact you if your relay is " + "misconfigured, end-of-life, or something else goes wrong. It " + "is also possible that your relay might get rejected from the " + "network due to a missing valid contact address.\n"); tor_free(msg); free_options_test_data(tdata); tdata = get_options_test_data("ORPort 127.0.0.1:5555\n" "ContactInfo hella(a)example.org"); mock_clean_saved_logs(); - ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); - tt_int_op(ret, OP_EQ, -1); + ret = options_validate(NULL, tdata->opt, &msg); + tt_int_op(ret, OP_EQ, 0); expect_no_log_msg( - "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.\n"); + "Your ContactInfo config option is not set. Please strongly " + "consider setting it, so we can contact you if your relay is " + "misconfigured, end-of-life, or something else goes wrong. It " + "is also possible that your relay might get rejected from the " + "network due to a missing valid contact address.\n"); tor_free(msg); done:

1 0

[tor/release-0.4.3] Merge branch 'maint-0.4.3' into release-0.4.3
by nickm＠torproject.org 12 Mar '20

12 Mar '20

commit 13210e93f487d34298ef77f78919b07abf01b2e8 Merge: 619cb682f 3e42004e5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 13:45:06 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 src/test/test_options.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)

1 0

[tor/maint-0.4.3] Fix unit tests that look at contactinfo logs.
by nickm＠torproject.org 12 Mar '20

12 Mar '20

commit 8dc7ad1275a53cfe490128e7fb25b759dd7d88b5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 13:42:17 2020 -0400 Fix unit tests that look at contactinfo logs. --- src/test/test_options.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/test/test_options.c b/src/test/test_options.c index 66b0e7ef1..0e52967a2 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -485,7 +485,8 @@ test_options_validate__uname_for_server(void *ignored) #endif options_test_data_t *tdata = get_options_test_data( - "ORPort 127.0.0.1:5555"); + "ORPort 127.0.0.1:5555\n" + "ContactInfo nobody(a)example.com"); setup_capture_of_logs(LOG_WARN); MOCK(get_uname, fixed_get_uname); @@ -633,9 +634,11 @@ test_options_validate__contactinfo(void *ignored) ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, -1); expect_log_msg( - "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.\n"); + "Your ContactInfo config option is not set. Please strongly " + "consider setting it, so we can contact you if your relay is " + "misconfigured, end-of-life, or something else goes wrong. It " + "is also possible that your relay might get rejected from the " + "network due to a missing valid contact address.\n"); tor_free(msg); free_options_test_data(tdata); @@ -645,9 +648,11 @@ test_options_validate__contactinfo(void *ignored) ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, -1); expect_no_log_msg( - "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.\n"); + "Your ContactInfo config option is not set. Please strongly " + "consider setting it, so we can contact you if your relay is " + "misconfigured, end-of-life, or something else goes wrong. It " + "is also possible that your relay might get rejected from the " + "network due to a missing valid contact address.\n"); tor_free(msg); done:

1 0

[tor/maint-0.4.3] Merge branch 'ticket33361_035_01_squashed' into maint-0.4.3
by nickm＠torproject.org 12 Mar '20

12 Mar '20

commit 3e42004e54054b111068e0a83825b95b7c8ff585 Merge: e03bb35f9 8dc7ad127 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 13:42:42 2020 -0400 Merge branch 'ticket33361_035_01_squashed' into maint-0.4.3 src/test/test_options.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --cc src/test/test_options.c index 636d3c0e5,0e52967a2..9cd1d11d2 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@@ -633,24 -631,28 +634,28 @@@ test_options_validate__contactinfo(voi setup_capture_of_logs(LOG_DEBUG); tdata->opt->ContactInfo = NULL; - ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); - tt_int_op(ret, OP_EQ, -1); + ret = options_validate(NULL, tdata->opt, &msg); + tt_int_op(ret, OP_EQ, 0); expect_log_msg( - "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.\n"); + "Your ContactInfo config option is not set. Please strongly " + "consider setting it, so we can contact you if your relay is " + "misconfigured, end-of-life, or something else goes wrong. It " + "is also possible that your relay might get rejected from the " + "network due to a missing valid contact address.\n"); tor_free(msg); free_options_test_data(tdata); tdata = get_options_test_data("ORPort 127.0.0.1:5555\n" "ContactInfo hella(a)example.org"); mock_clean_saved_logs(); - ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); - tt_int_op(ret, OP_EQ, -1); + ret = options_validate(NULL, tdata->opt, &msg); + tt_int_op(ret, OP_EQ, 0); expect_no_log_msg( - "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.\n"); + "Your ContactInfo config option is not set. Please strongly " + "consider setting it, so we can contact you if your relay is " + "misconfigured, end-of-life, or something else goes wrong. It " + "is also possible that your relay might get rejected from the " + "network due to a missing valid contact address.\n"); tor_free(msg); done:

1 0

[gettor/master] Ensure replies to the help message will work
by cohosh＠torproject.org 12 Mar '20

12 Mar '20

commit 0cd6443cdd8964fbfad00010d2cd0220f31e18f0 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Mon Feb 10 16:28:21 2020 -0500 Ensure replies to the help message will work This commit makes some changes and adds some tests to ensure that valid replies to the gettor help message will contain links. Non-valid replies should still return the GetTor help message. --- gettor/parse/email.py | 29 +++++++++++++++++------------ tests/test_email_service.py | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 12 deletions(-) diff --git a/gettor/parse/email.py b/gettor/parse/email.py index 38bc120..9409a99 100644 --- a/gettor/parse/email.py +++ b/gettor/parse/email.py @@ -13,6 +13,7 @@ from __future__ import absolute_import import re +import io import dkim import hashlib @@ -117,18 +118,22 @@ class EmailParser(object): def parse_keywords(self, text, request): - for word in re.split(r"\s+", text.strip()): - for locale in self.locales: - if word.lower() == locale.lower(): - request["language"] = locale - elif (not request["language"]) and (word.lower()[:2] == - locale.lower()[:2]): - request["language"] = locale - if word.lower() in self.platforms: - request["command"] = "links" - request["platform"] = word.lower() - if (not request["command"]) and word.lower() == "help": - request["command"] = "help" + buf = io.StringIO(text) + for line in buf: + if len(line.strip()) > 0 and line.strip()[0] == ">": + continue + for word in re.split(r"\s+", line.strip()): + for locale in self.locales: + if word.lower() == locale.lower(): + request["language"] = locale + elif (not request["language"]) and (word.lower()[:2] == + locale.lower()[:2]): + request["language"] = locale + if word.lower() in self.platforms: + request["command"] = "links" + request["platform"] = word.lower() + if (not request["command"]) and word.lower() == "help": + request["command"] = "help" return request def build_request(self, msg_str, norm_addr): diff --git a/tests/test_email_service.py b/tests/test_email_service.py index 45278bc..995ba55 100644 --- a/tests/test_email_service.py +++ b/tests/test_email_service.py @@ -210,6 +210,47 @@ class EmailServiceTests(unittest.TestCase): assert "en-US" in ep.locales del ep + def test_help_reply(self): + #Replying to GetTor Help with a valid links request should get you links + ep = conftests.EmailParser(self.settings, "gettor(a)torproject.org") + ep.locales = ["en-US", "es-ES", "es-AR", "pt-BR", "fa"] + request = ep.parse("From: \"silvia [hiro]\" <hiro(a)torproject.org>\n" + "Subject: Re: [GetTor] Help Email\r\n Reply-To: hiro(a)torproject.org \nTo:" + "gettor(a)torproject.org\n osx en\n") + self.assertEqual(request["command"], "links") + self.assertEqual(request["language"], "en-US") + self.assertEqual(request["platform"], "osx") + + request = ep.parse("From: \"silvia [hiro]\" <hiro(a)torproject.org>\n" + "Subject: Re: [GetTor] Help Email\r\n Reply-To: hiro(a)torproject.org \nTo:" + "gettor(a)torproject.org\nlinux fa\n\n" + "On 2020-02-10 11:54 a.m., gettor(a)torproject.org wrote:\n" + "> This is how you can request a tor browser bundle link.\n" + ">\n" + "> Send an email to: gettor(a)torproject.org\n" + ">\n" + "> In the body of the email only write: <operating system> <language>.\n" + ">\n" + "> We only support windows, osx and linux as operating systems.\n" + ">\n") + self.assertEqual(request["command"], "links") + self.assertEqual(request["language"], "fa") + self.assertEqual(request["platform"], "linux") + + request = ep.parse("From: \"silvia [hiro]\" <hiro(a)torproject.org>\n" + "Subject: Re: [GetTor] Help Email\r\n Reply-To: hiro(a)torproject.org \nTo:" + "gettor(a)torproject.org\n" + "On 2020-02-10 11:54 a.m., gettor(a)torproject.org wrote:\n" + "> This is how you can request a tor browser bundle link.\n" + ">\n" + "> Send an email to: gettor(a)torproject.org\n" + ">\n" + "> In the body of the email only write: <operating system> <language>.\n" + ">\n" + "> We only support windows, osx and linux as operating systems.\n" + ">\n") + self.assertEqual(request["command"], "help") + if __name__ == "__main__": unittest.main()

1 0