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

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 29 Apr '16

29 Apr '16

commit 0eebda0e3b042fa0ccb973dc9fc154d6009f457b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 29 14:45:42 2016 +0000 Update translations for tor-launcher-network-settings --- ca/network-settings.dtd | 64 ++++++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/ca/network-settings.dtd b/ca/network-settings.dtd index 9ebf4d2..bff8120 100644 --- a/ca/network-settings.dtd +++ b/ca/network-settings.dtd @@ -11,66 +11,66 @@ <!ENTITY torSettings.yes "Sí"> <!ENTITY torSettings.no "No"> -<!ENTITY torSettings.firstQuestion "Quina de les següuens descriula teva situació?"> -<!ENTITY torSettings.configurePrompt1 "La connexió a internet d'aquest ordinador està censurada o configurada amb un proxy. "> -<!ENTITY torSettings.configurePrompt2 "Necessito configurar el pont o el servidor proxy local abans de connectar a la red Tor&#160"> +<!ENTITY torSettings.firstQuestion "Quina de les situacions següents descriu millor la teva?"> +<!ENTITY torSettings.configurePrompt1 "La connexió a internet d'aquest ordinador està censurada o configurada amb un servidor intermediari."> +<!ENTITY torSettings.configurePrompt2 "He de configurar el pont o el servidor intermediari local abans de connectar a la red Tor&#160"> <!ENTITY torSettings.configure "Configura"> -<!ENTITY torSettings.connectPrompt2 "M'agradaria fer una connexió directa a la red Tor."> +<!ENTITY torSettings.connectPrompt2 "Vull connectar-me directament a la xarxa Tor."> <!ENTITY torSettings.connectPrompt3 "Això funciona en la majoria dels casos."> -<!ENTITY torSettings.connect "Conectar"> +<!ENTITY torSettings.connect "Conecta't"> <!ENTITY torSettings.proxyPageTitle "Configuració del servidor intermediari local"> -<!ENTITY torSettings.proxyQuestion "Aquest ordinador ha de fer servir un proxy local per accedir a internet?"> +<!ENTITY torSettings.proxyQuestion "Aquest ordinador ha de fer servir un servidor intermediari local per accedir a internet?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Introdueix les opcions del proxy."> +<!ENTITY torSettings.proxyExplanation1 "En la majoria dels casos, un servidor intermediari local no és necessari, però pot ser que ho sigui quan la connexió és a través d'una xarxa d'empresa, d'una escola, o d'una universitat."> +<!ENTITY torSettings.proxyExplanation2 "Si no sabeu com respondre aquesta pregunta, mireu les preferències d'internet d'un altre navegador o reviseu la configuració de xarxa del vostre sistema per veure si cal un servidor intermediari local."> +<!ENTITY torSettings.enterProxy "Introdueix les opcions del servidor intermediari local."> <!ENTITY torSettings.bridgePageTitle "Configuració dels ponts Tor"> <!ENTITY torSettings.bridgeQuestion "El vostre proveïdor d'Internet (ISP) bloqueja o censura les connexions a la Xarxa Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "Hauries d'utilitzar el set de repetidors provist o customitzar el teu propi."> +<!ENTITY torSettings.bridgeExplanation1 "Si no sabeu com respondre aquesta pregunta, escolliu No (si no podeu connectar-vos a la xarxa Tor sense un pont, podeu afegir-lo després)."> +<!ENTITY torSettings.bridgeExplanation2 "Si escolliu Sí, se us demanarà que configureu els ponts Tor, que són repetidors no llistats que fan que sigui més difícil bloquejar les connexions a la xarxa Tor."> +<!ENTITY torSettings.bridgeSettingsPrompt "Podeu utilitzar el joc de repetidors aportat o fer-vos-en un de personalitzat. ">  <!ENTITY torsettings.startingTor "Esperant a Tor per començar..."> <!ENTITY torsettings.restartTor "Reinicia Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigurar"> +<!ENTITY torsettings.reconfigTor "Reconfigura"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Elimina el ajusts i connecta"> +<!ENTITY torsettings.discardSettings.prompt "Heu configurat ponts Tor o heu introduit una configuració de servidor intermediari.  Per a connectar-se directament a la xarxa Tor, aquestes preferències s'han de treure. "> +<!ENTITY torsettings.discardSettings.proceed "Elimina les preferències i connecta"> <!ENTITY torsettings.optional "Opcional "> -<!ENTITY torsettings.useProxy.checkbox "Aquest ordinador ha de fer servir un proxy local per accedir a internet. "> -<!ENTITY torsettings.useProxy.type "Tipus de Proxy:"> +<!ENTITY torsettings.useProxy.checkbox "Aquest ordinador ha de fer servir un servidor intermediari local per accedir a internet. "> +<!ENTITY torsettings.useProxy.type "Tipus de servidor intermediari local:"> <!ENTITY torsettings.useProxy.address "Adreça:"> -<!ENTITY torsettings.useProxy.address.placeholder "Direcció IP o nom del host"> +<!ENTITY torsettings.useProxy.address.placeholder "Adreça IP o nom del host"> <!ENTITY torsettings.useProxy.port "Port:"> <!ENTITY torsettings.useProxy.username "Nom d'usuari:"> <!ENTITY torsettings.useProxy.password "Contrasenya:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "Aquest ordinador va a través d'un proxy que només permet connexions a certs ports"> +<!ENTITY torsettings.firewall.checkbox "Aquest ordinador va a través d'un tallafoc que només permet connexions a certs ports"> <!ENTITY torsettings.firewall.allowedPorts "Ports permesos:"> <!ENTITY torsettings.useBridges.checkbox "El meu proveidor d'internet (ISP) bloqueja les conexions a la xarxa Tor"> -<!ENTITY torsettings.useBridges.default "Connectar amb els repetidors porvistos."> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.default "Connecta't amb els ponts predefinits."> +<!ENTITY torsettings.useBridges.note "Cada tipus de pont fa servir un mètode diferent per evitar la censura.  Si un pont no funciona, intenteu-ho amb un altre."> <!ENTITY torsettings.useBridges.type "Tipus de transport:"> -<!ENTITY torsettings.useBridges.custom "Entra als repetidors customitzats."> -<!ENTITY torsettings.useBridges.label "Entra en un o més repetidors (un per linia)."> +<!ENTITY torsettings.useBridges.custom "Entra els ponts propis"> +<!ENTITY torsettings.useBridges.label "Entra un o més repetidor de pont (un per línia)."> <!ENTITY torsettings.useBridges.placeholder "introdueix adreça:port"> -<!ENTITY torsettings.copyLog "Copiar el Log al portapapers"> -<!ENTITY torsettings.bridgeHelpTitle "Ajuda Repetidors"> -<!ENTITY torsettings.bridgeHelp1 "Si no sóu capaçps de connectar-vos a la xarxa Tor, pot ser que el vostre proveidor d'internet (ISP) o alguna altra agència estigui bloquejant Tor.  normalment, podeu evitar aquest problema usant Ponts Tor, que son relés no llistats més difícils de bloquejar. "> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> +<!ENTITY torsettings.copyLog "Copia el registre de Tor al porta-retalls"> +<!ENTITY torsettings.bridgeHelpTitle "Ajuda per als repetidors de pont"> +<!ENTITY torsettings.bridgeHelp1 "Si no podeu connectar-vos a la xarxa Tor, pot ser que el vostre proveidor d'internet (ISP) o alguna altra agència estigui bloquejant Tor.  En principi, podeu evitar aquest problema fent servir Ponts Tor, que son repetidors no llistats més difícils de bloquejar. "> +<!ENTITY torsettings.bridgeHelp1B "Podeu fer servir el joc de ponts preconfigurat o podeu fer-vos en un de propi mitjançant aquests tres mètodes:"> <!ENTITY torsettings.bridgeHelp2Heading "A través del web"> -<!ENTITY torsettings.bridgeHelp2 "Utilitza un navegador web o vés a: https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "A través del mail d'autorresposta."> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Envieu un e-mail a bridges(a)torproject.org només amb el text 'get bridges' al cos del missatge.  No obstant, per a fer més difícil per a l'atacant d'aprendre moltes adreces pont, heu d'enviar aquesta petició des d'un dels proveïdors de correu següents (llistats en ordre de preferència):"> +<!ENTITY torsettings.bridgeHelp2 "Utilitza un navegador web per visitar https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "A través del correu d'autorresposta."> +<!ENTITY torsettings.bridgeHelp3.emailDesc "Envieu un correu electrònic a bridges(a)torproject.org només amb el text 'get bridges' al cos del missatge.  No obstant, per fer més difícil que l'atacant esbrini moltes adreces pont, heu d'enviar aquesta petició des d'un dels proveïdors de correu següents (llistats en ordre de preferència):"> <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, o https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "A través del Escriptori d'Ajuda"> -<!ENTITY torsettings.bridgeHelp4 "Com a última opció, pots demanar adreces de repetidors enviant un missatge a help(a)rt.torproject.org.  siusplau recorda que serà una persona qui et respondrà, siguis pacient i amable."> +<!ENTITY torsettings.bridgeHelp4Heading "A través de l'Escriptori d'Ajuda"> +<!ENTITY torsettings.bridgeHelp4 "Com a última opció, podeu demanar adreces de pont enviant un missatge a help(a)rt.torproject.org.  Una persona respondrà cada petició.">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 29 Apr '16

