tor-commits March 2014

tor-commits@lists.torproject.org

22 participants
2036 discussions

[ooni-probe/master] Merge branch 'master' into feature/bridget
by art＠torproject.org 24 Mar '14

24 Mar '14

commit 8c9ee9225720752bf4e938a9d41d39cd5482dce7 Merge: 9b7fc3f efb85ae Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Mar 1 19:03:07 2014 +0100 Merge branch 'master' into feature/bridget * master: Fix bug in initializing of the test instance. ooni/tasks.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[ooni-probe/master] Use log.msg
by art＠torproject.org 24 Mar '14

24 Mar '14

commit 9b7fc3f1205b5db9c6edb38899375daa6b6b98b2 Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Mar 1 13:34:34 2014 +0100 Use log.msg --- ooni/nettests/blocking/bridge_reachability.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ooni/nettests/blocking/bridge_reachability.py b/ooni/nettests/blocking/bridge_reachability.py index acce3d3..eb03983 100644 --- a/ooni/nettests/blocking/bridge_reachability.py +++ b/ooni/nettests/blocking/bridge_reachability.py @@ -68,7 +68,7 @@ class BridgeReachability(nettest.NetTestCase): config.save() def updates(prog, tag, summary): - print "Tor progress: %s%%" % prog + log.msg("Tor progress: %s%%" % prog) self.report['tor_progress'] = int(prog) self.report['tor_progress_tag'] = tag self.report['tor_progress_summary'] = summary @@ -77,12 +77,12 @@ class BridgeReachability(nettest.NetTestCase): progress_updates=updates) @d.addCallback def setup_complete(proto): - print "Success" + log.msg("Success") self.report['success'] = True @d.addErrback def setup_failed(failure): - print "Failed" + log.msg("Failed") log.exception(failure) self.report['success'] = False

1 0

[ooni-probe/master] Add the file option to the required options.
by art＠torproject.org 24 Mar '14

24 Mar '14

commit ad1a572495111a71756713dc164d85712a155d4d Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Mar 3 11:00:04 2014 +0100 Add the file option to the required options. --- ooni/nettests/blocking/bridge_reachability.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ooni/nettests/blocking/bridge_reachability.py b/ooni/nettests/blocking/bridge_reachability.py index eb03983..65e968a 100644 --- a/ooni/nettests/blocking/bridge_reachability.py +++ b/ooni/nettests/blocking/bridge_reachability.py @@ -27,6 +27,8 @@ class BridgeReachability(nettest.NetTestCase): inputFile = ['file', 'f', None, 'File containing bridges to test reachability for (they should be one per line IP:ORPort)'] + requiredOptions = ['file'] + def setUp(self): self.tor_progress = 0 self.timeout = int(self.localOptions['timeout'])

1 0

[ooni-probe/master] Add support for pyobfsproxy based bridge testing
by art＠torproject.org 24 Mar '14

24 Mar '14

