- tor-commits - lists.torproject.org

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 22 Nov '12

22 Nov '12

commit 03bcc7bfa946f07446d3ac48488fa75e8f333045 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 22 18:45:17 2012 +0000 Update translations for vidalia_alpha --- es/vidalia_es.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index f769fbb..7dedc12 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-11-22 17:53+0000\n" +"PO-Revision-Date: 2012-11-22 18:40+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -3544,7 +3544,7 @@ msgstr "Abrir" msgctxt "Stream" msgid "Failed" -msgstr "Falló" +msgstr "Fallo" msgctxt "Stream" msgid "Closed" @@ -3552,7 +3552,7 @@ msgstr "Cerrado" msgctxt "Stream" msgid "Retrying" -msgstr "Intentando de nuevo" +msgstr "Reintentando" msgctxt "Stream" msgid "Remapped" @@ -3566,7 +3566,7 @@ msgctxt "TorControl" msgid "" "Vidalia has not started Tor. You need to stop Tor through the interface you " "started it." -msgstr "Vidalia no ha iniciado Tor. Tiene que parar el proceso activo Tor a través de la interfaz con la que lo inició." +msgstr "Vidalia no ha iniciado Tor. Ha de parar el proceso de Tor a través de la interfaz con la que lo inició." msgctxt "TorControl" msgid "Start failed: %1"

1 0

[translation/vidalia_alpha_completed] Update translations for vidalia_alpha_completed
by translation＠torproject.org 22 Nov '12

22 Nov '12

commit 186bdb6b2f3f14c30fc604249b09648d4679b850 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 22 18:15:25 2012 +0000 Update translations for vidalia_alpha_completed --- es/vidalia_es.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 234e0c0..f769fbb 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-11-22 17:00+0000\n" +"PO-Revision-Date: 2012-11-22 17:53+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -3508,7 +3508,7 @@ msgid "" "see an increase in network traffic shown by the Bandwidth Graph within a few" " hours as more clients learn about your relay. Thank you for contributing to" " the Tor network!" -msgstr "Su nodo ya está en línea y disponible para usar por los clientes de la red Tor. Deberia de ver un aumento en el tráfico de red que se muestra en la gráfica de ancho de banda que se ira incrementando a las pocas horas a medida que más clientes registren su nodo como repetidor de la red Tor. ¡Gracias por contribuir a la red Tor!" +msgstr "Su repetidor (relay) está conectado y disponible para su uso por clientes Tor. Debería ver un aumento en el tráfico de red reflejado en la Gráfica de Ancho de Banda que se ira incrementando a las pocas horas a medida que el estado de su repetidor se propague entre más clientes. ¡Gracias por contribuir a la red Tor!" msgctxt "StatusTab" msgid "Status" @@ -3516,7 +3516,7 @@ msgstr "Estado" msgctxt "StatusTab" msgid "Message Log" -msgstr "Registro de mensajes" +msgstr "Registro de mensajes (log)" msgctxt "StatusTab" msgid "Tor Status" @@ -3524,7 +3524,7 @@ msgstr "Estado de Tor" msgctxt "StatusTab" msgid "Show on startup" -msgstr "Mostrar en el inicio" +msgstr "Mostrar al inicio" msgctxt "Stream" msgid "New"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 22 Nov '12

22 Nov '12

commit d51c42effe7cef6d540c6aa75115a22127523c65 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 22 18:15:22 2012 +0000 Update translations for vidalia_alpha --- es/vidalia_es.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 234e0c0..f769fbb 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-11-22 17:00+0000\n" +"PO-Revision-Date: 2012-11-22 17:53+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -3508,7 +3508,7 @@ msgid "" "see an increase in network traffic shown by the Bandwidth Graph within a few" " hours as more clients learn about your relay. Thank you for contributing to" " the Tor network!" -msgstr "Su nodo ya está en línea y disponible para usar por los clientes de la red Tor. Deberia de ver un aumento en el tráfico de red que se muestra en la gráfica de ancho de banda que se ira incrementando a las pocas horas a medida que más clientes registren su nodo como repetidor de la red Tor. ¡Gracias por contribuir a la red Tor!" +msgstr "Su repetidor (relay) está conectado y disponible para su uso por clientes Tor. Debería ver un aumento en el tráfico de red reflejado en la Gráfica de Ancho de Banda que se ira incrementando a las pocas horas a medida que el estado de su repetidor se propague entre más clientes. ¡Gracias por contribuir a la red Tor!" msgctxt "StatusTab" msgid "Status" @@ -3516,7 +3516,7 @@ msgstr "Estado" msgctxt "StatusTab" msgid "Message Log" -msgstr "Registro de mensajes" +msgstr "Registro de mensajes (log)" msgctxt "StatusTab" msgid "Tor Status" @@ -3524,7 +3524,7 @@ msgstr "Estado de Tor" msgctxt "StatusTab" msgid "Show on startup" -msgstr "Mostrar en el inicio" +msgstr "Mostrar al inicio" msgctxt "Stream" msgid "New"

1 0

[flashproxy/master] Checking if the proxy is running in a Tor Proxy and disabling itelf.
by dcf＠torproject.org 22 Nov '12

22 Nov '12

