- tor-commits - lists.torproject.org

[ooni-probe/master] Make the extra flags use the defaults of scapy
by art＠torproject.org 22 Nov '12

22 Nov '12

commit 5e8edc54e84143681921cab217e8de12937ca611 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 22 11:41:04 2012 +0100 Make the extra flags use the defaults of scapy --- ooni/templates/scapyt.py | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ooni/templates/scapyt.py b/ooni/templates/scapyt.py index ca6d938..ff05922 100644 --- a/ooni/templates/scapyt.py +++ b/ooni/templates/scapyt.py @@ -44,24 +44,28 @@ class BaseScapyTest(NetTestCase): requiresRoot = True baseFlags = [ - ['ipsrc', 's', 'Check if IP src matches when processing answers'], + ['ipsrc', 's', 'Does *not* check if IP src and ICMP IP citation 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): + self.report['answer_flags'] = [] if self.localOptions['ipsrc']: - config.checkIPsrc = 1 - else: config.checkIPsrc = 0 + else: + self.report['answer_flags'].append('ipsrc') + config.checkIPsrc = 1 if self.localOptions['ipid']: + self.report['answer_flags'].append('ipid') config.checkIPID = 1 else: config.checkIPID = 0 # XXX we don't support strict matching if self.localOptions['seqack']: + self.report['answer_flags'].append('seqack') config.check_TCPerror_seqack = 1 else: config.check_TCPerror_seqack = 0

1 0

[ooni-probe/master] Clean up docstrings of scapy test template
by art＠torproject.org 22 Nov '12

22 Nov '12

commit b505b1ca9891b5a9049234156ec570fc8847f093 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 22 11:56:56 2012 +0100 Clean up docstrings of scapy test template --- ooni/templates/scapyt.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ooni/templates/scapyt.py b/ooni/templates/scapyt.py index ff05922..8d9ea8f 100644 --- a/ooni/templates/scapyt.py +++ b/ooni/templates/scapyt.py @@ -45,8 +45,8 @@ class BaseScapyTest(NetTestCase): requiresRoot = True baseFlags = [ ['ipsrc', 's', 'Does *not* check if IP src and ICMP IP citation 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'] + ['seqack', 'k', 'Check if TCP sequence number and ACK match in the ICMP citation when processing answers'], + ['ipid', 'i', 'Check if the IPID matches when processing answers'] ] def _setUp(self): @@ -63,6 +63,10 @@ class BaseScapyTest(NetTestCase): else: config.checkIPID = 0 # XXX we don't support strict matching + # since (from scapy's documentation), some stacks have a bug for which + # the bytes in the IPID are swapped. + # Perhaps in the future we will want to have more fine grained control + # over this. if self.localOptions['seqack']: self.report['answer_flags'].append('seqack')

1 0

[ooni-probe/master] Add some more fine grained control over traceroute test
by art＠torproject.org 22 Nov '12

22 Nov '12

commit 201a39b3a6c64a8f16e4a58d70bfbc3a22d5b969 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 22 12:11:07 2012 +0100 Add some more fine grained control over traceroute test * Configuration flags and options for source and destination ports --- nettests/core/traceroute.py | 30 +++++++++++++++++++++++++----- 1 files changed, 25 insertions(+), 5 deletions(-) diff --git a/nettests/core/traceroute.py b/nettests/core/traceroute.py index 4317a0e..bbbe14e 100644 --- a/nettests/core/traceroute.py +++ b/nettests/core/traceroute.py @@ -15,8 +15,10 @@ class UsageOptions(usage.Options): optParameters = [ ['backend', 'b', '8.8.8.8', 'Test backend to use'], ['timeout', 't', 5, 'The timeout for the traceroute test'], - ['maxttl', 'm', 30, 'The maximum value of ttl to set on packets'] + ['maxttl', 'm', 30, 'The maximum value of ttl to set on packets'], + ['srcport', 'p', None, 'Set the source port to a specific value (only applies to TCP and UDP)'] ] + optFlags = [['randomize','r', 'Randomize the source port']] class TracerouteTest(scapyt.BaseScapyTest): name = "Multi Protocol Traceroute Test" @@ -24,8 +26,21 @@ class TracerouteTest(scapyt.BaseScapyTest): version = "0.1.1" usageOptions = UsageOptions + dst_ports = [22, 23, 53, 80, 123, 443] + + def setUp(self): + def get_sport(protocol): + if self.localOptions['srcport']: + return int(self.localOptions['srcport']) + elif self.localOptions['randomize']: + return random.randint(1024, 65535) + elif protocol == 'tcp': + return 80 + elif protocol == 'udp': + return 53 + + self.get_sport = get_sport - dst_ports = [22, 23, 80, 123, 443] def max_ttl_and_timeout(self): max_ttl = int(self.localOptions['maxttl']) timeout = int(self.localOptions['timeout']) @@ -53,8 +68,10 @@ class TracerouteTest(scapyt.BaseScapyTest): dl = [] max_ttl, timeout = self.max_ttl_and_timeout() for port in self.dst_ports: - packets = IP(dst=self.localOptions['backend'], - ttl=(1,max_ttl),id=RandShort())/TCP(flags=0x2, dport=port) + packets = IP(dst=self.localOptions['backend'], + ttl=(1,max_ttl),id=RandShort())/TCP(flags=0x2, dport=port, + sport=self.get_sport('tcp')) + d = self.sr(packets, timeout=timeout) d.addCallback(finished, port) dl.append(d) @@ -80,7 +97,9 @@ class TracerouteTest(scapyt.BaseScapyTest): max_ttl, timeout = self.max_ttl_and_timeout() for port in self.dst_ports: packets = IP(dst=self.localOptions['backend'], - ttl=(1,max_ttl),id=RandShort())/UDP(dport=port) + ttl=(1,max_ttl),id=RandShort())/UDP(dport=port, + sport=self.get_sport('udp')) + d = self.sr(packets, timeout=timeout) d.addCallback(finished, port) dl.append(d) @@ -106,6 +125,7 @@ class TracerouteTest(scapyt.BaseScapyTest): max_ttl, timeout = self.max_ttl_and_timeout() packets = IP(dst=self.localOptions['backend'], ttl=(1,max_ttl),id=RandShort())/ICMP() + d = self.sr(packets, timeout=timeout) d.addCallback(finished) return d

1 0

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

22 Nov '12

commit 47e10215c8541b2cd08c26756272e5c092f69704 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 22 10:45:39 2012 +0000 Update translations for vidalia_help_completed --- ro/links.po | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 81 insertions(+), 0 deletions(-) diff --git a/ro/links.po b/ro/links.po new file mode 100644 index 0000000..da53fc9 --- /dev/null +++ b/ro/links.po @@ -0,0 +1,81 @@ +# +# Translators: +# <anouser(a)yahoo.com>, 2012. +# <roastmepls(a)yahoo.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: 2011-05-05 20:21+0200\n" +"PO-Revision-Date: 2012-11-22 10:21+0000\n" +"Last-Translator: HarmlessKiller <roastmepls(a)yahoo.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: ro\n" +"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" + +#. type: Content of: <html><body><h1> +#: links.html:16 +msgid "Helpful Links" +msgstr "Adrese utile" + +#. type: Content of: <html><body><h3> +#: links.html:19 +msgid "Vidalia" +msgstr "Vidalia" + +#. type: Content of: <html><body><table><tr><td> +#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57 +msgid "   " +msgstr "   " + +#. type: Content of: <html><body><table><tr><td> +#: links.html:23 links.html:43 +msgid "Homepage" +msgstr "Prima pagina" + +#. type: Content of: <html><body><table><tr><td> +#: links.html:25 +msgid "" +"<a href=\"https://www.torproject.org/vidalia/\"> " +"https://www.torproject.org/vidalia/</a>" +msgstr "<a href=\"https://www.torproject.org/vidalia/\"> https://www.torproject.org/vidalia/</a>" + +#. type: Content of: <html><body><table><tr><td> +#: links.html:31 links.html:58 +msgid "Wiki and Bugtracker" +msgstr "Wiki si Bugtracker" + +#. type: Content of: <html><body><table><tr><td> +#: links.html:33 +msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>" +msgstr "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>" + +#. type: Content of: <html><body><h3> +#: links.html:39 +msgid "Tor" +msgstr "Tor" + +#. type: Content of: <html><body><table><tr><td> +#: links.html:45 +msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>" +msgstr "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>" + +#. type: Content of: <html><body><table><tr><td> +#: links.html:50 +msgid "FAQ" +msgstr "FAQ" + +#. type: Content of: <html><body><table><tr><td> +#: links.html:52 +msgid "" +"<a href=\"https://www.torproject.org/docs/faq.html\"> " +"https://www.torproject.org/docs/faq.html</a>" +msgstr "<a href=\"https://www.torproject.org/docs/faq.html\"> https://www.torproject.org/docs/faq.html</a>" + +#. type: Content of: <html><body><table><tr><td> +#: links.html:60 +msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>" +msgstr "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"

1 0

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

22 Nov '12

commit 8a7450c9bab2a5eac42b3c164355da80b7f31b56 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 22 10:45:31 2012 +0000 Update translations for vidalia_help --- ro/links.po | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ro/links.po b/ro/links.po index a5a31a0..da53fc9 100644 --- a/ro/links.po +++ b/ro/links.po @@ -1,19 +1,20 @@ # # Translators: # <anouser(a)yahoo.com>, 2012. +# <roastmepls(a)yahoo.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: 2011-05-05 20:21+0200\n" -"PO-Revision-Date: 2012-08-31 23:59+0000\n" -"Last-Translator: anouser <anouser(a)yahoo.com>\n" +"PO-Revision-Date: 2012-11-22 10:21+0000\n" +"Last-Translator: HarmlessKiller <roastmepls(a)yahoo.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: ro\n" -"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n" +"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" #. type: Content of: <html><body><h1> #: links.html:16 @@ -45,12 +46,12 @@ msgstr "<a href=\"https://www.torproject.org/vidalia/\"> https://www.torproject. #. type: Content of: <html><body><table><tr><td> #: links.html:31 links.html:58 msgid "Wiki and Bugtracker" -msgstr "" +msgstr "Wiki si Bugtracker" #. type: Content of: <html><body><table><tr><td> #: links.html:33 msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>" -msgstr "" +msgstr "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>" #. type: Content of: <html><body><h3> #: links.html:39 @@ -72,9 +73,9 @@ msgstr "FAQ" msgid "" "<a href=\"https://www.torproject.org/docs/faq.html\"> " "https://www.torproject.org/docs/faq.html</a>" -msgstr "" +msgstr "<a href=\"https://www.torproject.org/docs/faq.html\"> https://www.torproject.org/docs/faq.html</a>" #. type: Content of: <html><body><table><tr><td> #: links.html:60 msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>" -msgstr "" +msgstr "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"

1 0

[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