commit 01058a96860b3d01e22438cf5e6568cdf606f3d0 Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Mar 16 13:06:42 2013 -0400 Add support for pyobfsproxy based bridge testing --- nettests/experimental/bridget.py | 77 +++++++++++++++++++++++++++++--------- ooni/reporter.py | 3 +- 2 files changed, 61 insertions(+), 19 deletions(-) diff --git a/nettests/experimental/bridget.py b/nettests/experimental/bridget.py index 8f31e80..1cb7b32 100644 --- a/nettests/experimental/bridget.py +++ b/nettests/experimental/bridget.py @@ -1,21 +1,23 @@ +# -*- encoding: utf-8 -*- import random +import string +import subprocess from twisted.python import usage -from twisted.internet import defer +from twisted.internet import defer, reactor import txtorcon -from txtorcon.torconfig import TorSetupTimeout from ooni.utils import log from ooni import nettest class UsageOptions(usage.Options): - optParameters = [['timeout', 't', 30, - 'Specify the timeout after which to consider the Tor bootstrapping process to have failed'] + optParameters = [['timeout', 't', 60, + 'Specify the timeout after which to consider the Tor bootstrapping process to have failed'], ] class KeywordFiltering(nettest.NetTestCase): - name = "Bridget, at it's bare minimum" + name = "BridgetKISS" author = "Arturo Filastò" version = "0.1" @@ -25,35 +27,74 @@ class KeywordFiltering(nettest.NetTestCase): 'File containing bridges to test reachability for (they should be one per line IP:ORPort)'] def setUp(self): + + def find_pyobfsproxy(): + try: + proc = subprocess.Popen(('type -p pyobfsproxy', ), stdout=subprocess.PIPE, + stderr=subprocess.PIPE, shell=True) + except OSError: + pass + else: + stdout, _ = proc.communicate() + if proc.poll() == 0 and stdout != '': + return stdout.strip() + self.tor_progress = 0 self.timeout = int(self.localOptions['timeout']) self.report['timeout'] = self.timeout + self.bridge = self.input + self.pyobfsproxy_bin = find_pyobfsproxy() def test_full_tor_connection(self): + def getTransport(address): + """ + If the address of the bridge starts with a valid c identifier then + we consider it to be a bridge. + Returns: + The transport_name if it's a transport. + None if it's not a obfsproxy bridge. + """ + transport_name = address.split(' ')[0] + transport_name_chars = string.ascii_letters + string.digits + if all(c in transport_name_chars for c in transport_name): + return transport_name + else: + return None + config = txtorcon.TorConfig() - config.OrPort = random.randint(2**14, 2**16) + config.ControlPort = random.randint(2**14, 2**16) config.SocksPort = random.randint(2**14, 2**16) - config.Bridge = self.input + + transport_name = getTransport(self.bridge) + if transport_name and self.pyobfsproxy_bin: + config.ClientTransportPlugin = "%s exec %s managed" % (transport_name, self.pyobfsproxy_bin) + self.report['transport_name'] = transport_name + elif transport_name and not self.pyobfsproxy_bin: + log.err("Unable to test bridge because pyobfsproxy is not installed") + self.report['success'] = None + return + + config.Bridge = self.bridge config.UseBridges = 1 + config.save() def updates(prog, tag, summary): + print "Tor progress: %s%%" % prog self.report['tor_progress'] = int(prog) + self.report['tor_progress_tag'] = tag + self.report['tor_progress_summary'] = summary - d = txtorcon.launch_tor(config, reactor, progress_updates=updates, self.timeout) + d = txtorcon.launch_tor(config, reactor, timeout=self.timeout, + progress_updates=updates) @d.addCallback def setup_complete(proto): - self.report['failed'] = False + print "Success" + self.report['success'] = True @d.addErrback def setup_failed(failure): - failure.trap(TorSetupTimeout) - if isinstance(failure, TorSetupTimeout): - self.report['failure'] = 'timedout' - else: - self.report['failure'] = 'unknown' - self.report['failed'] = True + print "Failed" + log.exception(failure) + self.report['success'] = False return d - - def test_connect_scan(self): - pass diff --git a/ooni/reporter.py b/ooni/reporter.py index 594c6b8..3da1eea 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -24,7 +24,8 @@ try: from scapy.packet import Packet except ImportError: log.err("Scapy is not installed.") - + class Packet(object): + pass from ooni.errors import InvalidOONIBCollectorAddress from ooni.errors import ReportNotCreated, ReportAlreadyClosed

1 0

[ooni-probe/master] Use find_executable instead of homebrew function and search for obfsproxy
by art＠torproject.org 24 Mar '14

24 Mar '14

commit 1d4efdc0b8560f5001cb90553fec34804c89e90d Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Mar 1 13:03:18 2014 +0100 Use find_executable instead of homebrew function and search for obfsproxy --- nettests/experimental/bridget.py | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/nettests/experimental/bridget.py b/nettests/experimental/bridget.py index 1cb7b32..acce3d3 100644 --- a/nettests/experimental/bridget.py +++ b/nettests/experimental/bridget.py @@ -2,6 +2,7 @@ import random import string import subprocess +from distutils.spawn import find_executable from twisted.python import usage from twisted.internet import defer, reactor @@ -16,8 +17,8 @@ class UsageOptions(usage.Options): 'Specify the timeout after which to consider the Tor bootstrapping process to have failed'], ] -class KeywordFiltering(nettest.NetTestCase): - name = "BridgetKISS" +class BridgeReachability(nettest.NetTestCase): + name = "BridgeReachability" author = "Arturo Filastò" version = "0.1" @@ -27,23 +28,11 @@ class KeywordFiltering(nettest.NetTestCase): 'File containing bridges to test reachability for (they should be one per line IP:ORPort)'] def setUp(self): - - def find_pyobfsproxy(): - try: - proc = subprocess.Popen(('type -p pyobfsproxy', ), stdout=subprocess.PIPE, - stderr=subprocess.PIPE, shell=True) - except OSError: - pass - else: - stdout, _ = proc.communicate() - if proc.poll() == 0 and stdout != '': - return stdout.strip() - self.tor_progress = 0 self.timeout = int(self.localOptions['timeout']) self.report['timeout'] = self.timeout self.bridge = self.input - self.pyobfsproxy_bin = find_pyobfsproxy() + self.pyobfsproxy_bin = find_executable('obfsproxy') def test_full_tor_connection(self): def getTransport(address): @@ -85,7 +74,7 @@ class KeywordFiltering(nettest.NetTestCase): self.report['tor_progress_summary'] = summary d = txtorcon.launch_tor(config, reactor, timeout=self.timeout, - progress_updates=updates) + progress_updates=updates) @d.addCallback def setup_complete(proto): print "Success"

