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

[dev/master] Update lego and templates
by hiro＠torproject.org 16 Jan '20

16 Jan '20

commit 9977fb2f99108fd5ec68b07676617372d3b59a2b Author: hiro <hiro(a)torproject.org> Date: Thu Jan 16 18:19:31 2020 +0100 Update lego and templates --- databags/links.ini | 1 + databags/menu.ini | 1 + databags/menu_footer.ini | 1 + databags/{pagenav+en.ini => pagenav.ini} | 0 lego | 2 +- templates/pagenav.html | 2 +- 6 files changed, 5 insertions(+), 2 deletions(-) diff --git a/databags/links.ini b/databags/links.ini new file mode 120000 index 0000000..fa8bbfe --- /dev/null +++ b/databags/links.ini @@ -0,0 +1 @@ +../lego/databags/links.ini \ No newline at end of file diff --git a/databags/menu.ini b/databags/menu.ini new file mode 120000 index 0000000..94f62ff --- /dev/null +++ b/databags/menu.ini @@ -0,0 +1 @@ +../lego/databags/menu.ini \ No newline at end of file diff --git a/databags/menu_footer.ini b/databags/menu_footer.ini new file mode 120000 index 0000000..e6c1f3b --- /dev/null +++ b/databags/menu_footer.ini @@ -0,0 +1 @@ +../lego/databags/menu_footer.ini \ No newline at end of file diff --git a/databags/pagenav+en.ini b/databags/pagenav.ini similarity index 100% rename from databags/pagenav+en.ini rename to databags/pagenav.ini diff --git a/lego b/lego index f0ea955..abbf18c 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit f0ea955c50f147813fd7735d226e7f4689e94523 +Subproject commit abbf18cb1bbca70caeb8913d2b60f0cb9332f287 diff --git a/templates/pagenav.html b/templates/pagenav.html index 0a6aa0f..7d38397 100644 --- a/templates/pagenav.html +++ b/templates/pagenav.html @@ -2,7 +2,7 @@ <div class="row flex-xl-nowrap {{ bag('alternatives', this.alt, 'order') }}"> <div class="row col-12 justify-content-center"> <ul class="nav"> - {% set menubag = 'pagenav' + '+' + this.alt %} + {% set menubag = 'pagenav' %} {% for id, item in bag(menubag).items() %} {% set abs_path = item.path %} <li{% if this.is_child_of(abs_path) %} class="nav-item active border-active" {% else %} class="nav-item" {% endif %}>

1 0

[gettor/master] Fix issues with duplicated filename in email body
by hiro＠torproject.org 16 Jan '20

16 Jan '20

