- tor-commits - lists.torproject.org

[ooni-probe/master] Change location of log file to cwd
by art＠torproject.org 22 Nov '12

22 Nov '12

commit f78499c1f32b4ae0303e3f65bc322b39d8e177eb Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 22 11:25:50 2012 +0100 Change location of log file to cwd --- ooniprobe.conf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ooniprobe.conf b/ooniprobe.conf index 2e5992a..1998c93 100644 --- a/ooniprobe.conf +++ b/ooniprobe.conf @@ -4,7 +4,7 @@ basic: # Where OONIProbe should be writing it's log file - logfile: /tmp/ooniprobe.log + logfile: ooniprobe.log privacy: # Should we include the IP address of the probe in the report? includeip: false

1 0

[ooni-probe/master] Use usageOptions in HTTP requests test
by art＠torproject.org 22 Nov '12

22 Nov '12

commit d3985c82de5537b4452838bd09bc28ca8758f69f Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 22 11:24:45 2012 +0100 Use usageOptions in HTTP requests test --- nettests/core/http_requests.py | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/nettests/core/http_requests.py b/nettests/core/http_requests.py index 0315145..7a2f5ef 100644 --- a/nettests/core/http_requests.py +++ b/nettests/core/http_requests.py @@ -6,6 +6,8 @@ import random import json +from twisted.python import usage + from ooni.utils import log, net from ooni.templates import httpt @@ -19,6 +21,14 @@ def random_capitalization(string): output += string[i] return output +class UsageOptions(usage.Options): + optParameters = [ + ['backend', 'b', None, + 'URL of the backend to use for sending the requests'], + ['headers', 'h', None, + 'Specify a yaml formatted file from which to read the request headers to send'] + ] + class HTTPRequests(httpt.HTTPTest): """ This test is also known as Header Field manipulation. It performes HTTP @@ -28,12 +38,7 @@ class HTTPRequests(httpt.HTTPTest): author = "Arturo Filastò" version = 0.1 - optParameters = [ - ['backend', 'b', None, - 'URL of the backend to use for sending the requests'], - ['headers', 'h', None, - 'Specify a yaml formatted file from which to read the request headers to send'] - ] + usageOptions = UsageOptions requiredOptions = ['backend']

1 0

[ooni-probe/master] Add test that generates a random invalid HTTP request
by art＠torproject.org 22 Nov '12

22 Nov '12

commit ebf39da6ee59e2fb55226e5c256553ce1093006c Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 22 11:22:16 2012 +0100 Add test that generates a random invalid HTTP request --- nettests/core/http_invalid_requests.py | 63 ++++++++++++++++++++++++++++++++ 1 files changed, 63 insertions(+), 0 deletions(-) diff --git a/nettests/core/http_invalid_requests.py b/nettests/core/http_invalid_requests.py new file mode 100644 index 0000000..7e6f47f --- /dev/null +++ b/nettests/core/http_invalid_requests.py @@ -0,0 +1,63 @@ +# -*- encoding: utf-8 -*- +from twisted.python import usage + +from ooni.utils import randomStr +from ooni.templates import tcpt + +class UsageOptions(usage.Options): + optParameters = [['backend', 'b', '127.0.0.1:57002', + 'The OONI backend that runs a TCP echo server (must be on port 80)']] + + optFlags = [['nopayloadmatch', 'n', + "Don't match the payload of the response. This option is used when you don't have a TCP echo server running"]] + +class HTTPInvalidRequests(tcpt.TCPTest): + name = "HTTP Invalid Requests" + version = "0.1.1" + authors = "Arturo Filastò" + + inputFile = ['file', 'f', None, + 'Input file of list of hostnames to attempt to resolve'] + + usageOptions = UsageOptions + requiredOptions = ['backend'] + + def setUp(self): + try: + self.address, self.port = self.localOptions['backend'].split(":") + self.port = int(self.port) + except: + raise usage.UsageError("Invalid backend address specified (must be address:port)") + + def test_random_invalid_request(self): + """ + We test sending data to a TCP echo server, if what we get back is not + what we have sent then there is tampering going on. + This is for example what squid will return when performing such + request: + + HTTP/1.0 400 Bad Request + Server: squid/2.6.STABLE21 + Date: Sat, 23 Jul 2011 02:22:44 GMT + Content-Type: text/html + Content-Length: 1178 + Expires: Sat, 23 Jul 2011 02:22:44 GMT + X-Squid-Error: ERR_INVALID_REQ 0 + X-Cache: MISS from cache_server + X-Cache-Lookup: NONE from cache_server:3128 + Via: 1.0 cache_server:3128 (squid/2.6.STABLE21) + Proxy-Connection: close + + """ + payload = randomStr(10) + "\n\r" + def got_all_data(received_array): + if not self.localOptions['nopayloadmatch']: + first = received_array[0] + if first != payload: + self.report['tampering'] = True + else: + self.report['tampering'] = 'unknown' + + d = self.sendPayload(payload) + d.addCallback(got_all_data) + return d

1 0

[ooni-probe/master] Merge branch 'tcptest'
by art＠torproject.org 22 Nov '12

22 Nov '12

commit 21fb4cb53e5d69e851aa0a2f4bd48b562d5c2ed3 Merge: f78499c d3985c8 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 22 11:27:06 2012 +0100 Merge branch 'tcptest' * tcptest: Use usageOptions in HTTP requests test Add test that generates a random invalid HTTP request Better error handling in tcp test template Add some more fine grained matching on received answers Add support for optFlags in nettest Implement TCP payload sending test template * Example test based on this test template Include socksproxy address in HTTP based tests nettests/core/http_invalid_requests.py | 63 +++++++++++++++++++++++ nettests/core/http_requests.py | 17 ++++-- nettests/examples/example_tcpt.py | 8 +++ ooni/nettest.py | 1 + ooni/runner.py | 8 +++ ooni/templates/httpt.py | 1 + ooni/templates/scapyt.py | 24 ++++++++- ooni/templates/tcpt.py | 87 ++++++++++++++++++++++++++++++++ 8 files changed, 202 insertions(+), 7 deletions(-)

1 0

[ooni-probe/master] Add some more fine grained matching on received answers
by art＠torproject.org 22 Nov '12

22 Nov '12

commit 0cf6a3d3bdc2ec847cd3834642cb3b8a4176ac5e Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 22 11:21:27 2012 +0100 Add some more fine grained matching on received answers --- ooni/templates/scapyt.py | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/ooni/templates/scapyt.py b/ooni/templates/scapyt.py index d137276..ca6d938 100644 --- a/ooni/templates/scapyt.py +++ b/ooni/templates/scapyt.py @@ -9,7 +9,7 @@ from twisted.python import usage from twisted.plugin import IPlugin from twisted.internet import protocol, defer, threads -from scapy.all import send, sr, IP, TCP +from scapy.all import send, sr, IP, TCP, config from ooni.nettest import NetTestCase from ooni.utils import log @@ -43,6 +43,28 @@ class BaseScapyTest(NetTestCase): version = 0.1 requiresRoot = True + baseFlags = [ + ['ipsrc', 's', 'Check if IP src matches when processing answers'], + ['seqack', 'k', 'Check if TCP sequence number and ack matches when processing answers'], + ['ipid', 'i', 'Check if IP id matches when processing answers'] + ] + + def _setUp(self): + if self.localOptions['ipsrc']: + config.checkIPsrc = 1 + else: + config.checkIPsrc = 0 + + if self.localOptions['ipid']: + config.checkIPID = 1 + else: + config.checkIPID = 0 + # XXX we don't support strict matching + + if self.localOptions['seqack']: + config.check_TCPerror_seqack = 1 + else: + config.check_TCPerror_seqack = 0 def sr(self, packets, *arg, **kw): """