1 0

[ooni-probe/master] Rename bridget to bridge_reachability
by art＠torproject.org 24 Mar '14

24 Mar '14

commit 0237bcfb340498a45081f935642ac0e28db74e55 Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Mar 1 13:04:36 2014 +0100 Rename bridget to bridge_reachability --- nettests/experimental/bridget.py | 89 ------------------------- ooni/nettests/blocking/bridge_reachability.py | 89 +++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 89 deletions(-) diff --git a/nettests/experimental/bridget.py b/nettests/experimental/bridget.py deleted file mode 100644 index acce3d3..0000000 --- a/nettests/experimental/bridget.py +++ /dev/null @@ -1,89 +0,0 @@ -# -*- encoding: utf-8 -*- -import random -import string -import subprocess -from distutils.spawn import find_executable - -from twisted.python import usage -from twisted.internet import defer, reactor - -import txtorcon - -from ooni.utils import log -from ooni import nettest - -class UsageOptions(usage.Options): - optParameters = [['timeout', 't', 60, - 'Specify the timeout after which to consider the Tor bootstrapping process to have failed'], - ] - -class BridgeReachability(nettest.NetTestCase): - name = "BridgeReachability" - author = "Arturo Filastò" - version = "0.1" - - usageOptions = UsageOptions - - inputFile = ['file', 'f', None, - 'File containing bridges to test reachability for (they should be one per line IP:ORPort)'] - - def setUp(self): - self.tor_progress = 0 - self.timeout = int(self.localOptions['timeout']) - self.report['timeout'] = self.timeout - self.bridge = self.input - self.pyobfsproxy_bin = find_executable('obfsproxy') - - def test_full_tor_connection(self): - def getTransport(address): - """ - If the address of the bridge starts with a valid c identifier then - we consider it to be a bridge. - Returns: - The transport_name if it's a transport. - None if it's not a obfsproxy bridge. - """ - transport_name = address.split(' ')[0] - transport_name_chars = string.ascii_letters + string.digits - if all(c in transport_name_chars for c in transport_name): - return transport_name - else: - return None - - config = txtorcon.TorConfig() - config.ControlPort = random.randint(2**14, 2**16) - config.SocksPort = random.randint(2**14, 2**16) - - transport_name = getTransport(self.bridge) - if transport_name and self.pyobfsproxy_bin: - config.ClientTransportPlugin = "%s exec %s managed" % (transport_name, self.pyobfsproxy_bin) - self.report['transport_name'] = transport_name - elif transport_name and not self.pyobfsproxy_bin: - log.err("Unable to test bridge because pyobfsproxy is not installed") - self.report['success'] = None - return - - config.Bridge = self.bridge - config.UseBridges = 1 - config.save() - - def updates(prog, tag, summary): - print "Tor progress: %s%%" % prog - self.report['tor_progress'] = int(prog) - self.report['tor_progress_tag'] = tag - self.report['tor_progress_summary'] = summary - - d = txtorcon.launch_tor(config, reactor, timeout=self.timeout, - progress_updates=updates) - @d.addCallback - def setup_complete(proto): - print "Success" - self.report['success'] = True - - @d.addErrback - def setup_failed(failure): - print "Failed" - log.exception(failure) - self.report['success'] = False - - return d diff --git a/ooni/nettests/blocking/bridge_reachability.py b/ooni/nettests/blocking/bridge_reachability.py new file mode 100644 index 0000000..acce3d3 --- /dev/null +++ b/ooni/nettests/blocking/bridge_reachability.py @@ -0,0 +1,89 @@ +# -*- encoding: utf-8 -*- +import random +import string +import subprocess +from distutils.spawn import find_executable + +from twisted.python import usage +from twisted.internet import defer, reactor + +import txtorcon + +from ooni.utils import log +from ooni import nettest + +class UsageOptions(usage.Options): + optParameters = [['timeout', 't', 60, + 'Specify the timeout after which to consider the Tor bootstrapping process to have failed'], + ] + +class BridgeReachability(nettest.NetTestCase): + name = "BridgeReachability" + author = "Arturo Filastò" + version = "0.1" + + usageOptions = UsageOptions + + inputFile = ['file', 'f', None, + 'File containing bridges to test reachability for (they should be one per line IP:ORPort)'] + + def setUp(self): + self.tor_progress = 0 + self.timeout = int(self.localOptions['timeout']) + self.report['timeout'] = self.timeout + self.bridge = self.input + self.pyobfsproxy_bin = find_executable('obfsproxy') + + def test_full_tor_connection(self): + def getTransport(address): + """ + If the address of the bridge starts with a valid c identifier then + we consider it to be a bridge. + Returns: + The transport_name if it's a transport. + None if it's not a obfsproxy bridge. + """ + transport_name = address.split(' ')[0] + transport_name_chars = string.ascii_letters + string.digits + if all(c in transport_name_chars for c in transport_name): + return transport_name + else: + return None + + config = txtorcon.TorConfig() + config.ControlPort = random.randint(2**14, 2**16) + config.SocksPort = random.randint(2**14, 2**16) + + transport_name = getTransport(self.bridge) + if transport_name and self.pyobfsproxy_bin: + config.ClientTransportPlugin = "%s exec %s managed" % (transport_name, self.pyobfsproxy_bin) + self.report['transport_name'] = transport_name + elif transport_name and not self.pyobfsproxy_bin: + log.err("Unable to test bridge because pyobfsproxy is not installed") + self.report['success'] = None + return + + config.Bridge = self.bridge + config.UseBridges = 1 + config.save() + + def updates(prog, tag, summary): + print "Tor progress: %s%%" % prog + self.report['tor_progress'] = int(prog) + self.report['tor_progress_tag'] = tag + self.report['tor_progress_summary'] = summary + + d = txtorcon.launch_tor(config, reactor, timeout=self.timeout, + progress_updates=updates) + @d.addCallback + def setup_complete(proto): + print "Success" + self.report['success'] = True + + @d.addErrback + def setup_failed(failure): + print "Failed" + log.exception(failure) + self.report['success'] = False + + return d

