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

[oonib/master] Merge branch 'master' of github.com:TheTorProject/ooni-backend
by art＠torproject.org 21 May '14

21 May '14

commit 3455f6a2273d5de1742560be4fd85494a417beee Merge: b4d1a8a 83d9d23 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon May 5 15:14:55 2014 +0200 Merge branch 'master' of github.com:TheTorProject/ooni-backend * 'master' of github.com:TheTorProject/ooni-backend: Make Vagrantfile also install libffi-dev Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[oonib/master] Make the header length check more stringent.
by art＠torproject.org 21 May '14

21 May '14

commit 543ed205930da70b9311b9a696eb482c054bd6c4 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed May 7 23:32:16 2014 +0200 Make the header length check more stringent. --- oonib/testhelpers/http_helpers.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/oonib/testhelpers/http_helpers.py b/oonib/testhelpers/http_helpers.py index b2afc59..ed3f582 100644 --- a/oonib/testhelpers/http_helpers.py +++ b/oonib/testhelpers/http_helpers.py @@ -51,7 +51,8 @@ class SimpleHTTPChannel(basic.LineReceiver, policies.TimeoutMixin): self.setTimeout(self.timeOut) def lineReceived(self, line): - if len(self.__header) >= self.maxHeaderLineLength: + if (len(self.__header) + len(line)) >= self.maxHeaderLineLength \ + and not self.__first_line: log.err("Maximum header length reached.") return self.transport.loseConnection()

1 0

[oonib/master] Bump to version 1.0.0
by art＠torproject.org 21 May '14

21 May '14

commit 46489362d9c3657e74d9f52bc5a7c19b6706d3f1 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed May 21 12:38:18 2014 +0200 Bump to version 1.0.0 --- oonib/__init__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/oonib/__init__.py b/oonib/__init__.py index ac17bef..980acb0 100644 --- a/oonib/__init__.py +++ b/oonib/__init__.py @@ -3,13 +3,14 @@ In here we shall keep track of all variables and objects that should be instantiated only once and be common to pieces of GLBackend code. """ -__version__ = '1.0.0-rc6' +__version__ = '1.0.0' __all__ = ['Storage', 'randomStr'] import string import random + class Storage(dict): """ A Storage object is like a dictionary except `obj.foo` can be used @@ -36,7 +37,7 @@ class Storage(dict): try: del self[key] except KeyError, k: - raise AttributeError, k + raise AttributeError(k) def __repr__(self): return '<Storage ' + dict.__repr__(self) + '>' @@ -47,6 +48,7 @@ class Storage(dict): def __setstate__(self, value): self.update(value.items()) + def randomStr(length, num=True): """ Returns a random a mixed lowercase, uppercase, alfanumerical (if num True)

1 0

[oonib/master] Fix missing import.
by art＠torproject.org 21 May '14

21 May '14

commit 583603d15dcd667d8b845f27cdb5b71b2b3c74f7 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu May 8 00:37:56 2014 +0200 Fix missing import. --- oonib/testhelpers/http_helpers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oonib/testhelpers/http_helpers.py b/oonib/testhelpers/http_helpers.py index ed3f582..8e03164 100644 --- a/oonib/testhelpers/http_helpers.py +++ b/oonib/testhelpers/http_helpers.py @@ -9,7 +9,7 @@ from cyclone.web import RequestHandler, Application from twisted.protocols import policies, basic from twisted.web.http import Request -from oonib import log +from oonib import log, randomStr class SimpleHTTPChannel(basic.LineReceiver, policies.TimeoutMixin):

1 0

[oonib/master] Bump to 1.0.2
by art＠torproject.org 21 May '14

21 May '14

commit 9a0b5fff24fbbef83826810ed285e7d4b98f0199 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed May 21 12:46:48 2014 +0200 Bump to 1.0.2 --- oonib/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oonib/__init__.py b/oonib/__init__.py index 1c465d1..25135d7 100644 --- a/oonib/__init__.py +++ b/oonib/__init__.py @@ -3,7 +3,7 @@ In here we shall keep track of all variables and objects that should be instantiated only once and be common to pieces of GLBackend code. """ -__version__ = '1.0.0' +__version__ = '1.0.2' __all__ = ['Storage', 'randomStr']

1 0

[oonib/master] Use SystemRandom instead of insecure RNG
by art＠torproject.org 21 May '14

21 May '14

commit 7dfd89b22c66eb4cfc38218b9430adc38e8ad073 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed May 21 12:46:16 2014 +0200 Use SystemRandom instead of insecure RNG --- oonib/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/oonib/__init__.py b/oonib/__init__.py index 980acb0..1c465d1 100644 --- a/oonib/__init__.py +++ b/oonib/__init__.py @@ -8,7 +8,8 @@ __version__ = '1.0.0' __all__ = ['Storage', 'randomStr'] import string -import random +from random import SystemRandom +random = SystemRandom() class Storage(dict):