commit 55b2cc2c8699304202423b9e54e3a8aa59846259 Author: hiro <hiro(a)torproject.org> Date: Thu Jan 16 17:21:00 2020 +0100 Fix issues with duplicated filename in email body --- gettor/services/email/sendmail.py | 2 +- share/locale/en.json | 2 +- share/locale/es.json | 4 +- share/locale/pt.json | 2 +- strings.patch | 301 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 306 insertions(+), 5 deletions(-) diff --git a/gettor/services/email/sendmail.py b/gettor/services/email/sendmail.py index 356f6c4..c570f22 100644 --- a/gettor/services/email/sendmail.py +++ b/gettor/services/email/sendmail.py @@ -140,7 +140,7 @@ class Sendmail(object): body_msg += strings._("links_body_archive") body_msg += strings._("links_body_internet_archive") body_msg += strings._("links_body_google_drive") - body_msg += strings._("links_body_internet_archive").format(file) + body_msg += strings._("links_body_download_filename").format(file) body_msg += strings._("links_body_ending") return body_msg diff --git a/share/locale/en.json b/share/locale/en.json index be7dd33..8e90cdd 100644 --- a/share/locale/en.json +++ b/share/locale/en.json @@ -4,7 +4,7 @@ "links_body_archive": "Should you have issues with any of the links above you can access the following archives:\n\n", "links_body_internet_archive": "- Internet Archive: https://archive.org/details/@gettor\n\n", "links_body_google_drive": "- Google Drive folder: https://drive.google.com/open?id=13CADQTsCwrGsIID09YQbNz2DfRMUoxUU\n\n", - "links_body_internet_archive": "Download the file: {}\n\n", + "links_body_download_filename": "Download the file: {}\n\n", "links_body_ending": "\n--\nGetTor", "links_subject": "[GetTor] Links for your request", "help_body_intro": "This is how you can request a tor browser bundle link.\n\n", diff --git a/share/locale/es.json b/share/locale/es.json index 8ac5705..8e90cdd 100644 --- a/share/locale/es.json +++ b/share/locale/es.json @@ -4,7 +4,7 @@ "links_body_archive": "Should you have issues with any of the links above you can access the following archives:\n\n", "links_body_internet_archive": "- Internet Archive: https://archive.org/details/@gettor\n\n", "links_body_google_drive": "- Google Drive folder: https://drive.google.com/open?id=13CADQTsCwrGsIID09YQbNz2DfRMUoxUU\n\n", - "links_body_internet_archive": "Download the file: {}\n\n", + "links_body_download_filename": "Download the file: {}\n\n", "links_body_ending": "\n--\nGetTor", "links_subject": "[GetTor] Links for your request", "help_body_intro": "This is how you can request a tor browser bundle link.\n\n", @@ -15,7 +15,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] Ayuda", + "smtp_help_subject": "[GetTor] Help", "smtp_unsupported_locale_subject": "[GetTor] Unsupported locale", "smtp_unsupported_locale_msg": "The locale you requested '{}' is not supported." } diff --git a/share/locale/pt.json b/share/locale/pt.json index be7dd33..8e90cdd 100644 --- a/share/locale/pt.json +++ b/share/locale/pt.json @@ -4,7 +4,7 @@ "links_body_archive": "Should you have issues with any of the links above you can access the following archives:\n\n", "links_body_internet_archive": "- Internet Archive: https://archive.org/details/@gettor\n\n", "links_body_google_drive": "- Google Drive folder: https://drive.google.com/open?id=13CADQTsCwrGsIID09YQbNz2DfRMUoxUU\n\n", - "links_body_internet_archive": "Download the file: {}\n\n", + "links_body_download_filename": "Download the file: {}\n\n", "links_body_ending": "\n--\nGetTor", "links_subject": "[GetTor] Links for your request", "help_body_intro": "This is how you can request a tor browser bundle link.\n\n", diff --git a/strings.patch b/strings.patch new file mode 100644 index 0000000..ea0504a --- /dev/null +++ b/strings.patch @@ -0,0 +1,301 @@ +From 906bec40b28a7e49ffba3a6e1c646bd81e5441b9 Mon Sep 17 00:00:00 2001 +From: hiro <hiro(a)torproject.org> +Date: Thu, 9 Jan 2020 12:24:10 +0100 +Subject: [PATCH] Fix current issue with gettor strings splitting #32906 Add + tests to check sent email messages. + +--- + gettor/services/email/sendmail.py | 82 ++++++++++++++++++------------- + gettor/utils/options.py | 8 +-- + gettor/utils/settings.py | 7 +-- + scripts/process_email | 6 ++- + share/locale/es.json | 2 +- + tests/conftests.py | 2 +- + tests/test_email_service.py | 35 ++++++++++++- + tests/test_twitter.py | 1 + + 8 files changed, 98 insertions(+), 45 deletions(-) + +diff --git a/gettor/services/email/sendmail.py b/gettor/services/email/sendmail.py +index 53d90f6..356f6c4 100644 +--- a/gettor/services/email/sendmail.py ++++ b/gettor/services/email/sendmail.py +@@ -100,6 +100,52 @@ class Sendmail(object): + ).addCallback(self.sendmail_callback).addErrback(self.sendmail_errback) + + ++ def build_help_body_message(self): ++ body_msg = strings._("help_body_intro") ++ body_msg += strings._("help_body_paragraph") ++ body_msg += strings._("help_body_support") ++ ++ return body_msg ++ ++ ++ def build_link_strings(self, links, platform, locale): ++ """ ++ Build the links strings ++ """ ++ ++ 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) ++ ++ link_msg = "{}\n{}".format(link_msg, link_str) ++ ++ return link_msg, file ++ ++ ++ def build_body_message(self, link_msg, platform, file): ++ body_msg = strings._("links_body_platform").format(platform) ++ body_msg += strings._("links_body_links").format(link_msg) ++ body_msg += strings._("links_body_archive") ++ body_msg += strings._("links_body_internet_archive") ++ body_msg += strings._("links_body_google_drive") ++ body_msg += strings._("links_body_internet_archive").format(file) ++ body_msg += strings._("links_body_ending") ++ ++ return body_msg ++ ++ + @defer.inlineCallbacks + def get_new(self): + """ +@@ -132,9 +178,7 @@ class Sendmail(object): + ) + ) + +- body_msg = strings._("help_body_intro") +- body_msg += strings._("help_body_paragraph") +- body_msg += strings._("help_body_support") ++ body_msg = self.build_help_body_message() + + yield self.sendmail( + email_addr=id, +@@ -179,36 +223,8 @@ class Sendmail(object): + ) + + # build message +- link_msg = None +- file = "" +- +- 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_platform").format(platform) +- body_msg += strings._("links_body_links").format(link_msg) +- body_msg += strings._("links_body_archive") +- body_msg += strings._("links_body_internet_archive") +- body_msg += strings._("links_body_google_drive") +- body_msg += strings._("links_body_internet_archive").format(file) +- body_msg += strings._("links_body_ending") +- ++ link_msg, file = self.build_link_strings(links, platform, locale) ++ body_msg = self.build_body_message(link_msg, platform, file) + subject_msg = strings._("links_subject") + + hid = hashlib.sha256(id.encode('utf-8')) +diff --git a/gettor/utils/options.py b/gettor/utils/options.py +index 8504f42..6f8d693 100644 +--- a/gettor/utils/options.py ++++ b/gettor/utils/options.py +@@ -3,9 +3,7 @@ + This file is part of GetTor, a service providing alternative methods to download + the Tor Browser. + +-:authors: Hiro <hiro(a)torproject.org> +- parser = argparse.ArgumentParser(formatter_class=lambda prog: argparse.HelpFormatter(prog,max_help_position=28)) +- parser.add_argument('--config', metavar='config', please also see AUTHORS file ++:authors: Hiro <hiro(a)torproject.org> please also see AUTHORS file + :copyright: (c) 2008-2014, The Tor Project, Inc. + (c) 2014, all entities within the AUTHORS file + :license: see included LICENSE for information +@@ -24,11 +22,13 @@ def load_settings(config): + settings.load() + return settings + +-def parse_settings(locale, config): ++def parse_settings(locale="en", config=None): + """ + Parse settings and loads strings in a given locale + This function needs to be rewritten considering passing a locale and + returing translated strings ++ + """ ++ + strings.load_strings(locale) + return load_settings(config) +diff --git a/gettor/utils/settings.py b/gettor/utils/settings.py +index a519755..67c31ec 100644 +--- a/gettor/utils/settings.py ++++ b/gettor/utils/settings.py +@@ -33,7 +33,8 @@ class Settings(object): + self.filename = config + else: + # Default config +- self.filename = self.build_filename() ++ default_config = "/home/gettor/gettor/gettor.conf.json" ++ self.filename = self.build_filename(default_config) + + # Dictionary of available languages, + # mapped to the language name, in that language +@@ -41,11 +42,11 @@ class Settings(object): + self._version = strings.get_version() + self._settings = {} + +- def build_filename(self): ++ def build_filename(self, file): + """ + Returns the path of the settings file. + """ +- return strings.get_resource_path('/home/gettor/gettor/gettor.conf.json', strings.find_run_dir()) ++ return strings.get_resource_path(file, strings.find_run_dir()) + + def load(self): + """ +diff --git a/scripts/process_email b/scripts/process_email +index a5da6eb..37c4e0b 100755 +--- a/scripts/process_email ++++ b/scripts/process_email +@@ -23,7 +23,8 @@ from gettor.utils import options + + @defer.inlineCallbacks + def process_email(message): +- settings = options.parse_settings() ++ ++ settings = options.parse_settings("en", "/home/gettor/gettor/gettor.conf.json") + + try: + ep = EmailParser(settings, "gettor(a)torproject.org") +@@ -49,7 +50,8 @@ def main(): + + + if __name__ == '__main__': +- settings = options.parse_settings() ++ ++ settings = options.parse_settings("en", "/home/gettor/gettor/gettor.conf.json") + email_parser_logfile = settings.get("email_parser_logfile") + log.startLogging(open(email_parser_logfile, 'a')) + log.msg("New email request received.", system="process email") +diff --git a/share/locale/es.json b/share/locale/es.json +index be7dd33..8ac5705 100644 +--- a/share/locale/es.json ++++ b/share/locale/es.json +@@ -15,7 +15,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." + } +diff --git a/tests/conftests.py b/tests/conftests.py +index f5194a5..cbb4d28 100644 +--- a/tests/conftests.py ++++ b/tests/conftests.py +@@ -5,7 +5,7 @@ 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.email.sendmail import Sendmail + from gettor.services.twitter import twitterdm + from gettor.parse.email import EmailParser, AddressError, DKIMError + from gettor.parse.twitter import TwitterParser +diff --git a/tests/test_email_service.py b/tests/test_email_service.py +index 8e60f7a..ff364f0 100644 +--- a/tests/test_email_service.py ++++ b/tests/test_email_service.py +@@ -14,8 +14,20 @@ class EmailServiceTests(unittest.TestCase): + timeout = 15 + def setUp(self): + self.settings = conftests.options.parse_settings("en","./gettor.conf.json") +- self.sm_client = conftests.sendmail.Sendmail(self.settings) ++ self.sm_client = conftests.Sendmail(self.settings) + self.locales = conftests.strings.get_locales() ++ self.links = [ ++ [ ++ "https://gitlab.com/thetorproject/gettorbrowser/raw/torbrowser-releases/TorB…", ++ "osx", ++ "en-US", ++ "64", ++ "9.0.3", ++ "gitlab", ++ "ACTIVE", ++ "TorBrowser-9.0.3-osx64_en-US.dmg" ++ ] ++ ] + + def tearDown(self): + print("tearDown()") +@@ -76,6 +88,27 @@ class EmailServiceTests(unittest.TestCase): + self.assertEqual(request["platform"], "osx") + self.assertEqual(request["language"], "en") + ++ def test_sent_links_message(self): ++ ep = self.sm_client ++ links = self.links ++ link_msg, file = ep.build_link_strings(links, "osx", "en") ++ assert "https://gitlab.com/thetorproject/gettorbrowser/raw/torbrowser-releases/TorB…" in link_msg ++ assert "osx" in link_msg ++ ++ self.assertEqual("TorBrowser-9.0.3-osx64_en-US.dmg", file) ++ ++ def test_sent_body_message(self): ++ ep = self.sm_client ++ links = self.links ++ link_msg, file = ep.build_link_strings(links, "osx", "en") ++ body_msg = ep.build_body_message(link_msg, "osx", file) ++ assert "You requested Tor Browser for osx" in body_msg ++ ++ def test_help_body_message(self): ++ ep = self.sm_client ++ help_msg = ep.build_help_body_message() ++ assert "This is how you can request a tor browser bundle link" in help_msg ++ + + if __name__ == "__main__": + unittest.main() +diff --git a/tests/test_twitter.py b/tests/test_twitter.py +index 7458cfc..a1515d0 100644 +--- a/tests/test_twitter.py ++++ b/tests/test_twitter.py +@@ -20,6 +20,7 @@ class TwitterTests(unittest.TestCase): + + def test_load_messages(self): + data = self.tw_client.twitter_data() ++ print(data) + assert data['events'] + + +-- +2.20.1 +

