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

[gettor/master] Fix error and call backs in email message responder
by hiro＠torproject.org 16 Oct '19

16 Oct '19

commit 3ca7bdd1036d33cc4a5c41868a1c293ae49bc756 Author: hiro <hiro(a)torproject.org> Date: Wed Oct 16 13:05:12 2019 +0200 Fix error and call backs in email message responder --- gettor/parse/email.py | 24 ++++++++++++------------ gettor/parse/twitter.py | 16 ++++++++-------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/gettor/parse/email.py b/gettor/parse/email.py index fdeefba..6783cc3 100644 --- a/gettor/parse/email.py +++ b/gettor/parse/email.py @@ -151,21 +151,21 @@ class EmailParser(object): return request - def check_num_requests(self, request_id, hid, request_service, limit): + def too_many_requests(self, request_id, hid, request_service, limit): # check limit first num_requests = limit if hid.hexdigest() == self.settings.get('test_hid'): - num_requests = 1 + num_requests = 0 else: num_requests = yield conn.get_num_requests( id=hid.hexdigest(), service=request_service ) if num_requests[0][0] < email_requests_limit: - return 1 - else: return 0 + else: + return 1 def parse(self, msg_str): @@ -240,7 +240,14 @@ class EmailParser(object): "Found request for {}.".format(request['command']), system="email parser" ) - if self.check_num_requests(request['id'], hid, request['service'], email_requests_limit): + check = yield self.too_many_requests(request['id'], hid, request['service'], email_requests_limit): + if check + log.msg( + "Discarded. Too many requests from {}.".format( + hid.hexdigest() + ), system="email parser" + ) + else: conn.new_request( id=request['id'], command=request['command'], @@ -250,13 +257,6 @@ class EmailParser(object): date=now_str, status="ONHOLD", ) - else: - log.msg( - "Discarded. Too many requests from {}.".format( - hid.hexdigest() - ), system="email parser" - ) - else: log.msg( "Request not found", diff --git a/gettor/parse/twitter.py b/gettor/parse/twitter.py index 4da3961..a6b49f6 100644 --- a/gettor/parse/twitter.py +++ b/gettor/parse/twitter.py @@ -124,7 +124,14 @@ class TwitterParser(object): id=str(request['id']), service=request['service'] ) - if num_requests[0][0] < twitter_requests_limit: + if num_requests[0][0] > twitter_requests_limit: + log.msg( + "Discarded. Too many requests from {}.".format( + hid.hexdigest() + ), system="twitter parser" + ) + + else: conn.new_request( id=str(request['id']), command=request['command'], @@ -135,13 +142,6 @@ class TwitterParser(object): status="ONHOLD", ) - else: - log.msg( - "Discarded. Too many requests from {}.".format( - hid.hexdigest() - ), system="twitter parser" - ) - def parse_errback(self, error): """

1 0

[gettor/master] Fix error and call backs in twitter message responder
by hiro＠torproject.org 16 Oct '19

16 Oct '19

commit e91d4b2a41d96ca8b7358c72043017f5ac453139 Author: hiro <hiro(a)torproject.org> Date: Wed Oct 16 12:57:09 2019 +0200 Fix error and call backs in twitter message responder --- gettor/services/email/sendmail.py | 3 +-- gettor/services/twitter/twitterdm.py | 9 ++++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/gettor/services/email/sendmail.py b/gettor/services/email/sendmail.py index 9976474..545fbb8 100644 --- a/gettor/services/email/sendmail.py +++ b/gettor/services/email/sendmail.py @@ -100,7 +100,6 @@ class Sendmail(object): ).addCallback(self.sendmail_callback).addErrback(self.sendmail_errback) - @defer.inlineCallbacks def get_new(self): """ @@ -178,7 +177,7 @@ class Sendmail(object): # build message link_msg = None file = "" - + for link in links: provider = link[5] version = link[4] diff --git a/gettor/services/twitter/twitterdm.py b/gettor/services/twitter/twitterdm.py index 8965319..e67610b 100644 --- a/gettor/services/twitter/twitterdm.py +++ b/gettor/services/twitter/twitterdm.py @@ -80,7 +80,9 @@ class Twitterdm(object): :return: deferred whose callback/errback will handle the API execution details. """ - return self.send_tweet(twitter_id, message) + return self.send_tweet( + twitter_id, message + ).addCallback(self.twitter_callback).addErrback(self.twitter_errback) def send_tweet(self, twitter_id, message): @@ -89,9 +91,10 @@ class Twitterdm(object): ) if post_data.status_code == 200: time.sleeps(30) - self.twitter_callback + else: - self.twitter_errback + raise RuntimeError as e: + log.info("Error sending message: {}.".format(e)) return post_data

