November 2015 - tor-commits - lists.torproject.org

[gettor/master] Added option to get links only, and fixed format according to current template for links file.
by ilv＠torproject.org 03 Nov '15

03 Nov '15

commit 24b655c4177eccc4439ac198ff098b7883425067 Author: ilv <ilv(a)users.noreply.github.com> Date: Sat Oct 31 15:09:37 2015 -0300 Added option to get links only, and fixed format according to current template for links file. --- upload/bundles2drive.py | 62 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 56 insertions(+), 6 deletions(-) diff --git a/upload/bundles2drive.py b/upload/bundles2drive.py index 1cf6a17..bac6fea 100644 --- a/upload/bundles2drive.py +++ b/upload/bundles2drive.py @@ -17,6 +17,7 @@ import os import gnupg import hashlib import logging +import argparse import ConfigParser import gettor.core @@ -242,11 +243,56 @@ def share_file(service, file_id): except errors.HttpError, error: print('Error occured while fetch public link for file: %s' % file_id) - print("Uploaded to %s" % file['webContentLink']) + print "Uploaded %s to %s" % (file['title'], file['webContentLink']) return file['webContentLink'] +def get_files_links(service, v): + """Print links of uploaded files. + + :param: service (object): Goolge Drive service object. + :param: v (string): Version of Tor Browser to look for. + + """ + + windows_re = 'torbrowser-install-%s_\w\w(-\w\w)?\.exe(\.asc)?' % v + linux_re = 'tor-browser-linux\d\d-%s_(\w\w)(-\w\w)?\.tar\.xz(\.asc)?' % v + osx_re = 'TorBrowser-%s-osx\d\d_(\w\w)(-\w\w)?\.dmg(\.asc)?' % v + + # dictionary to store file names and IDs + files_dict = dict() + + print "Trying to fetch links of uploaded files..." + links = service.files().list().execute() + items = links.get('items', []) + + if not items: + raise ValueError('No files found.') + + else: + for item in items: + if re.search(windows_re, item['title']): + files_dict[item['title']] = item['id'] + elif re.search(linux_re, item['title']): + files_dict[item['title']] = item['id'] + elif re.search(osx_re, item['title']): + files_dict[item['title']] = item['id'] + return files_dict + if __name__ == '__main__': + parser = argparse.ArgumentParser( + description='Utility to upload Tor Browser to Google Drive.' + ) + + # if no LC specified, download all + parser.add_argument( + '-l', '--links', default=None, + help='Create links file with files already uploaded and '\ + 'matching the specified version. ' + ) + + args = parser.parse_args() + config = ConfigParser.ConfigParser() config.read('drive.cfg') @@ -310,7 +356,14 @@ if __name__ == '__main__': readable = ' '.join(fp[i:i+4] for i in xrange(0, len(fp), 4)) try: - uploaded_files = upload_files(drive_service, upload_dir) + # helpful when something fails but files are uploaded. + if args.links: + uploaded_files = get_files_links(drive_service, args.links) + + if not uploaded_files: + raise ValueError("There are no files for that version") + else: + uploaded_files = upload_files(drive_service, upload_dir) # use default config core = gettor.core.Core('/home/gettor/core.cfg') @@ -351,10 +404,7 @@ if __name__ == '__main__': elif p3.match(file): osys, arch, lc = get_bundle_info(file, 'osx') - link = "Tor Browser %s-bit:\n%s$Tor Browser's signature %s-bit:"\ - "\n%s$SHA256 checksum of Tor Browser %s-bit (advanced):"\ - "\n%s$" %\ - (arch, link_file, arch, link_asc, arch, sha_file) + link = "%s$%s$%s$" % (link_file, link_asc, sha_file) # note that you should only upload bundles for supported locales core.add_link('Drive', osys, lc, link)

1 0

[gettor/master] Basic logging
by ilv＠torproject.org 03 Nov '15

03 Nov '15