1 0

[gettor/master] Fix current issue with gettor strings splitting #32906
by hiro＠torproject.org 16 Jan '20

16 Jan '20

commit 906bec40b28a7e49ffba3a6e1c646bd81e5441b9 Author: hiro <hiro(a)torproject.org> Date: Thu Jan 9 12:24:10 2020 +0100 Fix current issue with gettor strings splitting #32906 Add tests to check sent email messages. --- gettor/services/email/sendmail.py | 82 +++++++++++++++++++++++---------------- gettor/utils/options.py | 8 ++-- gettor/utils/settings.py | 7 ++-- scripts/process_email | 6 ++- share/locale/es.json | 2 +- tests/conftests.py | 2 +- tests/test_email_service.py | 35 ++++++++++++++++- tests/test_twitter.py | 1 + 8 files changed, 98 insertions(+), 45 deletions(-) diff --git a/gettor/services/email/sendmail.py b/gettor/services/email/sendmail.py index 53d90f6..356f6c4 100644 --- a/gettor/services/email/sendmail.py +++ b/gettor/services/email/sendmail.py @@ -100,6 +100,52 @@ class Sendmail(object): ).addCallback(self.sendmail_callback).addErrback(self.sendmail_errback) + def build_help_body_message(self): + body_msg = strings._("help_body_intro") + body_msg += strings._("help_body_paragraph") + body_msg += strings._("help_body_support") + + return body_msg + + + def build_link_strings(self, links, platform, locale): + """ + Build the links strings + """ + + 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) + + link_msg = "{}\n{}".format(link_msg, link_str) + + return link_msg, file + + + def build_body_message(self, link_msg, platform, file): + body_msg = strings._("links_body_platform").format(platform) + body_msg += strings._("links_body_links").format(link_msg) + body_msg += strings._("links_body_archive") + body_msg += strings._("links_body_internet_archive") + body_msg += strings._("links_body_google_drive") + body_msg += strings._("links_body_internet_archive").format(file) + body_msg += strings._("links_body_ending") + + return body_msg + + @defer.inlineCallbacks def get_new(self): """ @@ -132,9 +178,7 @@ class Sendmail(object): ) ) - body_msg = strings._("help_body_intro") - body_msg += strings._("help_body_paragraph") - body_msg += strings._("help_body_support") + body_msg = self.build_help_body_message() yield self.sendmail( email_addr=id, @@ -179,36 +223,8 @@ class Sendmail(object): ) # build message - link_msg = None - file = "" - - 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_platform").format(platform) - body_msg += strings._("links_body_links").format(link_msg) - body_msg += strings._("links_body_archive") - body_msg += strings._("links_body_internet_archive") - body_msg += strings._("links_body_google_drive") - body_msg += strings._("links_body_internet_archive").format(file) - body_msg += strings._("links_body_ending") - + link_msg, file = self.build_link_strings(links, platform, locale) + body_msg = self.build_body_message(link_msg, platform, file) subject_msg = strings._("links_subject") hid = hashlib.sha256(id.encode('utf-8')) diff --git a/gettor/utils/options.py b/gettor/utils/options.py index 8504f42..6f8d693 100644 --- a/gettor/utils/options.py +++ b/gettor/utils/options.py @@ -3,9 +3,7 @@ This file is part of GetTor, a service providing alternative methods to download the Tor Browser. -:authors: Hiro <hiro(a)torproject.org> - parser = argparse.ArgumentParser(formatter_class=lambda prog: argparse.HelpFormatter(prog,max_help_position=28)) - parser.add_argument('--config', metavar='config', please also see AUTHORS file +:authors: Hiro <hiro(a)torproject.org> please also see AUTHORS file :copyright: (c) 2008-2014, The Tor Project, Inc. (c) 2014, all entities within the AUTHORS file :license: see included LICENSE for information @@ -24,11 +22,13 @@ def load_settings(config): settings.load() return settings -def parse_settings(locale, config): +def parse_settings(locale="en", config=None): """ Parse settings and loads strings in a given locale This function needs to be rewritten considering passing a locale and returing translated strings + """ + strings.load_strings(locale) return load_settings(config) diff --git a/gettor/utils/settings.py b/gettor/utils/settings.py index a519755..67c31ec 100644 --- a/gettor/utils/settings.py +++ b/gettor/utils/settings.py @@ -33,7 +33,8 @@ class Settings(object): self.filename = config else: # Default config - self.filename = self.build_filename() + default_config = "/home/gettor/gettor/gettor.conf.json" + self.filename = self.build_filename(default_config) # Dictionary of available languages, # mapped to the language name, in that language @@ -41,11 +42,11 @@ class Settings(object): self._version = strings.get_version() self._settings = {} - def build_filename(self): + def build_filename(self, file): """ Returns the path of the settings file. """ - return strings.get_resource_path('/home/gettor/gettor/gettor.conf.json', strings.find_run_dir()) + return strings.get_resource_path(file, strings.find_run_dir()) def load(self): """ diff --git a/scripts/process_email b/scripts/process_email index a5da6eb..37c4e0b 100755 --- a/scripts/process_email +++ b/scripts/process_email @@ -23,7 +23,8 @@ from gettor.utils import options @defer.inlineCallbacks def process_email(message): - settings = options.parse_settings() + + settings = options.parse_settings("en", "/home/gettor/gettor/gettor.conf.json") try: ep = EmailParser(settings, "gettor(a)torproject.org") @@ -49,7 +50,8 @@ def main(): if __name__ == '__main__': - settings = options.parse_settings() + + settings = options.parse_settings("en", "/home/gettor/gettor/gettor.conf.json") email_parser_logfile = settings.get("email_parser_logfile") log.startLogging(open(email_parser_logfile, 'a')) log.msg("New email request received.", system="process email") diff --git a/share/locale/es.json b/share/locale/es.json index be7dd33..8ac5705 100644 --- a/share/locale/es.json +++ b/share/locale/es.json @@ -15,7 +15,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." } diff --git a/tests/conftests.py b/tests/conftests.py index f5194a5..cbb4d28 100644 --- a/tests/conftests.py +++ b/tests/conftests.py @@ -5,7 +5,7 @@ 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.email.sendmail import Sendmail from gettor.services.twitter import twitterdm from gettor.parse.email import EmailParser, AddressError, DKIMError from gettor.parse.twitter import TwitterParser diff --git a/tests/test_email_service.py b/tests/test_email_service.py index 8e60f7a..ff364f0 100644 --- a/tests/test_email_service.py +++ b/tests/test_email_service.py @@ -14,8 +14,20 @@ class EmailServiceTests(unittest.TestCase): timeout = 15 def setUp(self): self.settings = conftests.options.parse_settings("en","./gettor.conf.json") - self.sm_client = conftests.sendmail.Sendmail(self.settings) + self.sm_client = conftests.Sendmail(self.settings) self.locales = conftests.strings.get_locales() + self.links = [ + [ + "https://gitlab.com/thetorproject/gettorbrowser/raw/torbrowser-releases/TorB…", + "osx", + "en-US", + "64", + "9.0.3", + "gitlab", + "ACTIVE", + "TorBrowser-9.0.3-osx64_en-US.dmg" + ] + ] def tearDown(self): print("tearDown()") @@ -76,6 +88,27 @@ class EmailServiceTests(unittest.TestCase): self.assertEqual(request["platform"], "osx") self.assertEqual(request["language"], "en") + def test_sent_links_message(self): + ep = self.sm_client + links = self.links + link_msg, file = ep.build_link_strings(links, "osx", "en") + assert "https://gitlab.com/thetorproject/gettorbrowser/raw/torbrowser-releases/TorB…" in link_msg + assert "osx" in link_msg + + self.assertEqual("TorBrowser-9.0.3-osx64_en-US.dmg", file) + + def test_sent_body_message(self): + ep = self.sm_client + links = self.links + link_msg, file = ep.build_link_strings(links, "osx", "en") + body_msg = ep.build_body_message(link_msg, "osx", file) + assert "You requested Tor Browser for osx" in body_msg + + def test_help_body_message(self): + ep = self.sm_client + help_msg = ep.build_help_body_message() + assert "This is how you can request a tor browser bundle link" in help_msg + if __name__ == "__main__": unittest.main() diff --git a/tests/test_twitter.py b/tests/test_twitter.py index 7458cfc..a1515d0 100644 --- a/tests/test_twitter.py +++ b/tests/test_twitter.py @@ -20,6 +20,7 @@ class TwitterTests(unittest.TestCase): def test_load_messages(self): data = self.tw_client.twitter_data() + print(data) assert data['events']