1 0

[gettor/master] Fix bug in email and twitter parser
by hiro＠torproject.org 16 Oct '19

16 Oct '19

commit 983dbbd6cbdeab7d179e65411f072a27f30730bf Author: hiro <hiro(a)torproject.org> Date: Wed Oct 16 12:53:15 2019 +0200 Fix bug in email and twitter parser --- gettor/parse/email.py | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/gettor/parse/email.py b/gettor/parse/email.py index 5abf856..fdeefba 100644 --- a/gettor/parse/email.py +++ b/gettor/parse/email.py @@ -150,6 +150,24 @@ class EmailParser(object): return request + + def check_num_requests(self, request_id, hid, request_service, limit): + # check limit first + num_requests = limit + + if hid.hexdigest() == self.settings.get('test_hid'): + num_requests = 1 + else: + num_requests = yield conn.get_num_requests( + id=hid.hexdigest(), service=request_service + ) + + if num_requests[0][0] < email_requests_limit: + return 1 + else: + return 0 + + def parse(self, msg_str): """ Parse message content. Check if email address is well formed, if DKIM @@ -198,23 +216,6 @@ class EmailParser(object): return request - def check_num_requests(self, request_id, hid, request_service, limit): - # check limit first - num_requests = limit - - if hid.hexdigest() == self.settings.get('test_hid'): - num_requests = 1 - else: - num_requests = yield conn.get_num_requests( - id=hid.hexdigest(), service=request_service - ) - - if num_requests[0][0] < email_requests_limit: - return 1 - else: - return 0 - - @defer.inlineCallbacks def parse_callback(self, request): """

1 0

