October 2019 - tor-commits - lists.torproject.org

[gettor/master] Fix check hid
by hiro＠torproject.org 18 Oct '19

18 Oct '19

commit 6dafb82e017893ead94855bfed98ea8f707b6a21 Author: hiro <hiro(a)torproject.org> Date: Fri Oct 18 13:39:00 2019 +0200 Fix check hid --- gettor/parse/email.py | 7 +++---- tests/test_email_service.py | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/gettor/parse/email.py b/gettor/parse/email.py index 64cf5a9..d3d4fa1 100644 --- a/gettor/parse/email.py +++ b/gettor/parse/email.py @@ -151,9 +151,7 @@ class EmailParser(object): return request - def too_many_requests(self, hid, num_requests, limit): - test_hid = self.settings.get("test_hid") - + def too_many_requests(self, hid, test_hid, num_requests, limit): log.msg( "test_hid {}".format(test_hid), system="email parser" ) @@ -230,6 +228,7 @@ class EmailParser(object): email_requests_limit = self.settings.get("email_requests_limit") now_str = datetime.now().strftime("%Y%m%d%H%M%S") dbname = self.settings.get("dbname") + test_hid = self.settings.get("test_hid") conn = SQLite3(dbname) if request["command"]: @@ -247,7 +246,7 @@ class EmailParser(object): ) check = self.too_many_requests( - hid, num_requests[0][0], email_requests_limit + hid, test_hid, num_requests[0][0], email_requests_limit ) if check: diff --git a/tests/test_email_service.py b/tests/test_email_service.py index d15e813..4c8ff10 100644 --- a/tests/test_email_service.py +++ b/tests/test_email_service.py @@ -65,7 +65,7 @@ class EmailServiceTests(unittest.TestCase): hid = "80d7054da0d3826563c7babb5453e18f3e42f932e562c5ab0434aec9df7b0625" limit = self.settings.get("email_requests_limit") num_requests = 300 - check = ep.too_many_requests(hid, num_requests, limit) + check = ep.too_many_requests(hid, self.settings.get("test_hid"), num_requests, limit) self.assertEqual(hid, self.settings.get("test_hid")) self.assertEqual(check, False)

1 0

[gettor/master] Remove logs and check hid
by hiro＠torproject.org 18 Oct '19

18 Oct '19

commit 41c722503d94e880884d13ea4615e0cbecff7cc3 Author: hiro <hiro(a)torproject.org> Date: Fri Oct 18 13:31:49 2019 +0200 Remove logs and check hid --- gettor/parse/email.py | 5 +++++ gettor/utils/settings.py | 4 ---- tests/test_email_service.py | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/gettor/parse/email.py b/gettor/parse/email.py index 2cb55d5..64cf5a9 100644 --- a/gettor/parse/email.py +++ b/gettor/parse/email.py @@ -153,6 +153,11 @@ class EmailParser(object): def too_many_requests(self, hid, num_requests, limit): test_hid = self.settings.get("test_hid") + + log.msg( + "test_hid {}".format(test_hid), system="email parser" + ) + if hid == test_hid: return False elif num_requests < limit: diff --git a/gettor/utils/settings.py b/gettor/utils/settings.py index 226f57f..0543ad8 100644 --- a/gettor/utils/settings.py +++ b/gettor/utils/settings.py @@ -81,9 +81,5 @@ class Settings(object): "twitter_new_message_endpoint": "https://api.twitter.com/1.1/direct_messages/events/new.json" } - log.msg( - "Settings loaded {}".format(self._settings), system="GetTor" - ) - def get(self, key): return self._settings[key] diff --git a/tests/test_email_service.py b/tests/test_email_service.py index 0ec8b17..d15e813 100644 --- a/tests/test_email_service.py +++ b/tests/test_email_service.py @@ -66,7 +66,7 @@ class EmailServiceTests(unittest.TestCase): limit = self.settings.get("email_requests_limit") num_requests = 300 check = ep.too_many_requests(hid, num_requests, limit) - self.assertEqual(hid, self.settings.get('test_hid')) + self.assertEqual(hid, self.settings.get("test_hid")) self.assertEqual(check, False) def test_language_email_parser(self):

1 0

[gettor/master] Fix import
by hiro＠torproject.org 18 Oct '19

18 Oct '19

commit cabaddce5b255a1636db28c87999b58b985fb741 Author: hiro <hiro(a)torproject.org> Date: Fri Oct 18 13:27:29 2019 +0200 Fix import --- gettor/utils/settings.py | 1 + 1 file changed, 1 insertion(+) diff --git a/gettor/utils/settings.py b/gettor/utils/settings.py index 768c6fe..226f57f 100644 --- a/gettor/utils/settings.py +++ b/gettor/utils/settings.py @@ -15,6 +15,7 @@ import os import platform import locale +from twisted.python import log from . import strings

1 0

[gettor/master] Log loaded settings temporarily
by hiro＠torproject.org 18 Oct '19

18 Oct '19

