April 2016 - tor-commits - lists.torproject.org

[ooni-probe/master] psiphon: use the python provided by sys.executable
by art＠torproject.org 29 Apr '16

29 Apr '16

commit b899fb7f25533fef7ddc9a23afe869c4bf684f14 Author: Simone Basso <bassosimone(a)gmail.com> Date: Sat Oct 10 11:06:11 2015 +0200 psiphon: use the python provided by sys.executable There may be more than one Python (for example on MacOS I have both the system Python and the one installed with brew). Make sure we use the same Python with which ooni-probe was started such that modules installed with pip are found. Updated to avoid setting the temporary file executable and to avoid removing my Python interpreter :). --- ooni/nettests/third_party/psiphon.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ooni/nettests/third_party/psiphon.py b/ooni/nettests/third_party/psiphon.py index 8ac287d..6a2e08e 100644 --- a/ooni/nettests/third_party/psiphon.py +++ b/ooni/nettests/third_party/psiphon.py @@ -1,6 +1,7 @@ import tempfile import stat import os +import sys from twisted.internet import defer, reactor from twisted.internet.endpoints import TCP4ClientEndpoint @@ -76,15 +77,14 @@ class PsiphonTest(httpt.HTTPTest, process.ProcessTest): 'psiphon-circumvention-system/pyclient') log.debug('psiphon path: %s' % self.psiphonpath) - x = """#!/usr/bin/env python + x = """ from psi_client import connect connect(False) """ f = tempfile.NamedTemporaryFile(delete=False) f.write(x) f.close() - os.chmod(f.name, os.stat(f.name).st_mode | stat.S_IEXEC) - self.command = [f.name] + self.command = [sys.executable, f.name] log.debug('command: %s' % ''.join(self.command)) def handleRead(self, stdout, stderr): @@ -119,7 +119,7 @@ connect(False) def cleanup(_): log.debug('PsiphonTest:cleanup') self.processDirector.transport.signalProcess('INT') - os.remove(self.command[0]) + os.remove(self.command[1]) return finished self.bootstrapped.addBoth(cleanup)

1 0

[ooni-probe/master] Update ooniprobe to 1.3.2
by art＠torproject.org 29 Apr '16

29 Apr '16

commit 5b62ae5e8e5f8b098dc527561a055de9d0085ca1 Author: Arturo <art(a)fuffa.org> Date: Fri Nov 20 15:33:30 2015 +0100 Update ooniprobe to 1.3.2 --- ChangeLog.rst | 17 +++++++++++++++++ ooni/__init__.py | 2 +- setup.py | 1 + 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/ChangeLog.rst b/ChangeLog.rst index d3a7729..79cb883 100644 --- a/ChangeLog.rst +++ b/ChangeLog.rst @@ -1,6 +1,23 @@ Changelog ========= +v1.3.2 (Fri, 20 Nov 2015) +------------------------- + +* Implement third party test template + +* Add tutorial for using TCP test + +* Add tests for censorship resistance + + * Add meek test + + * Add lantern test + +* Support for Twisted 15.0 + +* Various stability and bug fixes + v1.3.1 (Fri, 3 Apr 2015) ------------------------ diff --git a/ooni/__init__.py b/ooni/__init__.py index 1bc0cb8..a9c6112 100644 --- a/ooni/__init__.py +++ b/ooni/__init__.py @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*- __author__ = "Open Observatory of Network Interference" -__version__ = "1.3.1" +__version__ = "1.3.2" __all__ = ['config', 'inputunit', 'kit', 'lib', 'nettest', 'oonicli', 'report', 'reporter', diff --git a/setup.py b/setup.py index d99a90f..23088c9 100644 --- a/setup.py +++ b/setup.py @@ -208,6 +208,7 @@ setup( "bin/ooniprobequeue"], dependency_links=dependency_links, install_requires=install_requires, + zip_safe=False, cmdclass={"install": install}, classifiers=( "Development Status :: 5 - Production/Stable",

1 0

[ooni-probe/master] Remove unneeded space
by art＠torproject.org 29 Apr '16

29 Apr '16

commit ad6c90b781ff89ed8292c728c5bcb200c0395ca7 Author: anadahz <kojgelo(a)inbox.com> Date: Tue Nov 17 20:17:31 2015 +0100 Remove unneeded space --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f265676..926468a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,7 @@ install: # command to run tests, e.g. python setup.py test script: - sudo $(which coverage) run $(which trial) ooni -after_success: +after_success: - coveralls notifications: irc:

1 0

[ooni-probe/master] Add description to meek test
by art＠torproject.org 29 Apr '16

29 Apr '16

commit f5279950cd048d9a9ce36a26933865012783b90b Author: Arturo <art(a)fuffa.org> Date: Fri Nov 20 15:03:21 2015 +0100 Add description to meek test --- ooni/nettests/blocking/meek_fronted_requests.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ooni/nettests/blocking/meek_fronted_requests.py b/ooni/nettests/blocking/meek_fronted_requests.py index 2ccd72e..1a16955 100644 --- a/ooni/nettests/blocking/meek_fronted_requests.py +++ b/ooni/nettests/blocking/meek_fronted_requests.py @@ -28,7 +28,8 @@ class meekTest(httpt.HTTPTest): a0.awsstatic.com:d2zfqthxsdq309.cloudfront.net """ - name = "meek fronted requests test" + name = "Meek fronted requests test" + description = "This tests for the Meek Tor pluggable transport frontend reachability" version = "0.0.1" usageOptions = UsageOptions