[translation/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
by translation＠torproject.org 16 Oct '19

16 Oct '19

commit 2d9b9d091f7190bd163d27ffcb218de6988ceb45 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 16 10:52:34 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- ja/network-settings.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ja/network-settings.dtd b/ja/network-settings.dtd index 8560d67b4..f199382d5 100644 --- a/ja/network-settings.dtd +++ b/ja/network-settings.dtd @@ -68,7 +68,7 @@ <!ENTITY torPreferences.learnMore "さらに詳しく"> <!ENTITY torPreferences.bridges "ブリッジ"> <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another."> -<!ENTITY torPreferences.useBridge "Use a bridge"> +<!ENTITY torPreferences.useBridge "ブリッジを使用する"> <!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;"> <!ENTITY torPreferences.provideBridge "Provide a bridge"> <!ENTITY torPreferences.advanced "詳細"> @@ -78,6 +78,6 @@ <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait."> <!ENTITY torPreferences.requestBridgeDialogSolvePrompt " ブリッジをリクエストするにはCAPTCHAを解いて下さい。"> <!ENTITY torPreferences.requestBridgeErrorBadSolution "その解答は正しくありません。再度実行してください。"> -<!ENTITY torPreferences.viewTorLogs "View the Tor logs."> -<!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> +<!ENTITY torPreferences.viewTorLogs "Tor のログを表示する。"> +<!ENTITY torPreferences.viewLogs "ログを表示&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">

1 0

[gettor/master] Fix bug in email and twitter parser
by hiro＠torproject.org 16 Oct '19

16 Oct '19

commit fca4f2062d4b392e28a9e152783f0f584db4c0ff Author: hiro <hiro(a)torproject.org> Date: Wed Oct 16 12:51:45 2019 +0200 Fix bug in email and twitter parser --- gettor/parse/twitter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gettor/parse/twitter.py b/gettor/parse/twitter.py index b132b8d..4da3961 100644 --- a/gettor/parse/twitter.py +++ b/gettor/parse/twitter.py @@ -138,7 +138,7 @@ class TwitterParser(object): else: log.msg( "Discarded. Too many requests from {}.".format( - hid.hexdigest + hid.hexdigest() ), system="twitter parser" )

1 0

[gettor/master] Fix bug in email and twitter parser
by hiro＠torproject.org 16 Oct '19

16 Oct '19

commit 27c65468a28b2f90ea2deecb355905f7bfd70a5b Author: hiro <hiro(a)torproject.org> Date: Wed Oct 16 12:51:37 2019 +0200 Fix bug in email and twitter parser --- gettor/parse/email.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gettor/parse/email.py b/gettor/parse/email.py index 9660863..5abf856 100644 --- a/gettor/parse/email.py +++ b/gettor/parse/email.py @@ -252,7 +252,7 @@ class EmailParser(object): else: log.msg( "Discarded. Too many requests from {}.".format( - hid.hexdigest + hid.hexdigest() ), system="email parser" )

1 0

[gettor/master] Fix bug in email parser
by hiro＠torproject.org 16 Oct '19

16 Oct '19

commit 3c5c96c64655e7bf1ba994ca406f5855f85b5922 Author: hiro <hiro(a)torproject.org> Date: Wed Oct 16 12:48:57 2019 +0200 Fix bug in email parser --- gettor/parse/email.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gettor/parse/email.py b/gettor/parse/email.py index f1c7dc3..9660863 100644 --- a/gettor/parse/email.py +++ b/gettor/parse/email.py @@ -198,9 +198,8 @@ class EmailParser(object): return request - def check_num_requests(self, request_id, request_service, limit): - hid = hashlib.sha256(request_id.encode('utf-8')) - # check limits first + def check_num_requests(self, request_id, hid, request_service, limit): + # check limit first num_requests = limit if hid.hexdigest() == self.settings.get('test_hid'): @@ -232,6 +231,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") + hid = hashlib.sha256(request['id'].encode('utf-8')) conn = SQLite3(dbname) if request["command"]: @@ -239,7 +239,7 @@ class EmailParser(object): "Found request for {}.".format(request['command']), system="email parser" ) - if self.check_num_requests(request['id'], request['service'], email_requests_limit): + if self.check_num_requests(request['id'], hid, request['service'], email_requests_limit): conn.new_request( id=request['id'], command=request['command'],

1 0

[training/master] We need ODP versions of the all-about-tor slides for the community portal
by pili＠torproject.org 16 Oct '19

16 Oct '19

commit 38dd035981758df85042902456eb127365d3fe8a Author: Pili Guerra <pili(a)piliguerra.com> Date: Wed Oct 16 12:47:17 2019 +0200 We need ODP versions of the all-about-tor slides for the community portal --- 2019/all-about-tor/all-about-tor-full-pack+en.odp | Bin 0 -> 4235078 bytes 2019/all-about-tor/all-about-tor-full-pack.odp | Bin 0 -> 4235078 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/2019/all-about-tor/all-about-tor-full-pack+en.odp b/2019/all-about-tor/all-about-tor-full-pack+en.odp new file mode 100644 index 0000000..920d582 Binary files /dev/null and b/2019/all-about-tor/all-about-tor-full-pack+en.odp differ diff --git a/2019/all-about-tor/all-about-tor-full-pack.odp b/2019/all-about-tor/all-about-tor-full-pack.odp new file mode 100644 index 0000000..920d582 Binary files /dev/null and b/2019/all-about-tor/all-about-tor-full-pack.odp differ

1 0

[gettor/master] Fix bug in email parser
by hiro＠torproject.org 16 Oct '19

16 Oct '19

commit e9ee80b15d11268b9190c87a71bb1631e64a7899 Author: hiro <hiro(a)torproject.org> Date: Wed Oct 16 12:43:07 2019 +0200 Fix bug in email parser --- gettor/parse/email.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gettor/parse/email.py b/gettor/parse/email.py index 06f92c2..f1c7dc3 100644 --- a/gettor/parse/email.py +++ b/gettor/parse/email.py @@ -199,11 +199,7 @@ class EmailParser(object): def check_num_requests(self, request_id, request_service, limit): - now_str = datetime.now().strftime("%Y%m%d%H%M%S") - dbname = self.settings.get("dbname") - conn = SQLite3(dbname) - - hid = hashlib.sha256(request['id'].encode('utf-8')) + hid = hashlib.sha256(request_id.encode('utf-8')) # check limits first num_requests = limit @@ -234,6 +230,9 @@ class EmailParser(object): execution details. """ 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") + conn = SQLite3(dbname) if request["command"]: log.msg(

1 0

[gettor/master] Add time wait to send twitter direct message
by hiro＠torproject.org 16 Oct '19

16 Oct '19

commit 815e4571b3c19597b1ff164fd273c55d9559816d Author: hiro <hiro(a)torproject.org> Date: Wed Oct 16 12:39:05 2019 +0200 Add time wait to send twitter direct message --- gettor/services/twitter/twitterdm.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gettor/services/twitter/twitterdm.py b/gettor/services/twitter/twitterdm.py index dcfc290..8965319 100644 --- a/gettor/services/twitter/twitterdm.py +++ b/gettor/services/twitter/twitterdm.py @@ -15,6 +15,7 @@ from __future__ import absolute_import import gettext import hashlib import json +import time import configparser @@ -87,6 +88,7 @@ class Twitterdm(object): twitter_id, message ) if post_data.status_code == 200: + time.sleeps(30) self.twitter_callback else: self.twitter_errback

1 0