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

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 07 Mar '14

07 Mar '14

commit d492b0b1fcd89cf832b1e3a2dc6a87b78d954ba3 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 7 16:45:23 2014 +0000 Update translations for tails-greeter --- es/es.po | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/es/es.po b/es/es.po index 3da3b96..ed308a1 100644 --- a/es/es.po +++ b/es/es.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-06 17:16+0100\n" -"PO-Revision-Date: 2014-03-07 08:52+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-03-07 16:40+0000\n" +"Last-Translator: strel\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -38,7 +38,7 @@ msgstr "¿Usar persistencia?" #: ../glade/persistencewindow.glade.h:5 msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>" -msgstr "" +msgstr "<a href=\"doc/first_steps/persistence/use.es.html\">Documentación</a>" #: ../glade/persistencewindow.glade.h:6 msgid "Yes" @@ -72,7 +72,7 @@ msgstr "Contraseña de administración" msgid "" "<a " "href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>" -msgstr "" +msgstr "<a href=\"doc/first_steps/startup_options/administration_password.es.html\">Documentación</a>" #: ../glade/optionswindow.glade.h:5 msgid "" @@ -94,13 +94,13 @@ msgstr "Las contraseñas no concuerdan" #: ../glade/optionswindow.glade.h:10 msgid "Windows camouflage" -msgstr "" +msgstr "Camuflaje de Windows" #: ../glade/optionswindow.glade.h:11 msgid "" "<a " "href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">Documentation</a>" -msgstr "" +msgstr "<a href=\"doc/first_steps/startup_options/windows_camouflage.es.html\">Documentación</a>" #: ../glade/optionswindow.glade.h:12 msgid "" @@ -120,7 +120,7 @@ msgstr "Falseamiento de la dirección MAC" msgid "" "<a " "href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>" -msgstr "" +msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.es.html\">Documentación</a>" #: ../glade/optionswindow.glade.h:16 msgid "" @@ -140,25 +140,25 @@ msgstr "Falsear todas las direcciones MAC" #: ../glade/optionswindow.glade.h:19 msgid "Network configuration" -msgstr "" +msgstr "Configuración de red" #: ../glade/optionswindow.glade.h:20 msgid "" "<a " "href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>" -msgstr "" +msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.es.html\">Documentación</a>" #: ../glade/optionswindow.glade.h:21 msgid "" "This computer's Internet connection is clear of obstacles. You would like to" " connect directly to the Tor network." -msgstr "" +msgstr "La conexión a Internet de esta computadora está limpia de obstáculos. Puede que quiera conectar directamente a la red Tor." #: ../glade/optionswindow.glade.h:22 msgid "" "This computer's Internet connection is censored, filtered, or proxied. You " "need to configure bridge, firewall, or proxy settings." -msgstr "" +msgstr "La conexión a Internet de esta computadora está censurada, filtrada, o proxyficada. Tendrá que configurar un repetidor puente ('bridge'), un cortafuegos ('firewall'), o las configuraciones para proxy." #: ../glade/langpanel.glade.h:1 msgid " "

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 07 Mar '14

07 Mar '14

commit 26bcd044d74d5bf2290e9aa2cc14afbbcfa1d759 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 7 16:15:36 2014 +0000 Update translations for tails-misc --- pt_BR.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pt_BR.po b/pt_BR.po index c7f014f..60f21ee 100644 --- a/pt_BR.po +++ b/pt_BR.po @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-06 14:52+0100\n" -"PO-Revision-Date: 2014-03-07 08:49+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-03-07 16:12+0000\n" +"Last-Translator: carlo_valente <carlo.gt.valente(a)gmail.com>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -287,7 +287,7 @@ msgstr "Falha ao sincronizar o relógio!" #: config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector:38 msgid "Network connection blocked?" -msgstr "" +msgstr "Conexão de rede bloqueada?" #: config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector:40 msgid "" @@ -295,7 +295,7 @@ msgid "" "MAC spoofing feature. For more information, see the <a " "href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\">MAC" " spoofing documentation</a>." -msgstr "" +msgstr "Aparentemente você está bloqueado na rede. Isso pode estar relacionado à funcionalidade de troca de MAC. Para mais informações, veja a <a href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\"> documentação sobre troca de MAC</a>." #: config/chroot_local-includes/usr/local/bin/tails-security-check:145 msgid "This version of Tails has known security issues:" @@ -304,18 +304,18 @@ msgstr "Temos o conhecimento que esta versão do Tails apresenta problemas de se #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:29 #, sh-format msgid "Network card ${nic} disabled" -msgstr "" +msgstr "Placa de rede ${nic} desabilitada" #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:30 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}) so it is temporarily disabled.\n" "You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." -msgstr "" +msgstr "A troca do MAC falhou para a placa de rede ${nic_name} (${nic}), portanto, está temporariamente desabilitada.\nVocê deve preferir reiniciar o Tails e desabilitar a troca de MAC. Veja a <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>documentação</a>." #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:39 msgid "All networking disabled" -msgstr "" +msgstr "Toda as redes desabilitadas" #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:40 #, sh-format