1 0

[tor/master] compat_compiler: add a macro to prevent coverity deadcode warnings.
by nickm＠torproject.org 16 Jan '20

16 Jan '20

commit 5e27caa60c4ccf257c0dca64883cdf672d8d8ce4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 15 10:21:18 2020 -0500 compat_compiler: add a macro to prevent coverity deadcode warnings. The POSSIBLE(e) macro evaluates to the value of (e), but does so in a way that a static analyzer will not conclude that (e) is impossible. We can use this when we expect our regular compilers to eliminate deadcode, but we don't want coverity to complain about it. Part of a fix for 32960. --- src/lib/cc/compat_compiler.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/lib/cc/compat_compiler.h b/src/lib/cc/compat_compiler.h index 47782fda0..907622f94 100644 --- a/src/lib/cc/compat_compiler.h +++ b/src/lib/cc/compat_compiler.h @@ -227,4 +227,17 @@ #define EAT_SEMICOLON \ struct dummy_semicolon_eater__ +/** + * Tell our static analysis tool to believe that (clang's scan-build or + * coverity scan) that an expression might be true. We use this to suppress + * dead-code warnings. + **/ +#if defined(__COVERITY__) || defined(__clang_analyzer__) +/* By calling getenv, we force the analyzer not to conclude that 'expr' is + * false. */ +#define POSSIBLE(expr) ((expr) || getenv("STATIC_ANALYZER_DEADCODE_DUMMY_")) +#else +#define POSSIBLE(expr) (expr) +#endif + #endif /* !defined(TOR_COMPAT_COMPILER_H) */

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1663'
by nickm＠torproject.org 16 Jan '20

