tor-commits October 2019

tor-commits@lists.torproject.org

22 participants
4141 discussions

[gettor/master] Add test for email limit
by hiro＠torproject.org 15 Oct '19

15 Oct '19

commit 0ffadaaa3da6dbc7592dcf82a4d91efaa0bde228 Author: hiro <hiro(a)torproject.org> Date: Mon Oct 14 18:08:47 2019 +0200 Add test for email limit --- gettor/parse/email.py | 54 +++++++++++++++++++++++++++------------------ share/locale/es.json | 2 +- tests/test_email_service.py | 11 +++++++++ 3 files changed, 45 insertions(+), 22 deletions(-) diff --git a/gettor/parse/email.py b/gettor/parse/email.py index 3980763..74156b0 100644 --- a/gettor/parse/email.py +++ b/gettor/parse/email.py @@ -198,6 +198,23 @@ class EmailParser(object): return request + def check_num_request(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')) + # check limits first + 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): """ @@ -212,30 +229,13 @@ class EmailParser(object): execution details. """ email_requests_limit = self.settings.get("email_requests_limit") - log.msg( - "Found request for {}.".format(request['command']), - system="email parser" - ) if request["command"]: - 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')) - # check limits first - num_requests = yield conn.get_num_requests( - id=hid.hexdigest(), service=request['service'] - ) - - if num_requests[0][0] > email_requests_limit: - log.msg( - "Discarded. Too many requests from {}.".format( - hid.hexdigest - ), system="email parser" + log.msg( + "Found request for {}.".format(request['command']), + system="email parser" ) - - else: + if check_num_request(request['id'], request['service'], email_request_limit): conn.new_request( id=request['id'], command=request['command'], @@ -245,6 +245,18 @@ 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", + system="email parser" + ) def parse_errback(self, error): """ diff --git a/share/locale/es.json b/share/locale/es.json index 8ed6722..4d18f61 100644 --- a/share/locale/es.json +++ b/share/locale/es.json @@ -7,7 +7,7 @@ "help_config": "Custom config file location (optional)", "smtp_links_subject": "[GetTor] Links for your request", "smtp_mirrors_subject": "[GetTor] Mirrors", - "smtp_help_subject": "[GetTor] Help", + "smtp_help_subject": "[GetTor] Ayuda", "smtp_unsupported_locale_subject": "[GetTor] Unsupported locale", "smtp_unsupported_locale_msg": "The locale you requested '{}' is not supported.", "smtp_vlinks_msg": "You requested Tor Browser for {}.\n\nYou will need only one of the links below to download the bundle. If a link does not work for you, try the next one.\n\n{}\n\nShould you have issues with any of the links above you can access the following Google Drive folder: https://drive.google.com/open?id=13CADQTsCwrGsIID09YQbNz2DfRMUoxUU\n\n Download the file: {}\n\n \n--\nGetTor", diff --git a/tests/test_email_service.py b/tests/test_email_service.py index 9d50f5f..f81bd17 100644 --- a/tests/test_email_service.py +++ b/tests/test_email_service.py @@ -58,6 +58,17 @@ class EmailServiceTests(unittest.TestCase): self.assertEqual(request["platform"], "osx") self.assertEqual(request["language"], "es") + def test_remove_limits(self): + ep = conftests.EmailParser(self.settings, "gettor(a)torproject.org") + msg_str = "From: \"GetTor Test\" <test.gettor.browser(a)gmail.com>\n Subject: \r\n Reply-To: test.gettor.browser(a)gmail.com \nTo: gettor(a)torproject.org\r\n osx es" + msg = conftests.message_from_string(msg_str) + languages = [*self.locales.keys()] + platforms = self.settings.get('platforms') + request = ep.build_request(msg_str, "hiro(a)torproject.org", languages, platforms) + email_requests_limit = self.settings.get("email_requests_limit") + check = check_num_request(request['id'], request['service'], email_request_limit) + assert check + def test_language_email_parser(self): ep = conftests.EmailParser(self.settings, "gettor(a)torproject.org") request = ep.parse("From: \"silvia [hiro]\" <hiro(a)torproject.org>\n Subject: \r\n Reply-To: hiro(a)torproject.org \nTo: gettor(a)torproject.org\n osx en")

1 0

[gettor/master] Merge branch 'master' into twitter
by hiro＠torproject.org 15 Oct '19

15 Oct '19

commit 1b67ec28592a6ded66422ccbbdbcc18f052621a9 Merge: 7990284 93c972a Author: hiro <hiro(a)torproject.org> Date: Mon Oct 14 18:40:46 2019 +0200 Merge branch 'master' into twitter gettor/parse/email.py | 54 +++++++++++++++++++++++++++++++-------------------- scripts/check_service | 11 +++++++++-- 2 files changed, 42 insertions(+), 23 deletions(-)

1 0

[gettor/master] Remove test
by hiro＠torproject.org 15 Oct '19

15 Oct '19