29 Apr '16

commit fe8b7c0c7ecb05f6c184d3d257d97d9da1c0b10b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 29 11:45:16 2016 +0000 Update translations for https_everywhere --- ja/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ja/https-everywhere.dtd b/ja/https-everywhere.dtd index 1ddd984..0e196fa 100644 --- a/ja/https-everywhere.dtd +++ b/ja/https-everywhere.dtd @@ -48,7 +48,7 @@ <!ENTITY https-everywhere.chrome.host "ホスト:"> <!ENTITY https-everywhere.chrome.show_advanced "高度な設定を表示する"> <!ENTITY https-everywhere.chrome.hide_advanced "高度な設定を隠す"> -<!ENTITY https-everywhere.chrome.rule_name "Rule name"> +<!ENTITY https-everywhere.chrome.rule_name "ルール名"> <!ENTITY https-everywhere.chrome.regex "Matching regex"> <!ENTITY https-everywhere.chrome.redirect_to "リダイレクト先"> <!ENTITY https-everywhere.chrome.status_cancel_button "キャンセル">

1 0

[collector/master] Prefix entries in .gitignore with slash.
by karsten＠torproject.org 29 Apr '16

29 Apr '16

commit b41a71cd70d69e9847d4b3907015cc3217844a6a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Apr 29 00:14:43 2016 +0200 Prefix entries in .gitignore with slash. We really only want to ignore files and directories in the current directory, not files and directories in subdirectories. --- .gitignore | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index ec941d0..a31fb1c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,14 @@ -.classpath -.project -classes/ -config -data/ -in/ -out/ -log/ -rsync/ -stats/ -tarballs/ -generated -lib +/.classpath +/.project +/classes/ +/config +/data/ +/in/ +/out/ +/log/ +/rsync/ +/stats/ +/tarballs/ +/generated +/lib