1 0

r26642: {website} Adding 'New BridgeDB Distributor' project idea GSoC project (website/trunk/getinvolved/en)
by Damian Johnson 07 Mar '14

07 Mar '14

Author: atagar Date: 2014-03-07 16:15:03 +0000 (Fri, 07 Mar 2014) New Revision: 26642 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Adding 'New BridgeDB Distributor' project idea GSoC project idea from Isis for BridgeDB. Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2014-03-06 19:04:46 UTC (rev 26641) +++ website/trunk/getinvolved/en/volunteer.wml 2014-03-07 16:15:03 UTC (rev 26642) @@ -816,6 +816,11 @@ in. This was actively developed until Fall of 2010. + + Project Ideas: + <a href="#newBridgedbDistributor">New BridgeDB Distributor</a> + + <a id="project-ooni-probe"></a> <h3><a href="https://ooni.torproject.org/">Ooni Probe</a> (<a href="https://gitweb.torproject.org/ooni-probe.git">code</a>, <a @@ -1882,6 +1887,41 @@ </li> + <a id="newBridgedbDistributor"></a> + <li> + New BridgeDB Distributor + + Effort Level: Medium + + Skill Level: Medium to High + + Likely Mentors: isis, sysrqb + +BridgeDB is a Twisted Python system which runs a number of servers, in order +to distribute Tor bridge relays to users in potentially censored regions. Each +of BridgeDB's Distributors uses some unique channel to communicate bridge +addresses to users, currently there is an <a href="https://bridges.torproject.org"> +HTTPS Distributor</a>, and an Email Distributor. This project would involve +designing and creating a new Distributor for BridgeDB. Some ideas for new +Distributors: + + + <ul> + <li>A Twitter bot which interacts with Chinese and Farsi speaking Twitter users through PMs.</li> + <li>A distributor which uses XMPP+OTR to give bridges to users.</li> + </ul> + + +It's helpful if you already have some knowledge of Twisted. As part of your +application, please submit a design for a Distributor, as well as supply a +patch for a ticket which demonstrates knowledge of Twisted and Python ― +preferably for BridgeDB, see the +<a href="https://trac.torproject.org/projects/tor/query?status=!closed&keywords=~bri…"> +'bridgedb-gsoc-application' Trac tag</a> for some examples of good tickets to +try, or contact isis or sysrqb on IRC to ask for ticket suggestions or advice. + + </li> + <!-- <a id=""></a> <li>

1 0

[translation/tails-iuk_completed] Update translations for tails-iuk_completed
by translation＠torproject.org 07 Mar '14

07 Mar '14

commit 93ae5a4aea955411f24cec7c23a54dd4b8544bfd Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 7 15:45:52 2014 +0000 Update translations for tails-iuk_completed --- es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es.po b/es.po index e344ef5..6ddb81d 100644 --- a/es.po +++ b/es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-03-05 15:11+0100\n" -"PO-Revision-Date: 2014-03-07 15:13+0000\n" +"PO-Revision-Date: 2014-03-07 15:20+0000\n" "Last-Translator: strel\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-iuk] Update translations for tails-iuk
by translation＠torproject.org 07 Mar '14

07 Mar '14