commit 93c972aff35587effc33d8400e60dcadee01ab27 Author: hiro <hiro(a)torproject.org> Date: Mon Oct 14 18:40:30 2019 +0200 Remove test --- gettor/parse/email.py | 4 ++-- tests/test_email_service.py | 11 ----------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/gettor/parse/email.py b/gettor/parse/email.py index 74156b0..5d65a93 100644 --- a/gettor/parse/email.py +++ b/gettor/parse/email.py @@ -198,7 +198,7 @@ class EmailParser(object): return request - def check_num_request(self, request_id, request_service, limit): + 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) @@ -235,7 +235,7 @@ class EmailParser(object): "Found request for {}.".format(request['command']), system="email parser" ) - if check_num_request(request['id'], request['service'], email_request_limit): + if check_num_requests(request['id'], request['service'], email_requests_limit): conn.new_request( id=request['id'], command=request['command'], diff --git a/tests/test_email_service.py b/tests/test_email_service.py index f81bd17..9d50f5f 100644 --- a/tests/test_email_service.py +++ b/tests/test_email_service.py @@ -58,17 +58,6 @@ class EmailServiceTests(unittest.TestCase): self.assertEqual(request["platform"], "osx") self.assertEqual(request["language"], "es") - def test_remove_limits(self): - ep = conftests.EmailParser(self.settings, "gettor(a)torproject.org") - msg_str = "From: \"GetTor Test\" <test.gettor.browser(a)gmail.com>\n Subject: \r\n Reply-To: test.gettor.browser(a)gmail.com \nTo: gettor(a)torproject.org\r\n osx es" - msg = conftests.message_from_string(msg_str) - languages = [*self.locales.keys()] - platforms = self.settings.get('platforms') - request = ep.build_request(msg_str, "hiro(a)torproject.org", languages, platforms) - email_requests_limit = self.settings.get("email_requests_limit") - check = check_num_request(request['id'], request['service'], email_request_limit) - assert check - def test_language_email_parser(self): ep = conftests.EmailParser(self.settings, "gettor(a)torproject.org") request = ep.parse("From: \"silvia [hiro]\" <hiro(a)torproject.org>\n Subject: \r\n Reply-To: hiro(a)torproject.org \nTo: gettor(a)torproject.org\n osx en")

1 0

[gettor/master] Reset limit if test address
by hiro＠torproject.org 15 Oct '19

15 Oct '19

commit f08583579adfeac7f33494fee98e1f7a194423b0 Author: hiro <hiro(a)torproject.org> Date: Mon Oct 14 18:53:16 2019 +0200 Reset limit if test address --- gettor.conf.json.example | 1 + gettor/parse/email.py | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gettor.conf.json.example b/gettor.conf.json.example index bd5b71f..958785a 100644 --- a/gettor.conf.json.example +++ b/gettor.conf.json.example @@ -13,6 +13,7 @@ "consumer_secret": "", "access_key": "", "access_secret": "", + "test_hid" = "", "twitter_handle": "get_tor", "twitter_messages_endpoint": "https://api.twitter.com/1.1/direct_messages/events/list.json", "twitter_new_message_endpoint": "https://api.twitter.com/1.1/direct_messages/events/new.json" diff --git a/gettor/parse/email.py b/gettor/parse/email.py index 5d65a93..785c983 100644 --- a/gettor/parse/email.py +++ b/gettor/parse/email.py @@ -205,9 +205,14 @@ class EmailParser(object): hid = hashlib.sha256(request['id'].encode('utf-8')) # check limits first - num_requests = yield conn.get_num_requests( - id=hid.hexdigest(), service=request_service - ) + 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

1 0

[gettor/master] Use example config
by hiro＠torproject.org 15 Oct '19

15 Oct '19

commit cdfb42de25634c66d761e1c1a390f26c3d8cffd7 Author: hiro <hiro(a)torproject.org> Date: Wed Oct 9 19:25:56 2019 +0200 Use example config --- gettor.conf.json => gettor.conf.json.example | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gettor.conf.json b/gettor.conf.json.example similarity index 100% rename from gettor.conf.json rename to gettor.conf.json.example

1 0

[gettor/master] Start twitter responder
by hiro＠torproject.org 15 Oct '19

15 Oct '19

commit 1ca126906fcb0c216d5ec82df4b21d093873af00 Author: hiro <hiro(a)torproject.org> Date: Wed Oct 9 19:23:46 2019 +0200 Start twitter responder --- .gitignore | 1 + gettor.conf.json | 7 +- gettor/services/twitter/twitterdm.py | 91 ++++++++++++++++++++++++ gettor/utils/settings.py | 9 ++- share/locale/smtp/i18n/en/LC_MESSAGES/en.mo | Bin 1730 -> 0 bytes share/locale/smtp/i18n/en/LC_MESSAGES/en.po | 57 --------------- share/locale/smtp/i18n/es/LC_MESSAGES/es.mo | Bin 1811 -> 0 bytes share/locale/smtp/i18n/es/LC_MESSAGES/es.po | 94 ------------------------- share/locale/twitter/i18n/en/LC_MESSAGES/en.po | 55 --------------- share/locale/xmpp/i18n/en/LC_MESSAGES/en.mo | Bin 340 -> 0 bytes share/locale/xmpp/i18n/en/LC_MESSAGES/en.po | 55 --------------- share/locale/xmpp/i18n/en/LC_MESSAGES/es.mo | Bin 340 -> 0 bytes share/locale/xmpp/i18n/es/LC_MESSAGES/es.mo | Bin 342 -> 0 bytes share/locale/xmpp/i18n/es/LC_MESSAGES/es.po | 22 ------ 14 files changed, 105 insertions(+), 286 deletions(-) diff --git a/.gitignore b/.gitignore index f00fa50..6c0bd3f 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ _trial_temp gettor.pid csv .config +gettor.conf.json diff --git a/gettor.conf.json b/gettor.conf.json index c7d6707..5c06e37 100644 --- a/gettor.conf.json +++ b/gettor.conf.json @@ -6,5 +6,10 @@ "sendmail_interval": 10, "sendmail_addr": "gettor(a)torproject.org", "sendmail_host": "localhost", - "sendmail_port": 587 + "sendmail_port": 587, + "consumer_key": "", + "consumer_secret": "", + "access_key": "", + "access_secret": "", + "twitter_handle": "get_tor" } diff --git a/gettor/services/twitter/twitterdm.py b/gettor/services/twitter/twitterdm.py new file mode 100644 index 0000000..7f8543e --- /dev/null +++ b/gettor/services/twitter/twitterdm.py @@ -0,0 +1,91 @@ +# -*- coding: utf-8 -*- +# +# This file is part of GetTor, a Tor Browser distribution system. +# +# :authors: isra <hiro(a)torproject.org> +# see also AUTHORS file +# +# :copyright: (c) 2008-2014, The Tor Project, Inc. +# (c) 2019, Hiro +# +# :license: This is Free Software. See LICENSE for license information. + +from __future__ import absolute_import + +import gettext +import hashlib + +import configparser + +from twisted.internet import defer + +from ...utils.db import SQLite3 as DB +from ...utils.commons import log +from ...utils import strings + +class Twitterdm(object): + """ + Class for sending twitter replies to `help` and `links` requests. + """ + def __init__(self, settings): + """ + Constructor. It opens and stores a connection to the database. + :dbname: reads from configs + """ + self.settings = settings + dbname = self.settings.get("dbname") + consumer_key = self.settings.get("consumer_key") + consumer_secret = self.settings.get("consumer_secret") + access_key = self.settings.get("access_key") + access_secret = self.settings.get("access_secret") + twitter_handle = self.settings.get("twitter_handle") + + self.conn = DB(dbname) + + def get_interval(self): + """ + Get time interval for service periodicity. + + :return: time interval (float) in seconds. + """ + return self.settings.get("twitter_interval") + + + def twitter_callback(self, message): + """ + Callback invoked after a message has been sent. + + :param message (string): Success details from the server. + """ + log.info("Message sent successfully.") + + def twitter_errback(self, error): + """ + Errback if we don't/can't send the message. + """ + log.debug("Could not send message.") + raise Error("{}".format(error)) + + + def twitter_msg_list(self): + + + + def twitterdm(self): + """ + Send a twitter message for each message received. It creates a plain + text message, and sends it via twitter APIs + + :param twitter_handle (str): email address of the recipient. + :param text (str): subject of the message. + + :return: deferred whose callback/errback will handle the API execution + details. + """ + + log.debug("Retrieve list of messages") + + log.debug("Creating message") + + + log.debug("Calling twitter APIs.") diff --git a/gettor/utils/settings.py b/gettor/utils/settings.py index 3e0a521..c849803 100644 --- a/gettor/utils/settings.py +++ b/gettor/utils/settings.py @@ -53,7 +53,7 @@ class Settings(object): if os.path.exists(self.filename): try: with open(self.filename, 'r') as f: - self._settings = json.load(f) + self._settings = json.load(f) except: pass else: @@ -65,7 +65,12 @@ class Settings(object): "sendmail_interval": 10, "sendmail_addr": "gettor(a)torproject.org", "sendmail_host": "localhost", - "sendmail_port": 587 + "sendmail_port": 587, + "consumer_key": "", + "consumer_secret": "", + "access_key": "", + "access_secret": "", + "twitter_handle": "get_tor" } def get(self, key): diff --git a/share/locale/smtp/i18n/en/LC_MESSAGES/en.mo b/share/locale/smtp/i18n/en/LC_MESSAGES/en.mo deleted file mode 100644 index e686fcb..0000000 Binary files a/share/locale/smtp/i18n/en/LC_MESSAGES/en.mo and /dev/null differ diff --git a/share/locale/smtp/i18n/en/LC_MESSAGES/en.po b/share/locale/smtp/i18n/en/LC_MESSAGES/en.po deleted file mode 100644 index 13ea727..0000000 --- a/share/locale/smtp/i18n/en/LC_MESSAGES/en.po +++ /dev/null @@ -1,57 +0,0 @@ -domain "en" - -#: Links subject -msgid "links_subject" -msgstr "[GetTor] Links for your request" - -#: Mirrors subject -msgid "mirrors_subject" -msgstr "[GetTor] Mirrors" - -#: Help subject -msgid "help_subject" -msgstr "[GetTor] Help" - -# Unsupported locale subject -msgid "unsupported_locale_subject" -msgstr "[GetTor] Unsupported locale" - -# Unsupported locale message -msgid "unsupported_locale_msg" -msgstr "The locale you requested '%s' is not supported." - -#: Links message -msgid "links_msg" -msgstr "You requested Tor Browser for %s.\n\ -\n\ -You will need only one of the links below to download the bundle. If a link\n\ -does not work for you, try the next one.\n\ -\n\ -%s\n\ -\n\ -\n\ ---\n\ -GetTor" - -#: Mirrors message -msgid "mirrors_msg" -msgstr "Hi! this is the GetTor robot.\n\ -\n\ -Thank you for your request. Attached to this email you will find\n\ -an updated list of mirrors of Tor Project's website." - -#: Help message -msgid "help_msg" -msgstr "Hi! This is the GetTor robot. I am here to help you download the\n\ -latest version of Tor Browser.\n\ -\n\ -Please reply to this message with one of the options below:\n\ -\n\ - windows\n\ - linux\n\ - osx\n\ - mirrors\n\ -\n\ -I will then send you the download instructions.\n\ -\n\ -If you are unsure, just send a blank reply to this message." diff --git a/share/locale/smtp/i18n/es/LC_MESSAGES/es.mo b/share/locale/smtp/i18n/es/LC_MESSAGES/es.mo deleted file mode 100644 index c21fe7b..0000000 Binary files a/share/locale/smtp/i18n/es/LC_MESSAGES/es.mo and /dev/null differ diff --git a/share/locale/smtp/i18n/es/LC_MESSAGES/es.po b/share/locale/smtp/i18n/es/LC_MESSAGES/es.po deleted file mode 100644 index bc4b5a8..0000000 --- a/share/locale/smtp/i18n/es/LC_MESSAGES/es.po +++ /dev/null @@ -1,94 +0,0 @@ -domain "es" - -#: Links subject -msgid "links_subject" -msgstr "[GetTor] Enlaces para tu petición" - -#: Links subject (PT) -msgid "links_pt_subject" -msgstr "[GetTor] Enlaces para tu petición" - -#: Help subject -msgid "help_subject" -msgstr "[GetTor] Ayuda" - -#: Delay subject -msgid "delay_subject" -msgstr "[GetTor] Mensaje de demora" - -# Unsupported locale subject -msgid "unsupported_locale_subject" -msgstr "[GetTor] Locale no soportado" - -# Unsupported locale message -msgid "unsupported_locale_msg" -msgstr "El locale especificado %s no está soportado." - -#: Links message -msgid "links_msg" -msgstr """Gracias por tu petición para %s-%s.\n\ -\n\ -Aquí están los links de descarga:\n\ -\n\ -===\n\ -%s\n\ -===\n\ -\n\ -===\n\ -Soporte:\n\ -===\n\ -\n\ -¿Aún necesitas ayuda? Si tienes dudas, problemas para conectarte a la\n\ -red Tor, o necesitas hablar con un humano, por favor contacta a nuestro\n\ -equipo de soporte a:\n\ -\n\ - help(a)rt.torproject.org\n\ -\n\ -Estamos listos para responder tus consultas en Inglés, Farsi, Chino,\n\ -Arábico, Francés y Español.""" - -#: Links message (PT) -msgid "links_pt_msg" -msgstr """Gracias por tu petición para %s-%s.\n\ -\n\ -Aquí están los links de descarga:\n\ -\n\ -===\n\ -%s\n\ -===\n\ -Tip: Información sobre pluggable transports.\n\ -\n\ -===\n\ -Soporte:\n\ -===\n\ -\n\ -¿Aún necesitas ayuda? Si tienes dudas, problemas para conectarte a la\n\ -red Tor, o necesitas hablar con un humano, por favor contacta a nuestro\n\ -equipo de soporte a:\n\ -\n\ - help(a)rt.torproject.org\n\ -\n\ -Estamos listos para responder tus consultas en Inglés, Farsi, Chino,\n\ -Arábico, Francés y Español.""" - -#: Help message -msgid "help_msg" -msgstr "Hola, este es el robot 'GetTor'.\n\ -\n\ -Gracias por tu petición. Estoy aquí para ayudarte a descargar la última\n\ -versión del Tor Browser Bundle.\n\ -\n\ -Por favor responde a este mensaje con una de las siguientes opciones:\n\ -\n\ - windows\n\ - linux\n\ - osx\n\ -\n\ -Y te enviaré las instrucciones de descarga.\n\ -\n\ -Tip: Sólo envía una respuesta en blanco a este mensaje si no estás\n\ -seguro." - -#: Delay message -msgid "delay_msg" -msgstr "Mensaje de demora." diff --git a/share/locale/twitter/i18n/en/LC_MESSAGES/en.po b/share/locale/twitter/i18n/en/LC_MESSAGES/en.po deleted file mode 100644 index 46c2738..0000000 --- a/share/locale/twitter/i18n/en/LC_MESSAGES/en.po +++ /dev/null @@ -1,55 +0,0 @@ -domain "en" - -#: Links -msgid "links" -msgstr "You requested Tor Browser for %s.\n\ -\n\ -You will need only one of the links below to download the bundle. If a link\n\ -does not work for you, try the next one.\n\ -\n\ -%s" - -#: Mirrors message -msgid "mirrors" -msgstr "Hi! this is the GetTor robot.\n\ -\n\ -Thank you for your request. Below you will find an updated list of\n\ -mirrors of Tor Project's website.\n\ -\n\ -%s" - -#: Help -msgid "help" -msgstr "Hi! This is the GetTor robot. I am here to help you download the\n\ -latest version of Tor Browser.\n\ -\n\ -Please reply to this message with one of the options below:\n\ -\n\ - windows\n\ - linux\n\ - osx\n\ - mirrors\n\ -\n\ -I will then send you the download instructions." - -#: Mirrors unavailable message -msgid "mirrors_unavailable" -msgstr "Hello there! this is the 'GetTor' robot.\n\ -\n\ -I'm sorry, I can't send you mirrors right now, please try again later.\n\ -\n\ -Still need help? If you have any questions, trouble connecting to Tor\n\ -network, or need to talk to a human, please contact our support team at:\n\ -\n\ - help(a)rt.torproject.org\n\ -\n\ -We are ready to answer your queries in English, Farsi, Chinese, Arabic,\n\ -French and Spanish." - -#: Internal error -msgid "internal_error" -msgstr "Internal error" - -#: Internal error -msgid "message_error" -msgstr "Message too long." diff --git a/share/locale/xmpp/i18n/en/LC_MESSAGES/en.mo b/share/locale/xmpp/i18n/en/LC_MESSAGES/en.mo deleted file mode 100644 index 2480872..0000000 Binary files a/share/locale/xmpp/i18n/en/LC_MESSAGES/en.mo and /dev/null differ diff --git a/share/locale/xmpp/i18n/en/LC_MESSAGES/en.po b/share/locale/xmpp/i18n/en/LC_MESSAGES/en.po deleted file mode 100644 index 46c2738..0000000 --- a/share/locale/xmpp/i18n/en/LC_MESSAGES/en.po +++ /dev/null @@ -1,55 +0,0 @@ -domain "en" - -#: Links -msgid "links" -msgstr "You requested Tor Browser for %s.\n\ -\n\ -You will need only one of the links below to download the bundle. If a link\n\ -does not work for you, try the next one.\n\ -\n\ -%s" - -#: Mirrors message -msgid "mirrors" -msgstr "Hi! this is the GetTor robot.\n\ -\n\ -Thank you for your request. Below you will find an updated list of\n\ -mirrors of Tor Project's website.\n\ -\n\ -%s" - -#: Help -msgid "help" -msgstr "Hi! This is the GetTor robot. I am here to help you download the\n\ -latest version of Tor Browser.\n\ -\n\ -Please reply to this message with one of the options below:\n\ -\n\ - windows\n\ - linux\n\ - osx\n\ - mirrors\n\ -\n\ -I will then send you the download instructions." - -#: Mirrors unavailable message -msgid "mirrors_unavailable" -msgstr "Hello there! this is the 'GetTor' robot.\n\ -\n\ -I'm sorry, I can't send you mirrors right now, please try again later.\n\ -\n\ -Still need help? If you have any questions, trouble connecting to Tor\n\ -network, or need to talk to a human, please contact our support team at:\n\ -\n\ - help(a)rt.torproject.org\n\ -\n\ -We are ready to answer your queries in English, Farsi, Chinese, Arabic,\n\ -French and Spanish." - -#: Internal error -msgid "internal_error" -msgstr "Internal error" - -#: Internal error -msgid "message_error" -msgstr "Message too long." diff --git a/share/locale/xmpp/i18n/en/LC_MESSAGES/es.mo b/share/locale/xmpp/i18n/en/LC_MESSAGES/es.mo deleted file mode 100644 index 5896536..0000000 Binary files a/share/locale/xmpp/i18n/en/LC_MESSAGES/es.mo and /dev/null differ diff --git a/share/locale/xmpp/i18n/es/LC_MESSAGES/es.mo b/share/locale/xmpp/i18n/es/LC_MESSAGES/es.mo deleted file mode 100644 index d54f22c..0000000 Binary files a/share/locale/xmpp/i18n/es/LC_MESSAGES/es.mo and /dev/null differ diff --git a/share/locale/xmpp/i18n/es/LC_MESSAGES/es.po b/share/locale/xmpp/i18n/es/LC_MESSAGES/es.po deleted file mode 100644 index b6caac5..0000000 --- a/share/locale/xmpp/i18n/es/LC_MESSAGES/es.po +++ /dev/null @@ -1,22 +0,0 @@ -domain "es" - -#: Links -msgid "links" -msgstr "Enlaces para %s-%s:\n %s" - -#: Links -msgid "links_pt" -msgstr "Enlaces-PT para %s-%s:\n %s" - -#: Help -msgid "help" -msgstr "ayuda" - -#: Unsupported locale -msgid "unsupported_lc" -msgstr "Locale no soportado" - -#: Internal error -msgid "internal_error" -msgstr "Error interno" -