1 0

[ooni-probe/master] Merge branch 'master' into feature/bridget
by art＠torproject.org 24 Mar '14

24 Mar '14

commit 283ed262507377a0a14c7c8445831485a43cab06 Merge: 01058a9 aa45aca Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Mar 1 12:59:44 2014 +0100 Merge branch 'master' into feature/bridget * master: (510 commits) Install pyrex-real so that new pip does not give error Update index of documentation page. Bump to v1.0.0-rc-7 Add WARNING message to every run of ooniprobe. Expand the disclaimer in the README.md Update vagrant link to point to https site. Bump to version 1.0.0 Add instructions on setting up development dependencies. Make the geoip related tests make a less stronger assertion. Make GeoIP AS and GeoIP City soft dependencies. Minor fixes to comments DNS-host-resolution-for-tls_handshake Bug-Fixes-for-tls_handshake Properly expand the home directory to that of the user running ooniprobe. Fix import error in test_managers. Properly handle the cancelled failure. Silence the dummy protocol Write test that reproduces HTTP test stalling condition. Call connectionLost to avoid dirty reactor. Pass the mock super socket in the ScapyFactory constructor ... .coveragerc | 4 + .gitignore | 5 +- .travis.yml | 16 +- ChangeLog.md | 30 + HACKING | 2 +- LICENSE | 5 +- MANIFEST.in | 7 + Makefile | 202 - README.md | 272 +- Vagrantfile | 44 + bin/oonib | 36 - bin/oonid | 7 + collector | 1 - data/Makefile | 12 +- data/decks/complete.deck | 72 + data/decks/complete_no_root.deck | 60 + data/decks/fast.deck | 36 + data/decks/fast_no_root.deck | 24 + data/decks/mlab.deck | 60 + data/decks/mlab_no_root.deck | 48 + data/inputs/Makefile | 13 + data/inputs/README | 47 + data/nettests/examples/example_dns_http.py | 11 + data/nettests/examples/example_dnst.py | 13 + data/nettests/examples/example_http_checksum.py | 27 + data/nettests/examples/example_httpt.py | 36 + data/nettests/examples/example_myip.py | 21 + data/nettests/examples/example_scapyt.py | 29 + data/nettests/examples/example_scapyt_yield.py | 25 + data/nettests/examples/example_simple.py | 8 + data/nettests/examples/example_tcpt.py | 21 + data/ooniprobe.conf.sample | 64 + data/ui/.bowerrc | 5 + data/ui/app/index.html | 39 + data/ui/app/libs/angular-resource/README.md | 4 + .../app/libs/angular-resource/angular-resource.js | 445 + data/ui/app/libs/angular-resource/component.json | 17 + data/ui/app/libs/angular/angular.js |14733 ++++++++++++++++++++ data/ui/app/libs/angular/component.json | 14 + data/ui/app/libs/bootstrap/component.json | 9 + .../libs/bootstrap/css/bootstrap-responsive.css | 1109 ++ data/ui/app/libs/bootstrap/css/bootstrap.css | 6158 ++++++++ .../bootstrap/img/glyphicons-halflings-white.png | Bin 0 -> 8777 bytes .../libs/bootstrap/img/glyphicons-halflings.png | Bin 0 -> 12799 bytes data/ui/app/libs/bootstrap/js/bootstrap.js | 2276 +++ data/ui/app/libs/jquery/component.json | 14 + data/ui/app/libs/jquery/composer.json | 23 + data/ui/app/libs/jquery/jquery.js | 9472 +++++++++++++ data/ui/app/libs/ng-upload/component.json | 23 + data/ui/app/libs/ng-upload/ng-upload.js | 107 + data/ui/app/scripts/app.js | 30 + data/ui/app/scripts/controllers.js | 96 + data/ui/app/scripts/directives.js | 5 + data/ui/app/scripts/filters.js | 5 + data/ui/app/scripts/services.js | 27 + data/ui/app/styles/app.css | 21 + data/ui/app/views/inputs.html | 31 + data/ui/app/views/sidebar.html | 10 + data/ui/app/views/test.html | 48 + data/ui/component.json | 9 + debian/README | 5 + debian/changelog | 5 + debian/compat | 1 + debian/control | 54 + debian/copyright | 51 + debian/rules | 6 + debian/source/format | 1 + decks/before_i_commit.testdeck | 36 - decks/short_no_root.deck | 60 - docs/fabfile.py | 22 + docs/source/architecture.rst | 40 + docs/source/index.rst | 18 +- docs/source/reports.rst | 15 +- docs/source/tests/dnsconsistency.rst | 4 +- docs/source/tests/dnsspoof.rst | 2 +- docs/source/tests/http_requests.rst | 6 +- fabfile.py | 47 +- inputs/Makefile | 11 - inputs/README | 47 - nettests/NETTESTS_HAVE_MOVED.txt | 1 + nettests/blocking/__init__.py | 1 - nettests/blocking/dnsconsistency.py | 173 - nettests/blocking/http_requests.py | 130 - nettests/blocking/tcpconnect.py | 45 - nettests/examples/example_dnst.py | 13 - nettests/examples/example_http_checksum.py | 27 - nettests/examples/example_httpt.py | 36 - nettests/examples/example_myip.py | 17 - nettests/examples/example_scapyt.py | 29 - nettests/examples/example_scapyt_yield.py | 25 - nettests/examples/example_simple.py | 8 - nettests/examples/example_tcpt.py | 21 - .../experimental/bridge_reachability/bridget.py | 462 - nettests/experimental/bridge_reachability/echo.py | 132 - nettests/experimental/chinatrigger.py | 108 - nettests/experimental/dns_injection.py | 63 - nettests/experimental/domclass_collector.py | 33 - nettests/experimental/http_keyword_filtering.py | 45 - nettests/experimental/http_uk_mobile_networks.py | 85 - nettests/experimental/keyword_filtering.py | 52 - nettests/experimental/parasitictraceroute.py | 129 - nettests/experimental/squid.py | 117 - nettests/manipulation/captiveportal.py | 650 - nettests/manipulation/daphne.py | 119 - nettests/manipulation/dnsspoof.py | 69 - .../manipulation/http_header_field_manipulation.py | 189 - nettests/manipulation/http_host.py | 109 - nettests/manipulation/http_invalid_request_line.py | 109 - nettests/manipulation/traceroute.py | 143 - nettests/scanning/http_url_list.py | 98 - nettests/third_party/Makefile | 3 - nettests/third_party/README | 14 - nettests/third_party/netalyzr.py | 58 - nettests/tls-handshake.py | 32 - ooni/__init__.py | 12 +- ooni/api/spec.py | 253 + ooni/config.py | 118 - ooni/deck.py | 214 + ooni/director.py | 182 +- ooni/errors.py | 99 +- ooni/geoip.py | 194 + ooni/managers.py | 82 +- ooni/nettest.py | 455 +- ooni/nettests/blocking/__init__.py | 1 + ooni/nettests/blocking/dnsconsistency.py | 180 + ooni/nettests/blocking/http_requests.py | 124 + ooni/nettests/blocking/tcp_connect.py | 70 + .../experimental/bridge_reachability/bridget.py | 462 + .../experimental/bridge_reachability/echo.py | 132 + ooni/nettests/experimental/chinatrigger.py | 108 + ooni/nettests/experimental/dns_injection.py | 63 + ooni/nettests/experimental/domclass_collector.py | 33 + .../experimental/http_filtering_bypassing.py | 84 + .../experimental/http_keyword_filtering.py | 45 + ooni/nettests/experimental/http_trix.py | 47 + .../experimental/http_uk_mobile_networks.py | 85 + ooni/nettests/experimental/keyword_filtering.py | 52 + ooni/nettests/experimental/parasitictraceroute.py | 129 + ooni/nettests/experimental/script.py | 90 + ooni/nettests/experimental/squid.py | 117 + ooni/nettests/experimental/tls_handshake.py | 837 ++ ooni/nettests/manipulation/captiveportal.py | 650 + ooni/nettests/manipulation/daphne.py | 120 + ooni/nettests/manipulation/dnsspoof.py | 76 + .../manipulation/http_header_field_manipulation.py | 160 + ooni/nettests/manipulation/http_host.py | 160 + .../manipulation/http_invalid_request_line.py | 110 + ooni/nettests/manipulation/traceroute.py | 135 + ooni/nettests/scanning/http_url_list.py | 98 + ooni/nettests/third_party/Makefile | 3 + ooni/nettests/third_party/README | 14 + ooni/nettests/third_party/netalyzr.py | 58 + ooni/oonibclient.py | 252 + ooni/oonicli.py | 223 +- ooni/oonid.py | 20 + ooni/otime.py | 2 + ooni/reporter.py | 281 +- ooni/runner.py | 241 - ooni/settings.py | 99 + ooni/tasks.py | 61 +- ooni/templates/dnst.py | 10 +- ooni/templates/httpt.py | 55 +- ooni/templates/scapyt.py | 8 +- ooni/templates/tcpt.py | 2 + ooni/tests/__init__.py | 3 + ooni/tests/disable_test_dns.py | 24 + ooni/tests/mocks.py | 172 + ooni/tests/test_deck.py | 130 + ooni/tests/test_director.py | 47 + ooni/tests/test_geoip.py | 22 + ooni/tests/test_managers.py | 228 + ooni/tests/test_mutate.py | 15 + ooni/tests/test_nettest.py | 315 + ooni/tests/test_oonibclient.py | 150 + ooni/tests/test_otime.py | 15 + ooni/tests/test_reporter.py | 91 + ooni/tests/test_safe_represent.py | 14 + ooni/tests/test_templates.py | 43 + ooni/tests/test_trueheaders.py | 41 + ooni/tests/test_txscapy.py | 47 + ooni/tests/test_utils.py | 22 + ooni/utils/__init__.py | 16 +- ooni/utils/geodata.py | 40 - ooni/utils/log.py | 27 +- ooni/utils/logo.py | 214 - ooni/utils/net.py | 36 +- ooni/utils/onion.py | 704 - ooni/utils/trueheaders.py | 159 + ooni/utils/txagentwithsocks.py | 215 - ooni/utils/txscapy.py | 21 +- oonib/INSTALL | 4 - oonib/README.md | 117 - oonib/__init__.py | 24 - oonib/config.py | 58 - oonib/db/__init__.py | 30 - oonib/db/tables.py | 123 - oonib/models.py | 129 - oonib/oonibackend.py | 74 - oonib/report/__init__.py | 5 - oonib/report/api.py | 106 - oonib/report/file_collector.py | 193 - oonib/requirements.txt | 24 - oonib/runner.py | 81 - oonib/testhelpers/__init__.py | 5 - oonib/testhelpers/dns_helpers.py | 16 - oonib/testhelpers/http_helpers.py | 154 - oonib/testhelpers/ssl_helpers.py | 9 - oonib/testhelpers/tcp_helpers.py | 72 - ooniprobe.conf.sample | 42 - requirements-dev.txt | 1 + requirements.txt | 41 +- scripts/archive_reports.py | 174 - scripts/build-ooniprobe.sh | 15 + setup-dependencies.sh | 1002 +- setup.py | 118 +- tests/mocks.py | 168 - tests/test-class-design.py | 101 - tests/test_director.py | 58 - tests/test_dns.py | 24 - tests/test_inputunit.py | 29 - tests/test_managers.py | 215 - tests/test_mutate.py | 15 - tests/test_nettest.py | 264 - tests/test_otime.py | 15 - tests/test_reporter.py | 238 - tests/test_runner.py | 80 - tests/test_safe_represent.py | 14 - tests/test_trueheaders.py | 41 - tests/test_utils.py | 20 - 229 files changed, 44851 insertions(+), 8729 deletions(-) diff --cc ooni/reporter.py index 3da1eea,c8d0748..cf35a87 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@@ -24,20 -26,17 +26,18 @@@ try from scapy.packet import Packet except ImportError: log.err("Scapy is not installed.") - + class Packet(object): + pass - from ooni.errors import InvalidOONIBCollectorAddress - from ooni.errors import ReportNotCreated, ReportAlreadyClosed + from ooni import errors from ooni import otime - from ooni.utils import geodata, pushFilenameStack + from ooni.utils import pushFilenameStack from ooni.utils.net import BodyReceiver, StringProducer, userAgents - from ooni import config - - from ooni.tasks import ReportEntry, TaskTimedOut + from ooni.settings import config + from ooni.tasks import ReportEntry, ReportTracker class ReporterException(Exception): pass