1 0

[ooni-probe/master] Better error handling in tcp test template
by art＠torproject.org 22 Nov '12

22 Nov '12

commit 880ddb4fdfb95006e4792350d752925b36474dcf Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 22 11:21:58 2012 +0100 Better error handling in tcp test template --- ooni/templates/tcpt.py | 33 +++++++++++++++++++++++++++++++-- 1 files changed, 31 insertions(+), 2 deletions(-) diff --git a/ooni/templates/tcpt.py b/ooni/templates/tcpt.py index 3312cbe..e592274 100644 --- a/ooni/templates/tcpt.py +++ b/ooni/templates/tcpt.py @@ -7,10 +7,37 @@ from ooni.utils import log class TCPSender(protocol.Protocol): report = None + payload_len = None + received_data = '' def dataReceived(self, data): - self.report['received'].append(data) + """ + We receive data until the total amount of data received reaches that + which we have sent. At that point we append the received data to the + report and we fire the callback of the test template sendPayload + function. + + This is used in pair with a TCP Echo server. + + The reason why we put the data received inside of an array is that in + future we may want to expand this to support state and do something + similar to what daphne does, but without the mutation. + + XXX Actually daphne will probably be refactored to be a subclass of the + TCP Test Template. + """ + if self.payload_len: + self.received_data += data + if len(self.received_data) >= self.payload_len: + self.transport.loseConnection() + self.report['received'].append(data) + self.deferred.callback(self.report['received']) def sendPayload(self, payload): + """ + Write the payload to the wire and set the expected size of the payload + we are to receive. + """ + self.payload_len = len(payload) self.report['sent'].append(payload) self.transport.write(payload) @@ -37,15 +64,17 @@ class TCPTest(NetTestCase): def closeConnection(p): p.transport.loseConnection() log.debug("Closing connection") - d1.callback(None) + d1.callback(self.report['received']) def errback(failure): self.report['error'] = str(failure) log.exception(failure) + d1.callback(self.report['received']) def connected(p): log.debug("Connected to %s:%s" % (self.address, self.port)) p.report = self.report + p.deferred = d1 p.sendPayload(payload) reactor.callLater(self.timeout, closeConnection, p)

