May 2016 - tor-commits - lists.torproject.org

[oonib/master] Pass report_id to get correct file path
by art＠torproject.org 09 May '16

09 May '16

commit 1617489c7d6175e45153a79ee5b1bcbd227948b8 Author: Arturo Filastò <arturo(a)filasto.net> Date: Mon Feb 15 19:21:18 2016 +0100 Pass report_id to get correct file path --- oonib/report/handlers.py | 4 ++-- oonib/test/test_report.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/oonib/report/handlers.py b/oonib/report/handlers.py index b27a943..3e308e5 100644 --- a/oonib/report/handlers.py +++ b/oonib/report/handlers.py @@ -39,8 +39,8 @@ def report_file_name(archive_dir, report_details, report_id=report_id ) report_file_template = "{iso8601_timestamp}-{test_name}-{report_id}-{probe_asn}-{probe_cc}-probe-0.2.0.{ext}" - if config.main.report_file_template: - report_file_template = config.main.report_file_template + if config.main.get('report_file_template'): + report_file_template = config.main['report_file_template'] dst_filename = os.path.join(archive_dir, report_file_template.format(**keys)) dst_dir = os.path.dirname(dst_filename) if not os.path.exists(dst_dir): diff --git a/oonib/test/test_report.py b/oonib/test/test_report.py index 55f78be..5e1712b 100644 --- a/oonib/test/test_report.py +++ b/oonib/test/test_report.py @@ -178,7 +178,7 @@ class TestReport(HandlerTestCase): response = yield self.request('/report/%s/close' % report_id, "POST") written_report_header['format'] = 'yaml' - written_report_path = report_file_name(".", written_report_header) + written_report_path = report_file_name(".", written_report_header, report_id) with open(written_report_path) as f: self.filenames.add(written_report_path) written_report = yaml.safe_load_all(f)

1 0

[oonib/master] Do the conversion of YAML to JSON on the submission stage
by art＠torproject.org 09 May '16

09 May '16