16 Jan '20

commit 17c63ff9f64c9f678f566bca70497992f5d4d04d Merge: 4025cbada 77246dc0d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 16 10:24:39 2020 -0500 Merge remote-tracking branch 'tor-github/pr/1663' src/app/main/main.c | 2 +- src/lib/cc/compat_compiler.h | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-)

1 0

[tor/master] Tell static analyzer that having ntservice functions not exist is ok
by nickm＠torproject.org 16 Jan '20

16 Jan '20

commit 77246dc0d8b90e99bb411475da1911919799dae8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 15 10:30:03 2020 -0500 Tell static analyzer that having ntservice functions not exist is ok When we made these functions exist unconditionally (as macros on non-windows platforms), we started to get a dead-code warning on Coverity. We now use a macro to tell coverity not to worry about this particular dead-code instance. --- src/app/main/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/main/main.c b/src/app/main/main.c index 36f85c6a4..b533406ea 100644 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@ -1240,7 +1240,7 @@ tor_run_main(const tor_main_configuration_t *tor_cfg) int done = 0; result = nt_service_parse_options(argc, argv, &done); - if (done) + if (POSSIBLE(done)) goto done; pubsub_install();

1 0

[translation/tbmanual-contentspot_completed] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot_completed
by translation＠torproject.org 16 Jan '20