1 0

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

22 Nov '12

commit 81a71e88e75e0136d34145be352b02775fb99562 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 22 00:45:21 2012 +0000 Update translations for vidalia_alpha_completed --- es/vidalia_es.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index bc08d3f..ee9f682 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 00:13+0000\n" +"PO-Revision-Date: 2012-11-22 00: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" @@ -3466,11 +3466,11 @@ msgid "" "Tor is trying to determine if your relay's directory port is reachable from " "the Tor network by connecting to itself at %1:%2. This test could take " "several minutes." -msgstr "Tor está tratando de determinar si el puerto de su publicador de directorios es accesible desde la red Tor conectándose a sí mismo en%1:%2. Esta prueba puede tardar varios minutos." +msgstr "Tor está tratando de determinar si el puerto de su lista de propagación de repetidores (relay directory) es accesible desde la red Tor conectándose a si mismo en %1:%2. Esta prueba puede tardar varios minutos." msgctxt "StatusEventWidget" msgid "Directory Port Reachability Test Successful!" -msgstr "Prueba de acceso al puerto del Servidor de Directorio realizada con exito!" +msgstr "¡Prueba de acceso al puerto de la lista de propagación (directory) realizada con exito!" msgctxt "StatusEventWidget" msgid "Your relay's directory port is reachable from the Tor network!"

1 0

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

22 Nov '12

commit 9881df56f1d2bb507225f2e3b49d3e3d25700352 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 22 00:45:19 2012 +0000 Update translations for vidalia_alpha --- es/vidalia_es.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index bc08d3f..ee9f682 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 00:13+0000\n" +"PO-Revision-Date: 2012-11-22 00: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" @@ -3466,11 +3466,11 @@ msgid "" "Tor is trying to determine if your relay's directory port is reachable from " "the Tor network by connecting to itself at %1:%2. This test could take " "several minutes." -msgstr "Tor está tratando de determinar si el puerto de su publicador de directorios es accesible desde la red Tor conectándose a sí mismo en%1:%2. Esta prueba puede tardar varios minutos." +msgstr "Tor está tratando de determinar si el puerto de su lista de propagación de repetidores (relay directory) es accesible desde la red Tor conectándose a si mismo en %1:%2. Esta prueba puede tardar varios minutos." msgctxt "StatusEventWidget" msgid "Directory Port Reachability Test Successful!" -msgstr "Prueba de acceso al puerto del Servidor de Directorio realizada con exito!" +msgstr "¡Prueba de acceso al puerto de la lista de propagación (directory) realizada con exito!" msgctxt "StatusEventWidget" msgid "Your relay's directory port is reachable from the Tor network!"