1 0

[ooni-probe/master] Specify a more recent version of setuptools
by art＠torproject.org 29 Apr '16

29 Apr '16

commit df7070bfdeab4060476437ab079e251d150e0b9a Author: Arturo Filastò <arturo(a)filasto.net> Date: Wed Apr 27 12:49:29 2016 +0200 Specify a more recent version of setuptools * cryptography -> depends on -> cffi -> ipaddress -> setuptools >=11.3 * Python dependencies are hell --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 229504b..7aeaabc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,7 @@ # These are dependencies of ooniprobe depedencies that require specific # versions. pyasn1>=0.1.8 +setuptools>=11.3 # These are direct dependencies of ooniprobe. PyYAML>=3.10

1 0

[ooni-probe/master] Join ooniprobe and ooniprobequeue into one command
by art＠torproject.org 29 Apr '16

29 Apr '16

commit 1192ca0d0fd7c7b4aa5cb593fe711eb175d5c880 Author: Arturo Filastò <arturo(a)filasto.net> Date: Tue Apr 26 23:33:14 2016 +0200 Join ooniprobe and ooniprobequeue into one command --- bin/ooniprobe | 19 +++++++++++++++++-- bin/ooniprobequeue | 16 ---------------- ooni/oonicli.py | 21 +++++++-------------- ooni/tests/test_oonicli.py | 5 +++-- setup.py | 3 +-- 5 files changed, 28 insertions(+), 36 deletions(-) diff --git a/bin/ooniprobe b/bin/ooniprobe index 4832d91..ad97553 100755 --- a/bin/ooniprobe +++ b/bin/ooniprobe @@ -1,9 +1,24 @@ #!/usr/bin/env python +import sys + from twisted.internet import reactor -from ooni.oonicli import runWithDirector -d = runWithDirector() +from ooni.oonicli import setupGlobalOptions +from ooni.oonicli import runWithDaemonDirector, runWithDirector + +exit_code=0 + +global_options = setupGlobalOptions(logging=True, start_tor=True, + check_incoherences=True) +if global_options['queue']: + d = runWithDaemonDirector(global_options) +else: + d = runWithDirector(global_options) @d.addBoth def cb(result): + global exit_code + if result is not None: + exit_code=1 reactor.stop() reactor.run() +sys.exit(exit_code) diff --git a/bin/ooniprobequeue b/bin/ooniprobequeue deleted file mode 100755 index 88359e0..0000000 --- a/bin/ooniprobequeue +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env python -import sys -from twisted.internet import reactor - -code=0 - -from ooni.oonicli import runWithDaemonDirector -d = runWithDaemonDirector() -(a)d.addBoth -def cb(result): - global code - if result is not None: - code=1 - reactor.stop() -reactor.run() -sys.exit(code) diff --git a/ooni/oonicli.py b/ooni/oonicli.py index 09936b6..1ffe467 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -205,6 +205,7 @@ def setupGlobalOptions(logging, start_tor, check_incoherences): log.err("Insufficient Privileges to capture packets." " See ooniprobe.conf privacy.includepcap") sys.exit(2) + global_options['check_incoherences'] = check_incoherences return global_options def setupAnnotations(global_options): @@ -294,14 +295,13 @@ def createDeck(global_options, url=None): return deck -def runTestWithDirector(director, global_options, url=None, - start_tor=True, check_incoherences=True): +def runTestWithDirector(director, global_options, url=None, start_tor=True): deck = createDeck(global_options, url=url) start_tor |= deck.requiresTor d = director.start(start_tor=start_tor, - check_incoherences=check_incoherences) + check_incoherences=global_options['check_incoherences']) def setup_nettest(_): try: @@ -341,13 +341,11 @@ def runTestWithDirector(director, global_options, url=None, d.addErrback(director_startup_other_failures) return d -def runWithDirector(logging=True, start_tor=True, check_incoherences=True): +def runWithDirector(global_options): """ Instance the director, parse command line options and start an ooniprobe test! """ - global_options = setupGlobalOptions(logging, start_tor, check_incoherences) - from ooni.director import Director director = Director() if global_options['list']: @@ -398,14 +396,13 @@ def runWithDirector(logging=True, start_tor=True, check_incoherences=True): return runTestWithDirector(director=director, start_tor=start_tor, - global_options=global_options, - check_incoherences=check_incoherences) + global_options=global_options) # this variant version of runWithDirector splits the process in two, # allowing a single director instance to be reused with multiple decks. -def runWithDaemonDirector(logging=True, start_tor=True, check_incoherences=True): +def runWithDaemonDirector(global_options): """ Instance the director, parse command line options and start an ooniprobe test! @@ -421,9 +418,6 @@ def runWithDaemonDirector(logging=True, start_tor=True, check_incoherences=True) print "Install with \"pip install pika\"." sys.exit(7) - - global_options = setupGlobalOptions(logging, start_tor, check_incoherences) - director = Director() if global_options.get('annotations') is not None: @@ -464,8 +458,7 @@ def runWithDaemonDirector(logging=True, start_tor=True, check_incoherences=True) d = runTestWithDirector(director=director, start_tor=start_tor, global_options=global_options, - url=data['url'].encode('utf8'), - check_incoherences=check_incoherences) + url=data['url'].encode('utf8')) # When the test has been completed, go back to waiting for a message. d.addCallback(readmsg, channel, queue_object, consumer_tag, counter+1) except exceptions.AMQPError,v: diff --git a/ooni/tests/test_oonicli.py b/ooni/tests/test_oonicli.py index 172b9cd..f5c8545 100644 --- a/ooni/tests/test_oonicli.py +++ b/ooni/tests/test_oonicli.py @@ -7,7 +7,7 @@ from twisted.internet import defer from ooni.tests import is_internet_connected from ooni.tests.bases import ConfigTestCase from ooni.settings import config -from ooni.oonicli import runWithDirector +from ooni.oonicli import runWithDirector, setupGlobalOptions from ooni.utils.net import hasRawSocketPermission @@ -89,7 +89,8 @@ class TestRunDirector(ConfigTestCase): sys.argv.extend(ooni_args) sys.argv.extend(['-n', '-o', output_file, test_name]) sys.argv.extend(nettest_args) - yield runWithDirector(False, False, False) + global_options = setupGlobalOptions(False, False, False) + yield runWithDirector(global_options) with open(output_file) as f: entries = yaml.safe_load_all(f) header = entries.next() diff --git a/setup.py b/setup.py index 1fd9a7b..a70df0c 100644 --- a/setup.py +++ b/setup.py @@ -204,8 +204,7 @@ setup( packages=packages, include_package_data=True, scripts=["bin/oonideckgen", "bin/ooniprobe", - "bin/oonireport", "bin/ooniresources", - "bin/ooniprobequeue"], + "bin/oonireport", "bin/ooniresources"], dependency_links=dependency_links, install_requires=install_requires, zip_safe=False,