commit 006708e921a1a93cbc619c6993c30404857d7bcf Author: Jorge Couchet <jorge.couchet(a)gmail.com> Date: Thu Nov 22 13:08:36 2012 +0100 Checking if the proxy is running in a Tor Proxy and disabling itelf. --- proxy/flashproxy.js | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index 2078b69..435b8ea 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -865,6 +865,23 @@ function repr(x) { } } +/* The function is trying to detect that the proxy is running in a Tor Browser. A Tor Browser has + an specific 'navigator.userAgent' string, it is also entirely disabling the DOM storage and + not listing the supported MIME types. + + https://trac.torproject.org/projects/tor/ticket/6293 + +*/ +function is_likely_tor_browser() { + + var isTB = false; + + if ( (navigator.userAgent == "Mozilla/5.0 (Windows NT 6.1; rv:10.0) Gecko/20100101 Firefox/10.0") && (sessionStorage === null) && (navigator.mimeTypes.length == 0) ) + isTB = true; + + return isTB; +} + /* Are circumstances such that we should self-disable and not be a proxy? We take a best-effort guess as to whether this device runs on a battery or the data transfer might be expensive. @@ -876,6 +893,13 @@ function repr(x) { function flashproxy_should_disable() { var ua; + /* If the proxy is running in a Tor Browser there is a possible security problem: + It is reported at: https://trac.torproject.org/projects/tor/ticket/6293 */ + if (is_likely_tor_browser()) { + puts("Disable because is running in a Tor Browser."); + return true; + } + ua = window.navigator.userAgent; if (ua !== null) { var UA_LIST = [

1 0

[flashproxy/master] Style changes.
by dcf＠torproject.org 22 Nov '12

22 Nov '12

commit 061260e4a32980c4837a6e6ba8373a3fd762e2cc Author: David Fifield <david(a)bamsoftware.com> Date: Thu Nov 22 09:59:45 2012 -0800 Style changes. --- proxy/flashproxy.js | 25 ++++++++----------------- 1 files changed, 8 insertions(+), 17 deletions(-) diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index 435b8ea..13a77f5 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -865,21 +865,13 @@ function repr(x) { } } -/* The function is trying to detect that the proxy is running in a Tor Browser. A Tor Browser has - an specific 'navigator.userAgent' string, it is also entirely disabling the DOM storage and - not listing the supported MIME types. - - https://trac.torproject.org/projects/tor/ticket/6293 - -*/ +/* Do we seem to be running in Tor Browser? Check the user-agent string, lack of + DOM storage, and no listing of supported MIME types. */ +var TBB_UA = "Mozilla/5.0 (Windows NT 6.1; rv:10.0) Gecko/20100101 Firefox/10.0"; function is_likely_tor_browser() { - - var isTB = false; - - if ( (navigator.userAgent == "Mozilla/5.0 (Windows NT 6.1; rv:10.0) Gecko/20100101 Firefox/10.0") && (sessionStorage === null) && (navigator.mimeTypes.length == 0) ) - isTB = true; - - return isTB; + return window.navigator.userAgent === TBB_UA + && window.sessionStorage === null + && (window.navigator.mimeTypes && window.navigator.mimeTypes.length === 0); } /* Are circumstances such that we should self-disable and not be a @@ -893,10 +885,9 @@ function is_likely_tor_browser() { function flashproxy_should_disable() { var ua; - /* If the proxy is running in a Tor Browser there is a possible security problem: - It is reported at: https://trac.torproject.org/projects/tor/ticket/6293 */ + /* https://trac.torproject.org/projects/tor/ticket/6293 */ if (is_likely_tor_browser()) { - puts("Disable because is running in a Tor Browser."); + puts("Disable because running in Tor Browser."); return true; }

1 0

[flashproxy/master] ChangeLog for Tor Browser self-disabling.
by dcf＠torproject.org 22 Nov '12

22 Nov '12

commit 878dc7019f57fc3b663087c6944984b8d76904de Author: David Fifield <david(a)bamsoftware.com> Date: Thu Nov 22 10:09:05 2012 -0800 ChangeLog for Tor Browser self-disabling. --- ChangeLog | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 823b56b..c623787 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Changes in version 0.9 + o The proxy now tries to determine whether it is running in Tor + Browser, and disables itself if so. Fixes bug #6293. Patch by Jorge + Couchet. + Changes in version 0.8 o flashproxy-client now operates as a managed proxy by default. This means that there is no longer a need to start flashproxy-client

1 0

[ooni-probe/master] Add fabfile for automatic deployment of ooni-probe to remote sites
by art＠torproject.org 22 Nov '12

22 Nov '12

commit e19c4869edadce35dee246ccb582fafb4e0d0310 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 22 18:31:31 2012 +0100 Add fabfile for automatic deployment of ooni-probe to remote sites --- fabfile.py | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 55 insertions(+), 0 deletions(-) diff --git a/fabfile.py b/fabfile.py new file mode 100644 index 0000000..119d669 --- /dev/null +++ b/fabfile.py @@ -0,0 +1,55 @@ +#-*- coding: utf-8 -*- +# +# :authors: Arturo Filastò, Isis Lovecruft +# :license: see included LICENSE file +import os +import sys +import xmlrpclib + +from fabric.api import run, cd, sudo + +api_auth = {} +# Set these values +api_auth['Username'] = "you(a)example.com" +api_auth['AuthString'] = "your_password" +slice_name = "your_slice_name" + +### Do not change this +api_auth['AuthMethod'] = "password" + +def search_node(nfilter="*.cert.org.cn"): + api_server = xmlrpclib.ServerProxy('https://www.planet-lab.org/PLCAPI/') + if api_server.AuthCheck(api_auth): + print "We are authenticated" + else: + print "We are not authenticated" + node_filter = {'hostname': nfilter} + return_fields = ['hostname', 'site_id'] + all_nodes = api_server.GetNodes(api_auth, node_filter, return_fields) + print all_nodes + +def add_node(nodeid): + node_id = int(nodeid) + api_server = xmlrpclib.ServerProxy('https://www.planet-lab.org/PLCAPI/') + node_filter = {'node_id': node_id} + return_fields = ['hostname', 'site_id'] + nodes = api_server.GetNodes(api_auth, node_filter, return_fields) + print 'Adding nodes %s' % nodes + api_server.AddNode(api_auth, node_id, slice_name) + +def deployooniprobe(distro="debian"): + """ + This is used to deploy ooni-probe on debian based systems. + """ + run("git clone https://git.torproject.org/ooni-probe.git ooni-probe") + cd("ooni-probe") + if distro == "debian": + sudo("apt-get install git-core python python-pip python-dev") + else: + print "The selected distro is not supported" + print "The following commands may fail" + run("virtualenv env") + run("source env/bin/activate") + run("pip install https://hg.secdev.org/scapy/archive/tip.zip") + run("pip install -r requirements.txt") +

1 0

[ooni-probe/master] Move scapy set log level to the logger module so that it gets called before scapy is imported.
by art＠torproject.org 22 Nov '12

22 Nov '12

commit 9684dee4bde88e096fe85603c62dca35d8441468 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 22 18:52:44 2012 +0100 Move scapy set log level to the logger module so that it gets called before scapy is imported. --- ooni/reporter.py | 10 +--------- ooni/utils/log.py | 4 ++++ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/ooni/reporter.py b/ooni/reporter.py index 0635d2f..265cd93 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -26,15 +26,7 @@ from ooni.utils import otime, log, geodata from ooni.utils.hacks import OSafeRepresenter, OSafeDumper from ooni import config -try: - ## Get rid of the annoying "No route found for - ## IPv6 destination warnings": - logging.getLogger("scapy.runtime").setLevel(logging.ERROR) - from scapy.all import packet -except: - class FooClass: - Packet = object - packet = FooClass +from scapy.all import packet class NoTestIDSpecified(Exception): pass diff --git a/ooni/utils/log.py b/ooni/utils/log.py index d9b57bb..170d7b5 100644 --- a/ooni/utils/log.py +++ b/ooni/utils/log.py @@ -15,6 +15,10 @@ from twisted.python.logfile import DailyLogFile from ooni.utils import otime from ooni import config +## Get rid of the annoying "No route found for +## IPv6 destination warnings": +logging.getLogger("scapy.runtime").setLevel(logging.ERROR) + def start(logfile=None, application_name="ooniprobe"): daily_logfile = None

1 0

[ooni-probe/master] Update documentation on test writing
by art＠torproject.org 22 Nov '12

22 Nov '12

commit d594afd8a45eba2013b6e96dc277602f6d94cc0f Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 22 18:24:25 2012 +0100 Update documentation on test writing * Write docs for Scapy based tests and TCP based tests * Clean up the examples that go with the documentation * Add example on using the scapy test with yield * Fix bug in usageOptions --- docs/source/writing_tests.rst | 283 +++++++++++++++++++++++++++-- nettests/core/parasitictraceroute.py | 2 +- nettests/examples/example_scapyt.py | 16 +- nettests/examples/example_scapyt_yield.py | 25 +++ nettests/examples/example_tcpt.py | 15 ++- ooni/nettest.py | 2 +- ooni/oonicli.py | 2 +- ooni/runner.py | 42 ++--- ooni/templates/tcpt.py | 3 +- 9 files changed, 335 insertions(+), 55 deletions(-) diff --git a/docs/source/writing_tests.rst b/docs/source/writing_tests.rst index 01ddfb5..f74f3f0 100644 --- a/docs/source/writing_tests.rst +++ b/docs/source/writing_tests.rst @@ -10,21 +10,20 @@ Test Cases ---------- The atom of OONI Testing is called a Test Case. A test case class may contain -multiple Test Functions. +multiple Test Methods. .. autoclass:: ooni.nettest.NetTestCase :noindex: -:class:`ooni.nettest.TestCase` is a subclass of :class:`unittest.TestCase` so -the assert methods that apply to :class:`unittest.TestCase` will also apply to -:class:`ooni.nettest.TestCase`. If the test you plan to write is not listed on the `Tor OONI trac page <https://trac.torproject.org/projects/tor/wiki/doc/OONI/Tests>`_, you should -add it to the list and following the `test template -<https://trac.torproject.org/projects/tor/wiki/doc/OONI/Tests/TestTemplate>`_ -write up a description about it. +add it to the list and then add a description about it following the `Test +Template <https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/docs/source/tests/t…>`_ +Tests are driven by inputs. For every input a new test instance is created, +internally the _setUp method is called that is defined inside of test +templates, then the setUp method that is overwritable by users. Inputs ------ @@ -33,7 +32,8 @@ Inputs are what is given as input to every iteration of the Test Case. You have 100 inputs, then every test case will be run 100 times. To configure a static set of inputs you should define the -:class:`ooni.nettest.TestCase` attribute ``inputs``. The test will be run ``len(inputs)`` times. Any iterable object is a valid ``inputs`` attribute. +:class:`ooni.nettest.TestCase` attribute ``inputs``. The test will be run +``len(inputs)`` times. Any iterable object is a valid ``inputs`` attribute. If you would like to have inputs be determined from a user specified input file, then you must set the ``inputFile`` attribute. This is an array that @@ -46,40 +46,285 @@ descriptor and yield the next item. The default ``inputProcessor`` looks like this:: - def lineByLine(fp): - for x in fp.readlines(): + def lineByLine(filename): + fp = open(filename) + for x in fp.xreadlines(): yield x.strip() fp.close() -Test Functions --------------- +Setup and command line passing +------------------------------ + +Tests may define the `setUp` method that will be called every time the Test +Case object is intantiated, in here you may place some common logic to all your +Test Methods that should be run before any testing occurs. + +Command line arguments can be parsed thanks to the twisted +`twisted.python.usage.UsageOptions` class. + +You will have to subclass this and define the NetTestCase attribute +usageOptions to point to a subclass of this. + +:: + + class UsageOptions(usage.Options): + optParameters = [['backend', 'b', 'http://127.0.0.1:57001', + 'URL of the test backend to use'] + ] + + class MyTestCase(nettest.TestCase): + usageOptions = UsageOptions + + inputFile = ['file', 'f', None, "Some foo file"] + requiredOptions = ['backend'] + + def test_my_test(self): + self.localOptions['backend'] + + +You will then be able to access the parsed command line arguments via the class +attribute localOptions. + +The `requiredOptions` attributes specifies an array of parameters that are +required for the test to run properly. + +`inputFile` is a special class attribute that will be used for processing of +the inputFile. The filename that is read here will be given to the +`ooni.nettest.NetTestCase.inputProcessor` method that will yield, by default, +one line of the file at a time. + + + +Test Methods +------------ These shall be defined inside of your :class:`ooni.nettest.TestCase` subclass. These will be class methods. +All class methods that are prefixed with test\_ shall be run. Functions that +are relevant to your test should be all lowercase separated by underscore. + To add data to the test report you may write directly to the report object like so:: - def my_test_function(): + def test_my_function(): result = do_something() self.report['something'] = result + OONI will then handle the writing of the data to the final test report. To access the current input you can use the ``input`` attribute, for example:: - def my_test_with_input(): + def test_with_input(): do_something_with_input(self.input) This will at each iteration over the list of inputs do something with the input. -Backward compatibility ----------------------- +Test Templates +-------------- + +Test templates assist you in writing tests. They already contain all the common +functionality that is useful to running a test of that type. They also take +care of writing the data they collect that is relevant to the test run to the +report file. + +Currently implemented test templates are `ooni.templates.scapt` for tests based +on Scapy, `ooni.templates.tcpt` for tests based on TCP, `ooni.templates.httpt` +for tests based on HTTP, `ooni.templates.dnst` for tests based on DNS. + + +Scapy based tests +................. + +Scapy based tests will be a subclass of `ooni.templates.scapyt.BaseScapyTest`. + +It provides a wrapper around the scapy send and receive function that will +write the sent and received packets to the report with sanitization of the src +and destination IP addresses. + +It has the same syntax as the Scapy sr function, except that it will return a +deferred. + +To implement a simple ICMP ping based on this function you can do like so +(taken from nettest/examples/example_scapyt.py): + + +:: + + from twisted.python import usage + + from scapy.all import IP, ICMP + + from ooni.templates import scapyt + + class UsageOptions(usage.Options): + optParameters = [['target', 't', '8.8.8.8', "Specify the target to ping"]] + + class ExampleICMPPingScapy(scapyt.BaseScapyTest): + name = "Example ICMP Ping Test" + + usageOptions = UsageOptions + + def test_icmp_ping(self): + def finished(packets): + print packets + answered, unanswered = packets + for snd, rcv in answered: + rcv.show() + + packets = IP(dst=self.localOptions['target'])/ICMP() + d = self.sr(packets) + d.addCallback(finished) + return d + +The arguments taken by self.sr() are exactly the same as the scapy send and +receive function, the only difference is that instead of using the regualar +scapy super socket it uses our twisted drivven wrapper around it. + +Alternatively this test can also be written using the +`twisted.defer.inlineCallbacks` decorator, that makes it look more similar to +regular sequential code. + +:: + + from twisted.python import usage + from twisted.internet import defer + + from scapy.all import IP, ICMP + + from ooni.templates import scapyt + + class UsageOptions(usage.Options): + optParameters = [['target', 't', self.localOptions['target'], "Specify the target to ping"]] + + class ExampleICMPPingScapyYield(scapyt.BaseScapyTest): + name = "Example ICMP Ping Test" + + usageOptions = UsageOptions + + @defer.inlineCallbacks + def test_icmp_ping(self): + packets = IP(dst=self.localOptions['target'])/ICMP() + answered, unanswered = yield self.sr(packets) + for snd, rcv in answered: + rcv.show() + + +Report Format +************* + + +:: + + ########################################### + # OONI Probe Report for Example ICMP Ping Test test + # Thu Nov 22 18:20:43 2012 + ########################################### + --- + {probe_asn: null, probe_cc: null, probe_ip: 127.0.0.1, software_name: ooniprobe, software_version: 0.0.7.1-alpha, + start_time: 1353601243.0, test_name: Example ICMP Ping Test, test_version: 0.1} + ... + --- + input: null + report: + answer_flags: [ipsrc] + answered_packets: + - - raw_packet: !!binary | + RQAAHAEdAAAuAbjKCAgICH8AAAEAAAAAAAAAAA== + summary: IP / ICMP 8.8.8.8 > 127.0.0.1 echo-reply 0 + sent_packets: + - - raw_packet: !!binary | + RQAAHAABAABAAevPfwAAAQgICAgIAPf/AAAAAA== + summary: IP / ICMP 127.0.0.1 > 8.8.8.8 echo-request 0 + test_name: test_icmp_ping + test_started: 1353604843.553605 + ... + + +TCP based tests +............... + +TCP based tests will subclass `ooni.templates.tcpt.TCPTest`. + +This test template facilitates the sending of TCP payloads to the wire and +recording the response. + +:: + + from twisted.internet.error import ConnectionRefusedError + from ooni.utils import log + from ooni.templates import tcpt + + class ExampleTCPT(tcpt.TCPTest): + def test_hello_world(self): + def got_response(response): + print "Got this data %s" % response + + def connection_failed(failure): + failure.trap(ConnectionRefusedError) + print "Connection Refused" + + self.address = "127.0.0.1" + self.port = 57002 + payload = "Hello World!\n\r" + d = self.sendPayload(payload) + d.addErrback(connection_failed) + d.addCallback(got_response) + return d + + +The possible failures for a TCP connection are: + +`twisted.internet.error.NoRouteError` that corresponds to errno.ENETUNREACH + +`twisted.internet.error.ConnectionRefusedError` that corresponds to +errno.ECONNREFUSED + +`twisted.internet.error.TCPTimedOutError` that corresponds to errno.ETIMEDOUT + +Report format +************* + +The basic report of a TCP test looks like the following (this is an report +generated by running the above example against a TCP echo server). + +:: + + ########################################### + # OONI Probe Report for Base TCP Test test + # Thu Nov 22 18:18:28 2012 + ########################################### + --- + {probe_asn: null, probe_cc: null, probe_ip: 127.0.0.1, software_name: ooniprobe, software_version: 0.0.7.1-alpha, + start_time: 1353601108.0, test_name: Base TCP Test, test_version: '0.1'} + ... + --- + input: null + report: + errors: [] + received: ["Hello World!\n\r"] + sent: ["Hello World!\n\r"] + test_name: test_hello_world + test_started: 1353604708.705081 + ... + + +TODO finish this with more details + +HTTP based tests +................ + +see nettests/examples/example_httpt.py + +TODO + +DNS based tests +............... -All ooni tests written using the experiment(), control() pattern are supported, -but all new tests should no longer be written using such pattern. +see nettests/core/dnstamper.py -Code in protocols should be refactored to follow the new API. +TODO diff --git a/nettests/core/parasitictraceroute.py b/nettests/core/parasitictraceroute.py index 9d8de16..8ea27bc 100644 --- a/nettests/core/parasitictraceroute.py +++ b/nettests/core/parasitictraceroute.py @@ -21,7 +21,7 @@ class UsageOptions(usage.Options): optFlags = [['randomize','r', 'Randomize the source port']] -class TracerouteTest(scapyt.BaseScapyTest): +class ParasiticalTracerouteTest(scapyt.BaseScapyTest): name = "Parasitic TCP Traceroute Test" author = "Arturo Filastò" version = "0.1" diff --git a/nettests/examples/example_scapyt.py b/nettests/examples/example_scapyt.py index a6199e2..ba04072 100644 --- a/nettests/examples/example_scapyt.py +++ b/nettests/examples/example_scapyt.py @@ -1,27 +1,29 @@ # -*- encoding: utf-8 -*- # -# :authors: Arturo Filastò # :licence: see LICENSE -from ooni.utils import log -from ooni.templates import scapyt +from twisted.python import usage + from scapy.all import IP, ICMP +from ooni.templates import scapyt +class UsageOptions(usage.Options): + optParameters = [['target', 't', '8.8.8.8', "Specify the target to ping"]] + class ExampleICMPPingScapy(scapyt.BaseScapyTest): name = "Example ICMP Ping Test" - author = "Arturo Filastò" - version = 0.1 + + usageOptions = UsageOptions def test_icmp_ping(self): - log.msg("Pinging 8.8.8.8") def finished(packets): print packets answered, unanswered = packets for snd, rcv in answered: rcv.show() - packets = IP(dst='8.8.8.8')/ICMP() + packets = IP(dst=self.localOptions['target'])/ICMP() d = self.sr(packets) d.addCallback(finished) return d diff --git a/nettests/examples/example_scapyt_yield.py b/nettests/examples/example_scapyt_yield.py new file mode 100644 index 0000000..311b5aa --- /dev/null +++ b/nettests/examples/example_scapyt_yield.py @@ -0,0 +1,25 @@ +# -*- encoding: utf-8 -*- +# +# :licence: see LICENSE + +from twisted.python import usage +from twisted.internet import defer + +from scapy.all import IP, ICMP + +from ooni.templates import scapyt + +class UsageOptions(usage.Options): + optParameters = [['target', 't', self.localOptions['target'], "Specify the target to ping"]] + +class ExampleICMPPingScapyYield(scapyt.BaseScapyTest): + name = "Example ICMP Ping Test" + + usageOptions = UsageOptions + + @defer.inlineCallbacks + def test_icmp_ping(self): + packets = IP(dst=self.localOptions['target'])/ICMP() + answered, unanswered = yield self.sr(packets) + for snd, rcv in answered: + rcv.show() diff --git a/nettests/examples/example_tcpt.py b/nettests/examples/example_tcpt.py index ccb3077..613160b 100644 --- a/nettests/examples/example_tcpt.py +++ b/nettests/examples/example_tcpt.py @@ -1,8 +1,21 @@ + +from twisted.internet.error import ConnectionRefusedError +from ooni.utils import log from ooni.templates import tcpt class ExampleTCPT(tcpt.TCPTest): def test_hello_world(self): + def got_response(response): + print "Got this data %s" % response + + def connection_failed(failure): + failure.trap(ConnectionRefusedError) + print "Connection Refused" + self.address = "127.0.0.1" self.port = 57002 payload = "Hello World!\n\r" - return self.sendPayload(payload) + d = self.sendPayload(payload) + d.addErrback(connection_failed) + d.addCallback(got_response) + return d diff --git a/ooni/nettest.py b/ooni/nettest.py index c9febf4..d460147 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -79,7 +79,7 @@ class NetTestCase(object): report = {} report['errors'] = [] - usageOptions = None + usageOptions = usage.Options optParameters = None baseParameters = None diff --git a/ooni/oonicli.py b/ooni/oonicli.py index 8c5c0e9..c8385ed 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -122,7 +122,7 @@ def run(): print " you should run ooniprobe as root or disable the options in ooniprobe.conf" sys.exit(1) print "Starting sniffer" - sniffer_d = net.capturePackets(pcap_filename) + net.capturePackets(pcap_filename) log.start(cmd_line_options['logfile']) diff --git a/ooni/runner.py b/ooni/runner.py index a296e7f..8843cd9 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -39,44 +39,40 @@ def processTest(obj, cmd_line_options): A configured and instantiated :class:`twisted.python.usage.Options` class. """ - options = None - - if obj.usageOptions and obj.inputFile: + if obj.inputFile: obj.usageOptions.optParameters.append(obj.inputFile) - if obj.usageOptions and obj.baseParameters: + if obj.baseParameters: if not hasattr(obj.usageOptions, 'optParameters'): obj.usageOptions.optParameters = [] for parameter in obj.baseParameters: obj.usageOptions.optParameters.append(parameter) - if obj.usageOptions and obj.baseFlags: + if obj.baseFlags: if not hasattr(obj.usageOptions, 'optFlags'): obj.usageOptions.optFlags = [] for flag in obj.baseFlags: obj.usageOptions.optFlags.append(flag) - if obj.usageOptions: - options = obj.usageOptions() + options = obj.usageOptions() - if options: - options.parseOptions(cmd_line_options['subArgs']) - obj.localOptions = options + options.parseOptions(cmd_line_options['subArgs']) + obj.localOptions = options - if obj.inputFile: - obj.inputFilename = options[obj.inputFile[0]] + if obj.inputFile: + obj.inputFilename = options[obj.inputFile[0]] - try: - log.debug("processing options") - tmp_test_case_object = obj() - tmp_test_case_object._processOptions(options) - - except usage.UsageError, e: - test_name = tmp_test_case_object.name - print "There was an error in running %s!" % test_name - print "%s" % e - options.opt_help() - raise usage.UsageError("Error in parsing command line args for %s" % test_name) + try: + log.debug("processing options") + tmp_test_case_object = obj() + tmp_test_case_object._processOptions(options) + + except usage.UsageError, e: + test_name = tmp_test_case_object.name + print "There was an error in running %s!" % test_name + print "%s" % e + options.opt_help() + raise usage.UsageError("Error in parsing command line args for %s" % test_name) if obj.requiresRoot: try: diff --git a/ooni/templates/tcpt.py b/ooni/templates/tcpt.py index e592274..77ffe3e 100644 --- a/ooni/templates/tcpt.py +++ b/ooni/templates/tcpt.py @@ -68,8 +68,7 @@ class TCPTest(NetTestCase): def errback(failure): self.report['error'] = str(failure) - log.exception(failure) - d1.callback(self.report['received']) + d1.errback(failure) def connected(p): log.debug("Connected to %s:%s" % (self.address, self.port))

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 22 Nov '12

22 Nov '12

commit 59c1b4c292411951ffe4151f8b9fe67ffef438d2 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 22 17:16:02 2012 +0000 Update translations for tails-persistence-setup_completed --- bg/bg.po | 319 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 319 insertions(+), 0 deletions(-) diff --git a/bg/bg.po b/bg/bg.po new file mode 100644 index 0000000..388ce28 --- /dev/null +++ b/bg/bg.po @@ -0,0 +1,319 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Tails developers +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# <kirilvelinov(a)gmail.com>, 2012. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2012-10-29 19:33+0100\n" +"PO-Revision-Date: 2012-11-22 17:02+0000\n" +"Last-Translator: kirilvel <kirilvelinov(a)gmail.com>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: bg\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:48 +msgid "Personal Data" +msgstr "Лични Данни" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:50 +msgid "Keep files stored in the `Persistent' directory" +msgstr "Съхранявайте файловете в \"Постоянна\"(Persistent) директория" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:58 +msgid "GnuPG" +msgstr "GnuPG" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:60 +msgid "GnuPG keyrings and configuration" +msgstr "GnuPG ключодържатели и конфигурация" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:68 +msgid "SSH Client" +msgstr "SSH Програма" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:70 +msgid "SSH keys, configuration and known hosts" +msgstr "SSH ключове, конфигурация и познатите хостове" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:78 +msgid "Pidgin" +msgstr "Pidgin" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:80 +msgid "Pidgin profiles and OTR keyring" +msgstr "Pidgin профили и OTR ключодържател" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:88 +msgid "Claws Mail" +msgstr "Claws Mail" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:90 +msgid "Claws Mail profiles and locally stored email" +msgstr "Claws Mail профили и локално съхранени имейл" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:98 +msgid "GNOME Keyring" +msgstr "GNOME ключодържател" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:100 +msgid "Secrets stored by GNOME Keyring" +msgstr "Тайните, съхранявани от GNOME ключодържател" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:108 +msgid "Network Connections" +msgstr "Мрежовите Връзки" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:110 +msgid "Configuration of network devices and connections" +msgstr "Конфигуриране на мрежови устройства и връзки" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:118 +msgid "APT Packages" +msgstr "APT Пакети" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:120 +msgid "Packages downloaded by APT" +msgstr "Пакети свален от APT" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:128 +msgid "APT Lists" +msgstr "APT списъци" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:130 +msgid "Lists downloaded by APT" +msgstr "Списъци свалени с APT" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:138 +msgid "Dotfiles" +msgstr "Dotfiles" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:140 +msgid "" +"Symlink into $HOME every file or directory found in the `dotfiles' directory" +msgstr "Символична връзка в $ HOME всеки файл или директория в директория \"dotfiles\"" + +#: ../lib/Tails/Persistence/Setup.pm:259 +msgid "" +"The device Tails is running from cannot be found. Maybe you used the `toram'" +" option?" +msgstr "Устройствата от което Tails работи не може да бъде намерено. Може би сте използвали опцията \"toram\"?" + +#: ../lib/Tails/Persistence/Setup.pm:284 +msgid "'Unparseable partition path.'" +msgstr "'Не перефразирам пътен дял.'" + +#: ../lib/Tails/Persistence/Setup.pm:298 +msgid "Setup Tails persistent volume" +msgstr "Настройка Tails устойчиви обем" + +#: ../lib/Tails/Persistence/Setup.pm:442 +#, perl-format +msgid "Device %s already has a persistent volume." +msgstr "Устройството %s вече има постоянен обем." + +#: ../lib/Tails/Persistence/Setup.pm:450 +#, perl-format +msgid "Device %s has not enough unallocated space." +msgstr "Устройството %s не е достатъчно неразпределено пространство." + +#: ../lib/Tails/Persistence/Setup.pm:458 ../lib/Tails/Persistence/Setup.pm:472 +#, perl-format +msgid "Device %s has no persistent volume." +msgstr "Устройството %s не разполага с постоянен обем." + +#: ../lib/Tails/Persistence/Setup.pm:464 +msgid "" +"Cannot delete the persistent volume while in use. You should restart Tails " +"without persistence." +msgstr "Не можете да изтриете упорит обем по време на използване. Трябва да рестартирате Tails без постоянство." + +#: ../lib/Tails/Persistence/Setup.pm:483 +msgid "Persistence volume is not unlocked." +msgstr "Устойчивото пространство не отключено." + +#: ../lib/Tails/Persistence/Setup.pm:488 +msgid "Persistence volume is not mounted." +msgstr "Устойчивото пространство не е монтирано." + +#: ../lib/Tails/Persistence/Setup.pm:493 +msgid "Persistence volume is not readable. Permissions or ownership problems?" +msgstr "Устойчивото пространство не се чете. Проблеми с разрешения или собствеността ?" + +#: ../lib/Tails/Persistence/Setup.pm:498 +msgid "Persistence volume is not writable. Maybe it was mounted read-only?" +msgstr "Устойчивото пространство не е записваем. Може би това е монтирана само за четене?" + +#: ../lib/Tails/Persistence/Setup.pm:507 +#, perl-format +msgid "Tails is running from non-USB device %s." +msgstr "Tails работи от не-USB устройство %s." + +#: ../lib/Tails/Persistence/Setup.pm:513 +#, perl-format +msgid "Device %s is optical." +msgstr "Устройството %s е оптично." + +#: ../lib/Tails/Persistence/Setup.pm:520 +#, perl-format +msgid "Device %s was not created using Tails USB installer." +msgstr "Устройството %s не е създаден с помощта на Tails USB инсталатора." + +#: ../lib/Tails/Persistence/Setup.pm:554 +msgid "Error" +msgstr "ГРЕШКА" + +#: ../lib/Tails/Persistence/Setup.pm:861 +msgid "Persistence wizard - Finished" +msgstr "Устойчивото Wizard - Завършен" + +#: ../lib/Tails/Persistence/Setup.pm:864 +msgid "" +"Any changes you have made will only take effect after restarting Tails.\n" +"\n" +"You may now close this application." +msgstr "Всички промени, които сте направили, ще влязат в сила след рестартиране на Tails. ⏎ ⏎ Сега можете да затворите тази програма." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:54 +msgid "Persistence wizard - Persistent volume creation" +msgstr "Persistence Wizard - създаване на Постоянно пространство" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:57 +msgid "Choose a passphrase to protect the persistent volume" +msgstr "Изберете парола за защита на устойчивото пространство" + +#. TRANSLATORS: size, device vendor, device model +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:61 +#, perl-format +msgid "" +"A %s persistent volume will be created on the %s %s device. Data on " +"this device will be stored in an encrypted form protected by a passphrase." +msgstr "Устойчивото пространство %s ще бъде създаден на на %s %s устройство. Данните за това устройство ще се съхраняват в криптиран вид, защитени с парола." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:66 +msgid "Create" +msgstr "Създаване на" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:110 +msgid "" +"Beware! Using persistence has consequences that must be well " +"understood. Tails can't help you if you use it wrong! See <a " +"href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'>Tails" +" documentation about persistence</a> to learn more." +msgstr " Пазете се! Използването на постоянство има последици, които трябва да бъдат добре разбрани. Tails не може да ви помогне, ако се използват неправилно! Вижте <a href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'> Tails документация за постоянство </a>, за да научите повече." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:144 +msgid "Passphrase:" +msgstr "Тайна фраза:" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:154 +msgid "Verify Passphrase:" +msgstr "Потвърди Тайната фраза:" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:167 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:231 +msgid "Passphrase can't be empty" +msgstr "Тайната фраза не може да бъде празна" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:222 +msgid "Passphrases do not match" +msgstr "Тайните фрази не съвпадат" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:262 +#: ../lib/Tails/Persistence/Step/Configure.pm:189 +msgid "Failed" +msgstr "Неуспешно" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:269 +#: ../lib/Tails/Persistence/Step/Delete.pm:84 +msgid "Correcting attributes on Tails system partition." +msgstr "Коригиране на атрибути на системния дял на Tails." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:272 +#: ../lib/Tails/Persistence/Step/Delete.pm:87 +msgid "The attributes of the Tails system partition will be corrected." +msgstr "Атрибутите на системния дял на Tails ще бъдат коригирани." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:280 +msgid "Mounting Tails persistence partition." +msgstr "Монтиране Tails постоянствен дял." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 +msgid "The Tails persistence partition will be mounted." +msgstr "Постоянствен Tails дял ще бъде монтиран." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:304 +msgid "Creating..." +msgstr "Създава се ..." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:307 +msgid "Creating the persistent volume..." +msgstr "Създаване на устойчивото пространство ..." + +#: ../lib/Tails/Persistence/Step/Configure.pm:60 +msgid "Persistence wizard - Persistent volume configuration" +msgstr "Persistence съветника - устойчиви пространство конфигурация" + +#: ../lib/Tails/Persistence/Step/Configure.pm:63 +msgid "Specify the files that will be saved in the persistent volume" +msgstr "Посочете файловете, които ще бъдат съхранени в продължаващото пространство" + +#. TRANSLATORS: partition, size, device vendor, device model +#: ../lib/Tails/Persistence/Step/Configure.pm:67 +#, perl-format +msgid "" +"The selected files will be stored in the encrypted partition %s (%s), on the" +" %s %s device." +msgstr "Избраните файлове ще се съхраняват в криптиран дял %s (%s), на %s %s устройство." + +#: ../lib/Tails/Persistence/Step/Configure.pm:73 +msgid "Save" +msgstr "Запиши" + +#: ../lib/Tails/Persistence/Step/Configure.pm:135 +msgid "Make custom directory persistent (absolute path):" +msgstr "Направете персонализиран устойчивото (абсолютен път)" + +#: ../lib/Tails/Persistence/Step/Configure.pm:141 +msgid "Destination:" +msgstr "Дестинация:" + +#: ../lib/Tails/Persistence/Step/Configure.pm:204 +msgid "Saving..." +msgstr "Запазване..." + +#: ../lib/Tails/Persistence/Step/Configure.pm:207 +msgid "Saving persistence configuration..." +msgstr "Запазване на постоянните конфигурация" + +#: ../lib/Tails/Persistence/Step/Delete.pm:41 +msgid "Persistence wizard - Persistent volume deletion" +msgstr "Persistence съветника - устойчиви обем заличаване" + +#: ../lib/Tails/Persistence/Step/Delete.pm:44 +msgid "Your persistent data will be deleted." +msgstr "Вашите постоянни данни ще бъдат изтрити." + +#: ../lib/Tails/Persistence/Step/Delete.pm:48 +#, perl-format +msgid "" +"The persistent volume %s (%s), on the %s %s device, will be deleted." +msgstr "Продължаващата памет %s (%s), на %s %s устройство, ще бъдат изтрита." + +#: ../lib/Tails/Persistence/Step/Delete.pm:54 +msgid "Delete" +msgstr "Изтриване" + +#: ../lib/Tails/Persistence/Step/Delete.pm:99 +msgid "Deleting..." +msgstr "Изтрива се ..." + +#: ../lib/Tails/Persistence/Step/Delete.pm:102 +msgid "Deleting the persistent volume..." +msgstr "Изтриването на постоянен обем ..."

1 0