16 Jan '20

commit 7011be0875df70aa244a5747bf53b60bf1f22eea Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 16 13:20:36 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspo… --- contents+lt.po | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/contents+lt.po b/contents+lt.po index 80336cc898..4aff7e0d44 100644 --- a/contents+lt.po +++ b/contents+lt.po @@ -790,12 +790,12 @@ msgstr "" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) msgid "</tbody>" -msgstr "" +msgstr "</tbody>" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) msgid "</table>" -msgstr "" +msgstr "</table>" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -1533,6 +1533,8 @@ msgid "" "You can do this by increasing Tor Browser's Security Levels in the shield " "menu." msgstr "" +"Tai galite padaryti padidindami Tor naršyklės saugumo lygmenis, esančius " +"skydo meniu." #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1984,6 +1986,13 @@ msgid "" " displaying correctly, so Tor Browser’s default setting is to allow all " "websites to run scripts in \"Standard\" mode." msgstr "" +"Naudotojai, kuriems, naršant internete, reikia aukšto saugumo lygmens, " +"turėtų nusistatyti Tor Naršyklės [Saugumo lygmenį](../lt/security-settings) " +"į „Saugesnį“ (kuris išjungia „JavaScript“ ne HTTPS internetinėse svetainėse)" +" arba „Saugiausią“ (kuris tai atlieka visose internetinėse svetainėse). Vis " +"dėlto, išjungus „JavaScript“ daugelis internetinių svetainių nebus tinkamai " +"atvaizduojamos, todėl numatytasis Tor Naršyklės nustatymas yra leisti visoms" +" internetinėms svetainėms vykdyti scenarijus „Standartinėje“ veiksenoje." #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body)

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 16 Jan '20