1 0

[ooni-probe/master] Merge branch 'feature/fix_cct_tests' into release/1.4.0
by art＠torproject.org 29 Apr '16

29 Apr '16

commit 397ed5506d97a17cb4d05852af06ebf3674c638b Merge: b2dbd38 bcc2be4 Author: Arturo Filastò <arturo(a)filasto.net> Date: Tue Apr 26 23:17:01 2016 +0200 Merge branch 'feature/fix_cct_tests' into release/1.4.0 * feature/fix_cct_tests: Fix bug in parsing of options for Lantern Add support for setting the url and expected-body in tests Re-create the command inside the test method. Update user documentation for psiphon and lantern When GeoIP lookup is disabled it's not possible to perform sanitisations Always use the same URL when testing psiphon Add support for stripping potential inclusion of probe IPs in reports Refactor lantern test to use the ProcessTest template Add test for Vanilla Tor docs/source/tests/lantern.rst | 23 ++++--- docs/source/tests/psiphon.rst | 24 ++++--- ooni/nettests/blocking/vanilla_tor.py | 105 +++++++++++++++++++++++++++++ ooni/nettests/third_party/lantern.py | 122 ++++++++++++++++++---------------- ooni/nettests/third_party/psiphon.py | 50 ++++++++------ ooni/templates/httpt.py | 8 ++- ooni/templates/process.py | 9 ++- ooni/utils/net.py | 3 + 8 files changed, 245 insertions(+), 99 deletions(-) diff --cc ooni/nettests/third_party/psiphon.py index 2633f60,2b18b18..d4eb18f --- a/ooni/nettests/third_party/psiphon.py +++ b/ooni/nettests/third_party/psiphon.py @@@ -30,11 -31,11 +31,11 @@@ class PsiphonTest(httpt.HTTPTest, proc """ name = "Psiphon Test" - description = "Bootstraps Psiphon and \ - does a HTTP GET for the specified URL" + description = ("Bootstraps Psiphon and" + "does a HTTP GET for the specified URL") author = "juga" - version = "0.0.1" - timeout = 20 + version = "0.1.0" + timeout = 120 usageOptions = UsageOptions def _setUp(self): diff --cc ooni/templates/httpt.py index edab3fa,12995bb..fd6c8ab --- a/ooni/templates/httpt.py +++ b/ooni/templates/httpt.py @@@ -163,22 -131,21 +163,26 @@@ class HTTPTest(NetTestCase) 'url': request['url'], 'method': request['method'], 'tor': request['tor'] -- } ++ }, ++ 'response': None } if response: + if self.localOptions.get('withoutbody', 0) is 0: + response_body = _representBody(response_body) + else: + response_body = '' + # Attempt to redact the IP address of the probe from the responses + if config.privacy.includeip is False and config.probe_ip.address is not None: + response_body = response_body.replace(config.probe_ip.address, "[REDACTED]") - request_response['response'] = { - 'headers': list(response.headers.getAllRawHeaders()), - 'body': response_body if self.localOptions.get('withoutbody', 0) == 0 else '', + session['response'] = { + 'headers': _representHeaders(response.headers), + 'body': response_body, 'code': response.code - } + } + session['failure'] = None if failure_string: - request_response['failure'] = failure_string - - self.report['requests'].append(request_response) + session['failure'] = failure_string + self.report['requests'].append(session) def _processResponseBody(self, response_body, request, response, body_processor): log.debug("Processing response body")