commit 973297a0ad8f5093ec9c08954a4d8419f50bd5d7 Author: Arturo Filastò <arturo(a)filasto.net> Date: Wed Jan 27 16:52:46 2016 +0100 Do the conversion of YAML to JSON on the submission stage --- oonib/__init__.py | 24 ++++++++++++++ oonib/errors.py | 4 +++ oonib/onion.py | 2 +- oonib/otime.py | 2 +- oonib/report/handlers.py | 84 ++++++++++++++++++++++-------------------------- 5 files changed, 69 insertions(+), 47 deletions(-) diff --git a/oonib/__init__.py b/oonib/__init__.py index ba6dea3..773f2db 100644 --- a/oonib/__init__.py +++ b/oonib/__init__.py @@ -7,6 +7,7 @@ __version__ = '1.1.4' __all__ = ['Storage', 'randomStr'] +import json import string from random import SystemRandom random = SystemRandom() @@ -59,3 +60,26 @@ def randomStr(length, num=True): if num: chars += string.digits return ''.join(random.choice(chars) for x in range(length)) + +def binary_to_base64_dict(data): + from base64 import b64encode + return { + "data": b64encode(data), + "format": "base64" + } + +def json_dumps(obj): + def _default(o): + if isinstance(o, set): + return list(o) + elif isinstance(o, str): + try: + o = unicode(o, 'ascii') + except UnicodeDecodeError: + try: + o = unicode(o, 'utf-8') + except UnicodeDecodeError: + o = binary_to_base64_dict(o) + return o + + return json.dumps(obj, default=_default) diff --git a/oonib/errors.py b/oonib/errors.py index 6d97190..b82f8fe 100644 --- a/oonib/errors.py +++ b/oonib/errors.py @@ -111,6 +111,10 @@ class TestHelperNotFound(OONIBError): log_message = "test-helper-not-found" +class InvalidFormatField(OONIBError): + status_code = 400 + log_message = "invalid-format-field" + class ConfigFileNotSpecified(Exception): pass diff --git a/oonib/onion.py b/oonib/onion.py index 9c94d02..c06dc6b 100644 --- a/oonib/onion.py +++ b/oonib/onion.py @@ -73,7 +73,7 @@ def startTor(torconfig): if os.path.exists(config.main.tor_datadir): torconfig.DataDirectory = os.path.abspath(config.main.tor_datadir) else: - raise Exception + raise Exception("Could not find tor datadir") tor_log_file = os.path.join(torconfig.DataDirectory, "tor.log") torconfig.Log = ["notice stdout", "notice file %s" % tor_log_file] diff --git a/oonib/otime.py b/oonib/otime.py index 67a6bc6..31f0cc7 100644 --- a/oonib/otime.py +++ b/oonib/otime.py @@ -95,5 +95,5 @@ def timestamp(t=None): """ if t is None: t = datetime.utcnow() - ISO8601 = "%Y-%m-%dT%H%M%SZ" + ISO8601 = "%Y%m%dT%H%M%SZ" return t.strftime(ISO8601) diff --git a/oonib/report/handlers.py b/oonib/report/handlers.py index 50e0cb7..7671723 100644 --- a/oonib/report/handlers.py +++ b/oonib/report/handlers.py @@ -12,17 +12,12 @@ from oonib.handlers import OONIBHandler from oonib.policy.handlers import Policy from datetime import datetime -from oonib import randomStr, otime, log +from oonib import randomStr, otime, log, json_dumps from oonib.config import config def report_file_name(archive_dir, report_details): timestamp = datetime.fromtimestamp(report_details['start_time']) - ext = report_details.get("format") - if ext == "json": - ext = "json" - else: - ext = "yamloo" keys = dict( report_details.items(), iso8601_timestamp=otime.timestamp(timestamp), @@ -31,10 +26,9 @@ def report_file_name(archive_dir, report_details): day=timestamp.strftime("%d"), hour=timestamp.strftime("%H"), minute=timestamp.strftime("%M"), - second=timestamp.strftime("%S"), - ext=ext + second=timestamp.strftime("%S") ) - report_file_template = "{probe_cc}/{test_name}-{iso8601_timestamp}-{probe_asn}-probe.{ext}" + report_file_template = "{iso8601_timestamp}-{test_name}-{probe_asn}-{probe_cc}-probe-0.2.0.json" if config.main.report_file_template: report_file_template = config.main.report_file_template dst_filename = os.path.join(archive_dir, report_file_template.format(**keys)) @@ -51,14 +45,13 @@ class Report(object): stale_time, report_dir, archive_dir, - reports, file_format="yaml"): + reports): self.report_id = report_id self.stale_time = stale_time self.report_dir = report_dir self.archive_dir = archive_dir self.reports = reports - self.file_format = file_format self.refresh() @@ -83,24 +76,14 @@ class Report(object): report_filename = get_report_path(self.report_id) try: with open(report_filename) as fd: - if self.file_format == "json": - line = fd.readline() - json.loads(line) - else: - g = yaml.safe_load_all(fd) - report_details = g.next() + line = fd.readline() + report_details = json.loads(line.strip()) except IOError: raise e.ReportNotFound dst_filename = report_file_name(self.archive_dir, report_details) shutil.move(report_filename, dst_filename) - if self.file_format == "json": - report_details["record_type"] = "footer" - with open(dst_filename, "a+") as fd: - json.dump(report_details, dst_filename) - fd.write("\n") - if not self.delayed_call.called: self.delayed_call.cancel() del self.reports[self.report_id] @@ -169,6 +152,8 @@ def parseNewReportRequest(request): except KeyError: pass + parsed_request['format'] = parsed_request.get('format', 'yaml') + return parsed_request @@ -213,7 +198,6 @@ class ReportHandler(OONIBHandler): class UpdateReportMixin(object): - def updateReport(self, report_id, parsed_request): log.debug("Got this request %s" % parsed_request) @@ -224,9 +208,24 @@ class UpdateReportMixin(object): except KeyError: raise e.OONIBError(404, "Report not found") + content_format = parsed_request.get('format', 'yaml') + if content_format == 'json': + data = json_dumps(parsed_request['content']) + elif content_format == 'yaml': + try: + entry = yaml.safe_load_all(parsed_request['content']).next() + data = json_dumps(entry) + except Exception as exc: + log.error("Received an invalid entry") + log.msg(parsed_request['content']) + log.exception(exc) + raise e.OONIBError(400, "Invalid report entry") + else: + raise e.InvalidFormatField try: with open(report_filename, 'a+') as fd: - fd.write(parsed_request['content']) + fd.write(data) + fd.write("\n") except IOError: raise e.OONIBError(404, "Report not found") self.write({'status': 'success'}) @@ -306,25 +305,15 @@ class NewReportHandlerFile(ReportHandler, UpdateReportMixin): self.checkPolicy() if 'content' in report_data: - content = yaml.safe_load(report_data['content']) - report_header = validate_report_header(content) - + if report_data['format'] == 'json': + content = report_data['content'] + elif report_data['format'] == 'yaml': + content = None + else: + raise e.InvalidFormatField + content['backend_version'] = config.backend_version else: - content = { - 'software_name': software_name, - 'software_version': software_version, - 'probe_asn': probe_asn, - 'probe_cc': probe_cc, - 'test_name': self.testName, - 'test_version': self.testVersion, - 'input_hashes': self.inputHashes, - 'start_time': time.time() - } - - content['backend_version'] = config.backend_version - - report_header = yaml.dump(content) - content = "---\n" + report_header + '...\n' + content = None if not probe_asn: probe_asn = "AS0" @@ -356,8 +345,13 @@ class NewReportHandlerFile(ReportHandler, UpdateReportMixin): self.report_dir, self.archive_dir, self.reports) - - self.writeToReport(report_filename, content) + if content: + # XXX make sure to validate the cotent to ensure it's possible to + # encode as JSON + data = json_dumps(content) + "\n" + self.writeToReport(report_filename, data) + else: + open(report_filename, 'w+').close() self.write(response)

1 0

[oonib/master] Implement test that attempts to write to the backend using JSON
by art＠torproject.org 09 May '16

09 May '16

commit d7f9d5990be9975df46e92164eb1b044c97c89ab Author: Arturo Filastò <arturo(a)filasto.net> Date: Thu Mar 10 19:11:22 2016 +0100 Implement test that attempts to write to the backend using JSON --- oonib/test/test_report.py | 119 ++++++++++++++++++++++++++-------------------- 1 file changed, 67 insertions(+), 52 deletions(-) diff --git a/oonib/test/test_report.py b/oonib/test/test_report.py index 5e1712b..63865ae 100644 --- a/oonib/test/test_report.py +++ b/oonib/test/test_report.py @@ -12,54 +12,45 @@ from oonib.report.handlers import report_file_name from oonib.report.api import reportAPI from oonib.test.handler_helpers import HandlerTestCase, mock_initialize -sample_report_entry = """--- -agent: agent -input: null -requests: -- request: - body: null - headers: - - - ACCePT-LAnGuagE - - ['en-US,en;q=0.8'] - - - aCCEPT-ENcODInG - - ['gzip,deflate,sdch'] - - - aCcEPT - - ['text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8'] - - - User-AGeNt - - ['Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.7) Gecko/20091221 - Firefox/3.5.7'] - - - aCCEpt-cHArSEt - - ['ISO-8859-1,utf-8;q=0.7,*;q=0.3'] - - - HOsT - - [KIXnnZDJfGKRNab.com] - method: GET - url: http://12.34.56.78 -response: - body: '{"headers_dict": {"ACCePT-LAnGuagE": ["en-US,en;q=0.8"], "aCCEPT-ENcODInG": - ["gzip,deflate,sdch"], "HOsT": ["KIXnnZDJfGKRNab.com"], "aCcEPT": ["text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"], - "User-AGeNt": ["Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.7) - Gecko/20091221 Firefox/3.5.7"], "aCCEpt-cHArSEt": ["ISO-8859-1,utf-8;q=0.7,*;q=0.3"], - "Connection": ["close"]}, "request_line": "GET / HTTP/1.1", "request_headers": - [["Connection", "close"], ["ACCePT-LAnGuagE", "en-US,en;q=0.8"], ["aCCEPT-ENcODInG", - "gzip,deflate,sdch"], ["aCcEPT", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"], - ["User-AGeNt", "Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.7) - Gecko/20091221 Firefox/3.5.7"], ["aCCEpt-cHArSEt", "ISO-8859-1,utf-8;q=0.7,*;q=0.3"], - ["HOsT", "KIXnnZDJfGKRNab.com"]]}' - code: 200 - headers: [] -socksproxy: null -tampering: -header_field_name: false -header_field_number: false -header_field_value: false -header_name_capitalization: false -header_name_diff: [] -request_line_capitalization: false -total: false -... -""" +sample_report_entry = { + 'agent': 'agent', + 'input': 'http://example.com', + 'requests': [ + { + 'request': { + 'body': None, + 'headers': { + 'Accept-Language': 'en-US,en;q=0.8', + 'User-AGeNt': 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.7) Gecko/20091221' + }, + 'method': 'GET', + 'url': 'http://example.com' + }, + 'response': { + 'body': 'widgets', + 'headers': [] + } + } + ], + 'test_specific_key': 'some value', + 'input_hashes': [], + 'options': [], + 'probe_asn': 'AS0', + 'probe_cc': 'ZZ', + 'probe_city': None, + 'probe_ip': '127.0.0.1', + 'software_name': 'ooniprobe', + 'software_version': '1.1.0', + 'start_time': 0, + 'test_name': 'fake_test', + 'test_version': '0.1.0' +} -sample_report_header = """--- +sample_report_entry_yaml = '---\n' +sample_report_entry_yaml += yaml.dump(sample_report_entry) +sample_report_entry_yaml += '...\n' + +sample_report_header_yaml = """--- input_hashes: [] options: [] probe_asn: AS0 @@ -92,7 +83,7 @@ class TestReport(HandlerTestCase): app = web.Application(reportAPI, name='reportAPI') @defer.inlineCallbacks - def update_report(self, report_id, content=sample_report_entry): + def update_report(self, report_id, content=sample_report_entry_yaml): data = { 'content': content } @@ -113,7 +104,7 @@ class TestReport(HandlerTestCase): @defer.inlineCallbacks def test_create_valid_report_with_content(self): data = deepcopy(dummy_data) - data['content'] = sample_report_header + data['content'] = sample_report_header_yaml response = yield self.request('/report', "POST", data) response_body = json.loads(response.body) self.assertIn('backend_version', response_body) @@ -148,7 +139,7 @@ class TestReport(HandlerTestCase): written_report_header = written_report.next() for key in dummy_data.keys(): self.assertEqual(written_report_header[key], dummy_data[key]) - self.assertEqual(yaml.safe_load(sample_report_entry), + self.assertEqual(yaml.safe_load(sample_report_entry_yaml), written_report.next()) @defer.inlineCallbacks @@ -172,7 +163,7 @@ class TestReport(HandlerTestCase): self.assertEqual(written_report_header[key], dummy_data[key]) - self.assertEqual(yaml.safe_load(sample_report_entry), + self.assertEqual(yaml.safe_load(sample_report_entry_yaml), written_report.next()) response = yield self.request('/report/%s/close' % report_id, "POST") @@ -185,5 +176,29 @@ class TestReport(HandlerTestCase): written_report.next() for i in range(report_entry_count): - self.assertEqual(yaml.safe_load(sample_report_entry), + self.assertEqual(yaml.safe_load(sample_report_entry_yaml), written_report.next()) + + @defer.inlineCallbacks + def test_create_update_and_close_report_json(self): + report_header = dummy_data.copy() + report_header['format'] = 'json' + response = yield self.request('/report', "POST", report_header) + response_body = json.loads(response.body) + self.assertIn('backend_version', response_body) + self.assertIn('report_id', response_body) + + report_entry_count = 100 + + report_id = response_body['report_id'] + for i in range(report_entry_count): + yield self.update_report(report_id, content=sample_report_entry) + + response = yield self.request('/report/%s/close' % report_id, "POST") + + written_report_path = report_file_name(".", report_header, report_id) + with open(written_report_path) as f: + self.filenames.add(written_report_path) + for line in f: + written_report = json.loads(line) + self.assertEqual(sample_report_entry, written_report)