1 0

[ooni-probe/master] add openvpn user documentation
by art＠torproject.org 29 Apr '16

29 Apr '16

commit 652f236777b1f0f394b5b26dd6518e815c87de4b Author: juga0 <juga> Date: Thu Nov 19 19:59:58 2015 +0000 add openvpn user documentation --- docs/source/nettests/ooni.nettests.third_party.rst | 8 ++ docs/source/tests/openvpn.rst | 148 +++++++++++++++++++++ 2 files changed, 156 insertions(+) diff --git a/docs/source/nettests/ooni.nettests.third_party.rst b/docs/source/nettests/ooni.nettests.third_party.rst index 54573fb..ef53443 100644 --- a/docs/source/nettests/ooni.nettests.third_party.rst +++ b/docs/source/nettests/ooni.nettests.third_party.rst @@ -8,3 +8,11 @@ ooni.nettests third_party Package :members: :undoc-members: :show-inheritance: + +:mod:`ooni.nettests.third_party.openvpn` Module +------------------------------------------------ + +.. automodule:: ooni.nettests.third_party.openvpn + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/tests/openvpn.rst b/docs/source/tests/openvpn.rst new file mode 100644 index 0000000..a95da96 --- /dev/null +++ b/docs/source/tests/openvpn.rst @@ -0,0 +1,148 @@ +Details +======= + +*Test Name*: OpenVPN + +*Current version*: 0.1 + +*NetTest*: OpenVPN (https://github.com/TheTorProject/ooni-probe/blob/master/ooni/nettests/third…) + +*Test Helper*: None + +*Test Type*: third party + +*Requires Root*: Yes + +Description +=========== + +This test first launches OpenVPN and parses output to determine if it has bootstrapped. After bootstrap, it fetches the URL specified by the --url argument using OpenVPN. + +The specific string used to determine bootstrap from OpenVPN output in version +"0.0.1" is "Initialization Sequence Completed" from standard output. + +How to run the test +=================== + +First get credentials for a OpenVPN service and create the configuration file for OpenVPN. +An example: + + client + dev tun + proto tcp + remote <vpndomain> 80 + remote <vppnip> 80 + resolv-retry infinite + tun-mtu 1500 + key-direction 1 + nobind + persist-key + persist-tun + ns-cert-type server + comp-lzo + verb 3 + auth-user-pass <vpnuserandpasswordfile> + route-method exe + route-delay 2 + + <ca> + -----BEGIN CERTIFICATE----- + ... + -----END CERTIFICATE----- + </ca> + <tls-auth> + -----BEGIN OpenVPN Static key V1----- + ... + -----END OpenVPN Static key V1----- + </tls-auth> + +To run the test: + +`ooniprobe third_party/openvpn -u http://<url>/ -c <OpenVPN configuration file>` + +How to install OpenVPN +=================== + +Run the install script: + +`scripts/openvpn_install.sh` + +To run OpenVPN manually, : + +`openvpn --config <OpenVPN configuration file>` + +Sample report +============= + +`ooniprobe blocking/http_requests -f example_inputs/url_lists_file.txt` + + :: + + ########################################### + # OONI Probe Report for openvpn_client_test (0.0.2) + # Thu Nov 19 12:16:35 2015 + ########################################### + --- + input_hashes: [] + options: [-c, openvpn-config.ovpn, -u, ''] + probe_asn: AS0 + probe_cc: ZZ + probe_city: null + probe_ip: 127.0.0.1 + report_id: oVWw3KA3UH2XrOlLa8gRaUB1ocvn6LhMeTBOtU1yFMtdyM3L6Bg9ix1ulSWZCGtK + software_name: ooniprobe + software_version: 1.3.1 + start_time: 1447928194.0 + test_helpers: {} + test_name: openvpn_client_test + test_version: 0.0.2 + ... + --- + /usr/sbin/openvpn --config openvpn-config.ovpn: { + exit_reason: process_done, stderr: '', stdout: 'Thu Nov 19 12:16:35 2015 OpenVPN + 2.3.2 x86_64-pc-linux-gnu [SSL (OpenSSL)] [LZO] [EPOLL] [PKCS11] [eurephia] [MH] + [IPv6] built on Dec 1 2014 + + Thu Nov 19 12:16:35 2015 WARNING: file ''/tmp/openvpn.txt'' is group or others + accessible + + Thu Nov 19 12:16:35 2015 Control Channel Authentication: tls-auth using INLINE + static key file + + Thu Nov 19 12:16:35 2015 Attempting to establish TCP connection with [AF_INET]10.100.0.1:993 + [nonblock] + + Thu Nov 19 12:16:37 2015 TCP connection established with [AF_INET]10.100.0.1:993 + + Thu Nov 19 12:16:37 2015 TCPv4_CLIENT link local: [undef] + + Thu Nov 19 12:16:37 2015 TCPv4_CLIENT link remote: [AF_INET]10.100.0.1:993 + + Thu Nov 19 12:16:39 2015 WARNING: this configuration may cache passwords in memory + -- use the auth-nocache option to prevent this + + Thu Nov 19 12:16:42 2015 [server] Peer Connection Initiated with [AF_INET]10.100.0.1:993 + + Thu Nov 19 12:16:44 2015 Options error: Unrecognized option or missing parameter(s) + in [PUSH-OPTIONS]:3: dhcp (2.3.2) + + Thu Nov 19 12:16:44 2015 TUN/TAP device tun0 opened + + Thu Nov 19 12:16:44 2015 do_ifconfig, tt->ipv6=0, tt->did_ifconfig_ipv6_setup=0 + + Thu Nov 19 12:16:44 2015 /sbin/ip link set dev tun0 up mtu 1500 + + Thu Nov 19 12:16:44 2015 /sbin/ip addr add dev tun0 local 10.10.0.54 peer 10.10.0.53 + + Thu Nov 19 12:16:44 2015 Initialization Sequence Completed + + '} + body: "<HTML><HEAD><meta http-equiv=\"content-type\" content=\"text/html;charset=utf-8\"\ + >\n<TITLE>302 Moved</TITLE></HEAD><BODY>\n<H1>302 Moved</H1>\nThe document has moved\n\ + <A HREF=\"http://www.google.de/?gfe_rd=cr&ei=yq9NVsq5JYvZ8Ae58KHoDA\">here</A>.\r\ + \n</BODY></HTML>\r\n" + input: null + success: true + test_runtime: 9.549253940582275 + test_start_time: 1447928195.0 + ...

1 0

[ooni-probe/master] add script to install openvpn for the openvpn test
by art＠torproject.org 29 Apr '16

29 Apr '16

commit 73b6546d3344a06207b9ba54717d5b0c2b49c5ad Author: juga0 <juga> Date: Thu Nov 19 15:36:51 2015 +0000 add script to install openvpn for the openvpn test --- scripts/openvpn_install.sh | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/scripts/openvpn_install.sh b/scripts/openvpn_install.sh new file mode 100755 index 0000000..b9ab549 --- /dev/null +++ b/scripts/openvpn_install.sh @@ -0,0 +1,21 @@ +#!/bin/sh + +set -e + +user="$(id -un 2>/dev/null || true)" + +sh_c='sh -c' + +if [ "$user" != 'root' ]; then + if command_exists sudo; then + sh_c='sudo sh -c -E' + elif command_exists su; then + sh_c='su -c --preserve-environment' + else + echo >&2 'Error: this installer needs the ability to run commands as root.' + echo >&2 'We are unable to find either "sudo" or "su" available to make this happen.' + exit 1 + fi +fi + +$sh_c "apt-get -y install openvpn"

1 0

[ooni-probe/master] Fix annotations in ooniprobe
by art＠torproject.org 29 Apr '16

29 Apr '16

commit 08d54806912c2e690f294d0b07afbe9e54f62cf8 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 26 18:39:06 2015 +0100 Fix annotations in ooniprobe --- ooni/nettest.py | 4 +++- ooni/oonicli.py | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ooni/nettest.py b/ooni/nettest.py index 9eb6f37..848d958 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -139,6 +139,7 @@ class NetTestLoader(object): "(httpo://[a-z0-9]{16}\.onion)/input/([a-z0-9]{64})$") self.options = options self.testCases = [] + self.annotations = {} if test_file: self.loadNetTestFile(test_file) @@ -217,7 +218,8 @@ class NetTestLoader(object): 'options': options, 'input_hashes': input_file_hashes, 'report_id': self.reportID, - 'test_helpers': self.testHelpers + 'test_helpers': self.testHelpers, + 'annotations': self.annotations } return test_details diff --git a/ooni/oonicli.py b/ooni/oonicli.py index b3e1013..1167da9 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -299,8 +299,7 @@ def runTestWithDirector(director, global_options, url=None, collector = setupCollector(global_options, net_test_loader) - test_details = net_test_loader.testDetails - test_details['annotations'] = global_options['annotations'] + net_test_loader.annotations = global_options['annotations'] director.startNetTest(net_test_loader, global_options['reportfile'],

1 0

[ooni-probe/master] add psiphon user documentation
by art＠torproject.org 29 Apr '16

29 Apr '16

commit d29782da9e3aa31feee5261a5713a04247e5e611 Author: juga0 <juga> Date: Thu Nov 19 19:55:36 2015 +0000 add psiphon user documentation --- docs/source/nettests/ooni.nettests.third_party.rst | 8 ++ docs/source/tests/psiphon.rst | 119 +++++++++++++++++++++ 2 files changed, 127 insertions(+) diff --git a/docs/source/nettests/ooni.nettests.third_party.rst b/docs/source/nettests/ooni.nettests.third_party.rst index ef53443..7c0e692 100644 --- a/docs/source/nettests/ooni.nettests.third_party.rst +++ b/docs/source/nettests/ooni.nettests.third_party.rst @@ -16,3 +16,11 @@ ooni.nettests third_party Package :members: :undoc-members: :show-inheritance: + +:mod:`ooni.nettests.third_party.psiphon` Module +------------------------------------------------ + +.. automodule:: ooni.nettests.third_party.psiphon + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/tests/psiphon.rst b/docs/source/tests/psiphon.rst new file mode 100644 index 0000000..5050b79 --- /dev/null +++ b/docs/source/tests/psiphon.rst @@ -0,0 +1,119 @@ +Details +======= + +*Test Name*: Psiphon + +*Current version*: 0.1 + +*NetTest*: Psiphon (https://github.com/TheTorProject/ooni-probe/blob/master/ooni/nettests/third…) + +*Test Helper*: None + +*Test Type*: third party + +*Requires Root*: No + +Description +=========== + +This test first check that the Psiphon path exists, then launches Psiphon and parses output to determine if it has bootstrapped. After bootstrap, it fetches google.com (or other URL specified by the --url argument) using Psiphons SOCKS proxy listening on 127.0.0.1:1080 (or otherwise specified by the --socksproxy argument). + +The specific string used to determine bootstrap from Psiphon output in version +"0.0.1" is "Press Ctrl-C to terminate." from standard output. + +How to run the test +=================== + +`ooniprobe third_party/psiphon` + +To test Psiphon with a different URL run: + +`ooniprobe third_party/psiphon -u http://<url>/` + +To test Psiphon when it is installed in a different path other than the user home: + +`ooniprobe blocking/http_requests -p <path to Psiphon repository>` + +How to install Psiphon +=================== + +Run the install script: + +`scripts/psiphon_install.sh` + +To run Psiphon manually, it must be run inside of the proper directory: + +`cd <psiphonpath>//psiphon-circumvention-system/pyclient/` +`python psi_client.py` + +Sample report +============= + +`ooniprobe blocking/http_requests -f example_inputs/url_lists_file.txt` + + :: + + ########################################### + # OONI Probe Report for psiphon_test (0.0.1) + # Mon Oct 12 21:40:52 2015 + ########################################### + --- + input_hashes: [] + options: [-u, google.com] + probe_asn: AS0 + probe_cc: ZZ + probe_city: null + probe_ip: 127.0.0.1 + report_id: 4dAHr0ceNDBmw5lUQ7pBoxqgyUSfP873Qj1zv5VyElnSSTXwcsLYeCv69DsUjb94 + software_name: ooniprobe + software_version: 1.3.1 + start_time: 1444686051.0 + test_helpers: {} + test_name: psiphon_test + test_version: 0.0.1 + ... + --- + /tmp/tmplKg8K3: {exit_reason: process_done, stderr: '', stdout: "./ssh is not a valid\ + \ executable. Using standard ssh.\r\n\r\nYour SOCKS proxy is now running at 127.0.0.1:1080\r\ + \n\r\nPress Ctrl-C to terminate.\r\nTerminating...\r\nConnection closed\r\n"} + agent: agent + input: null + psiphon_installed: true + requests: + - request: + body: null + headers: [] + method: GET + tor: {is_tor: false} + url: http://google.com + response: + body: "<HTML><HEAD><meta http-equiv=\"content-type\" content=\"text/html;charset=utf-8\"\ + >\n<TITLE>301 Moved</TITLE></HEAD><BODY>\n<H1>301 Moved</H1>\nThe document has\ + \ moved\n<A HREF=\"http://www.google.com/\">here</A>.\r\n</BODY></HTML>\r\n" + code: 301 + headers: + - - Content-Length + - ['219'] + - - X-XSS-Protection + - [1; mode=block] + - - Expires + - ['Wed, 11 Nov 2015 21:40:58 GMT'] + - - Server + - [gws] + - - Connection + - [close] + - - Location + - ['http://www.google.com/'] + - - Cache-Control + - ['public, max-age=2592000'] + - - Date + - ['Mon, 12 Oct 2015 21:40:58 GMT'] + - - X-Frame-Options + - [SAMEORIGIN] + - - Content-Type + - [text/html; charset=UTF-8] + socksproxy: 127.0.0.1:1080 + test_runtime: 7.373162031173706 + test_start_time: 1444686052.0 + ... +

1 0

[ooni-probe/master] Fix conditionals, move echo output
by art＠torproject.org 29 Apr '16

29 Apr '16

commit 20fae977f9b905561435e9d64fa14eefd0edfa00 Author: anadahz <kojgelo(a)inbox.com> Date: Wed Nov 18 19:33:52 2015 +0100 Fix conditionals, move echo output --- scripts/psiphon_install.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/psiphon_install.sh b/scripts/psiphon_install.sh index e5b2a78..9a1431d 100755 --- a/scripts/psiphon_install.sh +++ b/scripts/psiphon_install.sh @@ -33,17 +33,18 @@ fi echo "installing dependencies" $sh_c "apt-get -y install zlib1g-dev libssl-dev" -if [ -z "command_exists hg" ]; then +if [ ! "command_exists hg" ]; then $sh_c "apt-get -y install mercurial" fi -echo "cloning psiphon repository" cd $PSIPHON_PATH if [ ! -d "psiphon-circumvention-system" ]; then + echo "cloning psiphon repository" hg clone $PSIPHON_REPO_URL - echo "psiphon repository cloned" fi +echo "psiphon repository cloned" + # optional, compile their ssh if [ ! -f "$PSIPHON_PYCLIENT_PATH/ssh" ]; then echo "compiling psiphon ssh" @@ -61,7 +62,7 @@ if [ `python -c 'import sys; print hasattr(sys, "real_prefix")'` = "False" ]; th # not in a virtualenv # create a virtualenv # FIXME: assuming debian version will have secure pip/virtualenv - if [ -z "command_exists virtualenv" ]; then + if [ ! "command_exists virtualenv" ]; then $sh_c "apt-get -y install python-virtualenv" fi if [ ! -f $OONI_VIRTUALENV_PATH/bin/activate ]; then

1 0

[ooni-probe/master] Really handleAllFailures()
by art＠torproject.org 29 Apr '16

29 Apr '16

commit 864d001be170cb12fd5ad55faafe9518fbffce89 Author: srvetus <srvetus(a)users.noreply.github.com> Date: Fri Sep 25 00:23:53 2015 +0200 Really handleAllFailures() handleAllFailures() only handles failures which are explicitly named. Maybe it should be renamed or emit a log message when an unknown failure is reraised from `failure.trap()` The known failure list has been converted to a list of tuples as the order of the failure checking is important. Some Failures subclass other failures and so they should be listed from most specific failure to the least specific. --- ooni/errors.py | 69 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 34 insertions(+), 35 deletions(-) diff --git a/ooni/errors.py b/ooni/errors.py index 5751baf..84c0afc 100644 --- a/ooni/errors.py +++ b/ooni/errors.py @@ -20,33 +20,33 @@ from txsocksx.errors import TTLExpired, CommandNotSupported from socket import gaierror -known_failures = { - ConnectionRefusedError: 'connection_refused_error', - ConnectionLost: 'connection_lost_error', - ConnectError: 'connect_error', - CancelledError: 'task_timed_out', - gaierror: 'address_family_not_supported_error', - DNSLookupError: 'dns_lookup_error', - TCPTimedOutError: 'tcp_timed_out_error', - ResponseNeverReceived: 'response_never_received', - DeferTimeoutError: 'deferred_timeout_error', - GenericTimeoutError: 'generic_timeout_error', - SOCKSError: 'socks_error', - MethodsNotAcceptedError: 'socks_methods_not_supported', - AddressNotSupported: 'socks_address_not_supported', - NetworkUnreachable: 'socks_network_unreachable', - ConnectionError: 'socks_connect_error', - ConnectionLostEarly: 'socks_connection_lost_early', - ConnectionNotAllowed: 'socks_connection_not_allowed', - NoAcceptableMethods: 'socks_no_acceptable_methods', - ServerFailure: 'socks_server_failure', - HostUnreachable: 'socks_host_unreachable', - ConnectionRefused: 'socks_connection_refused', - TTLExpired: 'socks_ttl_expired', - CommandNotSupported: 'socks_command_not_supported', - ProcessDone: 'process_done', - ConnectionDone: 'connection_done', -} +known_failures = [ + (ConnectionRefusedError, 'connection_refused_error'), + (ConnectionLost, 'connection_lost_error'), + (CancelledError, 'task_timed_out'), + (gaierror, 'address_family_not_supported_error'), + (DNSLookupError, 'dns_lookup_error'), + (TCPTimedOutError, 'tcp_timed_out_error'), + (ResponseNeverReceived, 'response_never_received'), + (DeferTimeoutError, 'deferred_timeout_error'), + (GenericTimeoutError, 'generic_timeout_error'), + (SOCKSError, 'socks_error'), + (MethodsNotAcceptedError, 'socks_methods_not_supported'), + (AddressNotSupported, 'socks_address_not_supported'), + (NetworkUnreachable, 'socks_network_unreachable'), + (ConnectionError, 'socks_connect_error'), + (ConnectionLostEarly, 'socks_connection_lost_early'), + (ConnectionNotAllowed, 'socks_connection_not_allowed'), + (NoAcceptableMethods, 'socks_no_acceptable_methods'), + (ServerFailure, 'socks_server_failure'), + (HostUnreachable, 'socks_host_unreachable'), + (ConnectionRefused, 'socks_connection_refused'), + (TTLExpired, 'socks_ttl_expired'), + (CommandNotSupported, 'socks_command_not_supported'), + (ProcessDone, 'process_done'), + (ConnectionDone, 'connection_done'), + (ConnectError, 'connect_error'), +] def handleAllFailures(failure): """ @@ -55,9 +55,7 @@ def handleAllFailures(failure): returned by failure.trap(). """ - # TODO: Should this function actually handle ALL failures and - # not just the failures configured in this list. - failure.trap(*known_failures.keys()) + failure.trap(*[failure_type for failure_type, _ in known_failures]) return failureToString(failure) @@ -75,12 +73,13 @@ def failureToString(failure): A string representing the HTTP response error message. """ - for failure_type, failure_string in known_failures.items(): + for failure_type, failure_string in known_failures: if isinstance(failure.value, failure_type): - return failure_string - - # Did not find a matching failure message - return 'unknown_failure %s' % str(failure.value) + if failure_string: + return failure_string + else: + # Failure without a corresponding failure message + return 'unknown_failure %s' % str(failure.value) class DirectorException(Exception): pass

1 0