1 0

[ooni-probe/master] Update references to ooni logo
by art＠torproject.org 29 Apr '16

29 Apr '16

commit 44028962566098be17af0ecb5ccb2c3fa3858fba Author: Arturo Filastò <arturo(a)filasto.net> Date: Wed Apr 27 19:53:43 2016 +0200 Update references to ooni logo * Use the png instead of the svg for the mascot image --- README.rst | 2 +- setup.py | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index b42d755..ef9e0ba 100644 --- a/README.rst +++ b/README.rst @@ -9,7 +9,7 @@ ooniprobe: a network interference detection tool ___________________________________________________________________________ -.. image:: https://ooni.torproject.org/images/ooni-header-mascot.svg +.. image:: https://ooni.torproject.org/images/ooni-header-mascot.png :target: https:://ooni.torproject.org/ OONI, the Open Observatory of Network Interference, is a global observation diff --git a/setup.py b/setup.py index a70df0c..da0b967 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ ooniprobe: a network interference detection tool ___________________________________________________________________________ -.. image:: https://ooni.torproject.org/theme/img/ooni-logo.png +.. image:: https://ooni.torproject.org/images/ooni-header-mascot.png :target: https:://ooni.torproject.org/ OONI, the Open Observatory of Network Interference, is a global observation @@ -53,6 +53,13 @@ To install ooniprobe you will need the following dependencies: * libffi-dev * libdumbnet-dev + +On debian based systems this can generally be done by running: + +.. code:: bash + + sudo apt-get install -y build-essential libdumbnet-dev libpcap-dev libgeoip-dev libffi-dev python-dev python-pip + When you got them run: .. code:: bash

