- tor-commits - lists.torproject.org

[tor/master] Only disable TLS tickets when being/acting as a server.
by nickm＠torproject.org 25 Oct '12

25 Oct '12

commit 62a49c0cc85037d3e79468961ff625ec5e8aad65 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 24 20:13:25 2012 -0400 Only disable TLS tickets when being/acting as a server. Fix for bug 7189. --- changes/bug7189_server_only | 5 +++++ src/common/tortls.c | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/changes/bug7189_server_only b/changes/bug7189_server_only new file mode 100644 index 0000000..6c24621 --- /dev/null +++ b/changes/bug7189_server_only @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Only disable TLS session ticket support when running as a TLS + server. It's important for clients to remain hard to distinguish + from regular firefox connections. Fixes bug 7189; bugfix on + Tor 0.2.3.23-rc. diff --git a/src/common/tortls.c b/src/common/tortls.c index bec2c71..12eac8d 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1198,10 +1198,13 @@ tor_tls_context_new(crypto_pk_t *identity, unsigned int key_lifetime, /* Disable TLS tickets if they're supported. We never want to use them; * using them can make our perfect forward secrecy a little worse, *and* * create an opportunity to fingerprint us (since it's unusual to use them - * with TLS sessions turned off). + * with TLS sessions turned off). Clients need to advertise support for + * them, though to avoid a TLS distinguishability vector. */ #ifdef SSL_OP_NO_TICKET - SSL_CTX_set_options(result->ctx, SSL_OP_NO_TICKET); + if (! is_client) { + SSL_CTX_set_options(result->ctx, SSL_OP_NO_TICKET); + } #endif if (

1 0

[tor/master] Change changes file and comment for 7189, for making it 0.2.4-only for now
by nickm＠torproject.org 25 Oct '12

25 Oct '12

commit a1c121e78e09ad29a60f1ed4ab1c8d1333bb4236 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 24 22:11:43 2012 -0400 Change changes file and comment for 7189, for making it 0.2.4-only for now --- changes/bug7189_server_only | 5 ++--- src/common/tortls.c | 8 ++++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/changes/bug7189_server_only b/changes/bug7189_server_only index 6c24621..9ad5ad9 100644 --- a/changes/bug7189_server_only +++ b/changes/bug7189_server_only @@ -1,5 +1,4 @@ o Minor bugfixes: - Only disable TLS session ticket support when running as a TLS - server. It's important for clients to remain hard to distinguish - from regular firefox connections. Fixes bug 7189; bugfix on - Tor 0.2.3.23-rc. + server. This keeps clients harder to distinguish from regular firefox + connections. Fixes bug 7189; bugfix on Tor 0.2.3.23-rc. diff --git a/src/common/tortls.c b/src/common/tortls.c index 3bb0581..1b7b544 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1193,8 +1193,12 @@ tor_tls_context_new(crypto_pk_t *identity, unsigned int key_lifetime, /* Disable TLS tickets if they're supported. We never want to use them; * using them can make our perfect forward secrecy a little worse, *and* * create an opportunity to fingerprint us (since it's unusual to use them - * with TLS sessions turned off). Clients need to advertise support for - * them, though to avoid a TLS distinguishability vector. + * with TLS sessions turned off). + * + * In 0.2.4, clients advertise support for them, though to avoid a TLS + * distinguishability vector. This can give us worse PFS, though, if we + * get a server that doesn't set SSL_OP_NO_TICKET. With luck, there will + * be few such servers by the time 0.2.4 is more stable. */ #ifdef SSL_OP_NO_TICKET if (! is_client) {

1 0

[tor/master] Merge remote-tracking branch 'public/bug7189_tentative'
by nickm＠torproject.org 25 Oct '12

25 Oct '12

commit 4a7962e439312b5002e05e0c720245e8359ad808 Merge: 4a9bc56 62a49c0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 24 22:07:10 2012 -0400 Merge remote-tracking branch 'public/bug7189_tentative' changes/bug7189_server_only | 5 +++++ src/common/tortls.c | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-)

1 0

[flashproxy/master] Rearrange some functions around __main__.
by dcf＠torproject.org 24 Oct '12

24 Oct '12

commit 0c6b4e34306fb4de93f2321525db3642126335ec Author: David Fifield <david(a)bamsoftware.com> Date: Mon Oct 22 23:22:56 2012 -0700 Rearrange some functions around __main__. --- flashproxy-client | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/flashproxy-client b/flashproxy-client index 088b8a7..1e32d8f 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -846,7 +846,7 @@ class LocalSocket(object): def __getattr__(self, name): return getattr(self.fd, name) -def main(): +def proxy_loop(): while True: rset = remote_listen + local_listen + websocket_pending + socks_pending + locals + remotes rset, _, _ = select.select(rset, [], [], WEBSOCKET_REQUEST_TIMEOUT) @@ -932,7 +932,12 @@ def build_register_command(method): else: raise ValueError("Unknown registration method \"%s\"" % method) -if __name__ == "__main__": +def main(): + global remote_listen, local_listen + global locals, remotes + global websocket_pending, socks_pending + global unlinked_locals, unlinked_remotes + register_addr_spec = None register_methods = [] @@ -1044,7 +1049,10 @@ if __name__ == "__main__": register() try: - main() + proxy_loop() except Exception: exc = traceback.format_exc() log("".join(exc)) + +if __name__ == "__main__": + main()

1 0

[tor/master] Fix instructions for using Tor with gcov
by nickm＠torproject.org 24 Oct '12

24 Oct '12

commit 4a9bc5658f4d7fa786aa2a154bba00f4e3f0bc45 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 24 15:03:49 2012 -0400 Fix instructions for using Tor with gcov It seems as if our new build system broke gcov for me. I've tried to fix doc/HACKING to describe what I needed to do in order to make it work again. --- doc/HACKING | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/doc/HACKING b/doc/HACKING index e76b374..c06a682 100644 --- a/doc/HACKING +++ b/doc/HACKING @@ -121,7 +121,8 @@ Running gcov for unit test coverage make clean make CFLAGS='-g -fprofile-arcs -ftest-coverage' ./src/test/test - cd src/common; gcov *.[ch] + gcov -o src/common src/common/*.[ch] + gcov -o src/or src/or/*.[ch] cd ../or; gcov *.[ch] ----- @@ -130,6 +131,13 @@ compiler generated no code for that line. '######' means that the line was never reached. Lines with numbers were called that number of times. +If that doesn't work: + * Try configuring Tor with --disable-gcc-hardening + * On recent OSX versions, you might need to add CC=clang to your + build line, as in: + make CFLAGS='-g -fprofile-arcs -ftest-coverage' CC=clang + Their llvm-gcc doesn't work so great for me. + Profiling Tor with oprofile ~~~~~~~~~~~~~~~~~~~~~~~~~~~

1 0

[ooni-probe/master] Further refactoring of nettest and runner
by art＠torproject.org 24 Oct '12

24 Oct '12

commit d7209408126949ae4a7a00b3ca0d7553644b98b7 Author: Arturo Filastò <arturo(a)filasto.net> Date: Wed Oct 24 15:49:06 2012 +0000 Further refactoring of nettest and runner * Add some notes on running tests in threads * Define and document _tests attribute of out nettest TestSuite * Remove unused code --- ooni/nettest.py | 52 +++++++++++++++++++++++----------------------------- ooni/runner.py | 1 - 2 files changed, 23 insertions(+), 30 deletions(-) diff --git a/ooni/nettest.py b/ooni/nettest.py index ade26ed..5302d2f 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -1,8 +1,17 @@ -import itertools +# -*- encoding: utf-8 -*- +# +# :authors: Arturo "hellais" Filastò <art(a)fuffa.org> +# :licence: see LICENSE + +import sys import os +import itertools +import traceback from twisted.trial import unittest, itrial, util from twisted.internet import defer, utils +from twisted.python import usage + from ooni.utils import log pyunit = __import__('unittest') @@ -12,6 +21,10 @@ class InputTestSuite(pyunit.TestSuite): This in an extension of a unittest test suite. It adds support for inputs and the tracking of current index via idx. """ + + # This is used to keep track of the tests that are associated with our + # special test suite + _tests = None def run(self, result, idx=0): log.debug("Running test suite") self._idx = idx @@ -29,25 +42,16 @@ class InputTestSuite(pyunit.TestSuite): test.input = self.input test._idx = self._idx except Exception, e: - log.debug("Error in some stuff") + log.debug("Error in setting test attributes") + log.debug("This is probably because the test case you are "\ + "running is not a nettest") log.debug(e) - import sys - print sys.exc_info() - try: - log.debug("Running test") - test(result) - log.debug("Ran.") - except Exception, e: - log.debug("Attribute error thing") - log.debug("Had some problems with _idx") - log.debug(e) - import traceback, sys - print sys.exc_info() - traceback.print_exc() - print e - - test(result) + log.debug("Running test") + # XXX we may want in a future to put all of these tests inside of a + # thread pool and run them all in parallel + test(result) + log.debug("Ran.") self._idx += 1 return result @@ -94,7 +98,7 @@ class TestCase(unittest.TestCase): * version: is the version string of the test. """ name = "I Did Not Change The Name" - author = "John Doe <foo(a)example.com>" + author = "Jane Doe <foo(a)example.com>" version = "0" inputs = [None] @@ -105,16 +109,6 @@ class TestCase(unittest.TestCase): optParameters = None - def _raaun(self, methodName, result): - from twisted.internet import reactor - method = getattr(self, methodName) - log.debug("Running %s" % methodName) - d = defer.maybeDeferred( - utils.runWithWarningsSuppressed, self._getSuppress(), method) - d.addBoth(lambda x : call.active() and call.cancel() or x) - return d - - def deferSetUp(self, ignored, result): """ If we have the reporterFactory set we need to write the header. If such diff --git a/ooni/runner.py b/ooni/runner.py index de90a80..8068b5b 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -123,7 +123,6 @@ def loadTestsAndOptions(classes, config): method_prefix = 'test' options = [] test_cases = [] - names = [] _old_klass_type = LegacyOONITest

1 0

[ooni-probe/master] Refactor reporter and removal of dead code
by art＠torproject.org 24 Oct '12

24 Oct '12

commit 6bb22e9b86a073cdbd9dc87d7ea87389f7296239 Author: Arturo Filastò <arturo(a)filasto.net> Date: Wed Oct 24 15:59:53 2012 +0000 Refactor reporter and removal of dead code --- ooni/oonicli.py | 27 ++++----- ooni/oonitests/httphost.py | 135 -------------------------------------------- ooni/oonitests/squid.py | 113 ------------------------------------ ooni/oonitests/template.py | 65 --------------------- ooni/reporter.py | 26 ++++++--- 5 files changed, 29 insertions(+), 337 deletions(-) diff --git a/ooni/oonicli.py b/ooni/oonicli.py index 5ea92d7..aa3cdc0 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -13,29 +13,24 @@ # original copyright (c) by Twisted Matrix Laboratories. -import sys, os, random, gc, time, warnings - -import unittest -import inspect - -from ooni.inputunit import InputUnitFactory -from ooni.reporter import ReporterFactory -from ooni.nettest import InputTestSuite -from ooni.plugoo import tests -from ooni import nettest, runner, reporter +import sys +import os +import random +import time from twisted.internet import defer from twisted.application import app -from twisted.python import usage, reflect, failure -from twisted.python.filepath import FilePath -from twisted import plugin +from twisted.python import usage, failure from twisted.python.util import spewer -from twisted.python.compat import set -from twisted.trial import itrial -from twisted.trial import runner as irunner +from ooni import nettest, runner, reporter + +from ooni.inputunit import InputUnitFactory +from ooni.reporter import ReporterFactory +from ooni.nettest import InputTestSuite from ooni.utils import log + class Options(usage.Options, app.ReactorSelectionMixin): synopsis = """%s [options] [[file|package|module|TestCase|testmethod]...] """ % (os.path.basename(sys.argv[0]),) diff --git a/ooni/oonitests/__init__.py b/ooni/oonitests/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/ooni/oonitests/httphost.py b/ooni/oonitests/httphost.py deleted file mode 100644 index 25adff2..0000000 --- a/ooni/oonitests/httphost.py +++ /dev/null @@ -1,135 +0,0 @@ -""" - HTTP Host based filtering - ************************* - - This test detect HTTP Host field - based filtering. - It is used to detect censorship on - performed with Web Guard (used by - T-Mobile US). -""" -import os -from datetime import datetime -from gevent import monkey - -import urllib2 -import httplib -# WARNING! Using gevent's socket -# introduces the 0x20 DNS "feature". -# This will result is weird DNS requests -# appearing on the wire. -monkey.patch_socket() - -try: - from BeautifulSoup import BeautifulSoup -except: - print "BeautifulSoup-3.2.1 is missing. Please see https://crate.io/packages/BeautifulSoup/" - -from plugoo.assets import Asset -from plugoo.tests import Test - -__plugoo__ = "HTTP Host" -__desc__ = "This detects HTTP Host field based filtering" - -class HTTPHostAsset(Asset): - """ - This is the asset that should be used by the Test. It will - contain all the code responsible for parsing the asset file - and should be passed on instantiation to the test. - """ - def __init__(self, file=None): - self = Asset.__init__(self, file) - - def parse_line(self, line): - return line.split(',')[1].replace('\n','') - -class HTTPHost(Test): - """ - The main Test class - """ - - def check_response(self, response): - soup = BeautifulSoup(response) - if soup.head.title.string == "Content Filtered": - # Response indicates censorship - return True - else: - # Response does not indicate censorship - return False - - - def is_censored(self, response): - if response: - soup = BeautifulSoup(response) - censored = self.check_response(response) - else: - censored = "unreachable" - return censored - - def urllib2_test(self, control_server, host): - req = urllib2.Request(control_server) - req.add_header('Host', host) - try: - r = urllib2.urlopen(req) - response = r.read() - censored = self.is_censored(response) - except Exception, e: - censored = "Error! %s" % e - - return censored - - def httplib_test(self, control_server, host): - try: - conn = httplib.HTTPConnection(control_server) - conn.putrequest("GET", "", skip_host=True, skip_accept_encoding=True) - conn.putheader("Host", host) - conn.putheader("User-Agent", "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-GB; rv:1.8.1.6") - conn.endheaders() - r = conn.getresponse() - response = r.read() - censored = self.is_censored(response) - except Exception, e: - censored = "Error! %s" % e - - return censored - - - def experiment(self, *a, **kw): - """ - Try to connect to the control server with - the specified host field. - """ - host = kw['data'] - control_server = kw['control_server'] - self.logger.info("Testing %s (%s)" % (host, control_server)) - - #censored = self.urllib2_test(control_server, host) - censored = self.httplib_test(control_server, host) - - self.logger.info("%s: %s" % (host, censored)) - return {'Time': datetime.now(), - 'Host': host, - 'Censored': censored} - - -def run(ooni): - """ - This is the function that will be called by OONI - and it is responsible for instantiating and passing - the arguments to the Test class. - """ - config = ooni.config - - # This the assets array to be passed to the run function of - # the test - assets = [HTTPHostAsset(os.path.join(config.main.assetdir, \ - "top-1m.csv"))] - - # Instantiate the Test - thetest = HTTPHost(ooni) - ooni.logger.info("starting HTTP Host Test...") - # Run the test with argument assets - thetest.run(assets, {'index': 5825, 'control_server': '195.85.254.203:8080'}) - ooni.logger.info("finished.") - - diff --git a/ooni/oonitests/squid.py b/ooni/oonitests/squid.py deleted file mode 100644 index 847135e..0000000 --- a/ooni/oonitests/squid.py +++ /dev/null @@ -1,113 +0,0 @@ -""" - Squid Proxy Detector - ******************** - -""" -import os -import httplib -import urllib2 -from urlparse import urlparse - -from plugoo import gen_headers -from plugoo.assets import Asset -from plugoo.tests import Test - -__plugoo__ = "SquidProxy" -__desc__ = "This Test aims at detecting the squid transparent proxy" - -class SquidAsset(Asset): - """ - This is the asset that should be used by the Test. It will - contain all the code responsible for parsing the asset file - and should be passed on instantiation to the test. - """ - def __init__(self, file=None): - self = Asset.__init__(self, file) - - -class Squid(Test): - """ - Squid Proxy testing class. - """ - def _http_request(self, method, url, - path=None, headers=None): - """ - Perform an HTTP Request. - XXX move this function to the core OONI - code. - """ - url = urlparse(url) - host = url.netloc - - conn = httplib.HTTPConnection(host, 80) - conn.connect() - - if path is None: - path = purl.path - - conn.putrequest(method, path) - - for h in gen_headers(): - conn.putheaders(h[0], h[1]) - conn.endheaders() - - send_browser_headers(self, None, conn) - - response = conn.getresponse() - - headers = dict(response.getheaders()) - - self.headers = headers - self.data = response.read() - return True - - def invalid_request(self): - """ - This will trigger squids "Invalid Request" error. - """ - pass - - def cache_object(self): - """ - This attempts to do a GET cache_object://localhost/info on - any destination and checks to see if the response contains - is that of Squid. - """ - - pass - - def experiment(self, *a, **kw): - """ - Fill this up with the tasks that should be performed - on the "dirty" network and should be compared with the - control. - """ - - - def control(self): - """ - Fill this up with the control related code. - """ - return True - -def run(ooni): - """ - This is the function that will be called by OONI - and it is responsible for instantiating and passing - the arguments to the Test class. - """ - config = ooni.config - - # This the assets array to be passed to the run function of - # the test - assets = [TestTemplateAsset(os.path.join(config.main.assetdir, \ - "someasset.txt"))] - - # Instantiate the Test - thetest = TestTemplate(ooni) - ooni.logger.info("starting SquidProxyTest...") - # Run the test with argument assets - thetest.run(assets) - ooni.logger.info("finished.") - - diff --git a/ooni/oonitests/template.py b/ooni/oonitests/template.py deleted file mode 100644 index f5f9d93..0000000 --- a/ooni/oonitests/template.py +++ /dev/null @@ -1,65 +0,0 @@ -""" - Test Template - ************* - - This is a Test template, to be used when writing your - own OONI probe Tests. -""" -import os - -from plugoo.assets import Asset -from plugoo.tests import Test - -__plugoo__ = "Test Template" -__desc__ = "This a test template to be used to build your own tests" - -class TestTemplateAsset(Asset): - """ - This is the asset that should be used by the Test. It will - contain all the code responsible for parsing the asset file - and should be passed on instantiation to the test. - """ - def __init__(self, file=None): - self = Asset.__init__(self, file) - - -class TestTemplate(Test): - """ - The main Test class - """ - - def experiment(self, *a, **kw): - """ - Fill this up with the tasks that should be performed - on the "dirty" network and should be compared with the - control. - """ - return False - - def control(self): - """ - Fill this up with the control related code. - """ - return True - -def run(ooni): - """ - This is the function that will be called by OONI - and it is responsible for instantiating and passing - the arguments to the Test class. - """ - config = ooni.config - - # This the assets array to be passed to the run function of - # the test - assets = [TestTemplateAsset(os.path.join(config.main.assetdir, \ - "someasset.txt"))] - - # Instantiate the Test - thetest = TestTemplate(ooni) - ooni.logger.info("starting TestTemplate...") - # Run the test with argument assets - thetest.run(assets) - ooni.logger.info("finished.") - - diff --git a/ooni/reporter.py b/ooni/reporter.py index c12b28f..fc5dde9 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -1,4 +1,3 @@ -import copy_reg import itertools import logging import sys @@ -12,8 +11,8 @@ from yaml.serializer import * from yaml.resolver import * from datetime import datetime -from twisted.python.util import OrderedDict, untilConcludes -from twisted.trial import unittest, reporter, runner +from twisted.python.util import untilConcludes +from twisted.trial import reporter from twisted.internet import defer from ooni.utils import date, log, geodata @@ -30,6 +29,11 @@ except: pyunit = __import__('unittest') class OSafeRepresenter(SafeRepresenter): + """ + This is a custom YAML representer that allows us to represent reports + safely. + It extends the SafeRepresenter to be able to also represent complex numbers + """ def represent_complex(self, data): if data.imag == 0.0: data = u'%r' % data.real @@ -45,7 +49,10 @@ OSafeRepresenter.add_representer(complex, OSafeRepresenter.represent_complex) class OSafeDumper(Emitter, Serializer, OSafeRepresenter, Resolver): - + """ + This is a modification of the YAML Safe Dumper to use our own Safe + Representer that supports complex numbers. + """ def __init__(self, stream, default_style=None, default_flow_style=None, canonical=None, indent=None, width=None, @@ -64,6 +71,9 @@ class OSafeDumper(Emitter, Serializer, OSafeRepresenter, Resolver): def safe_dump(data, stream=None, **kw): + """ + Safely dump to a yaml file the specified data. + """ return yaml.dump_all([data], stream, Dumper=OSafeDumper, **kw) class OReporter(pyunit.TestResult): @@ -88,8 +98,8 @@ class OReporter(pyunit.TestResult): def _getTime(self): return time.time() - def _write(self, format, *args): - s = str(format) + def _write(self, format_string, *args): + s = str(format_string) assert isinstance(s, type('')) if args: self._stream.write(s % args) @@ -97,8 +107,8 @@ class OReporter(pyunit.TestResult): self._stream.write(s) untilConcludes(self._stream.flush) - def _writeln(self, format, *args): - self._write(format, *args) + def _writeln(self, format_string, *args): + self._write(format_string, *args) self._write('\n') def writeYamlLine(self, line):

1 0

[ooni-probe/master] Avoid doing wildcard import of scapy.all
by art＠torproject.org 24 Oct '12

24 Oct '12

commit 2916d809b933263bece9ee4e33f4bf7e868c759e Author: Arturo Filastò <arturo(a)filasto.net> Date: Wed Oct 24 16:17:19 2012 +0000 Avoid doing wildcard import of scapy.all * Your code has been rated at 5.68/10 (previous run: 5.63/10) --- ooni/protocols/daphn3.py | 2 +- ooni/templates/scapyt.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ooni/protocols/daphn3.py b/ooni/protocols/daphn3.py index a4cc32a..37c94c7 100644 --- a/ooni/protocols/daphn3.py +++ b/ooni/protocols/daphn3.py @@ -4,7 +4,7 @@ import yaml from twisted.internet import protocol, defer from twisted.internet.error import ConnectionDone -from scapy.all import * +from scapy.all import IP, Raw, rdpcap from ooni.utils import log from ooni.plugoo import reports diff --git a/ooni/templates/scapyt.py b/ooni/templates/scapyt.py index b2ac148..c0fca0c 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 -from scapy.all import * +from scapy.all import IP, TCP from ooni.nettest import TestCase from ooni.utils import log

1 0

[ooni-probe/master] Refactor reporter, config and onion
by art＠torproject.org 24 Oct '12

24 Oct '12

commit b86bd2f72edc7cd7cea440596ec676940b0c8ea8 Author: Arturo Filastò <arturo(a)filasto.net> Date: Wed Oct 24 16:12:23 2012 +0000 Refactor reporter, config and onion * Stop using newstyle super method on oldstyle class --- ooni/reporter.py | 17 ++++------- ooni/utils/config.py | 6 ++-- ooni/utils/onion.py | 76 +++++++++++++++++++++++++------------------------- 3 files changed, 47 insertions(+), 52 deletions(-) diff --git a/ooni/reporter.py b/ooni/reporter.py index fc5dde9..4d09729 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -191,9 +191,6 @@ class OONIReporter(OReporter): tbformat=tbformat, realtime=realtime, publisher=publisher) self._tests = {} - self._publisher = publisher - if publisher is not None: - publisher.addObserver(self._observeWarnings) def getTestIndex(self, test): try: @@ -261,8 +258,6 @@ class OONIReporter(OReporter): and L{_separator} are all implemented. """ log.debug("Test run concluded") - if self._publisher is not None: - self._publisher.removeObserver(self._observeWarnings) if self._startTime is not None: self.report['startTime'] = self._startTime self.report['runTime'] = time.time() - self._startTime @@ -274,11 +269,11 @@ class OONIReporter(OReporter): self.writeYamlLine(self.report) def addSuccess(self, test): - super(OONIReporter, self).addSuccess(test) + OONIReporter.addSuccess(self, test) #self.report['result'] = {'value': 'success'} def addError(self, test, exception): - super(OONIReporter, self).addError(test, exception) + OONIReporter.addError(self, test, exception) exc_type, exc_value, exc_traceback = exception log.err(exc_type) log.err(str(exc_value)) @@ -287,19 +282,19 @@ class OONIReporter(OReporter): log.err(line) def addFailure(self, *args): - super(OONIReporter, self).addFailure(*args) + OONIReporter.addFailure(self, *args) log.warn(args) def addSkip(self, *args): - super(OONIReporter, self).addSkip(*args) + OONIReporter.addSkip(self, *args) #self.report['result'] = {'value': 'skip', 'args': args} def addExpectedFailure(self, *args): - super(OONIReporter, self).addExpectedFailure(*args) + OONIReporter.addExpectedFailure(self, *args) #self.report['result'] = {'value': 'expectedFailure', 'args': args} def addUnexpectedSuccess(self, *args): - super(OONIReporter, self).addUnexpectedSuccess(*args) + OONIReporter.addUnexpectedSuccess(self, *args) #self.report['result'] = {'args': args, 'value': 'unexpectedSuccess'} diff --git a/ooni/utils/config.py b/ooni/utils/config.py index e429ef6..5a0782d 100644 --- a/ooni/utils/config.py +++ b/ooni/utils/config.py @@ -1,7 +1,7 @@ import ConfigParser import os -from ooni.utils import Storage +from ooni.utils import Storage, log class Config(Storage): """ @@ -110,12 +110,12 @@ class ValueChecker(object): def dir_check(d): """Check that the given directory exists.""" if not os.path.isdir(d): - raise ValueError("%s doesn't exist, or has wrong permissions" + raise ValueError("%s doesn't exist, or has wrong permissions" % d) @staticmethod def file_check(f): """Check that the given file exists.""" if not os.path.isfile(f): - raise ValueError("%s does not exist, or has wrong permissions" + raise ValueError("%s does not exist, or has wrong permissions" % f) diff --git a/ooni/utils/onion.py b/ooni/utils/onion.py index 3326c75..9c80f62 100644 --- a/ooni/utils/onion.py +++ b/ooni/utils/onion.py @@ -67,7 +67,7 @@ def write_torrc(conf, data_dir=None): """ Create a torrc in our data_dir. If we don't yet have a data_dir, create a temporary one. Any temporary files or folders are added to delete_list. - + :param conf: A :class:`ooni.lib.txtorcon.TorConfig` object, with all configuration values saved. @@ -82,12 +82,12 @@ def write_torrc(conf, data_dir=None): log.err(ie) delete_list = [] - + if data_dir is None: data_dir = mkdtemp(prefix='bridget-tordata') delete_list.append(data_dir) conf.DataDirectory = data_dir - + (fd, torrc) = mkstemp(dir=data_dir) delete_list.append(torrc) write(fd, conf.create_torrc()) @@ -136,7 +136,7 @@ def remove_public_relays(state, bridges): XXX FIXME: There is a problem in that Tor needs a Bridge line to already be configured in order to bootstrap. However, after bootstrapping, we grab the - microdescriptors of all the relays and check if any of our bridges are + microdescriptors of all the relays and check if any of our bridges are listed as public relays. Because of this, the first bridge does not get checked for being a relay. """ @@ -180,7 +180,7 @@ def state_complete(state): return state def updates(_progress, _tag, _summary): - """Log updates on the Tor bootstrapping process.""" + """Log updates on the Tor bootstrapping process.""" log.msg("%d%%: %s" % (_progress, _summary)) def bootstrap(ctrl): @@ -193,7 +193,7 @@ def bootstrap(ctrl): log.msg("Tor process connected, bootstrapping ...") def start_tor(reactor, config, control_port, tor_binary, data_dir, - report=None, progress=updates, + report=None, progress=updates, process_cb=None, process_eb=None): """ Use a txtorcon.TorConfig() instance, config, to write a torrc to a @@ -223,11 +223,11 @@ def start_tor(reactor, config, control_port, tor_binary, data_dir, A non-blocking function to handle bootstrapping updates, which takes three parameters: _progress, _tag, and _summary. :param process_cb: - The function to callback to after + The function to callback to after class:`ooni.lib.txtorcon.TorProcessProtocol` returns with the fully bootstrapped Tor process. :param process_eb: - The function to errback to if + The function to errback to if class:`ooni.lib.txtorcon.TorProcessProtocol` fails. :return: The result of the callback of a @@ -284,9 +284,9 @@ def start_tor(reactor, config, control_port, tor_binary, data_dir, def start_tor_filter_nodes(reactor, config, control_port, tor_binary, data_dir, bridges): """ - Bootstrap a Tor process and return a fully-setup + Bootstrap a Tor process and return a fully-setup :class:`ooni.lib.txtorcon.TorState`. Then search for our bridges - to test in the list of known public relays, + to test in the list of known public relays, :ivar:`ooni.lib.txtorcon.TorState.routers`, and remove any bridges which are known public relays. @@ -296,7 +296,7 @@ def start_tor_filter_nodes(reactor, config, control_port, tor_binary, An instance of :class:`ooni.lib.txtorcon.TorConfig`. :param control_port: The port to use for Tor's ControlPort. If already configured in - the TorConfig instance, this can be given as + the TorConfig instance, this can be given as TorConfig.config.ControlPort. :param tor_binary: The full path to the Tor binary to execute. @@ -309,7 +309,7 @@ def start_tor_filter_nodes(reactor, config, control_port, tor_binary, :return: A fully initialized :class:`ooni.lib.txtorcon.TorState`. """ - setup = yield start_tor(reactor, config, control_port, + setup = yield start_tor(reactor, config, control_port, tor_binary, data_dir, process_cb=setup_done, process_eb=setup_fail) filter_nodes = yield remove_public_relays(setup, bridges) @@ -333,7 +333,7 @@ def start_tor_with_timer(reactor, config, control_port, tor_binary, data_dir, An instance of :class:`ooni.lib.txtorcon.TorConfig`. :param control_port: The port to use for Tor's ControlPort. If already configured in - the TorConfig instance, this can be given as + the TorConfig instance, this can be given as TorConfig.config.ControlPort. :param tor_binary: The full path to the Tor binary to execute. @@ -347,7 +347,7 @@ def start_tor_with_timer(reactor, config, control_port, tor_binary, data_dir, The number of seconds to attempt to bootstrap the Tor process before raising a :class:`ooni.utils.timer.TimeoutError`. :return: - If the timeout limit is not exceeded, return a fully initialized + If the timeout limit is not exceeded, return a fully initialized :class:`ooni.lib.txtorcon.TorState`, else return None. """ error_msg = "Bootstrapping has exceeded the timeout limit..." @@ -365,9 +365,9 @@ def start_tor_with_timer(reactor, config, control_port, tor_binary, data_dir, else: state = yield remove_public_relays(setup, bridges) defer.returnValue(state) - + @defer.inlineCallbacks -def start_tor_filter_nodes_with_timer(reactor, config, control_port, +def start_tor_filter_nodes_with_timer(reactor, config, control_port, tor_binary, data_dir, bridges, timeout): """ Start bootstrapping a Tor process wrapped with an instance of the class @@ -386,7 +386,7 @@ def start_tor_filter_nodes_with_timer(reactor, config, control_port, An instance of :class:`ooni.lib.txtorcon.TorConfig`. :param control_port: The port to use for Tor's ControlPort. If already configured in - the TorConfig instance, this can be given as + the TorConfig instance, this can be given as TorConfig.config.ControlPort. :param tor_binary: The full path to the Tor binary to execute. @@ -400,13 +400,13 @@ def start_tor_filter_nodes_with_timer(reactor, config, control_port, The number of seconds to attempt to bootstrap the Tor process before raising a :class:`ooni.utils.timer.TimeoutError`. :return: - If the timeout limit is not exceeded, return a fully initialized + If the timeout limit is not exceeded, return a fully initialized :class:`ooni.lib.txtorcon.TorState`, else return None. """ error_msg = "Bootstrapping has exceeded the timeout limit..." with_timeout = deferred_timeout(timeout, e=error_msg)(start_tor_filter_nodes) try: - state = yield with_timeout(reactor, config, control_port, + state = yield with_timeout(reactor, config, control_port, tor_binary, data_dir, bridges) except TimeoutError, te: log.err(te) @@ -416,16 +416,16 @@ def start_tor_filter_nodes_with_timer(reactor, config, control_port, # defer.returnValue(None) else: defer.returnValue(state) - + class CustomCircuit(CircuitListenerMixin): """ - Utility class for controlling circuit building. See + Utility class for controlling circuit building. See 'attach_streams_by_country.py' in the txtorcon documentation. :param state: A fully bootstrapped instance of :class:`ooni.lib.txtorcon.TorState`. :param relays: - A dictionary containing a key 'all', which is a list of relays to + A dictionary containing a key 'all', which is a list of relays to test connecting to. :ivar waiting_circuits: The list of circuits which we are waiting to attach to. You shouldn't @@ -498,10 +498,10 @@ class CustomCircuit(CircuitListenerMixin): def check_circuit_route(self, router): """ - Check if a relay is a hop in one of our already built circuits. + Check if a relay is a hop in one of our already built circuits. :param router: - An item from the list + An item from the list :func:`ooni.lib.txtorcon.TorState.routers.values()`. """ for circ in self.state.circuits.values(): @@ -551,7 +551,7 @@ class CustomCircuit(CircuitListenerMixin): assert len(path) >= 3, \ "Circuit path must be at least three hops!" - log.msg("Requesting a circuit: %s" + log.msg("Requesting a circuit: %s" % '->'.join(map(lambda node: node, path))) class AppendWaiting: @@ -575,7 +575,7 @@ class CustomCircuit(CircuitListenerMixin): class TxtorconImportError(ImportError): """ Raised when ooni.lib.txtorcon cannot be imported from. Checks our current - working directory and the path given to see if txtorcon has been + working directory and the path given to see if txtorcon has been initialized via /ooni/lib/Makefile. """ from os import getcwd, path @@ -609,25 +609,25 @@ class PTNotFoundException(Exception): return sys.exit() @defer.inlineCallbacks -def __start_tor_with_timer__(reactor, config, control_port, tor_binary, +def __start_tor_with_timer__(reactor, config, control_port, tor_binary, data_dir, bridges=None, relays=None, timeout=None, retry=None): """ A wrapper for :func:`start_tor` which wraps the bootstrapping of a Tor - process and its connection to a reactor with a - :class:`twisted.internet.defer.Deferred` class decorator utility, + process and its connection to a reactor with a + :class:`twisted.internet.defer.Deferred` class decorator utility, :func:`ooni.utils.timer.deferred_timeout`, and a mechanism for resets. - + ## XXX fill me in """ raise NotImplementedError - + class RetryException(Exception): - pass + pass import sys from ooni.utils.timer import deferred_timeout, TimeoutError - + def __make_var__(old, default, _type): if old is not None: assert isinstance(old, _type) @@ -635,15 +635,15 @@ def __start_tor_with_timer__(reactor, config, control_port, tor_binary, else: new = default return new - + reactor = reactor timeout = __make_var__(timeout, 120, int) retry = __make_var__(retry, 1, int) with_timeout = deferred_timeout(timeout)(start_tor) - + @defer.inlineCallbacks - def __start_tor__(rc=reactor, cf=config, cp=control_port, tb=tor_binary, + def __start_tor__(rc=reactor, cf=config, cp=control_port, tb=tor_binary, dd=data_dir, br=bridges, rl=relays, cb=setup_done, eb=setup_fail, af=remove_public_relays, retry=retry): try: @@ -658,13 +658,13 @@ def __start_tor_with_timer__(reactor, config, control_port, tor_binary, setup = yield eb(setup) else: setup = setup - + if br is not None: state = af(setup,br) else: state = setup defer.returnValue(state) - + @defer.inlineCallbacks def __try_until__(tries): result = yield __start_tor__()

1 0

[translation/orbot_completed] Update translations for orbot_completed
by translation＠torproject.org 24 Oct '12

24 Oct '12

commit 3f3790a7a90d1d604de6f36f91f19267affea296 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 24 15:45:07 2012 +0000 Update translations for orbot_completed --- values-nl/strings.xml | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/values-nl/strings.xml b/values-nl/strings.xml index 105f489..b49ef0a 100644 --- a/values-nl/strings.xml +++ b/values-nl/strings.xml @@ -75,8 +75,11 @@ <string name="wizard_tips_otrchat">Gibberbot - Veilige instant messaging client voor Android</string> <string name="wizard_tips_proxy">Proxy Instellingen - Leer hoe je apps te configureren voor Orbot</string> <string name="wizard_tips_duckgo">Duckduckgo Zoekmachine app</string> + <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> <string name="wizard_tips_firefox">Firefox met Proxy Mobile extensie (vergt extra installatie achteraf)</string> + <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string> <string name="wizard_tips_twitter">Twitter ondersteunt http proxy \"localhost:8118\"</string> + <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Proxy Instellingen</string> <string name="wizard_proxy_help_msg">Als de Android app die je gebruikt beschikt over een HTTP of SOCKS proxy instelling, dan kun je het configureren zodat het via Orbot over het Tor netwerk gaat.\n\n\nDe host instelling is 127.0.0.1 of \"localhost\". De poort voor SOCKS is 9050 en voor HTTP 8118. Gebruik SOCKS4A of SOCKS5 indien mogelijk.\n\n\nJe kunt meer leren over het proxy-en op Android door naar de FAQ op http://tinyurl.com/proxyandroid te gaan\n </string> <string name="wizard_final">Orbot is klaar!</string> @@ -105,6 +108,8 @@ <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> <string name="wizard_tips_orweb">ORWEB (Alleen Android 1.x) - Browser gemaakt voor privacy & voor Orbot</string> <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> + <string name="wizard_tips_play">Vind alle Guardian Project apps op Google Play</string> + <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string> <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>

1 0