1 0

[oonib/master] Be sure to cancel the callLater deferred only if it has not been already called.
by art＠torproject.org 21 May '14

21 May '14

commit 5765bd000ee5b9f729cf4326d7a7fff12605d90c Author: Arturo Filastò <art(a)fuffa.org> Date: Wed May 21 12:41:52 2014 +0200 Be sure to cancel the callLater deferred only if it has not been already called. --- oonib/report/handlers.py | 49 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 15 deletions(-) diff --git a/oonib/report/handlers.py b/oonib/report/handlers.py index 01a665a..f1d9408 100644 --- a/oonib/report/handlers.py +++ b/oonib/report/handlers.py @@ -16,12 +16,15 @@ from oonib.config import config def report_file_name(report_details): - timestamp = otime.timestamp(datetime.fromtimestamp(report_details['start_time'])) + timestamp = otime.timestamp( + datetime.fromtimestamp( + report_details['start_time'])) dst_filename = '{test_name}-{timestamp}-{probe_asn}-probe.yamloo'.format( - timestamp=timestamp, - **report_details) + timestamp=timestamp, + **report_details) return dst_filename + class Report(object): delayed_call = None @@ -75,9 +78,11 @@ class Report(object): dst_path = os.path.join(dst_path, dst_filename) os.rename(report_filename, dst_path) - self.delayed_call.cancel() + if not self.delayed_call.called: + self.delayed_call.cancel() del self.reports[self.report_id] + def parseUpdateReportRequest(request): #db_report_id_regexp = re.compile("[a-zA-Z0-9]+$") @@ -100,6 +105,7 @@ def parseUpdateReportRequest(request): return parsed_request + def parseNewReportRequest(request): """ Here we parse a new report request. @@ -110,11 +116,11 @@ def parseNewReportRequest(request): test_helper = re.compile("[A-Za-z0-9_\-]+$") expected_request = { - 'software_name': name, - 'software_version': version_string, - 'test_name': name, - 'test_version': version_string, - 'probe_asn': probe_asn + 'software_name': name, + 'software_version': version_string, + 'test_name': name, + 'test_version': version_string, + 'probe_asn': probe_asn } parsed_request = json.loads(request) @@ -142,9 +148,10 @@ def parseNewReportRequest(request): return parsed_request + def validate_report_header(report_header): required_keys = ['probe_asn', 'probe_cc', 'probe_ip', 'software_name', - 'software_version', 'test_name', 'test_version'] + 'software_version', 'test_name', 'test_version'] for key in required_keys: if key not in report_header: raise e.MissingReportHeaderKey(key) @@ -165,13 +172,14 @@ def validate_report_header(report_header): if not re.match('[a-z_\-]+$', report_header['test_name']): raise e.InvalidReportHeader('test_name') - if not re.match('([0-9]+\.)+[0-9]+$', report_header['test_version']): raise e.InvalidReportHeader('test_version') return report_header + class ReportHandler(OONIBHandler): + def initialize(self): self.archive_dir = config.main.archive_dir self.report_dir = config.main.report_dir @@ -180,12 +188,14 @@ class ReportHandler(OONIBHandler): self.helpers = config.helpers self.stale_time = config.main.stale_time + class UpdateReportMixin(object): + def updateReport(self, report_id, parsed_request): log.debug("Got this request %s" % parsed_request) report_filename = os.path.join(self.report_dir, - report_id) + report_id) self.reports[report_id].refresh() @@ -196,7 +206,9 @@ class UpdateReportMixin(object): e.OONIBError(404, "Report not found") self.write({'status': 'success'}) + class NewReportHandlerFile(ReportHandler, UpdateReportMixin): + """ Responsible for creating and updating reports by writing to flat file. """ @@ -293,8 +305,8 @@ class NewReportHandlerFile(ReportHandler, UpdateReportMixin): probe_asn = "AS0" report_id = otime.timestamp() + '_' \ - + probe_asn + '_' \ - + randomStr(50) + + probe_asn + '_' \ + + randomStr(50) # The report filename contains the timestamp of the report plus a # random nonce @@ -309,7 +321,8 @@ class NewReportHandlerFile(ReportHandler, UpdateReportMixin): if requested_helper: try: - response['test_helper_address'] = self.helpers[requested_helper].address + response['test_helper_address'] = self.helpers[ + requested_helper].address except KeyError: raise e.TestHelperNotFound @@ -342,7 +355,9 @@ class NewReportHandlerFile(ReportHandler, UpdateReportMixin): self.updateReport(report_id, parsed_request) + class UpdateReportHandlerFile(ReportHandler, UpdateReportMixin): + def post(self, report_id): try: parsed_request = json.loads(self.request.body) @@ -350,7 +365,9 @@ class UpdateReportHandlerFile(ReportHandler, UpdateReportMixin): raise e.InvalidRequest self.updateReport(report_id, parsed_request) + class CloseReportHandlerFile(ReportHandler): + def get(self): pass @@ -360,7 +377,9 @@ class CloseReportHandlerFile(ReportHandler): else: raise e.ReportNotFound + class PCAPReportHandler(ReportHandler): + def get(self): pass