1 0

[ooni-probe/master] Always output the same deck filename
by art＠torproject.org 29 Apr '16

29 Apr '16

commit 97cd370e7349e6f74471f8ebb6beedb900197551 Author: Arturo Filastò <arturo(a)filasto.net> Date: Wed Apr 27 12:14:18 2016 +0200 Always output the same deck filename --- README.rst | 2 +- ooni/deckgen/cli.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index f137b88..a6dcb2c 100644 --- a/README.rst +++ b/README.rst @@ -188,7 +188,7 @@ you can do so (be sure to have updated the input resources first) by running:: oonideckgen --country-code IT --output ~/ -You will now have in your home a folder called `deck-YOUR_COUNTRY_CODE`, containing the ooni +You will now have in your home a folder called `deck-it`, containing the ooni deck (ends with .deck) and the inputs. Note: that you should not move the `deck-*` directory once it has been generated as the paths to the inputs referenced by the test in the deck are diff --git a/ooni/deckgen/cli.py b/ooni/deckgen/cli.py index c2ebfd8..2e0e976 100644 --- a/ooni/deckgen/cli.py +++ b/ooni/deckgen/cli.py @@ -111,8 +111,7 @@ def generate_deck(options): if config.advanced.debug: deck.pprint() deck_filename = os.path.join(options['output'], - "%s-%s-user.deck" % (__version__, - options['country-code'])) + "default-user.deck") deck.write_to_file(deck_filename) print "Deck written to %s" % deck_filename print "Run ooniprobe like so:"

1 0

[ooni-probe/master] Use the process template in the netalyzr test
by art＠torproject.org 29 Apr '16

29 Apr '16

