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

[gettor/master] Fix too many requests check
by hiro＠torproject.org 16 Oct '19

16 Oct '19

commit 5582c844f33d6389d41dd1202db2a1325ae9df53 Author: hiro <hiro(a)torproject.org> Date: Wed Oct 16 13:44:36 2019 +0200 Fix too many requests check --- 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 c9f527a..b7a65db 100644 --- a/gettor/parse/email.py +++ b/gettor/parse/email.py @@ -242,7 +242,7 @@ class EmailParser(object): ) check = self.too_many_requests( - request['id'], hid, request_service, num_request, email_requests_limit + request['id'], hid, request_service, num_requests, email_requests_limit ) if check:

1 0

[gettor/master] Fix too many requests check
by hiro＠torproject.org 16 Oct '19

16 Oct '19

commit 5450f3084e3ce588403336467f7c1347f013c05c Author: hiro <hiro(a)torproject.org> Date: Wed Oct 16 13:43:53 2019 +0200 Fix too many requests check --- gettor/parse/email.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gettor/parse/email.py b/gettor/parse/email.py index ba69347..c9f527a 100644 --- a/gettor/parse/email.py +++ b/gettor/parse/email.py @@ -228,6 +228,7 @@ class EmailParser(object): now_str = datetime.now().strftime("%Y%m%d%H%M%S") dbname = self.settings.get("dbname") hid = hashlib.sha256(request['id'].encode('utf-8')) + request_service = request['service'] conn = SQLite3(dbname) if request["command"]: @@ -241,7 +242,7 @@ class EmailParser(object): ) check = self.too_many_requests( - request['id'], hid, request['service'], num_request, email_requests_limit + request['id'], hid, request_service, num_request, email_requests_limit ) if check:

1 0

[gettor/master] Fix too many requests check
by hiro＠torproject.org 16 Oct '19

16 Oct '19

commit 2ca0005711ada47a03718c947ff140bc75a4ed1a Author: hiro <hiro(a)torproject.org> Date: Wed Oct 16 13:42:17 2019 +0200 Fix too many requests check --- gettor/parse/email.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/gettor/parse/email.py b/gettor/parse/email.py index e150a20..ba69347 100644 --- a/gettor/parse/email.py +++ b/gettor/parse/email.py @@ -151,18 +151,13 @@ class EmailParser(object): return request - def too_many_requests(self, request_id, hid, request_service, limit): + def too_many_requests(self, request_id, hid, request_service, num_request, limit): # check limit first num_requests = limit if hid.hexdigest() == self.settings.get('test_hid'): return False - else: - num_requests = yield conn.get_num_requests( - id=hid.hexdigest(), service=request_service - ) - - if num_requests[0][0] < email_requests_limit: + elif num_requests[0][0] < email_requests_limit: return False else: return True @@ -240,7 +235,15 @@ class EmailParser(object): "Found request for {}.".format(request['command']), system="email parser" ) - check = self.too_many_requests(request['id'], hid, request['service'], email_requests_limit) + + num_requests = yield conn.get_num_requests( + id=hid.hexdigest(), service=request_service + ) + + check = self.too_many_requests( + request['id'], hid, request['service'], num_request, email_requests_limit + ) + if check: log.msg( "Discarded. Too many requests from {}.".format( @@ -248,7 +251,7 @@ class EmailParser(object): ), system="email parser" ) else: - yield conn.new_request( + conn.new_request( id=request['id'], command=request['command'], platform=request['platform'],

1 0

[gettor/master] Fix too many requests check
by hiro＠torproject.org 16 Oct '19

16 Oct '19