1 0

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

22 Nov '12

commit 30cacb80553ad73d250975e689c75ce6af148eee Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 22 00:15:23 2012 +0000 Update translations for vidalia_alpha_completed --- es/vidalia_es.po | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index fb167b9..bc08d3f 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-21 22:49+0000\n" +"PO-Revision-Date: 2012-11-22 00:13+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" @@ -3424,30 +3424,30 @@ msgid "" "Tor detected that your DNS provider is providing false responses for well " "known domains. Since clients rely on Tor network relays to provide accurate " "DNS repsonses, your relay will not be configured as an exit relay." -msgstr "Tor detectó que su proveedor de DNS está proporcionando respuestas falsas para dominios bien conocidos. Ya que los clientes confían en que los repetidores de la red Tor proporcionen respuestas precisas de DNS, su repetidor (relay) no se configurará como un repetidor de salida (de la red Tor hacia internet)." +msgstr "Tor detectó que su proveedor de DNS está proporcionando respuestas falsas para dominios bien conocidos. Ya que los clientes confían en que los repetidores de la red Tor proporcionen respuestas precisas de DNS, su repetidor (relay) no se configurará como un repetidor de salida (a internet)." msgctxt "StatusEventWidget" msgid "Checking Server Port Reachability" -msgstr "Comprobando accesibilidad al puerto del servidor" +msgstr "Comprobando accesibilidad al puerto de su servidor" msgctxt "StatusEventWidget" msgid "" "Tor is trying to determine if your relay's server port is reachable from the" " Tor network by connecting to itself at %1:%2. This test could take several " "minutes." -msgstr "Tor está tratando de determinar si el puerto del servidor de su repetidor es accesible desde la red Tor conectándose a sí mismo en %1:%2. Esta prueba puede tardar varios minutos." +msgstr "Tor está tratando de determinar si el puerto del repetidor (relay) de su servidor es accesible desde la red Tor conectándose a sí mismo en %1:%2. Esta prueba puede tardar varios minutos." msgctxt "StatusEventWidget" msgid "Server Port Reachability Test Successful!" -msgstr "¡Prueba de acceso al puerto del servidor realizada con éxito!" +msgstr "¡Prueba de acceso al puerto de su servidor realizada con éxito!" msgctxt "StatusEventWidget" msgid "Your relay's server port is reachable from the Tor network!" -msgstr "¡El puerto del servidor de su repetidor está accesible desde la red Tor!" +msgstr "¡El puerto de repetidor (relay) de su servidor es accesible desde la red Tor!" msgctxt "StatusEventWidget" msgid "Server Port Reachability Test Failed" -msgstr "Prueba de acceso al Puerto del Servidor ha fallado!" +msgstr "¡Fallo en la prueba de acceso al puerto de su servidor!" msgctxt "StatusEventWidget" msgid "" @@ -3455,11 +3455,11 @@ msgid "" "happen if you are behind a router or firewall that requires you to set up " "port forwarding. If %1:%2 is not your correct IP address and server port, " "please check your relay's configuration." -msgstr "El puerto de retransmision del servidor no es accesible por otros clientes de Tor. Esto puede suceder si estás detrás de un router o firewall que requiere configurar el redireccionamiento de puertos. Si%1:%2 no es su dirección IP correcta, ni tampoco lo es el puerto del servidor, por favor, compruebe la configuración del nodo retransmisor." +msgstr "El puerto del repetidor (relay) de su servidor no es accesible por otros clientes Tor. Esto puede suceder si estás detrás de un router o firewall que requiere que configure el redireccionamiento de puertos. Si %1:%2 no no son su dirección IP y puerto de servidor correctos, compruebe la configuración de su repetidor." msgctxt "StatusEventWidget" msgid "Checking Directory Port Reachability" -msgstr "Comprobación de Acceso al Puerto de Directorios" +msgstr "Comprobando accesibilidad al puerto del directorio (de repetidores)" msgctxt "StatusEventWidget" msgid ""