commit 51c9b63c9cbf4499f43ec497e883afbfee8388c8 Author: Arturo Filastò <arturo(a)filasto.net> Date: Wed Apr 27 12:07:02 2016 +0200 Use the process template in the netalyzr test * Clean up text of psiphon test --- ooni/nettests/third_party/netalyzr.py | 77 +++++++++++++++++++---------------- ooni/nettests/third_party/psiphon.py | 2 +- 2 files changed, 43 insertions(+), 36 deletions(-) diff --git a/ooni/nettests/third_party/netalyzr.py b/ooni/nettests/third_party/netalyzr.py index 3154af7..ee5c477 100644 --- a/ooni/nettests/third_party/netalyzr.py +++ b/ooni/nettests/third_party/netalyzr.py @@ -6,55 +6,62 @@ # Arturo "hellais" Filastò <art(a)fuffa.org> # :licence: see LICENSE -from ooni import nettest -from ooni.utils import log import time import os +import distutils.spawn + +from twisted.python import usage from twisted.internet import reactor, threads -class NetalyzrWrapperTest(nettest.NetTestCase): - name = "NetalyzrWrapper" - requiresRoot = False - requiresTor = False +from ooni.templates import process +from ooni.utils import log - def setUp(self): - cwd = os.path.abspath(os.path.join(os.path.abspath(__file__), '..')) +class JavaNotInstalled(Exception): + pass - # XXX set the output directory to something more uniform - outputdir = os.path.join(cwd, '..', '..') +class CouldNotFindNetalyzrCli(Exception): + pass - program_path = os.path.join(cwd, 'NetalyzrCLI.jar') - program = "java -jar %s -d" % program_path +class UsageOptions(usage.Options): + optParameters = [ + ['clipath', 'p', None, 'Specify the path to NetalyzrCLI.jar (can be ' + 'downloaded from ' + 'http://netalyzr.icsi.berkeley.edu/NetalyzrCLI.jar)'] + ] - test_token = time.asctime(time.gmtime()).replace(" ", "_").strip() +class NetalyzrWrapperTest(process.ProcessTest): + name = "NetalyzrWrapper" + description = "A wrapper around the Netalyzr java command line client" + author = "Jacob Appelbaum <jacob(a)appelbaum.net>" + + requiredOptions = ['clipath'] - self.output_file = os.path.join(outputdir, - "NetalyzrCLI_" + test_token + ".out") - self.output_file.strip() - self.run_me = program + " 2>&1 >> " + self.output_file + usageOptions = UsageOptions + requiresRoot = False + requiresTor = False - def blocking_call(self): - try: - result = threads.blockingCallFromThread(reactor, os.system, self.run_me) - except: - log.debug("Netalyzr had an error, please see the log file: %s" % self.output_file) - finally: - self.clean_up() + timeout = 300 + + def requirements(self): + if not distutils.spawn.find_executable("java"): + raise JavaNotInstalled("Java is not installed.") + + def setUp(self): + if not os.path.exists(self.localOptions['clipath']): + raise CouldNotFindNetalyzrCli("Could not find NetalyzrCLI.jar at {}".format(self.localOptions['clipath'])) - def clean_up(self): - self.report['netalyzr_report'] = self.output_file - log.debug("finished running NetalzrWrapper") - log.debug("Please check %s for Netalyzr output" % self.output_file) + self.command = [ + distutils.spawn.find_executable("java"), + "-jar", + "{}".format(self.localOptions['clipath']), + "-d" + ] def test_run_netalyzr(self): """ This test simply wraps netalyzr and runs it from command line """ log.msg("Running NetalyzrWrapper (this will take some time, be patient)") - log.debug("with command '%s'" % self.run_me) - # XXX we probably want to use a processprotocol here to obtain the - # stdout from Netalyzr. This would allows us to visualize progress - # (currently there is no progress because the stdout of os.system is - # trapped by twisted) and to include the link to the netalyzr report - # directly in the OONI report, perhaps even downloading it. - reactor.callInThread(self.blocking_call) + log.debug("with command '%s'" % self.command) + self.d = self.run(self.command, env=os.environ, usePTY=1) + return self.d diff --git a/ooni/nettests/third_party/psiphon.py b/ooni/nettests/third_party/psiphon.py index d4eb18f..9e50832 100644 --- a/ooni/nettests/third_party/psiphon.py +++ b/ooni/nettests/third_party/psiphon.py @@ -31,7 +31,7 @@ class PsiphonTest(httpt.HTTPTest, process.ProcessTest): """ name = "Psiphon Test" - description = ("Bootstraps Psiphon and" + description = ("Bootstraps Psiphon and " "does a HTTP GET for the specified URL") author = "juga" version = "0.1.0"

1 0

[ooni-probe/master] Add codename for ooniprobe release
by art＠torproject.org 29 Apr '16

29 Apr '16

commit 28ba3237b782a95202008ba1aea98bc608295401 Author: Arturo Filastò <arturo(a)filasto.net> Date: Wed Apr 27 19:46:46 2016 +0200 Add codename for ooniprobe release --- ChangeLog.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog.rst b/ChangeLog.rst index 82d04cd..471e282 100644 --- a/ChangeLog.rst +++ b/ChangeLog.rst @@ -4,6 +4,8 @@ Changelog v1.4.0 (Wed, 27 Apr 2016) ------------------------- +codename: Under the Sea + * Support for reporting using JSON * Support for running ooniprobe with a message queue providing URLs to test

1 0