1 0

[ooni-probe/master] Write a quick and dirty implementation of bridget.
by art＠torproject.org 24 Mar '14

24 Mar '14

commit 46d428c6547262c5632adc9f6fb7d922e80beb4b Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Mar 16 01:18:26 2013 +0100 Write a quick and dirty implementation of bridget. --- nettests/experimental/bridget.py | 59 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/nettests/experimental/bridget.py b/nettests/experimental/bridget.py new file mode 100644 index 0000000..8f31e80 --- /dev/null +++ b/nettests/experimental/bridget.py @@ -0,0 +1,59 @@ +import random + +from twisted.python import usage +from twisted.internet import defer + +import txtorcon +from txtorcon.torconfig import TorSetupTimeout + +from ooni.utils import log +from ooni import nettest + +class UsageOptions(usage.Options): + optParameters = [['timeout', 't', 30, + 'Specify the timeout after which to consider the Tor bootstrapping process to have failed'] + ] + +class KeywordFiltering(nettest.NetTestCase): + name = "Bridget, at it's bare minimum" + author = "Arturo Filastò" + version = "0.1" + + usageOptions = UsageOptions + + inputFile = ['file', 'f', None, + 'File containing bridges to test reachability for (they should be one per line IP:ORPort)'] + + def setUp(self): + self.tor_progress = 0 + self.timeout = int(self.localOptions['timeout']) + self.report['timeout'] = self.timeout + + def test_full_tor_connection(self): + config = txtorcon.TorConfig() + config.OrPort = random.randint(2**14, 2**16) + config.SocksPort = random.randint(2**14, 2**16) + config.Bridge = self.input + config.UseBridges = 1 + + def updates(prog, tag, summary): + self.report['tor_progress'] = int(prog) + + d = txtorcon.launch_tor(config, reactor, progress_updates=updates, self.timeout) + @d.addCallback + def setup_complete(proto): + self.report['failed'] = False + + @d.addErrback + def setup_failed(failure): + failure.trap(TorSetupTimeout) + if isinstance(failure, TorSetupTimeout): + self.report['failure'] = 'timedout' + else: + self.report['failure'] = 'unknown' + self.report['failed'] = True + + return d + + def test_connect_scan(self): + pass

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 24 Mar '14