1 0

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

22 Nov '12

commit fddc43b559432c6bd8b65c9907aa1da0ad1e0d76 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 22 00:15:21 2012 +0000 Update translations for vidalia_alpha --- es/vidalia_es.po | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index fb167b9..bc08d3f 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-21 22:49+0000\n" +"PO-Revision-Date: 2012-11-22 00:13+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" @@ -3424,30 +3424,30 @@ msgid "" "Tor detected that your DNS provider is providing false responses for well " "known domains. Since clients rely on Tor network relays to provide accurate " "DNS repsonses, your relay will not be configured as an exit relay." -msgstr "Tor detectó que su proveedor de DNS está proporcionando respuestas falsas para dominios bien conocidos. Ya que los clientes confían en que los repetidores de la red Tor proporcionen respuestas precisas de DNS, su repetidor (relay) no se configurará como un repetidor de salida (de la red Tor hacia internet)." +msgstr "Tor detectó que su proveedor de DNS está proporcionando respuestas falsas para dominios bien conocidos. Ya que los clientes confían en que los repetidores de la red Tor proporcionen respuestas precisas de DNS, su repetidor (relay) no se configurará como un repetidor de salida (a internet)." msgctxt "StatusEventWidget" msgid "Checking Server Port Reachability" -msgstr "Comprobando accesibilidad al puerto del servidor" +msgstr "Comprobando accesibilidad al puerto de su servidor" msgctxt "StatusEventWidget" msgid "" "Tor is trying to determine if your relay's server port is reachable from the" " Tor network by connecting to itself at %1:%2. This test could take several " "minutes." -msgstr "Tor está tratando de determinar si el puerto del servidor de su repetidor es accesible desde la red Tor conectándose a sí mismo en %1:%2. Esta prueba puede tardar varios minutos." +msgstr "Tor está tratando de determinar si el puerto del repetidor (relay) de su servidor es accesible desde la red Tor conectándose a sí mismo en %1:%2. Esta prueba puede tardar varios minutos." msgctxt "StatusEventWidget" msgid "Server Port Reachability Test Successful!" -msgstr "¡Prueba de acceso al puerto del servidor realizada con éxito!" +msgstr "¡Prueba de acceso al puerto de su servidor realizada con éxito!" msgctxt "StatusEventWidget" msgid "Your relay's server port is reachable from the Tor network!" -msgstr "¡El puerto del servidor de su repetidor está accesible desde la red Tor!" +msgstr "¡El puerto de repetidor (relay) de su servidor es accesible desde la red Tor!" msgctxt "StatusEventWidget" msgid "Server Port Reachability Test Failed" -msgstr "Prueba de acceso al Puerto del Servidor ha fallado!" +msgstr "¡Fallo en la prueba de acceso al puerto de su servidor!" msgctxt "StatusEventWidget" msgid "" @@ -3455,11 +3455,11 @@ msgid "" "happen if you are behind a router or firewall that requires you to set up " "port forwarding. If %1:%2 is not your correct IP address and server port, " "please check your relay's configuration." -msgstr "El puerto de retransmision del servidor no es accesible por otros clientes de Tor. Esto puede suceder si estás detrás de un router o firewall que requiere configurar el redireccionamiento de puertos. Si%1:%2 no es su dirección IP correcta, ni tampoco lo es el puerto del servidor, por favor, compruebe la configuración del nodo retransmisor." +msgstr "El puerto del repetidor (relay) de su servidor no es accesible por otros clientes Tor. Esto puede suceder si estás detrás de un router o firewall que requiere que configure el redireccionamiento de puertos. Si %1:%2 no no son su dirección IP y puerto de servidor correctos, compruebe la configuración de su repetidor." msgctxt "StatusEventWidget" msgid "Checking Directory Port Reachability" -msgstr "Comprobación de Acceso al Puerto de Directorios" +msgstr "Comprobando accesibilidad al puerto del directorio (de repetidores)" msgctxt "StatusEventWidget" msgid ""

1 0