1 0

[translation/tor-and-https_completed] Update translations for tor-and-https_completed
by translation＠torproject.org 21 May '14

21 May '14

commit 21a03d1f5f8889e497dd7ceb445a881d6cf7300e Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 21 10:45:58 2014 +0000 Update translations for tor-and-https_completed --- pt.po | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/pt.po b/pt.po new file mode 100644 index 0000000..6d76b9f --- /dev/null +++ b/pt.po @@ -0,0 +1,95 @@ +# +# Translators: +# André Monteiro <andre.monteir(a)gmail.com>, 2014 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"POT-Creation-Date: 2014-05-21 09:17+0200\n" +"PO-Revision-Date: 2014-05-21 10:38+0000\n" +"Last-Translator: André Monteiro <andre.monteir(a)gmail.com>\n" +"Language-Team: Portuguese (http://www.transifex.com/projects/p/torproject/language/pt/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: pt\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: C/tor-and-https.svg223(svg/title) +#, no-wrap +msgid "Tor and HTTPS" +msgstr "Tor e HTTPS" + +#: C/tor-and-https.svg224(defs/text) +#, no-wrap +msgid "Site.com" +msgstr "Site.com" + +#: C/tor-and-https.svg224(defs/text) +#, no-wrap +msgid "user / pw" +msgstr "utilizador / password" + +#: C/tor-and-https.svg224(defs/text) +#, no-wrap +msgid "data" +msgstr "dados" + +#: C/tor-and-https.svg224(defs/text) +#, no-wrap +msgid "location" +msgstr "localização" + +#: C/tor-and-https.svg224(defs/text) +#, no-wrap +msgid "ISP" +msgstr "ISP" + +#: C/tor-and-https.svg224(defs/text) +#, no-wrap +msgid "Hacker" +msgstr "Hacker" + +#: C/tor-and-https.svg224(defs/text) +#, no-wrap +msgid "Lawyer" +msgstr "Advogado" + +#: C/tor-and-https.svg224(defs/text) +#, no-wrap +msgid "Sysadmin" +msgstr "Administrador de Sistemas" + +#: C/tor-and-https.svg224(defs/text) +#, no-wrap +msgid "Police" +msgstr "Polícia" + +#: C/tor-and-https.svg224(defs/text) +#, no-wrap +msgid "NSA" +msgstr "NSA" + +#: C/tor-and-https.svg224(defs/text) +#, no-wrap +msgid "Tor relay" +msgstr "Redirecionamento Tor" + +#: C/tor-and-https.svg224(defs/text) +#, no-wrap +msgid "Key" +msgstr "Chave" + +#: C/tor-and-https.svg224(defs/text) +#, no-wrap +msgid "Internet connection" +msgstr "Ligação de Internet" + +#: C/tor-and-https.svg224(defs/text) +#, no-wrap +msgid "Eavesdropping" +msgstr "À escuta" + +#: C/tor-and-https.svg224(defs/text) +#, no-wrap +msgid "Data sharing" +msgstr "Partilha da dados"

1 0

[translation/tor-and-https] Update translations for tor-and-https
by translation＠torproject.org 21 May '14

21 May '14