16 Jan '20

commit 5c7dfc71d475f0838ccf5ff9c3dda5e1d6478d1a Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 16 13:20:20 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+lt.po | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/contents+lt.po b/contents+lt.po index f14e4ccdc2..4aff7e0d44 100644 --- a/contents+lt.po +++ b/contents+lt.po @@ -1533,6 +1533,8 @@ msgid "" "You can do this by increasing Tor Browser's Security Levels in the shield " "menu." msgstr "" +"Tai galite padaryti padidindami Tor naršyklės saugumo lygmenis, esančius " +"skydo meniu." #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1984,6 +1986,13 @@ msgid "" " displaying correctly, so Tor Browser’s default setting is to allow all " "websites to run scripts in \"Standard\" mode." msgstr "" +"Naudotojai, kuriems, naršant internete, reikia aukšto saugumo lygmens, " +"turėtų nusistatyti Tor Naršyklės [Saugumo lygmenį](../lt/security-settings) " +"į „Saugesnį“ (kuris išjungia „JavaScript“ ne HTTPS internetinėse svetainėse)" +" arba „Saugiausią“ (kuris tai atlieka visose internetinėse svetainėse). Vis " +"dėlto, išjungus „JavaScript“ daugelis internetinių svetainių nebus tinkamai " +"atvaizduojamos, todėl numatytasis Tor Naršyklės nustatymas yra leisti visoms" +" internetinėms svetainėms vykdyti scenarijus „Standartinėje“ veiksenoje." #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body)

1 0

[collector/master] Bump version to 1.14.1-dev.
by karsten＠torproject.org 16 Jan '20

16 Jan '20

commit 145045478f3c7aa9286b1244e28a5ab4e5728460 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jan 16 12:16:30 2020 +0100 Bump version to 1.14.1-dev. --- CHANGELOG.md | 3 +++ build.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7161100..5606180 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# Changes in version 1.1?.? - 2020-0?-?? + + # Changes in version 1.14.1 - 2020-01-16 * Medium changes diff --git a/build.xml b/build.xml index 2e9e597..748351e 100644 --- a/build.xml +++ b/build.xml @@ -9,7 +9,7 @@ <property name="javadoc-title" value="CollecTor API Documentation"/> <property name="implementation-title" value="CollecTor" /> - <property name="release.version" value="1.14.1" /> + <property name="release.version" value="1.14.1-dev" /> <property name="project-main-class" value="org.torproject.metrics.collector.Main" /> <property name="name" value="collector"/> <property name="metricslibversion" value="2.10.0" />

1 0

[collector/release] Fix non-RunOnce mode.
by karsten＠torproject.org 16 Jan '20