1 0

[oonib/master] Fixes highlighted by the review of @bassosimone
by art＠torproject.org 09 May '16

09 May '16

commit bc2f24ffd1e22c9af92345602a3994c40f22d5fb Author: Arturo Filastò <arturo(a)filasto.net> Date: Thu Mar 10 18:51:58 2016 +0100 Fixes highlighted by the review of @bassosimone * Remove duplicated code * Be smarter and not use else when unneeded * Remove dead code --- oonib/report/handlers.py | 6 +----- oonib/testhelpers/http_helpers.py | 12 ------------ 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/oonib/report/handlers.py b/oonib/report/handlers.py index 3e308e5..55a9221 100644 --- a/oonib/report/handlers.py +++ b/oonib/report/handlers.py @@ -152,9 +152,6 @@ def validateHeader(header): if not header.get('start_time'): header['start_time'] = time.time() - if not header.get('start_time'): - header['start_time'] = time.time() - if not header.get('data_format_version'): header['data_format_version'] = '0.1.0' @@ -167,8 +164,7 @@ def validateHeader(header): log.debug("Matching %s with %s | %s" % (regexp, value_to_check, k)) if re.match(regexp, str(value_to_check)): continue - else: - raise e.InvalidRequestField(k) + raise e.InvalidRequestField(k) try: requested_test_helper = header['test_helper'] diff --git a/oonib/testhelpers/http_helpers.py b/oonib/testhelpers/http_helpers.py index 603bdc5..a28cbad 100644 --- a/oonib/testhelpers/http_helpers.py +++ b/oonib/testhelpers/http_helpers.py @@ -2,10 +2,6 @@ import json import random import string -from twisted.internet.protocol import Factory, Protocol - -from twisted.internet.endpoints import TCP4ClientEndpoint - from twisted.internet import protocol, defer from cyclone.web import RequestHandler, Application @@ -172,14 +168,6 @@ class HTTPRandomPage(HTTPTrapAll): length = 100000 self.write(self.genRandomPage(length, keyword)) -class TCPConnectProtocol(Protocol): - def connectionMade(self): - self.transport.loseConnection() - -class TCPConnectFactory(Factory): - def buildProtocol(self, addr): - return TCPConnectProtocol() - HTTPRandomPageHelper = Application([ # XXX add regexps here (r"/(.*)/(.*)", HTTPRandomPage)

1 0

[oonib/master] Merge pull request #62 from TheTorProject/feature/json
by art＠torproject.org 09 May '16

09 May '16

commit 715ab94bdee503513851c1851f9d27c7c701f7ed Merge: f556a9a d7f9d59 Author: Simone Basso <bassosimone(a)gmail.com> Date: Tue Mar 15 08:41:51 2016 +0100 Merge pull request #62 from TheTorProject/feature/json Feature/json .travis.yml | 1 - oonib/__init__.py | 4 + oonib/errors.py | 4 + oonib/onion.py | 2 +- oonib/oonibackend.py | 1 - oonib/otime.py | 2 +- oonib/report/handlers.py | 200 +++++++++++++++++++++++----------------------- oonib/test/test_report.py | 190 +++++++++++++++++++++---------------------- 8 files changed, 204 insertions(+), 200 deletions(-)

1 0

[oonib/master] Change the value of the key that is sent by the client in the 0.2 dataformat
by art＠torproject.org 09 May '16

09 May '16

commit e60b33a1077bfddf18e38b8e1eaedf2ccf053fe3 Author: Arturo Filastò <arturo(a)filasto.net> Date: Thu Mar 17 15:48:22 2016 +0100 Change the value of the key that is sent by the client in the 0.2 dataformat --- oonib/report/handlers.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/oonib/report/handlers.py b/oonib/report/handlers.py index 55a9221..56fe20b 100644 --- a/oonib/report/handlers.py +++ b/oonib/report/handlers.py @@ -18,7 +18,12 @@ from oonib.config import config def report_file_name(archive_dir, report_details, report_id='no_report_id'): - timestamp = datetime.fromtimestamp(report_details['start_time']) + if report_details.get("start_time"): + timestamp = datetime.fromtimestamp(report_details['start_time']) + elif report_details.get("test_start_time"): + timestamp = datetime.strptime(report_details['test_start_time'], "%Y-%m-%d %H:%M:%S") + else: + raise Exception("Could not find valid timestamp") if report_details['format'] == 'json': ext = 'json' elif report_details['format'] == 'yaml': @@ -149,8 +154,8 @@ def validateHeader(header): if not header.get('probe_cc'): header['probe_cc'] = 'ZZ' - if not header.get('start_time'): - header['start_time'] = time.time() + if not header.get('test_start_time'): + header['test_start_time'] = datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S") if not header.get('data_format_version'): header['data_format_version'] = '0.1.0' @@ -306,8 +311,8 @@ class NewReportHandlerFile(ReportHandler, UpdateReportMixin): 'test_name': self.testName, 'test_version': self.testVersion, 'input_hashes': report_data.get('input_hashes', []), - 'start_time': report_data['start_time'], - 'data_format_version': str(report_data['data_format_version']) + 'test_start_time': report_data['test_start_time'], + 'data_format_version': str(report_data.get('data_format_version', '0.1.0')) } data = "---\n" + yaml.dump(content) + "...\n" elif report_data['format'] == 'yaml' and 'content' in report_data:

1 0

[torspec/master] kill the rest of hsdir_spread_accept with fire
by arma＠torproject.org 09 May '16

09 May '16

commit 2b1d1812a58493ed484c255a48cc189d3eece79d Author: Roger Dingledine <arma(a)torproject.org> Date: Mon May 9 12:03:34 2016 -0400 kill the rest of hsdir_spread_accept with fire --- proposals/224-rend-spec-ng.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/proposals/224-rend-spec-ng.txt b/proposals/224-rend-spec-ng.txt index 989c741..70f05e9 100644 --- a/proposals/224-rend-spec-ng.txt +++ b/proposals/224-rend-spec-ng.txt @@ -684,10 +684,6 @@ Status: Draft hsdir_spread_store = an integer in range [1,128] with default value 3. - hsdir_spread_accept = an integer in range [1,128] - with default value 12. -[XXX I think I obsoleted this spread_accept notion? -RD] - To determine where a given hidden service descriptor will be stored in a given period, after the blinded public key for that period is derived, the uploading or downloading party calculate @@ -1220,7 +1216,7 @@ Status: Draft Recognized status values are: [00 00] -- Success: cell relayed to hidden service host. - [00 01] -- Failure: service ID not recognzied + [00 01] -- Failure: service ID not recognized [00 02] -- Failure: key ID not recognized [00 03] -- Bad message format

1 0

[onionoo/master] Don't include 0-character country codes in details.
by karsten＠torproject.org 09 May '16

09 May '16

commit d9c137c426487716213e6d67936fae485056a24e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon May 9 17:36:10 2016 +0200 Don't include 0-character country codes in details. Fixes #18989. --- src/main/java/org/torproject/onionoo/updater/LookupService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/onionoo/updater/LookupService.java b/src/main/java/org/torproject/onionoo/updater/LookupService.java index aaa4c1c..6da3608 100644 --- a/src/main/java/org/torproject/onionoo/updater/LookupService.java +++ b/src/main/java/org/torproject/onionoo/updater/LookupService.java @@ -296,7 +296,9 @@ public class LookupService { if (blockLocations.containsKey(blockNumber)) { String[] parts = blockLocations.get(blockNumber). replaceAll("\"", "").split(",", -1); - lookupResult.setCountryCode(parts[4].toLowerCase()); + if (parts[4].length() > 0) { + lookupResult.setCountryCode(parts[4].toLowerCase()); + } if (parts[5].length() > 0) { lookupResult.setCountryName(parts[5]); }

1 0

[torbirdy/master] Set authentication for Gmail to OAuth2 (#17118)
by sukhbir＠torproject.org 09 May '16

09 May '16

commit 1d08d03c80cb01c5495c9e04301ad20b21ae06bb Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon May 9 10:43:35 2016 -0400 Set authentication for Gmail to OAuth2 (#17118) For Gmail, the authentication type is set to OAuth2 instead of the default "normal password" which is what most providers use (Google doesn't allow non-OAuth2 logins). To make this work with the manual configuration wizard in TorBirdy, the authorization step takes place when the user checks the account for the first time, and is not done automatically. We can probably improve this but it's better to wait for the patches that secure the automatic configuration wizard to be merged upstream. See bugzilla 669238. --- chrome/content/emailwizard.js | 16 ++++++++++++++++ components/torbirdy.js | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js index 0223e7a..d38828e 100644 --- a/chrome/content/emailwizard.js +++ b/chrome/content/emailwizard.js @@ -13,6 +13,7 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { fixupTorbirdySettingsOnNewAccount = function(account) { var idkey = account.defaultIdentity.key; + var outgoing = account.defaultIdentity.smtpServerKey; var serverkey = account.incomingServer.key; var protocol = account.incomingServer.type; @@ -21,6 +22,12 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { ['mail.server.%serverkey%.login_at_startup', false] ]; + // 10 specifies OAuth2 as the authentication method (used for Gmail). + if (pub.isGmail) { + pref_spec.push(['mail.smtpserver.%outgoing%.authMethod', 10]); + pref_spec.push(['mail.server.%serverkey%.authMethod', 10]); + } + // Make sure that drafts are saved to Local Folders if it is an IMAP account. if (protocol === "imap") { pref_spec.push(['mail.identity.%idkey%.draft_folder', @@ -35,6 +42,7 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { for each (var [pref_template, value] in pref_spec) { var pref = pref_template.replace("%idkey%", idkey); pref = pref.replace("%serverkey%", serverkey); + pref = pref.replace("%outgoing%", outgoing); Preferences.set(pref, value); } } @@ -78,9 +86,17 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { config.outgoing.socketType = 2; // Set the authentication to 'Normal' (connection is already encrypted). + // This is true for all providers except Gmail, which uses OAuth2. config.incoming.auth = 3; config.outgoing.auth = 3; + // We will deal with Gmail later because it makes it easier to handle + // OAuth2 with the manual configuration. + let emailDomain = email.split("@")[1]; + if (emailDomain === "gmail.com") { + pub.isGmail = true; + } + // Default the outgoing SMTP port. config.outgoing.port = 465; diff --git a/components/torbirdy.js b/components/torbirdy.js index 276c745..4f83513 100644 --- a/components/torbirdy.js +++ b/components/torbirdy.js @@ -85,8 +85,8 @@ const TorBirdyPrefs = { // We don't want user's of Thunderbird to even come close to such a bypass // issue and so we have disabled websockets out of an abundance of caution. "network.websocket.enabled": false, - // No cookies are allowed. - "network.cookie.cookieBehavior": 2, + // Cookies are allowed, but not third-party cookies. For Gmail and Twitter. + "network.cookie.cookieBehavior": 1, // Disable link prefetching. "network.prefetch-next": false,

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 09 May '16

09 May '16

commit c874336b08aa4d10429bdef463ea03299bea5ebe Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 9 14:15:03 2016 +0000 Update translations for bridgedb --- es_MX/LC_MESSAGES/bridgedb.po | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/es_MX/LC_MESSAGES/bridgedb.po b/es_MX/LC_MESSAGES/bridgedb.po index f54f2d8..6689be6 100644 --- a/es_MX/LC_MESSAGES/bridgedb.po +++ b/es_MX/LC_MESSAGES/bridgedb.po @@ -7,13 +7,14 @@ # Javier Flores Topete <javierflorestopete789(a)gmail.com>, 2015 # Luis Gerardo Flores Ortiz <luisgflores(a)hotmail.com>, 2016 # TheFreeman <maurocarrizales(a)outlook.com>, 2014 +# tonyskapunk <tonysk8(a)gmx.net>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" -"Last-Translator: Luis Gerardo Flores Ortiz <luisgflores(a)hotmail.com>\n" +"PO-Revision-Date: 2016-05-09 14:10+0000\n" +"Last-Translator: tonyskapunk <tonysk8(a)gmx.net>\n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/otf/torproject/language/es_MX/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -63,7 +64,7 @@ msgstr "Mostrar código QR" #: bridgedb/https/templates/bridges.html:52 msgid "QRCode for your bridge lines" -msgstr "" +msgstr "Código QR para las entradas de tu(s) repetidores/puente(s)(bridge lines)" #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, @@ -72,7 +73,7 @@ msgstr "" #: bridgedb/https/templates/bridges.html:67 #: bridgedb/https/templates/bridges.html:125 msgid "Uh oh, spaghettios!" -msgstr "" +msgstr "¡Oh, diantres!" #: bridgedb/https/templates/bridges.html:68 msgid "It seems there was an error getting your QRCode." @@ -82,18 +83,18 @@ msgstr "Parece que hubo un error al obtener tu código QR." msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." -msgstr "" +msgstr "Este código QR contiene entradas de tus repetidores/puentes. Léelo con un lector de códigos QR para copiar las entradas de tus repetidores/puentes en tu teléfono móvil u otros dispositivos." #: bridgedb/https/templates/bridges.html:131 msgid "There currently aren't any bridges available..." -msgstr "" +msgstr "Actualmente no hay ningún repetidor/puente disponible..." #: bridgedb/https/templates/bridges.html:132 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " "type!" -msgstr "" +msgstr "Tal vez debería intentar %s ir hacía atrás %s y seleccionar un tipo de repetidor/puente diferente." #: bridgedb/https/templates/index.html:11 #, python-format @@ -113,7 +114,7 @@ msgstr "Paso %s2%s" #: bridgedb/https/templates/index.html:27 #, python-format msgid "Get %s bridges %s" -msgstr "" +msgstr "Obtener %s repetidores/puentes %s" #: bridgedb/https/templates/index.html:36 #, python-format @@ -123,7 +124,7 @@ msgstr "Paso %s3%s" #: bridgedb/https/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "" +msgstr "Ahora %s agregar los repetidores/puents al Navegador Tor %s" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -132,7 +133,7 @@ msgstr "" #: bridgedb/https/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" -msgstr "" +msgstr "¡Sólo(%sJ%s) dame los repetidores/puentes!" #: bridgedb/https/templates/options.html:51 msgid "Advanced Options" @@ -144,7 +145,7 @@ msgstr "No" #: bridgedb/https/templates/options.html:87 msgid "none" -msgstr "" +msgstr "Ninguno" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -152,7 +153,7 @@ msgstr "" #: bridgedb/https/templates/options.html:124 #, python-format msgid "%sY%ses!" -msgstr "" +msgstr "¡Sí(%sY%s)!" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -160,7 +161,7 @@ msgstr "" #: bridgedb/https/templates/options.html:147 #, python-format msgid "%sG%set Bridges" -msgstr "" +msgstr "Obtener(%sG%s) repetidores/puentes" #: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" @@ -227,7 +228,7 @@ msgid "" "difficult for anyone watching your internet traffic to determine that you are\n" "using Tor.\n" "\n" -msgstr "" +msgstr "BridgeDB puede proveer repetidores/puentes con un gran %stipos de transportes conectables(Pluggable Transports)%s,\nlos cuales pueden ofuscar tus conexiones hacía la red de Tor, haciendo más\ndifícil para cualquiera que observe tu tráfico hacía Internet que estas\nusando Tor.\n" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #: bridgedb/strings.py:79

1 0