commit 61ed42b3e8c947e0b489ff84cdc3cbe454b1f277 Author: hiro <hiro(a)torproject.org> Date: Fri Oct 18 13:25:53 2019 +0200 Log loaded settings temporarily --- gettor/utils/settings.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gettor/utils/settings.py b/gettor/utils/settings.py index 1a33bb2..768c6fe 100644 --- a/gettor/utils/settings.py +++ b/gettor/utils/settings.py @@ -80,5 +80,9 @@ class Settings(object): "twitter_new_message_endpoint": "https://api.twitter.com/1.1/direct_messages/events/new.json" } + log.msg( + "Settings loaded {}".format(self._settings), system="GetTor" + ) + def get(self, key): return self._settings[key]

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 18 Oct '19

18 Oct '19

commit d3bb9033a3240c54cfe6de812814ba25acb995ea Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 18 11:23:28 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+zh-CN.po | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 1c38ee368..c8b6008ad 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -3051,6 +3051,8 @@ msgid "" "[website](https://www.torproject.org), you can get a copy of Tor Browser " "delivered to you via [GetTor](https://gettor.torproject.org/)." msgstr "" +"如果你无法通过我们的 [网站](https://www.torproject.org)下载 Tor Browser，你可以通过 " +"[GetTor](https://gettor.torproject.org/) 获取一份 Tor Browser 的拷贝。" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description)

1 0

[gettor/master] Remove logs and fix checks
by hiro＠torproject.org 18 Oct '19

18 Oct '19