16 Jan '20

commit a6359c607438d05e66fa1aa0126af9a44a9bf22e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jan 16 11:40:35 2020 +0100 Fix non-RunOnce mode. This was accidentally broken in #32554. The RunOnce mode worked just fine, but the non-RunOnce mode terminated immediately after scheduling tasks. --- CHANGELOG.md | 7 ++++++- .../java/org/torproject/metrics/collector/Main.java | 8 ++++++-- .../metrics/collector/cron/Scheduler.java | 8 +++++--- .../metrics/collector/cron/ShutdownHook.java | 21 +++++++++++++++++++++ 4 files changed, 38 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d3088c3..7161100 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,9 @@ -# Changes in version 1.1?.? - 2020-0?-?? +# Changes in version 1.14.1 - 2020-01-16 + + * Medium changes + - Stay alive after scheduling (daemon) threads for modules. This + was broken by taking out the periodic check for configuration + file updates. # Changes in version 1.14.0 - 2020-01-15 diff --git a/src/main/java/org/torproject/metrics/collector/Main.java b/src/main/java/org/torproject/metrics/collector/Main.java index 77bb2ca..3822353 100644 --- a/src/main/java/org/torproject/metrics/collector/Main.java +++ b/src/main/java/org/torproject/metrics/collector/Main.java @@ -87,12 +87,16 @@ public class Main { } else { conf.loadAndCheckConfiguration(confPath); } - Scheduler.getInstance().scheduleModuleRuns(collecTorMains, conf); + if (!Scheduler.getInstance().scheduleModuleRuns(collecTorMains, conf)) { + return; + } } catch (ConfigurationException ce) { printUsage(ce.getMessage()); return; } - Runtime.getRuntime().addShutdownHook(new ShutdownHook()); + ShutdownHook shutdownHook = new ShutdownHook(); + Runtime.getRuntime().addShutdownHook(shutdownHook); + shutdownHook.stayAlive(); } private static void printUsage(String msg) { diff --git a/src/main/java/org/torproject/metrics/collector/cron/Scheduler.java b/src/main/java/org/torproject/metrics/collector/cron/Scheduler.java index 03292f4..70d27f5 100644 --- a/src/main/java/org/torproject/metrics/collector/cron/Scheduler.java +++ b/src/main/java/org/torproject/metrics/collector/cron/Scheduler.java @@ -50,10 +50,10 @@ public final class Scheduler implements ThreadFactory { } /** - * Schedule all classes given according to the parameters in the - * the configuration. + * Schedule all classes given according to the parameters in the configuration + * and return whether the caller should wait for completion. */ - public void scheduleModuleRuns(Map<Key, + public boolean scheduleModuleRuns(Map<Key, Class<? extends CollecTorMain>> collecTorMains, Configuration conf) { try { gracePeriodMinutes = conf.getLong(Key.ShutdownGraceWaitMinutes); @@ -89,11 +89,13 @@ public final class Scheduler implements ThreadFactory { try { if (conf.getBool(Key.RunOnce)) { scheduler.invokeAll(runOnceMains); + return false; } } catch (ConfigurationException | InterruptedException | RejectedExecutionException | NullPointerException ex) { logger.error("Cannot schedule run-once: {}", ex.getMessage(), ex); } + return true; } private void scheduleExecutions(CollecTorMain ctm, int offset, int period) { diff --git a/src/main/java/org/torproject/metrics/collector/cron/ShutdownHook.java b/src/main/java/org/torproject/metrics/collector/cron/ShutdownHook.java index c8f0807..ec34a19 100644 --- a/src/main/java/org/torproject/metrics/collector/cron/ShutdownHook.java +++ b/src/main/java/org/torproject/metrics/collector/cron/ShutdownHook.java @@ -13,15 +13,36 @@ public final class ShutdownHook extends Thread { private static final Logger log = LoggerFactory.getLogger(ShutdownHook.class); + private boolean stayAlive = true; + /** Names the shutdown thread for debugging purposes. */ public ShutdownHook() { super("CollecTor-ShutdownThread"); } + /** + * Stay alive until the shutdown thread gets run. + */ + public void stayAlive() { + synchronized (this) { + while (this.stayAlive) { + try { + this.wait(); + } catch (InterruptedException e) { + /* Nothing we can do about this. */ + } + } + } + } + @Override public void run() { log.info("Shutdown in progress ... "); Scheduler.getInstance().shutdownScheduler(); + synchronized (this) { + this.stayAlive = false; + this.notify(); + } log.info("Shutdown finished. Exiting."); } }

1 0