commit 6698e790924d5bbf4e18fc15cf1f69b422965026 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 21 10:45:56 2014 +0000 Update translations for tor-and-https --- es.po | 2 +- pt.po | 37 +++++++++++++++++++------------------ 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/es.po b/es.po index f6a7442..f026c0f 100644 --- a/es.po +++ b/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2014-05-21 09:17+0200\n" -"PO-Revision-Date: 2014-05-21 10:10+0000\n" +"PO-Revision-Date: 2014-05-21 10:28+0000\n" "Last-Translator: strel\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" diff --git a/pt.po b/pt.po index 4957baf..6d76b9f 100644 --- a/pt.po +++ b/pt.po @@ -1,11 +1,12 @@ # # Translators: +# André Monteiro <andre.monteir(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2014-05-21 09:17+0200\n" -"PO-Revision-Date: 2014-05-21 08:40+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2014-05-21 10:38+0000\n" +"Last-Translator: André Monteiro <andre.monteir(a)gmail.com>\n" "Language-Team: Portuguese (http://www.transifex.com/projects/p/torproject/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -16,79 +17,79 @@ msgstr "" #: C/tor-and-https.svg223(svg/title) #, no-wrap msgid "Tor and HTTPS" -msgstr "" +msgstr "Tor e HTTPS" #: C/tor-and-https.svg224(defs/text) #, no-wrap msgid "Site.com" -msgstr "" +msgstr "Site.com" #: C/tor-and-https.svg224(defs/text) #, no-wrap msgid "user / pw" -msgstr "" +msgstr "utilizador / password" #: C/tor-and-https.svg224(defs/text) #, no-wrap msgid "data" -msgstr "" +msgstr "dados" #: C/tor-and-https.svg224(defs/text) #, no-wrap msgid "location" -msgstr "" +msgstr "localização" #: C/tor-and-https.svg224(defs/text) #, no-wrap msgid "ISP" -msgstr "" +msgstr "ISP" #: C/tor-and-https.svg224(defs/text) #, no-wrap msgid "Hacker" -msgstr "" +msgstr "Hacker" #: C/tor-and-https.svg224(defs/text) #, no-wrap msgid "Lawyer" -msgstr "" +msgstr "Advogado" #: C/tor-and-https.svg224(defs/text) #, no-wrap msgid "Sysadmin" -msgstr "" +msgstr "Administrador de Sistemas" #: C/tor-and-https.svg224(defs/text) #, no-wrap msgid "Police" -msgstr "" +msgstr "Polícia" #: C/tor-and-https.svg224(defs/text) #, no-wrap msgid "NSA" -msgstr "" +msgstr "NSA" #: C/tor-and-https.svg224(defs/text) #, no-wrap msgid "Tor relay" -msgstr "" +msgstr "Redirecionamento Tor" #: C/tor-and-https.svg224(defs/text) #, no-wrap msgid "Key" -msgstr "" +msgstr "Chave" #: C/tor-and-https.svg224(defs/text) #, no-wrap msgid "Internet connection" -msgstr "" +msgstr "Ligação de Internet" #: C/tor-and-https.svg224(defs/text) #, no-wrap msgid "Eavesdropping" -msgstr "" +msgstr "À escuta" #: C/tor-and-https.svg224(defs/text) #, no-wrap msgid "Data sharing" -msgstr "" +msgstr "Partilha da dados"

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 21 May '14

21 May '14

commit 511a60b6b4dd15f43e8b56de2b6ecd3d3842b8c1 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 21 10:45:22 2014 +0000 Update translations for https_everywhere_completed --- pt/ssl-observatory.dtd | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pt/ssl-observatory.dtd b/pt/ssl-observatory.dtd index 9a157a8..baf52a4 100644 --- a/pt/ssl-observatory.dtd +++ b/pt/ssl-observatory.dtd @@ -41,6 +41,12 @@ to turn it on?">--> <!ENTITY ssl-observatory.prefs.asn_tooltip "Isso determinará e enviará o "Numéro de Sistema Autônomo" da sua rede, o qual ajudará na detecção de ataques ao HTTPS e na determinação da presença de observações de redes em lugares como o Irã e a Síria onde ataques são comparativamente mais comuns."> +<!ENTITY ssl-observatory.prefs.show_cert_warning +"Mostrar um alerta quando o Observatório detecta um certificado revogado, não capturado pelo seu browser."> + +<!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip +"Este irá verificar certificados submetidos contra conhecidas Listas de Revogação de Certificados. Infelizmente não podemos garantir que iremos marcar cada certificado revogado, mas se efectivamente vir um alerta existe uma boa chance de que algo está errado."> + <!ENTITY ssl-observatory.prefs.done "Completo"> <!ENTITY ssl-observatory.prefs.explanation @@ -84,7 +90,7 @@ visualizada. Passe com o rato em cima das opções para mais pormenores:"> <!ENTITY ssl-observatory.warning.showcert "Mostrar a cadeia de certificados"> <!ENTITY ssl-observatory.warning.okay "Entendo"> <!ENTITY ssl-observatory.warning.text "O Obvservatório SSL, da EFF, emitiu um aviso sobre o certificado(s) HTTPS deste sítio:"> -<!ENTITY ssl-observatory.warning.defense "Se tiver sessão iniciada neste sítio, será aconselhável mudar a password assim que estiver numa ligação segura."> +<!ENTITY ssl-observatory.warning.defense "Se está com sessão iniciada neste sítio, pode ser aconselhável alterar a sua palavra-passe uma vez feita a ligação segura. (Estes avisos podem ser desactivados em no separador "Observatório SSL" da caixa de preferências HTTPS em Tudo)."> <!ENTITY ssl-observatory.prefs.self_signed "Submeter e confirmar os certificados auto-assinados">

1 0