commit 83c1206711861526754db24e60197cb726c5c446 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 7 15:45:49 2014 +0000 Update translations for tails-iuk --- es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es.po b/es.po index e344ef5..6ddb81d 100644 --- a/es.po +++ b/es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-03-05 15:11+0100\n" -"PO-Revision-Date: 2014-03-07 15:13+0000\n" +"PO-Revision-Date: 2014-03-07 15:20+0000\n" "Last-Translator: strel\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 07 Mar '14

07 Mar '14

commit c71c94c8e4b15a39b09a609fd95f94a558f4d5fc Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 7 15:45:37 2014 +0000 Update translations for tails-misc --- es.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/es.po b/es.po index 684acad..025a64a 100644 --- a/es.po +++ b/es.po @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-06 14:52+0100\n" -"PO-Revision-Date: 2014-03-07 08:49+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-03-07 15:20+0000\n" +"Last-Translator: strel\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -284,7 +284,7 @@ msgstr "¡Fallo al sincronizar el reloj!" #: config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector:38 msgid "Network connection blocked?" -msgstr "" +msgstr "¿Está bloqueada la conexión a la red?" #: config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector:40 msgid "" @@ -292,7 +292,7 @@ msgid "" "MAC spoofing feature. For more information, see the <a " "href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\">MAC" " spoofing documentation</a>." -msgstr "" +msgstr "Parece como si estuviera bloqueado desde la red. Esto puede estar relacionado con la característica de simulación de la MAC. Para más información, vea la <a href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\">documentación de simulación de la MAC</a>." #: config/chroot_local-includes/usr/local/bin/tails-security-check:145 msgid "This version of Tails has known security issues:" @@ -301,7 +301,7 @@ msgstr "Esta versión de Tails tiene problemas de seguridad conocidos:" #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:29 #, sh-format msgid "Network card ${nic} disabled" -msgstr "" +msgstr "Tarjeta de red ${nic} deshabilitada" #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:30 #, sh-format

1 0

[ooni-probe/master] Merge branch 'master' into feature/better_testing
by art＠torproject.org 07 Mar '14

07 Mar '14

commit 9461a258aca6efdfb2ddd8eefdb10c97615c940b Merge: 17bf4d3 30e4744 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Mar 7 16:39:54 2014 +0100 Merge branch 'master' into feature/better_testing * master: Update changelog for 1.0.0 Fix bug in initializing of the test instance. Fix bug that leads to not showing the help if an option is not present. Conflicts: ooni/tasks.py ChangeLog.md | 12 ++++++++++++ ooni/deck.py | 15 +++++++++------ ooni/nettest.py | 5 ++++- 3 files changed, 25 insertions(+), 7 deletions(-)

1 0

[ooni-probe/master] Add unittests for oonicli.
by art＠torproject.org 07 Mar '14

07 Mar '14