commit f3aff5a7c6acef4f0f643b55eb94449719ac8039 Author: hiro <hiro(a)torproject.org> Date: Fri Oct 18 13:06:01 2019 +0200 Remove logs and fix checks --- gettor/parse/email.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/gettor/parse/email.py b/gettor/parse/email.py index decc13e..2cb55d5 100644 --- a/gettor/parse/email.py +++ b/gettor/parse/email.py @@ -152,13 +152,7 @@ class EmailParser(object): def too_many_requests(self, hid, num_requests, limit): - test_hid = self.settings.get('test_hid') - log.msg( - "test_hid {}".format(test_hid), system="email parser" - ) - log.msg( - "hid {}".format(hid), system="email parser" - ) + test_hid = self.settings.get("test_hid") if hid == test_hid: return False elif num_requests < limit: @@ -251,8 +245,6 @@ class EmailParser(object): hid, num_requests[0][0], email_requests_limit ) - log.msg("check: {}".format(check), system="email parser") - if check: log.msg( "Discarded. Too many requests from {}.".format(

1 0

[gettor/master] Log checks temporarily
by hiro＠torproject.org 18 Oct '19

18 Oct '19

commit 4515c62f58e4107328c097d87be8877148dc7bef Author: hiro <hiro(a)torproject.org> Date: Fri Oct 18 13:00:22 2019 +0200 Log checks temporarily --- gettor/parse/email.py | 11 ++++++++--- tests/test_email_service.py | 1 - 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gettor/parse/email.py b/gettor/parse/email.py index 52d97ec..decc13e 100644 --- a/gettor/parse/email.py +++ b/gettor/parse/email.py @@ -152,7 +152,14 @@ class EmailParser(object): def too_many_requests(self, hid, num_requests, limit): - if hid == self.settings.get('test_hid'): + test_hid = self.settings.get('test_hid') + log.msg( + "test_hid {}".format(test_hid), system="email parser" + ) + log.msg( + "hid {}".format(hid), system="email parser" + ) + if hid == test_hid: return False elif num_requests < limit: return False @@ -245,8 +252,6 @@ class EmailParser(object): ) log.msg("check: {}".format(check), system="email parser") - log.msg("hid: {}".format(hid), system="email parser") - log.msg("request['id']: {}".format(request['id']), system="email parser") if check: log.msg( diff --git a/tests/test_email_service.py b/tests/test_email_service.py index 8e7adf0..0ec8b17 100644 --- a/tests/test_email_service.py +++ b/tests/test_email_service.py @@ -63,7 +63,6 @@ class EmailServiceTests(unittest.TestCase): def test_too_many_request_exclude(self): ep = conftests.EmailParser(self.settings, "gettor(a)torproject.org") hid = "80d7054da0d3826563c7babb5453e18f3e42f932e562c5ab0434aec9df7b0625" - request_service = "osx" limit = self.settings.get("email_requests_limit") num_requests = 300 check = ep.too_many_requests(hid, num_requests, limit)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 18 Oct '19

18 Oct '19

commit 0169dcd88d8e2699896370c3a37f36f8d4264bb7 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 18 10:53:37 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+zh-CN.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 847513ea3..1c38ee368 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -2667,14 +2667,14 @@ msgstr "在其它浏览器中使用 Tor 可能会使你置于没有 Tor 浏览 msgid "" "What is the difference between using Tor Browser and 'Incognito mode' or " "private tabs?" -msgstr "" +msgstr "使用 Tor 浏览器与使用普通浏览器的 “隐身模式”（或隐私模式）有何区别？" #: https//support.torproject.org/tbb/tbb-and-incognito-mode/ #: (content/tbb/tbb-and-incognito-mode/contents+en.lrquestion.description) msgid "" "While the names may imply otherwise, 'Incognito mode' and 'private tabs' do " "not make you anonymous on the Internet." -msgstr "" +msgstr "它们的名字很具有误导性，但“隐身模式”（或隐私模式）无法让你在互联网上匿名化。" #: https//support.torproject.org/tbb/tbb-and-incognito-mode/ #: (content/tbb/tbb-and-incognito-mode/contents+en.lrquestion.description) @@ -2682,14 +2682,14 @@ msgid "" "They erase all the information on your machine relating to the browsing " "session after they are closed, but have no measures in place to hide your " "activity or digital fingerprint online." -msgstr "" +msgstr "它们在你关闭浏览器后删除你计算机上所有与你的浏览会话相关的信息，但是它们在隐匿你的网络痕迹方面毫无作为。" #: https//support.torproject.org/tbb/tbb-and-incognito-mode/ #: (content/tbb/tbb-and-incognito-mode/contents+en.lrquestion.description) msgid "" "This means that an observer can collect your traffic just as easily as any " "regular browser." -msgstr "" +msgstr "这表示一个窃听者可以和任何普通浏览器一样获取你的网络通信流量。" #: https//support.torproject.org/tbb/tbb-and-incognito-mode/ #: (content/tbb/tbb-and-incognito-mode/contents+en.lrquestion.description) @@ -2718,7 +2718,7 @@ msgstr "我应该“编辑我的 torrc”。这意味着什么？" #: (content/tbb/tbb-editing-torrc/contents+en.lrquestion.description) msgid "" "WARNING: Do NOT follow random advice instructing you to edit your `torrc`!" -msgstr "" +msgstr "警告: 千万不要遵循任何让你手动编辑你的 torrc 文件的建议/教程！！！" #: https//support.torproject.org/tbb/tbb-editing-torrc/ #: (content/tbb/tbb-editing-torrc/contents+en.lrquestion.description) @@ -6865,7 +6865,7 @@ msgstr "" msgid "" "Here's how you can enable Tor Package Repository in Debian based " "distributions:" -msgstr "" +msgstr "如果您需要在您的基于 Debian 的系统中添加 Tor 软件包仓库，请遵循以下指示：" #: https//support.torproject.org/apt/apt-1/ #: (content/apt/apt-1/contents+en.lrquestion.description) @@ -6964,7 +6964,7 @@ msgstr "" msgid "" "#### 3. Then add the gpg key used to sign the packages by running the " "following commands at your command prompt" -msgstr "" +msgstr "#### 3. 然后，在命令窗口中运行下面的命令来添加用于签名软件包的 gpg 公钥：" #: https//support.torproject.org/apt/apt-1/ #: (content/apt/apt-1/contents+en.lrquestion.description)

1 0

[translation/donatepages-messagespot_completed] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot_completed
by translation＠torproject.org 18 Oct '19

18 Oct '19

commit 7eb81c2994db5c31ab2f8655895095d4c76e0203 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 18 10:45:48 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/zh_CN/LC_MESSAGES/messages.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po index 0646b5224..9c986ef62 100644 --- a/locale/zh_CN/LC_MESSAGES/messages.po +++ b/locale/zh_CN/LC_MESSAGES/messages.po @@ -8,13 +8,13 @@ # erinm, 2019 # ciaran <ciaranchen(a)qq.com>, 2019 # Cloud P <heige.pcloud(a)outlook.com>, 2019 -# AngelFalse, 2019 # MD Rights <psychi2009(a)gmail.com>, 2019 # ff98sha, 2019 +# AngelFalse, 2019 # msgid "" msgstr "" -"Last-Translator: ff98sha, 2019\n" +"Last-Translator: AngelFalse, 2019\n" "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n" "Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" @@ -602,8 +602,8 @@ msgid "State/Province/Region" msgstr "州/省/地区" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:483 -msgid "Gift Selected" -msgstr "已选择的赠品" +msgid "Gift Selected:" +msgstr "" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:487 msgid "No Gift Selected"

1 0

[translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
by translation＠torproject.org 18 Oct '19

18 Oct '19

commit 0402a186a373f7eaa43311b38959865e89cfbb6f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 18 10:45:41 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/zh_CN/LC_MESSAGES/messages.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po index 7aaa10287..987a44428 100644 --- a/locale/zh_CN/LC_MESSAGES/messages.po +++ b/locale/zh_CN/LC_MESSAGES/messages.po @@ -8,13 +8,13 @@ # erinm, 2019 # ciaran <ciaranchen(a)qq.com>, 2019 # Cloud P <heige.pcloud(a)outlook.com>, 2019 -# AngelFalse, 2019 # MD Rights <psychi2009(a)gmail.com>, 2019 # ff98sha, 2019 +# AngelFalse, 2019 # msgid "" msgstr "" -"Last-Translator: ff98sha, 2019\n" +"Last-Translator: AngelFalse, 2019\n" "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n" "Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" @@ -603,7 +603,7 @@ msgstr "州/省/地区" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:483 msgid "Gift Selected:" -msgstr "" +msgstr "已选择的赠品：" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:487 msgid "No Gift Selected"

1 0