commit 888a1de21e3ec7b606d5a456e972d189f73c466c Author: ilv <ilv(a)users.noreply.github.com> Date: Mon Nov 2 18:01:28 2015 -0300 Basic logging --- gettor/twitter.py | 19 +++++++++---------- process_tweets.py | 19 ++++++++++++++++--- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/gettor/twitter.py b/gettor/twitter.py index a197ac1..13666a3 100644 --- a/gettor/twitter.py +++ b/gettor/twitter.py @@ -95,7 +95,6 @@ class TwitterBot(object): raise InternalError("Core error: %s" % str(e)) # logging - """ log = logging.getLogger(__name__) logging_format = utils.get_logging_format() @@ -109,8 +108,8 @@ class TwitterBot(object): log.addHandler(logfileh) # stop logging on stdout from now on - log.propagate = False - #self.log = log""" + #log.propagate = False + self.log = log def _is_blacklisted(self, username): """Check if a user is blacklisted. @@ -221,18 +220,18 @@ class TwitterBot(object): try: if self._is_blacklisted(str(sender_id)): - #self.log.info("Request from blacklisted account!") + self.log.info("Request from blacklisted account!") status = 'blacklisted' bogus_request = True if not bogus_request: - #self.log.debug("Request seems legit, let's parse it") + self.log.debug("Request seems legit, let's parse it") # let's try to guess what the user is asking request = self.parse_text(str(msg)) # possible options: links, mirrors, help if request['type'] == 'links': - #self.log.debug("Type of request: help") + self.log.debug("Type of request: links") links = self.core.get_links( 'Twitter', request['os'], @@ -244,7 +243,7 @@ class TwitterBot(object): elif request['type'] == 'mirrors': - #self.log.debug("Type of request: mirrors") + self.log.debug("Type of request: mirrors") status = 'success' reply = self._get_msg('mirrors', 'en') try: @@ -256,7 +255,7 @@ class TwitterBot(object): reply = self._get_msg('mirrors_unavailable', 'en') else: - #self.log.debug("Type of request: help") + self.log.debug("Type of request: help") status = 'success' reply = self._get_msg('help', 'en') @@ -267,14 +266,14 @@ class TwitterBot(object): except (core.ConfigError, core.InternalError) as e: # if core failes, send the user an error message, but keep going - #self.log.error("Something went wrong internally: %s" % str(e)) + self.log.error("Something went wrong internally: %s" % str(e)) status = 'core_error' reply = self._get_msg('internal_error', 'en') finally: # keep stats if request: - #self.log.debug("Adding request to database... ") + self.log.debug("Adding request to database... ") self.core.add_request_to_db() def start(self): diff --git a/process_tweets.py b/process_tweets.py index 484cb97..59c2f48 100644 --- a/process_tweets.py +++ b/process_tweets.py @@ -7,16 +7,29 @@ import logging import gettor.twitter def main(): + logging_level = 'DEBUG' + logging_file = '/home/ilv/Proyectos/tor/gettor/log/process_tweets.log' + logging_format = '[%(levelname)s] %(asctime)s - %(message)s' + date_format = "%Y-%m-%d" # %H:%M:%S + + logging.basicConfig( + format=logging_format, + datefmt=date_format, + filename = logging_file, + level = logging_level + ) + + logging.debug("Starting bot") try: bot = gettor.twitter.TwitterBot() bot.start() except gettor.twitter.ConfigError as e: - print "Configuration error: %s" % str(e) + logging.error("Configuration error: %s" % str(e)) except gettor.twitter.InternalError as e: - print "Core module not working: %s" % str(e) + logging.error("Core module not working: %s" % str(e)) except Exception as e: # in case something unexpected happens - print "Unexpected error: %s" % str(e) + logging.error("Unexpected error: %s" % str(e)) if __name__ == '__main__': main()

1 0

[gettor/master] Merge branch 'develop' of ssh://git-rw.torproject.org/user/ilv/gettor
by ilv＠torproject.org 03 Nov '15

03 Nov '15

1 0

[gettor/master] Replaced by process_chat.py
by ilv＠torproject.org 03 Nov '15

03 Nov '15

commit 652639ea63fafd83c1cb79f2446f73484d704404 Author: ilv <ilv(a)users.noreply.github.com> Date: Sat Oct 31 16:03:37 2015 -0300 Replaced by process_chat.py --- xmpp_demo.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/xmpp_demo.py b/xmpp_demo.py deleted file mode 100644 index 144f4a8..0000000 --- a/xmpp_demo.py +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env python -import sys - -import gettor.xmpp - -bot = gettor.xmpp.XMPP() -bot.start_bot()