commit 17bf4d37a0b7d2c85378922da529f61502126819 Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Mar 1 18:59:20 2014 +0100 Add unittests for oonicli. Allows to programatically run nettests. --- .travis.yml | 1 + bin/ooniprobe | 6 ++- ooni/director.py | 16 +++--- ooni/nettest.py | 11 ++-- ooni/oonicli.py | 31 +++++------- ooni/reporter.py | 11 ++-- ooni/tasks.py | 8 +-- ooni/tests/__init__.py | 1 + ooni/tests/mocks.py | 3 -- ooni/tests/test_director.py | 48 ++++++++++-------- ooni/tests/test_oonicli.py | 115 ++++++++++++++++++++++++++++++++++++++++++ ooni/tests/test_templates.py | 4 -- ooni/utils/log.py | 37 +++++++++----- 13 files changed, 210 insertions(+), 82 deletions(-) diff --git a/.travis.yml b/.travis.yml index 718e405..6bce942 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: python before_install: - sudo apt-get install tor libpcap-dev libgeoip-dev + - sudo /etc/init.d/tor start python: - "2.7" # command to install dependencies diff --git a/bin/ooniprobe b/bin/ooniprobe index 695b137..5e277e8 100755 --- a/bin/ooniprobe +++ b/bin/ooniprobe @@ -14,4 +14,8 @@ copy_reg._reduce_ex = patched_reduce_ex # from ooni.oonicli import run # run() from ooni.oonicli import runWithDirector -runWithDirector() +d = runWithDirector() +(a)d.addBoth +def cb(result): + reactor.stop() +reactor.run() diff --git a/ooni/director.py b/ooni/director.py index f3d646a..acf50cc 100644 --- a/ooni/director.py +++ b/ooni/director.py @@ -217,7 +217,6 @@ class Director(object): net_test_loader: an instance of :class:ooni.nettest.NetTestLoader """ - if config.privacy.includepcap: if not config.reports.pcap: config.reports.pcap = config.generatePcapFilename(net_test_loader.testDetails) @@ -231,14 +230,14 @@ class Director(object): yield net_test.report.open() yield net_test.initializeInputProcessor() - self.measurementManager.schedule(net_test.generateMeasurements()) - - self.activeNetTests.append(net_test) - - yield net_test.done - yield report.close() + try: + self.activeNetTests.append(net_test) + self.measurementManager.schedule(net_test.generateMeasurements()) - self.netTestDone(net_test) + yield net_test.done + yield report.close() + finally: + self.netTestDone(net_test) def startSniffing(self): """ Start sniffing with Scapy. Exits if required privileges (root) are not @@ -287,6 +286,7 @@ class Director(object): Called when we read from stdout that Tor has reached 100%. """ log.debug("Building a TorState") + config.tor.protocol = proto state = TorState(proto.tor_protocol) state.post_bootstrap.addCallback(state_complete) state.post_bootstrap.addErrback(setup_failed) diff --git a/ooni/nettest.py b/ooni/nettest.py index 943aeba..774c962 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -495,6 +495,9 @@ class NetTest(object): self.done = defer.Deferred() self.state = NetTestState(self.done) + + def __str__(self): + return ' '.join(tc.name for tc, _ in self.testCases) def doneReport(self, report_results): """ @@ -642,7 +645,6 @@ class NetTestCase(object): inputFilename = None report = {} - report['errors'] = [] usageOptions = usage.Options @@ -660,6 +662,7 @@ class NetTestCase(object): This is the internal setup method to be overwritten by templates. """ self.report = {} + self.inputs = None def setUp(self): """ @@ -742,13 +745,13 @@ class NetTestCase(object): a generator that will yield one item from the file based on the inputProcessor. """ - if self.inputs: - return self.inputs - if self.inputFileSpecified: self.inputFilename = self.localOptions[self.inputFile[0]] return self.inputProcessor(self.inputFilename) + if self.inputs: + return self.inputs + return None def _checkValidOptions(self): diff --git a/ooni/oonicli.py b/ooni/oonicli.py index 904f7fb..f75b31c 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -92,16 +92,7 @@ def parseOptions(): return dict(cmd_line_options) -def shutdown(result): - """ - This will get called once all the operations that need to be done in the - current oonicli session have been completed. - """ - log.debug("Halting reactor") - try: reactor.stop() - except: pass - -def runWithDirector(): +def runWithDirector(logging=True, start_tor=True): """ Instance the director, parse command line options and start an ooniprobe test! @@ -110,8 +101,11 @@ def runWithDirector(): config.global_options = global_options config.set_paths() config.read_config_file() + if not start_tor: + config.advanced.start_tor = False - log.start(global_options['logfile']) + if logging: + log.start(global_options['logfile']) if config.privacy.includepcap: try: @@ -172,7 +166,7 @@ def runWithDirector(): sys.exit(2) def setup_nettest(_): - try: + try: return deck.setup() except errors.UnableToLoadDeckInput as error: return defer.failure.Failure(error) @@ -241,7 +235,8 @@ def runWithDirector(): raise errors.TorNotRunning test_details = net_test_loader.testDetails - yaml_reporter = YAMLReporter(test_details) + yaml_reporter = YAMLReporter(test_details, + report_filename=global_options['reportfile']) reporters = [yaml_reporter] if collector: @@ -252,15 +247,13 @@ def runWithDirector(): except errors.InvalidOONIBCollectorAddress, e: raise e - log.debug("adding callback for startNetTest") - director.startNetTest(net_test_loader, reporters) - - director.allTestsDone.addBoth(shutdown) + netTestDone = director.startNetTest(net_test_loader, reporters) + return netTestDone def start(): d.addCallback(setup_nettest) d.addCallback(post_director_start) d.addErrback(director_startup_failed) + return d - reactor.callWhenRunning(start) - reactor.run() + return start() diff --git a/ooni/reporter.py b/ooni/reporter.py index c8d0748..3159428 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -165,15 +165,16 @@ class YAMLReporter(OReporter): the destination directory of the report """ - def __init__(self, test_details, report_destination='.'): + def __init__(self, test_details, report_destination='.', report_filename=None): self.reportDestination = report_destination if not os.path.isdir(report_destination): raise InvalidDestination - - report_filename = "report-" + \ - test_details['test_name'] + "-" + \ - otime.timestamp() + ".yamloo" + + if not report_filename: + report_filename = "report-" + \ + test_details['test_name'] + "-" + \ + otime.timestamp() + ".yamloo" report_path = os.path.join(self.reportDestination, report_filename) diff --git a/ooni/tasks.py b/ooni/tasks.py index efca9b0..578d8a9 100644 --- a/ooni/tasks.py +++ b/ooni/tasks.py @@ -105,11 +105,11 @@ class Measurement(TaskWithTimeout): """ self.testInstance = test_instance self.testInstance.input = test_input + self.testInstance._setUp() if 'input' not in self.testInstance.report.keys(): - self.testInstance.report = {'input': test_input} - self.testInstance._setUp() - self.testInstance._start_time = time.time() - self.testInstance.setUp() + self.testInstance.report['input'] = test_input + self.testInstance._start_time = time.time() + self.testInstance.setUp() self.netTestMethod = getattr(self.testInstance, test_method) diff --git a/ooni/tests/__init__.py b/ooni/tests/__init__.py index 1b5c949..5663ccf 100644 --- a/ooni/tests/__init__.py +++ b/ooni/tests/__init__.py @@ -1,3 +1,4 @@ from ooni.settings import config config.logging = False +config.advanced.debug = False diff --git a/ooni/tests/mocks.py b/ooni/tests/mocks.py index f849344..3fd75aa 100644 --- a/ooni/tests/mocks.py +++ b/ooni/tests/mocks.py @@ -1,13 +1,10 @@ from twisted.python import failure from twisted.internet import defer -from ooni.settings import config from ooni.tasks import BaseTask, TaskWithTimeout from ooni.nettest import NetTest from ooni.managers import TaskManager -config.logging = False - class MockMeasurementFailOnce(BaseTask): def run(self): f = open('dummyTaskFailOnce.txt', 'w') diff --git a/ooni/tests/test_director.py b/ooni/tests/test_director.py index c1ad524..9d86720 100644 --- a/ooni/tests/test_director.py +++ b/ooni/tests/test_director.py @@ -6,7 +6,30 @@ from ooni.director import Director from twisted.internet import defer from twisted.trial import unittest +from txtorcon import TorControlProtocol +proto = MagicMock() +proto.tor_protocol = TorControlProtocol() + +mock_TorState = MagicMock() +# We use the instance of mock_TorState so that the mock caching will +# return the same instance when TorState is created. +mts = mock_TorState() +mts.protocol.get_conf = lambda x: defer.succeed({'SocksPort': '4242'}) +mts.post_bootstrap = defer.succeed(mts) + +# Set the tor_protocol to be already fired +state = MagicMock() +proto.tor_protocol.post_bootstrap = defer.succeed(state) + +mock_launch_tor = MagicMock() +mock_launch_tor.return_value = defer.succeed(proto) + class TestDirector(unittest.TestCase): + def tearDown(self): + config.tor_state = None + config.tor.socks_port = None + config.tor.control_port = None + def test_get_net_tests(self): director = Director() nettests = director.getNetTests() @@ -14,34 +37,15 @@ class TestDirector(unittest.TestCase): assert 'dnsconsistency' in nettests assert 'http_header_field_manipulation' in nettests assert 'traceroute' in nettests - + + @patch('ooni.director.TorState', mock_TorState) + @patch('ooni.director.launch_tor', mock_launch_tor) def test_start_tor(self): - from txtorcon import TorControlProtocol - proto = MagicMock() - proto.tor_protocol = TorControlProtocol() - - mock_TorState = MagicMock() - # We use the instance of mock_TorState so that the mock caching will - # return the same instance when TorState is created. - mts = mock_TorState() - mts.protocol.get_conf = lambda x: defer.succeed({'SocksPort': '4242'}) - mts.post_bootstrap = defer.succeed(mts) - - # Set the tor_protocol to be already fired - state = MagicMock() - proto.tor_protocol.post_bootstrap = defer.succeed(state) - - mock_launch_tor = MagicMock() - mock_launch_tor.return_value = defer.succeed(proto) - - @patch('ooni.director.TorState', mock_TorState) - @patch('ooni.director.launch_tor', mock_launch_tor) @defer.inlineCallbacks def director_start_tor(): director = Director() yield director.startTor() assert config.tor.socks_port == 4242 assert config.tor.control_port == 4242 - config.tor_state = None return director_start_tor() diff --git a/ooni/tests/test_oonicli.py b/ooni/tests/test_oonicli.py new file mode 100644 index 0000000..ab10000 --- /dev/null +++ b/ooni/tests/test_oonicli.py @@ -0,0 +1,115 @@ +import os +import sys +import yaml +import signal + +from twisted.internet import base, defer +from twisted.trial import unittest + +from ooni.settings import config +from ooni.oonicli import runWithDirector + +def verify_header(header): + assert 'input_hashes' in header.keys() + assert 'options' in header.keys() + assert 'probe_asn' in header.keys() + assert 'probe_cc' in header.keys() + assert 'probe_ip' in header.keys() + assert 'software_name' in header.keys() + assert 'software_version' in header.keys() + assert 'test_name' in header.keys() + assert 'test_version' in header.keys() + +def verify_entry(entry): + assert 'input' in entry + + +class TestRunDirector(unittest.TestCase): + def setUp(self): + config.tor.socks_port = 9050 + config.tor.control_port = None + with open('example-input.txt', 'w+') as f: + f.write('http://torproject.org/\n') + f.write('http://bridges.torproject.org/\n') + f.write('http://blog.torproject.org/\n') + + def tearDown(self): + os.remove('test_report.yaml') + os.remove('example-input.txt') + + @defer.inlineCallbacks + def run_test(self, test_name, args, verify_function): + output_file = 'test_report.yaml' + sys.argv = ['', '-n', '-o', output_file, test_name] + sys.argv.extend(args) + yield runWithDirector(False, False) + with open(output_file) as f: + entries = yaml.safe_load_all(f) + header = entries.next() + try: + first_entry = entries.next() + except StopIteration: + raise Exception("Missing entry in report") + verify_header(header) + verify_entry(first_entry) + verify_function(first_entry) + + @defer.inlineCallbacks + def test_http_requests(self): + def verify_function(entry): + assert 'body_length_match' in entry + assert 'body_proportion' in entry + assert 'control_failure' in entry + assert 'experiment_failure' in entry + assert 'factor' in entry + assert 'headers_diff' in entry + assert 'headers_match' in entry + yield self.run_test('blocking/http_requests', + ['-u', 'http://torproject.org/'], + verify_function) + + @defer.inlineCallbacks + def test_http_requests_with_file(self): + def verify_function(entry): + assert 'body_length_match' in entry + assert 'body_proportion' in entry + assert 'control_failure' in entry + assert 'experiment_failure' in entry + assert 'factor' in entry + assert 'headers_diff' in entry + assert 'headers_match' in entry + yield self.run_test('blocking/http_requests', + ['-f', 'example-input.txt'], + verify_function) + + @defer.inlineCallbacks + def test_dnsconsistency(self): + def verify_function(entry): + assert 'queries' in entry + assert 'control_resolver' in entry + assert 'tampering' in entry + assert len(entry['tampering']) == 1 + yield self.run_test('blocking/dnsconsistency', + ['-b', '8.8.8.8:53', + '-t', '8.8.8.8', + '-f', 'example-input.txt'], + verify_function) + + @defer.inlineCallbacks + def test_http_header_field_manipulation(self): + def verify_function(entry): + assert 'agent' in entry + assert 'requests' in entry + assert 'socksproxy' in entry + assert 'tampering' in entry + assert 'header_field_name' in entry['tampering'] + assert 'header_field_number' in entry['tampering'] + assert 'header_field_value' in entry['tampering'] + assert 'header_name_capitalization' in entry['tampering'] + assert 'header_name_diff' in entry['tampering'] + assert 'request_line_capitalization' in entry['tampering'] + assert 'total' in entry['tampering'] + + yield self.run_test('manipulation/http_header_field_manipulation', + ['-b', 'http://64.9.225.221'], + verify_function) diff --git a/ooni/tests/test_templates.py b/ooni/tests/test_templates.py index 987c7fa..66960c3 100644 --- a/ooni/tests/test_templates.py +++ b/ooni/tests/test_templates.py @@ -1,13 +1,9 @@ -from ooni.settings import config - from ooni.templates import httpt from twisted.internet.error import DNSLookupError from twisted.internet import reactor, defer from twisted.trial import unittest -config.logging = False - class TestHTTPT(unittest.TestCase): def setUp(self): from twisted.web.resource import Resource diff --git a/ooni/utils/log.py b/ooni/utils/log.py index e0ad5d9..379b5c7 100644 --- a/ooni/utils/log.py +++ b/ooni/utils/log.py @@ -24,25 +24,38 @@ class LogWithNoPrefix(txlog.FileLogObserver): util.untilConcludes(self.write, "%s\n" % text) util.untilConcludes(self.flush) # Hoorj! -def start(logfile=None, application_name="ooniprobe"): - daily_logfile = None +class OONILogger(object): + def start(self, logfile=None, application_name="ooniprobe"): + daily_logfile = None + + if not logfile: + logfile = os.path.expanduser(config.basic.logfile) + + log_folder = os.path.dirname(logfile) + log_filename = os.path.basename(logfile) - if not logfile: - logfile = os.path.expanduser(config.basic.logfile) + daily_logfile = DailyLogFile(log_filename, log_folder) - log_folder = os.path.dirname(logfile) - log_filename = os.path.basename(logfile) + txlog.msg("Starting %s on %s (%s UTC)" % (application_name, otime.prettyDateNow(), + otime.utcPrettyDateNow())) + + self.fileObserver = txlog.FileLogObserver(daily_logfile) + self.stdoutObserver = LogWithNoPrefix(sys.stdout) - daily_logfile = DailyLogFile(log_filename, log_folder) + txlog.startLoggingWithObserver(self.stdoutObserver.emit) + txlog.addObserver(self.fileObserver.emit) - txlog.msg("Starting %s on %s (%s UTC)" % (application_name, otime.prettyDateNow(), - otime.utcPrettyDateNow())) + def stop(self): + self.stdoutObserver.stop() + self.fileObserver.stop() - txlog.startLoggingWithObserver(LogWithNoPrefix(sys.stdout).emit) - txlog.addObserver(txlog.FileLogObserver(daily_logfile).emit) +oonilogger = OONILogger() + +def start(logfile=None, application_name="ooniprobe"): + oonilogger.start(logfile, application_name) def stop(): - print "Stopping OONI" + oonilogger.stop() def msg(msg, *arg, **kw): if config.logging:

1 0

[ooni-probe/master] Merge pull request #291 from TheTorProject/feature/better_testing
by art＠torproject.org 07 Mar '14

07 Mar '14

commit 3ccb5f91b59e8b53e6bd11170613a326a68d64bc Merge: 30e4744 9461a25 Author: Arturo Filastò <hellais(a)users.noreply.github.com> Date: Fri Mar 7 16:40:29 2014 +0100 Merge pull request #291 from TheTorProject/feature/better_testing Add unittests for oonicli. .travis.yml | 1 + bin/ooniprobe | 6 ++- ooni/director.py | 16 +++--- ooni/nettest.py | 11 ++-- ooni/oonicli.py | 31 +++++------- ooni/reporter.py | 11 ++-- ooni/tasks.py | 2 +- ooni/tests/__init__.py | 1 + ooni/tests/mocks.py | 3 -- ooni/tests/test_director.py | 48 ++++++++++-------- ooni/tests/test_oonicli.py | 115 ++++++++++++++++++++++++++++++++++++++++++ ooni/tests/test_templates.py | 4 -- ooni/utils/log.py | 37 +++++++++----- 13 files changed, 207 insertions(+), 79 deletions(-)

1 0

[translation/tails-iuk_completed] Update translations for tails-iuk_completed
by translation＠torproject.org 07 Mar '14

