November 2012 - tor-commits - lists.torproject.org

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

22 Nov '12

commit 7877ba55835c7b322edb5f00b0db42ef03105f54 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 22 10:45:14 2012 +0000 Update translations for tsum --- ro/short-user-manual_ro_noimg.xhtml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ro/short-user-manual_ro_noimg.xhtml b/ro/short-user-manual_ro_noimg.xhtml index 8ebe310..7e1b9ba 100644 --- a/ro/short-user-manual_ro_noimg.xhtml +++ b/ro/short-user-manual_ro_noimg.xhtml @@ -5,8 +5,8 @@ </head> <body> <h1 id="the-short-user-manual">Scurt manual al utilizatorului</h1> - <p>This user manual contains information about how to download Tor, how to use it, and what to do if Tor is unable to connect to the network. If you can't find the answer to your question in this document, email help(a)rt.torproject.org.</p> - <p>Please note that we are providing support on a voluntary basis, and we get a lot of emails every single day. There is no need to worry if we don't get back to you straight away.</p> + <p>Acest manual contine informatii despre cum sa descarcati Tor, cum sa-l folositi, si ce sa faceti daca Tor nu se poate conecta la retea. Daca nu puteti gasi raspunsuri la intrebarile dumneavoastra in acest document, email help(a)rt.torproject.org</p> + <p>Va rugam notati ca noi oferim suport pe baza de voluntariat, si primim multe email-uri in fiecare zi. Nu trebuie sa va ingrijorati daca nu va contactam imediat.</p> <h2 id="how-tor-works">Cum lucreaza Tor</h2> <p>Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as <em>relays</em>) in the Tor network, before the traffic is sent out onto the public Internet.</p> <p>The image above illustrates a user browsing to different websites over Tor. The green monitors represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each relay.</p>

1 0

[ooni-probe/master] Print that the test requires root only after having parsed it's command line args
by art＠torproject.org 22 Nov '12

22 Nov '12

commit d127ce73e847032682c19993389ba45a8f223fcc Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 22 11:29:01 2012 +0100 Print that the test requires root only after having parsed it's command line args --- ooni/runner.py | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ooni/runner.py b/ooni/runner.py index 158523d..a296e7f 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -40,12 +40,6 @@ def processTest(obj, cmd_line_options): class. """ options = None - if obj.requiresRoot: - try: - checkForRoot() - except NotRootError: - log.err("%s requires root to run" % obj.name) - sys.exit(1) if obj.usageOptions and obj.inputFile: obj.usageOptions.optParameters.append(obj.inputFile) @@ -84,6 +78,13 @@ def processTest(obj, cmd_line_options): options.opt_help() raise usage.UsageError("Error in parsing command line args for %s" % test_name) + if obj.requiresRoot: + try: + checkForRoot() + except NotRootError: + log.err("%s requires root to run" % obj.name) + sys.exit(1) + return obj def isTestCase(obj):

1 0

[ooni-probe/master] Implement TCP payload sending test template
by art＠torproject.org 22 Nov '12

22 Nov '12

commit f873cd780a37451810b04526065fbe90d6250ba7 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Nov 21 18:59:56 2012 +0100 Implement TCP payload sending test template * Example test based on this test template --- nettests/examples/example_tcpt.py | 8 +++++ ooni/templates/tcpt.py | 58 +++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 0 deletions(-) diff --git a/nettests/examples/example_tcpt.py b/nettests/examples/example_tcpt.py new file mode 100644 index 0000000..ccb3077 --- /dev/null +++ b/nettests/examples/example_tcpt.py @@ -0,0 +1,8 @@ +from ooni.templates import tcpt + +class ExampleTCPT(tcpt.TCPTest): + def test_hello_world(self): + self.address = "127.0.0.1" + self.port = 57002 + payload = "Hello World!\n\r" + return self.sendPayload(payload) diff --git a/ooni/templates/tcpt.py b/ooni/templates/tcpt.py new file mode 100644 index 0000000..3312cbe --- /dev/null +++ b/ooni/templates/tcpt.py @@ -0,0 +1,58 @@ +from twisted.internet import protocol, defer, reactor +from twisted.internet.error import ConnectionDone +from twisted.internet.endpoints import TCP4ClientEndpoint + +from ooni.nettest import NetTestCase +from ooni.utils import log + +class TCPSender(protocol.Protocol): + report = None + def dataReceived(self, data): + self.report['received'].append(data) + + def sendPayload(self, payload): + self.report['sent'].append(payload) + self.transport.write(payload) + +class TCPSenderFactory(protocol.Factory): + def buildProtocol(self, addr): + return TCPSender() + +class TCPTest(NetTestCase): + name = "Base TCP Test" + version = "0.1" + + requiresRoot = False + timeout = 2 + address = None + port = None + + def _setUp(self): + self.report['sent'] = [] + self.report['received'] = [] + + def sendPayload(self, payload): + d1 = defer.Deferred() + + def closeConnection(p): + p.transport.loseConnection() + log.debug("Closing connection") + d1.callback(None) + + def errback(failure): + self.report['error'] = str(failure) + log.exception(failure) + + def connected(p): + log.debug("Connected to %s:%s" % (self.address, self.port)) + p.report = self.report + p.sendPayload(payload) + reactor.callLater(self.timeout, closeConnection, p) + + point = TCP4ClientEndpoint(reactor, self.address, self.port) + d2 = point.connect(TCPSenderFactory()) + d2.addCallback(connected) + d2.addErrback(errback) + return d1 + +

1 0

[ooni-probe/master] Add support for optFlags in nettest
by art＠torproject.org 22 Nov '12

22 Nov '12

commit 790d32c5d4b1c6f8ccd6bc5dbf43b6829d78af64 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 22 11:21:14 2012 +0100 Add support for optFlags in nettest --- ooni/nettest.py | 1 + ooni/runner.py | 8 ++++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/ooni/nettest.py b/ooni/nettest.py index ebb58ea..c9febf4 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -83,6 +83,7 @@ class NetTestCase(object): optParameters = None baseParameters = None + baseFlags = None requiredOptions = [] requiresRoot = False diff --git a/ooni/runner.py b/ooni/runner.py index 8edf857..158523d 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -51,9 +51,17 @@ def processTest(obj, cmd_line_options): obj.usageOptions.optParameters.append(obj.inputFile) if obj.usageOptions and 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 not hasattr(obj.usageOptions, 'optFlags'): + obj.usageOptions.optFlags = [] + for flag in obj.baseFlags: + obj.usageOptions.optFlags.append(flag) + if obj.usageOptions: options = obj.usageOptions()

1 0

[ooni-probe/master] Include socksproxy address in HTTP based tests
by art＠torproject.org 22 Nov '12

22 Nov '12

commit f8f1a0b561e5b0fecd80aee8ef865bbda1c012ca Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Nov 21 18:28:06 2012 +0100 Include socksproxy address in HTTP based tests --- ooni/templates/httpt.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ooni/templates/httpt.py b/ooni/templates/httpt.py index c62ea4d..47fbeb7 100644 --- a/ooni/templates/httpt.py +++ b/ooni/templates/httpt.py @@ -64,6 +64,7 @@ class HTTPTest(NetTestCase): sockshost, socksport = (None, None) if self.localOptions['socksproxy']: + self.report['socksproxy'] = self.localOptions['socksproxy'] sockshost, socksport = self.localOptions['socksproxy'].split(':') socksport = int(socksport)

1 0

[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