1 0

[gettor/master] Finish twitter responder
by hiro＠torproject.org 15 Oct '19

15 Oct '19

commit b99a82918ebfe61dccd3c448d52219608db96290 Author: hiro <hiro(a)torproject.org> Date: Thu Oct 10 18:55:21 2019 +0200 Finish twitter responder --- gettor.conf.json.example | 1 + gettor/main.py | 1 + gettor/parse/twitter.py | 6 +++--- gettor/services/twitter/twitterdm.py | 24 ++++++++++++++---------- gettor/utils/twitter.py | 4 ++-- 5 files changed, 21 insertions(+), 15 deletions(-) diff --git a/gettor.conf.json.example b/gettor.conf.json.example index 76450ce..bd5b71f 100644 --- a/gettor.conf.json.example +++ b/gettor.conf.json.example @@ -5,6 +5,7 @@ "email_requests_limit": 30, "twitter_requests_limit": 1, "sendmail_interval": 10, + "twitter_interval": 10, "sendmail_addr": "gettor(a)torproject.org", "sendmail_host": "localhost", "sendmail_port": 587, diff --git a/gettor/main.py b/gettor/main.py index f914deb..9cd18b7 100644 --- a/gettor/main.py +++ b/gettor/main.py @@ -28,6 +28,7 @@ def run(gettor, app): settings = options.parse_settings() sendmail = Sendmail(settings) + twitterdm = Twitterdm(settings) log.info("Starting services.") sendmail_service = BaseService( diff --git a/gettor/parse/twitter.py b/gettor/parse/twitter.py index ea7ad81..82ae80c 100644 --- a/gettor/parse/twitter.py +++ b/gettor/parse/twitter.py @@ -80,7 +80,7 @@ class TwitterParser(object): platforms = self.settings.get("platforms") languages = [*strings.get_locales().keys()] - hid = hashlib.sha256(twitter_id.encode('utf-8')) + hid = hashlib.sha256(str(twitter_id).encode('utf-8')) log.msg( "Request from {}".format(hid.hexdigest()), system="twitter parser" ) @@ -114,7 +114,7 @@ class TwitterParser(object): dbname = self.settings.get("dbname") conn = SQLite3(dbname) - hid = hashlib.sha256(request['id'].encode('utf-8')) + hid = hashlib.sha256(str(request['id']).encode('utf-8')) # check limits first num_requests = yield conn.get_num_requests( id=hid.hexdigest(), service=request['service'] @@ -129,7 +129,7 @@ class TwitterParser(object): else: conn.new_request( - id=request['id'], + id=str(request['id']), command=request['command'], platform=request['platform'], language=request['language'], diff --git a/gettor/services/twitter/twitterdm.py b/gettor/services/twitter/twitterdm.py index b346946..abade53 100644 --- a/gettor/services/twitter/twitterdm.py +++ b/gettor/services/twitter/twitterdm.py @@ -14,7 +14,7 @@ from __future__ import absolute_import import gettext import hashlib - +import json import configparser @@ -65,7 +65,7 @@ class Twitterdm(object): Errback if we don't/can't send the message. """ log.debug("Could not send message.") - raise Error("{}".format(error)) + raise RuntimeError("{}".format(error)) def twitterdm(self, twitter_id, message): @@ -80,9 +80,13 @@ class Twitterdm(object): details. """ - return self.twitter.post_message( + post_data = self.twitter.post_message( twitter_id, message - ).addCallback(self.twitterdm_callback).addErrback(self.twitterdm_errback) + ) + if post_data.status_code == 200: + self.twitter_callback + else: + self.twitter_errback @defer.inlineCallbacks def get_new(self): @@ -96,10 +100,10 @@ class Twitterdm(object): for e in data['events']: - message_id = { 'id': e['id'], 'twitter_handle': e['message_create']['sender_id'] } + message_id = { "id": e['id'], "twitter_handle": e['message_create']['sender_id'] } log.debug("Parsing message") - tp = TwitterParser(settings, message_id) + tp = TwitterParser(self.settings, message_id) yield defer.maybeDeferred( tp.parse, e['message_create']['message_data']['text'], message_id ).addCallback(tp.parse_callback).addErrback(tp.parse_errback) @@ -119,7 +123,7 @@ class Twitterdm(object): log.info("Got new help request.") for request in help_requests: - ids = json.load(request[0]) + ids = json.loads("{}".format(request[0].replace("'", '"'))) message_id = ids['id'] twitter_id = ids['twitter_handle'] date = request[5] @@ -133,7 +137,7 @@ class Twitterdm(object): yield self.twitterdm( twitter_id=twitter_id, - body=strings._("help_body") + message=strings._("help_body") ) yield self.conn.update_stats( @@ -146,7 +150,7 @@ class Twitterdm(object): service="twitter", date=date ) - except Error as e: + except RuntimeError as e: log.info("Error sending twitter message: {}.".format(e)) elif link_requests: @@ -219,7 +223,7 @@ class Twitterdm(object): service="twitter", date=date ) - except Error as e: + except RuntimeError as e: log.info("Error sending message: {}.".format(e)) else: log.debug("No pending twitter requests. Keep waiting.") diff --git a/gettor/utils/twitter.py b/gettor/utils/twitter.py index 2e3968b..f8fa90d 100644 --- a/gettor/utils/twitter.py +++ b/gettor/utils/twitter.py @@ -11,7 +11,6 @@ # :license: This is Free Software. See LICENSE for license information. from requests_oauthlib import OAuth1Session -import json class Twitter(object): """ @@ -58,4 +57,5 @@ class Twitter(object): } } - data = self.twitter_client.post(self.twitter_new_message_endpoint, message) + data = self.twitter_client.post(twitter_new_message_endpoint, json=message) + return data

1 0

[gettor/master] Add twitter service with parsing
by hiro＠torproject.org 15 Oct '19

15 Oct '19

commit 2082fa2b00c3611649f160e27754064f0459f025 Author: hiro <hiro(a)torproject.org> Date: Thu Oct 10 16:18:07 2019 +0200 Add twitter service with parsing --- gettor.conf.json.example | 5 +- gettor/main.py | 10 +++ gettor/parse/twitter.py | 148 ++++++++++++++++++++++++++++++ gettor/services/twitter/twitterdm.py | 168 +++++++++++++++++++++++++++++++---- gettor/utils/twitter.py | 61 +++++++++++++ requirements.txt | 2 +- share/locale/es.json | 2 +- tests/conftests.py | 3 + tests/test_twitter.py | 36 ++++++++ 9 files changed, 415 insertions(+), 20 deletions(-) diff --git a/gettor.conf.json.example b/gettor.conf.json.example index 5c06e37..76450ce 100644 --- a/gettor.conf.json.example +++ b/gettor.conf.json.example @@ -3,6 +3,7 @@ "dbname": "/srv/gettor.torproject.org/home/gettor/gettor.db", "email_parser_logfile": "/srv/gettor.torproject.org/home/gettor/log/email_parser.log", "email_requests_limit": 30, + "twitter_requests_limit": 1, "sendmail_interval": 10, "sendmail_addr": "gettor(a)torproject.org", "sendmail_host": "localhost", @@ -11,5 +12,7 @@ "consumer_secret": "", "access_key": "", "access_secret": "", - "twitter_handle": "get_tor" + "twitter_handle": "get_tor", + "twitter_messages_endpoint": "https://api.twitter.com/1.1/direct_messages/events/list.json", + "twitter_new_message_endpoint": "https://api.twitter.com/1.1/direct_messages/events/new.json" } diff --git a/gettor/main.py b/gettor/main.py index 98a2de3..f914deb 100644 --- a/gettor/main.py +++ b/gettor/main.py @@ -19,6 +19,7 @@ from .utils import options from .services import BaseService from .services.email.sendmail import Sendmail +from .services.twitter.twitterdm import Twitterdm def run(gettor, app): """ @@ -36,3 +37,12 @@ def run(gettor, app): gettor.addService(sendmail_service) gettor.setServiceParent(app) + + + twitter_service = BaseService( + "twitterdm", twitterdm.get_interval(), twitterdm + ) + + gettor.addService(twitter_service) + + gettor.setServiceParent(app) diff --git a/gettor/parse/twitter.py b/gettor/parse/twitter.py new file mode 100644 index 0000000..ea7ad81 --- /dev/null +++ b/gettor/parse/twitter.py @@ -0,0 +1,148 @@ +# -*- coding: utf-8 -*- +# +# This file is part of GetTor, a Tor Browser distribution system. +# +# :authors: isra <hiro(a)torproject.org> +# see also AUTHORS file +# +# :copyright: (c) 2008-2014, The Tor Project, Inc. +# (c) 2019, Hiro +# +# :license: This is Free Software. See LICENSE for license information. + +from __future__ import absolute_import + +import re +import dkim +import hashlib + +from datetime import datetime +import configparser + +from twisted.python import log +from twisted.internet import defer +from twisted.enterprise import adbapi + +from ..utils.db import SQLite3 +from ..utils import strings + + +class TwitterParser(object): + """Class for parsing twitter message requests.""" + + def __init__(self, settings, twitter_id=None): + """ + Constructor. + """ + self.settings = settings + self.twitter_id = twitter_id + + + def build_request(self, msg_text, twitter_id, languages, platforms): + + request = { + "id": twitter_id, + "command": None, + "platform": None, + "language": "en", + "service": "twitter" + } + + if msg_text: + for word in re.split(r"\s+", msg_text.strip()): + if word.lower() in languages: + request["language"] = word.lower() + if word.lower() in platforms: + request["command"] = "links" + request["platform"] = word.lower() + if word.lower() == "help": + request["command"] = "help" + break + + return request + + + def parse(self, msg, twitter_id): + """ + Parse message content. Prevent service flooding. Finally, look for + commands to process the request. Current commands are: + + - links: request links for download. + - help: help request. + + :param msg_str (str): incomming message as string. + + :return dict with email address and command (`links` or `help`). + """ + + log.msg("Building twitter message from string.", system="twitter parser") + + platforms = self.settings.get("platforms") + languages = [*strings.get_locales().keys()] + + hid = hashlib.sha256(twitter_id.encode('utf-8')) + log.msg( + "Request from {}".format(hid.hexdigest()), system="twitter parser" + ) + + request = self.build_request(msg, twitter_id, languages, platforms) + + return request + + + @defer.inlineCallbacks + def parse_callback(self, request): + """ + Callback invoked when the message has been parsed. It stores the + obtained information in the database for further processing by the + Sendmail service. + + :param (dict) request: the built request based on message's content. + It contains the `email_addr` and command `fields`. + + :return: deferred whose callback/errback will log database query + execution details. + """ + twitter_requests_limit = self.settings.get("twitter_requests_limit") + log.msg( + "Found request for {}.".format(request['command']), + system="twitter parser" + ) + + if request["command"]: + 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')) + # check limits first + num_requests = yield conn.get_num_requests( + id=hid.hexdigest(), service=request['service'] + ) + + 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=request['id'], + command=request['command'], + platform=request['platform'], + language=request['language'], + service=request['service'], + date=now_str, + status="ONHOLD", + ) + + def parse_errback(self, error): + """ + Errback if we don't/can't parse the message's content. + """ + log.msg( + "Error while parsing twitter message content: {}.".format(error), + system="twitter parser" + ) diff --git a/gettor/services/twitter/twitterdm.py b/gettor/services/twitter/twitterdm.py index 7f8543e..b346946 100644 --- a/gettor/services/twitter/twitterdm.py +++ b/gettor/services/twitter/twitterdm.py @@ -15,10 +15,13 @@ from __future__ import absolute_import import gettext import hashlib + import configparser from twisted.internet import defer +from ...parse.twitter import TwitterParser +from ...utils.twitter import Twitter from ...utils.db import SQLite3 as DB from ...utils.commons import log from ...utils import strings @@ -31,17 +34,14 @@ class Twitterdm(object): """ Constructor. It opens and stores a connection to the database. :dbname: reads from configs + """ self.settings = settings dbname = self.settings.get("dbname") - consumer_key = self.settings.get("consumer_key") - consumer_secret = self.settings.get("consumer_secret") - access_key = self.settings.get("access_key") - access_secret = self.settings.get("access_secret") - twitter_handle = self.settings.get("twitter_handle") - + self.twitter = Twitter(settings) self.conn = DB(dbname) + def get_interval(self): """ Get time interval for service periodicity. @@ -59,6 +59,7 @@ class Twitterdm(object): """ log.info("Message sent successfully.") + def twitter_errback(self, error): """ Errback if we don't/can't send the message. @@ -67,25 +68,158 @@ class Twitterdm(object): raise Error("{}".format(error)) - def twitter_msg_list(self): - - - - def twitterdm(self): + def twitterdm(self, twitter_id, message): """ Send a twitter message for each message received. It creates a plain text message, and sends it via twitter APIs - :param twitter_handle (str): email address of the recipient. - :param text (str): subject of the message. + :param twitter_id (str): twitter_id of the recipient. + :param message (str): text of the message. :return: deferred whose callback/errback will handle the API execution details. """ - log.debug("Retrieve list of messages") - - log.debug("Creating message") + return self.twitter.post_message( + twitter_id, message + ).addCallback(self.twitterdm_callback).addErrback(self.twitterdm_errback) + @defer.inlineCallbacks + def get_new(self): + """ + Get new requests to process. This will define the `main loop` of + the Twitter service. + """ - log.debug("Calling twitter APIs.") + log.debug("Retrieve list of messages") + data = self.twitter.twitter_data() + + for e in data['events']: + + message_id = { 'id': e['id'], 'twitter_handle': e['message_create']['sender_id'] } + + log.debug("Parsing message") + tp = TwitterParser(settings, message_id) + yield defer.maybeDeferred( + tp.parse, e['message_create']['message_data']['text'], message_id + ).addCallback(tp.parse_callback).addErrback(tp.parse_errback) + + # Manage help and links messages separately + help_requests = yield self.conn.get_requests( + status="ONHOLD", command="help", service="twitter" + ) + + link_requests = yield self.conn.get_requests( + status="ONHOLD", command="links", service="twtter" + ) + + if help_requests: + strings.load_strings("en") + try: + log.info("Got new help request.") + + for request in help_requests: + ids = json.load(request[0]) + message_id = ids['id'] + twitter_id = ids['twitter_handle'] + date = request[5] + + hid = hashlib.sha256(twitter_id.encode('utf-8')) + log.info( + "Sending help message to {}.".format( + hid.hexdigest() + ) + ) + + yield self.twitterdm( + twitter_id=twitter_id, + body=strings._("help_body") + ) + + yield self.conn.update_stats( + command="help", platform='', language='en', + service="twitter" + ) + + yield self.conn.update_request( + id=request[0], hid=hid.hexdigest(), status="SENT", + service="twitter", date=date + ) + + except Error as e: + log.info("Error sending twitter message: {}.".format(e)) + + elif link_requests: + try: + log.info("Got new links request.") + + for request in link_requests: + ids = json.load(request[0]) + message_id = ids['id'] + twitter_id = ids['twitter_handle'] + date = request[5] + platform = request[2] + language = request[3] + + if not language: + language = 'en' + + locales = strings.get_locales() + + strings.load_strings(language) + locale = locales[language]['locale'] + + log.info("Getting links for {}.".format(platform)) + links = yield self.conn.get_links( + platform=platform, language=locale, status="ACTIVE" + ) + + # build message + link_msg = None + for link in links: + provider = link[5] + version = link[4] + arch = link[3] + url = link[0] + file = link[7] + sig_url = url + ".asc" + + link_str = "Tor Browser {} for {}-{}-{} ({}): {}\n".format( + version, platform, locale, arch, provider, url + ) + + link_str += "Signature file: {}\n".format(sig_url) + + if link_msg: + link_msg = "{}\n{}".format(link_msg, link_str) + else: + link_msg = link_str + + body_msg = strings._("links_body").format(platform, link_msg, file) + + hid = hashlib.sha256(twitter_id.encode('utf-8')) + log.info( + "Sending links to {}.".format( + hid.hexdigest() + ) + ) + + yield self.twitterdm( + email_addr=twitter_id, + body=body_msg + ) + + yield self.conn.update_stats( + command="links", platform=platform, language=locale, + service="twitter" + ) + + yield self.conn.update_request( + id=request[0], hid=hid.hexdigest(), status="SENT", + service="twitter", date=date + ) + + except Error as e: + log.info("Error sending message: {}.".format(e)) + else: + log.debug("No pending twitter requests. Keep waiting.") diff --git a/gettor/utils/twitter.py b/gettor/utils/twitter.py new file mode 100644 index 0000000..2e3968b --- /dev/null +++ b/gettor/utils/twitter.py @@ -0,0 +1,61 @@ +# -*- coding: utf-8 -*- +# +# This file is part of GetTor, a Tor Browser distribution system. +# +# :authors: isra <hiro(a)torproject.org> +# see also AUTHORS file +# +# :copyright: (c) 2008-2014, The Tor Project, Inc. +# (c) 2019, Hiro +# +# :license: This is Free Software. See LICENSE for license information. + +from requests_oauthlib import OAuth1Session +import json + +class Twitter(object): + """ + Class for sending twitter commands via the API. + """ + def __init__(self, settings): + """ + Constructor. + + """ + self.settings = settings + + consumer_key = self.settings.get("consumer_key") + consumer_secret = self.settings.get("consumer_secret") + access_key = self.settings.get("access_key") + access_secret = self.settings.get("access_secret") + twitter_handle = self.settings.get("twitter_handle") + + self.twitter_messages_endpoint = self.settings.get("twitter_messages_endpoint") + self.twitter_new_message_endpoint = self.settings.get("twitter_new_message_endpoint") + self.twitter_client = self.twitter_oauth(consumer_key, consumer_secret, access_key, access_secret) + + def twitter_oauth(self, consumer_key, consumer_secret, access_key, access_secret): + tw_client = OAuth1Session(client_key=consumer_key, + client_secret=consumer_secret, + resource_owner_key=access_key, + resource_owner_secret=access_secret) + return tw_client + + + def twitter_data(self): + data = self.twitter_client.get(self.twitter_messages_endpoint) + return data.json() + + + def post_message(self, twitter_id, text): + message = { + "event": { + "type": "message_create", + "message_create": { + "target": {"recipient_id": twitter_id }, + "message_data": {"text": text } + } + } + } + + data = self.twitter_client.post(self.twitter_new_message_endpoint, message) diff --git a/requirements.txt b/requirements.txt index a6150bc..fc786a5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,5 +2,5 @@ service_identity==18.1.0 pydkim==0.3 pyopenssl==19.0.0 dnspython==1.16.0 -validate_email==1.3 twisted==19.2.1 +requests_oauthlib=1.0.0 diff --git a/share/locale/es.json b/share/locale/es.json index 8ed6722..4d18f61 100644 --- a/share/locale/es.json +++ b/share/locale/es.json @@ -7,7 +7,7 @@ "help_config": "Custom config file location (optional)", "smtp_links_subject": "[GetTor] Links for your request", "smtp_mirrors_subject": "[GetTor] Mirrors", - "smtp_help_subject": "[GetTor] Help", + "smtp_help_subject": "[GetTor] Ayuda", "smtp_unsupported_locale_subject": "[GetTor] Unsupported locale", "smtp_unsupported_locale_msg": "The locale you requested '{}' is not supported.", "smtp_vlinks_msg": "You requested Tor Browser for {}.\n\nYou will need only one of the links below to download the bundle. If a link does not work for you, try the next one.\n\n{}\n\nShould you have issues with any of the links above you can access the following Google Drive folder: https://drive.google.com/open?id=13CADQTsCwrGsIID09YQbNz2DfRMUoxUU\n\n Download the file: {}\n\n \n--\nGetTor", diff --git a/tests/conftests.py b/tests/conftests.py index 1f73f21..f5194a5 100644 --- a/tests/conftests.py +++ b/tests/conftests.py @@ -4,8 +4,11 @@ from __future__ import unicode_literals from gettor.utils import options from gettor.utils import strings +from gettor.utils import twitter from gettor.services.email import sendmail +from gettor.services.twitter import twitterdm from gettor.parse.email import EmailParser, AddressError, DKIMError +from gettor.parse.twitter import TwitterParser from email import message_from_string from email.utils import parseaddr diff --git a/tests/test_twitter.py b/tests/test_twitter.py new file mode 100644 index 0000000..fe155cc --- /dev/null +++ b/tests/test_twitter.py @@ -0,0 +1,36 @@ +#!/usr/bin/env python3 +import pytest +from twisted.trial import unittest +from twisted.internet import defer, reactor +from twisted.internet import task + +from . import conftests + +class TwitterTests(unittest.TestCase): + # Fail any tests which take longer than 15 seconds. + timeout = 15 + def setUp(self): + self.settings = conftests.options.parse_settings() + self.tw_client = conftests.twitter.Twitter(self.settings) + + + def tearDown(self): + print("tearDown()") + + + def test_load_messages(self): + data = self.tw_client.twitter_data() + assert data['events'] + + + def test_parse_tweet(self): + e = {'type': 'message_create', 'id': '1178649287208689669', 'created_timestamp': '1569846862972', 'message_create': {'target': {'recipient_id': '2514714800'}, 'sender_id': '1467062174', 'message_data': {'text': 'windows 10', 'entities': {'hashtags': [], 'symbols': [], 'user_mentions': [], 'urls': []}}}} + message_id = { 'id': e['id'], 'twitter_handle': e['message_create']['sender_id'] } + message = e['message_create']['message_data']['text'] + tp = conftests.TwitterParser(self.settings, message_id) + r = tp.parse(message, str(message_id)) + self.assertEqual(r, {'command': 'links', 'id': "{'id': '1178649287208689669', 'twitter_handle': '1467062174'}", 'language': 'en', 'platform': 'windows','service': 'twitter'}) + + +if __name__ == "__main__": + unittest.main()