07 Mar '14

commit 8529eaa660eae3d1282a526677f51f08d5a90c6c Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 7 15:15:53 2014 +0000 Update translations for tails-iuk_completed --- es.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/es.po b/es.po index 11d65f2..e344ef5 100644 --- a/es.po +++ b/es.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2014-02-21 17:38+0100\n" -"PO-Revision-Date: 2014-02-24 11:29+0000\n" +"POT-Creation-Date: 2014-03-05 15:11+0100\n" +"PO-Revision-Date: 2014-03-07 15:13+0000\n" "Last-Translator: strel\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -20,8 +20,8 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:146 ../lib/Tails/IUK/Frontend.pm:523 #: ../lib/Tails/IUK/Frontend.pm:667 -msgid "For debugging information, see ~/.xsession-errors." -msgstr "Para información de depuración, vea ~/.xsession-errors ." +msgid "For debugging information, see /home/amnesia/.xsession-errors" +msgstr "Para la información de depuración, vea /home/amnesia/.xsession-errors" #: ../lib/Tails/IUK/Frontend.pm:216 msgid "Error while checking for upgrades" @@ -98,7 +98,7 @@ msgstr "Error durante la detección de actualizaciones disponibles" msgid "" "You should upgrade to %{name}s %{version}s.\n" "\n" -"For more information about this new version, go to %{details_url}s.\n" +"For more information about this new version, go to %{details_url}s\n" "\n" "It is recommended to close all the open applications during the upgrade.\n" "Downloading the upgrade might take a long time, from several minutes to a few hours.\n" @@ -107,7 +107,7 @@ msgid "" "Download size: %{size}s\n" "\n" "Do you want to upgrade now?" -msgstr "Debería actualizar a %{name}s %{version}s.\n\nPara más información acerca de esta nueva versión, vaya a %{details_url}s.\n\nSe recomienda cerrar todas las aplicaciones abiertas durante la actualización.\nDescargar la actualización puede llevar bastante tiempo, desde varios minutos a unas pocas horas.\nLas redes estarán deshabilitadas después de descargar la actualización.\n\nTamaño de la descarga: %{size}s\n\n¿Quiere actualizar ahora?" +msgstr "Debe actualizar a %{name}s %{version}s.\n\nPara más información acerca de esta nueva versión, vaya a %{details_url}s\n\nDurante la actualización se recomienda cerrar todas las aplicaciones abiertas.\nDescargar la actualización podría llevar mucho tiempo, desde varios minutos a unas pocas horas.\nLa red será deshabilitada después de descargar la actualización.\n\nTamaño de la descarga: %{size}s\n\n¿Quiere actualizar ahora?" #: ../lib/Tails/IUK/Frontend.pm:385 msgid "Upgrade available" @@ -126,12 +126,12 @@ msgstr "Actualizar más tarde" msgid "" "You should do a manual upgrade to %{name}s %{version}s.\n" "\n" -"For more information about this new version, go to %{details_url}s.\n" +"For more information about this new version, go to %{details_url}s\n" "\n" "It is not possible to automatically upgrade your device to this new version: %{explanation}s.\n" "\n" "To learn how to do a manual upgrade, go to https://tails.boum.org/doc/first_steps/upgrade/#manual" -msgstr "Debería hacer una actualización manual a %{name}s %{version}s.\n\nPara más información acerca de esta versión, vaya a %{details_url}s.\n\nNo es posible actualizar automáticamente su dispositivo a esta nueva versión: %{explanation}s.\n\nPara aprender como hacer una actualización manual, vaya a https://tails.boum.org/doc/first_steps/upgrade/#manual" +msgstr "Debe hacer una actualización manual a %{name}s %{version}s.\n\nPara más información acerca de esta nueva versión, vaya a %{details_url}s\n\nNo es posible actualizar automáticamente su dispositivo a esta nueva versión: %{explanation}s.\n\nPara aprender cómo hacer una actualización manual, vaya a https://tails.boum.org/doc/first_steps/upgrade/#manual" #: ../lib/Tails/IUK/Frontend.pm:411 msgid "New version available"

1 0