1 0

[gettor/master] Merge branch 'develop'
by ilv＠torproject.org 03 Nov '15

03 Nov '15

commit 16036bebae226d3f7059fbf40dcd87ada267d36a Merge: bbae113 54ebdf8 Author: ilv <ilv(a)users.noreply.github.com> Date: Tue Nov 3 16:34:00 2015 -0300 Merge branch 'develop' gettor/smtp.py | 2 +- gettor/twitter.py | 19 +++++++++---------- gettor/xmpp.py | 2 +- process_tweets.py | 19 ++++++++++++++++--- 4 files changed, 27 insertions(+), 15 deletions(-)

1 0

[gettor/master] New format for links files.
by ilv＠torproject.org 03 Nov '15

03 Nov '15

1 0

[gettor/master] deleted unused files
by ilv＠torproject.org 03 Nov '15

03 Nov '15

commit 404f6eccccda0941845b0c60722e9ca718d25133 Author: ilv <ilv(a)users.noreply.github.com> Date: Sat Oct 31 15:50:42 2015 -0300 deleted unused files --- lang/core/i18n/en/en.po | 9 --------- upload/4.0.3/TorBrowser-4.0.3-osx32_en.dmg | 1 - upload/4.0.3/TorBrowser-4.0.3-osx32_en.dmg.asc | 1 - upload/4.0.3/sha256sums.txt | 1 - upload/4.0.3/test_file.txt | 1 - upload/4.0.3/tor-browser-linux32-4.0.3_en.tar.xz | 1 - upload/4.0.3/tor-browser-linux32-4.0.3_en.tar.xz.asc | 1 - upload/4.0.3/tor-browser-linux64-4.0.3_en.tar.xz | 1 - upload/4.0.3/tor-browser-linux64-4.0.3_en.tar.xz.asc | 1 - upload/4.0.3/torbrowser-install-4.0.3_ar.exe | 1 - upload/4.0.3/torbrowser-install-4.0.3_ar.exe.asc | 1 - 11 files changed, 19 deletions(-) diff --git a/lang/core/i18n/en/en.po b/lang/core/i18n/en/en.po deleted file mode 100644 index 0b28a70..0000000 --- a/lang/core/i18n/en/en.po +++ /dev/null @@ -1,9 +0,0 @@ -domain "en" - -#: Fingerprint message -msgid "fingerprint" -msgstr "Fingerprint of key used to sign Tor Browser (advanced): %s" - -#: Provider description -msgid "provider_desc" -msgstr "[From %s]" diff --git a/upload/4.0.3/TorBrowser-4.0.3-osx32_en.dmg b/upload/4.0.3/TorBrowser-4.0.3-osx32_en.dmg deleted file mode 100644 index d788456..0000000 --- a/upload/4.0.3/TorBrowser-4.0.3-osx32_en.dmg +++ /dev/null @@ -1 +0,0 @@ -dummy dmg file diff --git a/upload/4.0.3/TorBrowser-4.0.3-osx32_en.dmg.asc b/upload/4.0.3/TorBrowser-4.0.3-osx32_en.dmg.asc deleted file mode 100644 index 5e00057..0000000 --- a/upload/4.0.3/TorBrowser-4.0.3-osx32_en.dmg.asc +++ /dev/null @@ -1 +0,0 @@ -dummy dmg asc file diff --git a/upload/4.0.3/sha256sums.txt b/upload/4.0.3/sha256sums.txt deleted file mode 100644 index 2212b05..0000000 --- a/upload/4.0.3/sha256sums.txt +++ /dev/null @@ -1 +0,0 @@ -dummy sha256 file diff --git a/upload/4.0.3/test_file.txt b/upload/4.0.3/test_file.txt deleted file mode 100644 index 9daeafb..0000000 --- a/upload/4.0.3/test_file.txt +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/upload/4.0.3/tor-browser-linux32-4.0.3_en.tar.xz b/upload/4.0.3/tor-browser-linux32-4.0.3_en.tar.xz deleted file mode 100644 index 90272b5..0000000 --- a/upload/4.0.3/tor-browser-linux32-4.0.3_en.tar.xz +++ /dev/null @@ -1 +0,0 @@ -dummy tar.xz file diff --git a/upload/4.0.3/tor-browser-linux32-4.0.3_en.tar.xz.asc b/upload/4.0.3/tor-browser-linux32-4.0.3_en.tar.xz.asc deleted file mode 100644 index 3dd3325..0000000 --- a/upload/4.0.3/tor-browser-linux32-4.0.3_en.tar.xz.asc +++ /dev/null @@ -1 +0,0 @@ -dummy tar.xz asc file diff --git a/upload/4.0.3/tor-browser-linux64-4.0.3_en.tar.xz b/upload/4.0.3/tor-browser-linux64-4.0.3_en.tar.xz deleted file mode 100644 index 90272b5..0000000 --- a/upload/4.0.3/tor-browser-linux64-4.0.3_en.tar.xz +++ /dev/null @@ -1 +0,0 @@ -dummy tar.xz file diff --git a/upload/4.0.3/tor-browser-linux64-4.0.3_en.tar.xz.asc b/upload/4.0.3/tor-browser-linux64-4.0.3_en.tar.xz.asc deleted file mode 100644 index 3dd3325..0000000 --- a/upload/4.0.3/tor-browser-linux64-4.0.3_en.tar.xz.asc +++ /dev/null @@ -1 +0,0 @@ -dummy tar.xz asc file diff --git a/upload/4.0.3/torbrowser-install-4.0.3_ar.exe b/upload/4.0.3/torbrowser-install-4.0.3_ar.exe deleted file mode 100644 index 7e61f6d..0000000 --- a/upload/4.0.3/torbrowser-install-4.0.3_ar.exe +++ /dev/null @@ -1 +0,0 @@ -dummy exe file diff --git a/upload/4.0.3/torbrowser-install-4.0.3_ar.exe.asc b/upload/4.0.3/torbrowser-install-4.0.3_ar.exe.asc deleted file mode 100644 index 1ebde25..0000000 --- a/upload/4.0.3/torbrowser-install-4.0.3_ar.exe.asc +++ /dev/null @@ -1 +0,0 @@ -dummy exe asc file