1 0

[gettor/master] Fix typo in check script
by hiro＠torproject.org 15 Oct '19

15 Oct '19

commit 799028493a4556e76d760ebe1bf5cd0b055a3967 Author: hiro <hiro(a)torproject.org> Date: Thu Oct 10 19:23:25 2019 +0200 Fix typo in check script --- bin/gettor_check | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/gettor_check b/bin/gettor_check index 248a714..bf8775e 100755 --- a/bin/gettor_check +++ b/bin/gettor_check @@ -11,7 +11,7 @@ python3 /home/gettor/gettor/scripts/check_service $1 -store exit status +#store exit status status=$? if test $status -ne 0

1 0

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

15 Oct '19

commit 7b1dbc34f89f509906385168bf18113cfe4174a6 Author: hiro <hiro(a)torproject.org> Date: Mon Oct 14 17:28:20 2019 +0200 Fix gettor check script --- scripts/check_service | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/scripts/check_service b/scripts/check_service index b070a4b..e2f45fe 100644 --- a/scripts/check_service +++ b/scripts/check_service @@ -100,14 +100,18 @@ if __name__ == "__main__": else: password = "yourPassword" - status_file = open(STATUS_FILE,'w') + status_file = open(STATUS_FILE, 'r') + message = status_file.read() + status_file.close() try: status, message = send_email_from_gmail(password) except Exception as e: status = UNKNOWN message = repr(e) - status_file.write("UNKNOWN: %s" % message) + status_file = open(STATUS_FILE,'w') + status_file.write("UNKNOWN\n3: %s" % message) + status_file.close() time.sleep(600) @@ -119,6 +123,7 @@ if __name__ == "__main__": status = CRITICAL message = repr(e) finally: + status_file = open(STATUS_FILE,'w') if status == OK: status_file.write("OK\n0: %s" % message) elif status == WARNING: @@ -129,4 +134,6 @@ if __name__ == "__main__": status_file.write("UNKNOWN\n3: %s" % message) status = UNKNOWN + status_file.close() + sys.exit(status)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits October 2019