24 Mar '14

commit 137bd00b33571f83fe7f39ddc12181fdc0d61b1c Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 24 14:15:41 2014 +0000 Update translations for tails-misc_completed --- fr.po | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/fr.po b/fr.po index 2d6f548..14b062a 100644 --- a/fr.po +++ b/fr.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-06 14:52+0100\n" -"PO-Revision-Date: 2014-03-10 11:20+0000\n" -"Last-Translator: tneskovic <antoine_ecuador(a)yahoo.fr>\n" +"POT-Creation-Date: 2014-03-23 08:55+0100\n" +"PO-Revision-Date: 2014-03-24 14:00+0000\n" +"Last-Translator: chioubaca <chioubaca(a)gmail.com>\n" "Language-Team: French (http://www.transifex.com/projects/p/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,11 +23,11 @@ msgstr "" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:31 +#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:43 msgid "Tor is ready" msgstr "Tor est prêt" -#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:32 +#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:44 msgid "You can now access the Internet." msgstr "Vous pouvez maintenant accéder à Internet." @@ -350,6 +350,29 @@ msgid "" "following directory for more information:" msgstr "Quelque chose a mal tourné lors du démarrage de I2P. Regardez dans les journaux du répertoire suivant pour plus d'informations :" +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:19 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57 +msgid "error:" +msgstr "erreur:" + +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:20 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58 +msgid "Error" +msgstr "Erreur" + +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:40 +msgid "" +"Not enough memory available to check for upgrades.\n" +"\n" +"Make sure this system satisfies the requirements for running Tails.\n" +"See file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n" +"\n" +"Try to restart Tails to check for upgrades again.\n" +"\n" +"Or do a manual upgrade.\n" +"See https://tails.boum.org/doc/first_steps/upgrade#manual" +msgstr "Pas assez de mémoire système pour vérifier les mises à jour.\n\nAssurez vous que votre système correspond aux pré-requis pour lancer Tails.\nAllez sur file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nEssayez de redémarrer Tails afin de vérifier les mises à jour à nouveau.\n\nOu bien exécutez la mise à jour manuellement.\nAllez ici: https://tails.boum.org/doc/first_steps/upgrade#manual" + #: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:53 msgid "Warning: virtual machine detected!" msgstr "Attention : machine virtuelle détectée !" @@ -367,14 +390,6 @@ msgid "" " more...</a>" msgstr "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.fr.html'>En savoir plus...</a>" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57 -msgid "error:" -msgstr "erreur:" - -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58 -msgid "Error" -msgstr "Erreur" - #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:68 msgid "Do you really want to launch the Unsafe Browser?" msgstr "Êtes-vous sûr de vouloir utiliser le Navigateur Non-sécurisé ?"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 24 Mar '14

24 Mar '14

commit d8abc6be72578686dea841c54902e7d5699fcb52 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 24 14:15:38 2014 +0000 Update translations for tails-misc --- fr.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fr.po b/fr.po index 6397b1a..14b062a 100644 --- a/fr.po +++ b/fr.po @@ -14,8 +14,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-23 08:55+0100\n" -"PO-Revision-Date: 2014-03-23 08:50+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-03-24 14:00+0000\n" +"Last-Translator: chioubaca <chioubaca(a)gmail.com>\n" "Language-Team: French (http://www.transifex.com/projects/p/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -371,7 +371,7 @@ msgid "" "\n" "Or do a manual upgrade.\n" "See https://tails.boum.org/doc/first_steps/upgrade#manual" -msgstr "" +msgstr "Pas assez de mémoire système pour vérifier les mises à jour.\n\nAssurez vous que votre système correspond aux pré-requis pour lancer Tails.\nAllez sur file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nEssayez de redémarrer Tails afin de vérifier les mises à jour à nouveau.\n\nOu bien exécutez la mise à jour manuellement.\nAllez ici: https://tails.boum.org/doc/first_steps/upgrade#manual" #: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:53 msgid "Warning: virtual machine detected!"

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits March 2014