1 0

[gettor/master] Change related to #17211
by ilv＠torproject.org 03 Nov '15

03 Nov '15

commit 54ebdf8ec2110dd381e66e07349add7ead190dce Author: ilv <ilv(a)users.noreply.github.com> Date: Tue Nov 3 16:06:56 2015 -0300 Change related to #17211 --- gettor/xmpp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gettor/xmpp.py b/gettor/xmpp.py index f9b025d..a605f50 100644 --- a/gettor/xmpp.py +++ b/gettor/xmpp.py @@ -283,7 +283,7 @@ class XMPP(object): # first let's find out how many words are in the message # request shouldn't be longer than 3 words, but just in case - words = msg.split(' ') + words = re.split('\s+', msg.strip()) if len(words) > self.max_words: bogus_request = True self.log.info("Message way too long")

1 0

[gettor/master] Merge branch 'master' of ssh://git-rw.torproject.org/gettor
by ilv＠torproject.org 03 Nov '15

03 Nov '15

commit b1a11bd9699e64af680e4e7abcbaea0f8752e2e2 Merge: 16036be 3a19630 Author: ilv <ilv(a)users.noreply.github.com> Date: Tue Nov 3 16:34:30 2015 -0300 Merge branch 'master' of ssh://git-rw.torproject.org/gettor AUTHORS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[gettor/master] Minor correction to #17211
by ilv＠torproject.org 03 Nov '15

03 Nov '15

commit 540c525cb038ff42684488f4a1b3f4c5078b5b8e Author: ilv <ilv(a)users.noreply.github.com> Date: Tue Nov 3 16:06:20 2015 -0300 Minor correction to #17211 --- gettor/smtp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gettor/smtp.py b/gettor/smtp.py index 5476189..3697786 100644 --- a/gettor/smtp.py +++ b/gettor/smtp.py @@ -271,7 +271,7 @@ class SMTP(object): # search for OS or mirrors request # if nothing is found, help by default found_request = False - words = re.split('\s+', test.strip()) + words = re.split('\s+', msg.strip()) for word in words: if not found_request: # OS first

1 0