commit 9ab23e310d7576efbf6e3fdc60bbecfceb0f1771 Author: hiro <hiro(a)torproject.org> Date: Wed Oct 16 13:36:47 2019 +0200 Fix too many requests check --- gettor/parse/email.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gettor/parse/email.py b/gettor/parse/email.py index ac3aa89..e150a20 100644 --- a/gettor/parse/email.py +++ b/gettor/parse/email.py @@ -240,7 +240,7 @@ class EmailParser(object): "Found request for {}.".format(request['command']), system="email parser" ) - check = yield self.too_many_requests(request['id'], hid, request['service'], email_requests_limit) + check = self.too_many_requests(request['id'], hid, request['service'], email_requests_limit) if check: log.msg( "Discarded. Too many requests from {}.".format( @@ -248,7 +248,7 @@ class EmailParser(object): ), system="email parser" ) else: - conn.new_request( + yield conn.new_request( id=request['id'], command=request['command'], platform=request['platform'],

1 0

[gettor/master] Fix too many requests check
by hiro＠torproject.org 16 Oct '19

16 Oct '19

commit 64a9d4913179aa882286b31dd43e8dead2a9bba5 Author: hiro <hiro(a)torproject.org> Date: Wed Oct 16 13:35:12 2019 +0200 Fix too many requests check --- gettor/parse/email.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gettor/parse/email.py b/gettor/parse/email.py index 72d992d..ac3aa89 100644 --- a/gettor/parse/email.py +++ b/gettor/parse/email.py @@ -156,16 +156,16 @@ class EmailParser(object): num_requests = limit if hid.hexdigest() == self.settings.get('test_hid'): - return 0 + return False else: num_requests = yield conn.get_num_requests( id=hid.hexdigest(), service=request_service ) if num_requests[0][0] < email_requests_limit: - return 0 + return False else: - return 1 + return True def parse(self, msg_str):

1 0

[gettor/master] Fix too many requests check
by hiro＠torproject.org 16 Oct '19

16 Oct '19

commit a215b2067fd2c7ab8cda3364bc25d09ff42c3a5d Author: hiro <hiro(a)torproject.org> Date: Wed Oct 16 13:29:06 2019 +0200 Fix too many requests check --- 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 aa574a8..72d992d 100644 --- a/gettor/parse/email.py +++ b/gettor/parse/email.py @@ -156,7 +156,7 @@ class EmailParser(object): num_requests = limit if hid.hexdigest() == self.settings.get('test_hid'): - num_requests = 0 + return 0 else: num_requests = yield conn.get_num_requests( id=hid.hexdigest(), service=request_service

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 d37f106fc46d9d1c789e8921ca98f6afa9a96dd7 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 16 11:22:42 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- ja/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ja/network-settings.dtd b/ja/network-settings.dtd index f199382d5..9b65d4970 100644 --- a/ja/network-settings.dtd +++ b/ja/network-settings.dtd @@ -80,4 +80,4 @@ <!ENTITY torPreferences.requestBridgeErrorBadSolution "その解答は正しくありません。再度実行してください。"> <!ENTITY torPreferences.viewTorLogs "Tor のログを表示する。"> <!ENTITY torPreferences.viewLogs "ログを表示&#x2026;"> -<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> +<!ENTITY torPreferences.torLogsDialogTitle "Tor ログ">

1 0

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

16 Oct '19

commit 9efff8c6d105c9b170a4e68c0766a7784b2bad9f Author: hiro <hiro(a)torproject.org> Date: Wed Oct 16 13:19:57 2019 +0200 Fix error and call backs in email message responder --- 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 237548f..aa574a8 100644 --- a/gettor/parse/email.py +++ b/gettor/parse/email.py @@ -240,7 +240,7 @@ class EmailParser(object): "Found request for {}.".format(request['command']), system="email parser" ) - check = yield self.too_many_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(

1 0

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

16 Oct '19

commit 3a4cfabba53967b6047518ae759123168673d6d4 Author: hiro <hiro(a)torproject.org> Date: Wed Oct 16 13:10:44 2019 +0200 Fix error and call backs in email message responder --- gettor/services/twitter/twitterdm.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gettor/services/twitter/twitterdm.py b/gettor/services/twitter/twitterdm.py index e67610b..33dd495 100644 --- a/gettor/services/twitter/twitterdm.py +++ b/gettor/services/twitter/twitterdm.py @@ -93,8 +93,7 @@ class Twitterdm(object): time.sleeps(30) else: - raise RuntimeError as e: - log.info("Error sending message: {}.".format(e)) + raise RuntimeError("Error sending message: (%s)" % str(e)) return post_data

1 0

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

16 Oct '19

commit 84c42ffc855d2e65b53d1e4e79f2f423f8834a2f Author: hiro <hiro(a)torproject.org> Date: Wed Oct 16 13:06:26 2019 +0200 Fix error and call backs in email message responder --- gettor/parse/email.py | 2 +- gettor/parse/twitter.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/gettor/parse/email.py b/gettor/parse/email.py index 6783cc3..237548f 100644 --- a/gettor/parse/email.py +++ b/gettor/parse/email.py @@ -241,7 +241,7 @@ class EmailParser(object): system="email parser" ) check = yield self.too_many_requests(request['id'], hid, request['service'], email_requests_limit): - if check + if check: log.msg( "Discarded. Too many requests from {}.".format( hid.hexdigest() diff --git a/gettor/parse/twitter.py b/gettor/parse/twitter.py index a6b49f6..4f3ee9f 100644 --- a/gettor/parse/twitter.py +++ b/gettor/parse/twitter.py @@ -130,7 +130,6 @@ class TwitterParser(object): hid.hexdigest() ), system="twitter parser" ) - else: conn.new_request( id=str(request['id']),

1 0