- tor-commits - lists.torproject.org

[ooni-probe/master] Add description of what test helpers are in introduction.
by art＠torproject.org 31 Jan '16

31 Jan '16

commit c2e0def0fbac26f8262b6304d5aa692392612360 Author: Arturo Filastò <arturo(a)filasto.net> Date: Fri Jan 22 11:03:56 2016 +0100 Add description of what test helpers are in introduction. * Fix links --- docs/source/writing_test_helpers.rst | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/source/writing_test_helpers.rst b/docs/source/writing_test_helpers.rst index 2206115..d391aa4 100644 --- a/docs/source/writing_test_helpers.rst +++ b/docs/source/writing_test_helpers.rst @@ -1,23 +1,23 @@ Writing Test Helpers ======== -OONI test helpers are... +OONI test helpers are used by OONI nettests to perform their meausrements. They can be used either to establish a ground truth or to exchange information with the probe to determine if some form of network manipulation is happening in the network path between the probe and the backend. Writing a Censorship Directionality Test Helper -------------------------- Our goal is to write an OONI test helper that helps an OONI-probe client determine the directionality of keyword censorship it has detected. To do this our helper will receive "encoded" data from an OONI-probe client, decode that data into a text string, and send the OONI-probe client a confirmation packet and a second packet containing the decoded string. -The OONI-backend code-base has many concise examples of test-helpers that you can build off to create your own. For this tutorial I used the `TCP echo test-helper <https://github.com/TheTorProject/ooni-backend/blob/479a1bb154037b834292ccc4…>` as my guide. +The OONI-backend code-base has many concise examples of test-helpers that you can build off to create your own. For this tutorial I used the `TCP echo test-helper <https://github.com/TheTorProject/ooni-backend/blob/479a1bb154037b834292ccc4…>`_ as my guide. -Following this tutorial requires basic knowledge of event-driven programming (specifically 'Twisted'). You will be more than ready to build and implement a test-helper after reading though one or two `tutorials online. <http://krondo.com/?page_id=1327>` +Following this tutorial requires basic knowledge of event-driven programming (specifically 'Twisted'). You will be more than ready to build and implement a test-helper after reading though one or two `tutorials online. <http://krondo.com/?page_id=1327>`_ Creating the test helper -------------- -OONI-backend keeps all the test-helpers in the `oonib/testhelpers directory <https://github.com/TheTorProject/ooni-backend/tree/master/oonib/testhelpers>` Each individual test helper is a twisted service. Most of the current test-helpers consists of a twisted Factory and a twisted Protocol defined in the test helpers directory and a `stock Twisted Server <https://twistedmatrix.com/documents/current/api/twisted.application.interne…>` that is defined in the backend code. We will follow this model in the tutorial. +OONI-backend keeps all the test-helpers in the `oonib/testhelpers directory <https://github.com/TheTorProject/ooni-backend/tree/master/oonib/testhelpers>`_ Each individual test helper is a twisted service. Most of the current test-helpers consists of a twisted Factory and a twisted Protocol defined in the test helpers directory and a `stock Twisted Server <https://twistedmatrix.com/documents/current/api/twisted.application.interne…>`_ that is defined in the backend code. We will follow this model in the tutorial. -Because of how simple this example test-helper is the job of our test-helper factory is merely to deploy a single instance of our protocol each time it's buildProtocol method is called. Because we have our factory inheret from the base `Factory object <https://twistedmatrix.com/trac/browser/tags/releases/twisted-15.5.0/twisted…>` we merely have to define its ``protocol`` property to point to our protocol.:: +Because of how simple this example test-helper is the job of our test-helper factory is merely to deploy a single instance of our protocol each time it's buildProtocol method is called. Because we have our factory inheret from the base `Factory object <https://twistedmatrix.com/trac/browser/tags/releases/twisted-15.5.0/twisted…>`_ we merely have to define its ``protocol`` property to point to our protocol.:: class TCPDirectionalityTestHelper(Factory): """ @@ -26,7 +26,7 @@ Because of how simple this example test-helper is the job of our test-helper fac protocol = TCPDirectionalityTestProtocol -The protocol for this helper needs to do two things. First, upon receiving encoded data it needs to send the OONI-probe client back confirmation that the data has been received. Second, it needs to send the decoded data back to the OONI-probe client. Because we are extending the `Protocol object <https://twistedmatrix.com/trac/browser/tags/releases/twisted-15.5.0/twisted…>` we can rewrite its ``dataReceived`` method which is called and passed data whenever it is received.:: +The protocol for this helper needs to do two things. First, upon receiving encoded data it needs to send the OONI-probe client back confirmation that the data has been received. Second, it needs to send the decoded data back to the OONI-probe client. Because we are extending the `Protocol object <https://twistedmatrix.com/trac/browser/tags/releases/twisted-15.5.0/twisted…>`_ we can rewrite its ``dataReceived`` method which is called and passed data whenever it is received.:: class TCPDirectionalityTestProtocol(Protocol): @@ -68,7 +68,7 @@ With this added we have completed the base of simple test-helper and now just ha Adding the helper to the config file ------ -OONI-backend uses a config file located at `/etc/oonibackend.conf <https://github.com/TheTorProject/ooni-backend/blob/master/oonib.conf.example>`. This file contains a `section where each test-helper can be configured. <https://github.com/TheTorProject/ooni-backend/blob/479a1bb154037b834292ccc4…>`. +OONI-backend uses a config file located at `/etc/oonibackend.conf <https://github.com/TheTorProject/ooni-backend/blob/master/oonib.conf.example>`_. This file contains a `section where each test-helper can be configured. <https://github.com/TheTorProject/ooni-backend/blob/479a1bb154037b834292ccc4…>`_. The test-helper will need to be given a unique identifyer so that it can be called from the config file. In this example we use ``tcp-directionality`` as our identifyer. @@ -81,17 +81,17 @@ For a helper to be used in the ooni-backend it needs to be given an identifyer s Adding the helper to the backend ------ -For a helper to be integrated into the ooni-backend it needs to be added to the initialization scripts contained within `oonibackend.py <https://github.com/TheTorProject/ooni-backend/blob/master/oonib/oonibackend…>`. +For a helper to be integrated into the ooni-backend it needs to be added to the initialization scripts contained within `oonibackend.py <https://github.com/TheTorProject/ooni-backend/blob/master/oonib/oonibackend…>`_. -The OONI test-helper system is a collection of `Twisted services <https://twistedmatrix.com/documents/current/core/howto/application.html>`. For our test-helper we will need to define a service that will run our test-helper factory.:: +The OONI test-helper system is a collection of `Twisted services <https://twistedmatrix.com/documents/current/core/howto/application.html>`_. For our test-helper we will need to define a service that will run our test-helper factory.:: # Create the service that will run our test-helpers factory. tcp_directionality_helper = internet.TCPServer(int(port), tcp_helpers.TCPDirectionalityTestHelper()) -**NOTE:** In this example I have placed the original service in the existing tcp_helpers file. If you created your own file for your test-helper you will have to make sure that you import that file at the top of `oonibackend.py <https://github.com/TheTorProject/ooni-backend/blob/master/oonib/oonibackend…>`. +**NOTE:** In this example I have placed the original service in the existing tcp_helpers file. If you created your own file for your test-helper you will have to make sure that you import that file at the top of `oonibackend.py <https://github.com/TheTorProject/ooni-backend/blob/master/oonib/oonibackend…>`_. -OONI uses a `Multi Service <https://twistedmatrix.com/documents/current/api/twisted.application.service…>` which allows them to combine all the OONI test-helpers and the report-collector into a singlular service for easier management. The next step for creating our test-helper is to add it to the OONI-backend `multiService <https://github.com/TheTorProject/ooni-backend/blob/479a1bb154037b834292ccc4…>`:: +OONI uses a `Multi Service <https://twistedmatrix.com/documents/current/api/twisted.application.service…>`_ which allows them to combine all the OONI test-helpers and the report-collector into a singlular service for easier management. The next step for creating our test-helper is to add it to the OONI-backend `multiService <https://github.com/TheTorProject/ooni-backend/blob/479a1bb154037b834292ccc4…>`_:: # Add the helper as a child of the backends multi-service test-helper multiService.addService(tcp_directionality_helper) @@ -103,7 +103,7 @@ Finally, we need to start our service.:: In order for our test-helper to be managed using the backend config file we will need to modify this code to check the config file for a test-helper that uses the identifyer we selected earlier. For the directionality helper we check to see if our test-helper had its port specified in the config file to determine if it should be run. I also added a default encoding in case -This snippet contains the final code that would be inserted into `oonibackend.py <https://github.com/TheTorProject/ooni-backend/blob/master/oonib/oonibackend…>`.:: +This snippet contains the final code that would be inserted into `oonibackend.py <https://github.com/TheTorProject/ooni-backend/blob/master/oonib/oonibackend…>`_.:: # Check to see if our test-helper was defined in the config if config.helpers['tcp-directionality'].port:

1 0

[ooni-probe/master] Merge pull request #451 from juga0/fix/psiphon
by art＠torproject.org 31 Jan '16

31 Jan '16

commit c70886ab71954382c97e9897a71f18e83cf90eac Merge: c8e6244 c9d1d95 Author: Arturo Filastò <arturo(a)filasto.net> Date: Tue Jan 26 17:25:42 2016 +0100 Merge pull request #451 from juga0/fix/psiphon Fix/psiphon ooni/nettests/third_party/psiphon.py | 40 ++++++++++++++++++++++++++++-------- ooni/templates/process.py | 14 +++++++------ 2 files changed, 40 insertions(+), 14 deletions(-)

1 0

[ooni-probe/master] README: Vagrantfile requires ooni-backend in parent directory
by art＠torproject.org 31 Jan '16

31 Jan '16

commit c031b604b66acc701a65afddb8acfc4ed1409a42 Author: ecneladis <ecneladis(a)gmail.com> Date: Sat Jan 9 16:54:49 2016 +0100 README: Vagrantfile requires ooni-backend in parent directory --- README.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/README.rst b/README.rst index bf52114..c824c44 100644 --- a/README.rst +++ b/README.rst @@ -162,6 +162,7 @@ On debian/ubuntu:: 3. Open a Terminal and run:: git clone https://git.torproject.org/ooni-probe.git + git clone https://github.com/TheTorProject/ooni-backend.git cd ooni-probe/ vagrant up

1 0

[ooni-probe/master] Merge pull request #452 from juga0/fix/psiphon_install
by art＠torproject.org 31 Jan '16

31 Jan '16

commit 5bfe7a72763f54fe08dcf136c1c6f612d6a1c976 Merge: f222a9d 16bb447 Author: Arturo Filastò <arturo(a)filasto.net> Date: Tue Jan 26 17:25:58 2016 +0100 Merge pull request #452 from juga0/fix/psiphon_install fix checking if commands exist, other minor changes scripts/psiphon_install.sh | 66 ++++++++++++++++++++++++++++------------------ 1 file changed, 40 insertions(+), 26 deletions(-)

1 0

[ooni-probe/master] Merge pull request #411 from srvetus/openvpn-test-rebased
by art＠torproject.org 31 Jan '16

31 Jan '16

commit c124a4206b52757ada82714f11cbb829a85e0998 Merge: 5bfe7a7 1fb05dc Author: Arturo Filastò <arturo(a)filasto.net> Date: Tue Jan 26 17:26:05 2016 +0100 Merge pull request #411 from srvetus/openvpn-test-rebased OpenVPN Circumvention Test ooni/nettests/third_party/openvpn.py | 142 +++++++++++++++++++++++++++++++++++ 1 file changed, 142 insertions(+)

1 0

[ooni-probe/master] Merge pull request #455 from agrabeli/patch-1
by art＠torproject.org 31 Jan '16

31 Jan '16

commit 314edba631a88ddb201adef0eb86baa1aa324f5d Merge: c124a42 c8afae8 Author: Arturo Filastò <arturo(a)filasto.net> Date: Sat Jan 30 20:10:27 2016 +0100 Merge pull request #455 from agrabeli/patch-1 Edited various bits of the documentation page & moved "using ooniprob… docs/source/index.rst | 96 +++++++++++++++++++++------------------------------ 1 file changed, 40 insertions(+), 56 deletions(-)

1 0

[ooni-probe/master] Merge pull request #445 from TheTorProject/fix/psiphon
by art＠torproject.org 31 Jan '16

31 Jan '16

commit f222a9d68cfd845c3bbb0c66b0e20a0667f78530 Merge: 91f4a18 c70886a Author: Arturo Filastò <arturo(a)filasto.net> Date: Tue Jan 26 17:25:50 2016 +0100 Merge pull request #445 from TheTorProject/fix/psiphon Fix to make the psiphon test run ooni/nettests/third_party/psiphon.py | 44 +++++++++++++++++++++++++----------- ooni/templates/process.py | 14 +++++++----- 2 files changed, 39 insertions(+), 19 deletions(-)

1 0

[ooni-probe/master] Edited various bits of the documentation page & moved "using ooniprobe" towards the beginning
by art＠torproject.org 31 Jan '16

31 Jan '16

commit c8afae85af648942607faa2a3315533de80176fa Author: Maria Xynou <maria.x(a)espiv.net> Date: Sat Jan 30 13:09:53 2016 +0100 Edited various bits of the documentation page & moved "using ooniprobe" towards the beginning --- docs/source/index.rst | 96 +++++++++++++++++++++------------------------------ 1 file changed, 40 insertions(+), 56 deletions(-) diff --git a/docs/source/index.rst b/docs/source/index.rst index 1eabdee..13f7a8f 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -3,29 +3,19 @@ OONI: Open Observatory of Network Interference ============================================== -OONI, the Open Observatory of Network Interference, is a global observation -network which aims is to collect high quality data using open methodologies, -using Free and Open Source Software (FL/OSS) to share observations and data -about the various types, methods, and amounts of network tampering in the -world. +The Open Observatory of Network Interference (OONI) is a global observation +network which collects high quality data, using open methodologies and Free and Open Source Software (FL/OSS), to share observations about the various types, methods, and amounts of network tampering in the world. "The Net interprets censorship as damage and routes around it." - John Gilmore; TIME magazine (6 December 1993) +Are you interested in testing your network for signs of surveillance and censorship? Do you want to collect data so that you and others can better understand your network? If so, please read this document and we hope that ooniprobe will help you gather network data that will assist you with your endeavors! + ooniprobe --------- -ooniprobe is the first program that users run to probe their network and to -collect data for the OONI project. Are you interested in testing your network -for signs of surveillance and censorship? Do you want to collect data to share -with others, so that you and others may better understand your network? If so, -please read this document and we hope ooniprobe will help you to gather -network data that will assist you with your endeavors! - -ooniprobe allows the user to select what test should be run and what backend -should be used for storing the test report and/or assisting them in the running -of the test. +ooniprobe is a program that users can run to probe their network and to collect network measurement data. ooniprobe also allows users to choose what test should be run and what backend should be used for storing the test report and for assisting them in running the test. ooniprobe tests are divided into two categories: **Traffic Manipulation** and **Content Blocking**. @@ -35,23 +25,28 @@ tampering with the internet traffic between the probe and a remote test helper backend. As such they usually require the selection of a oonib backend component for running the test. -**Content Blocking** are aimed at enumerating the kind of content that is -blocked from the probes network point of view. As such they usually require to -have specified an input list for running the test. +**Content Blocking** tests aim to enumerate the kind of content that is +blocked from the probes network point of view. As such they usually require the specification of an input list for running the test. Read this before running ooniprobe! ----------------------------------- -Running ooniprobe is a potentially risky activity. This greatly depends on the -jurisdiction in which you are in and which test you are running. It is -technically possible for a person observing your internet connection to be -aware of the fact that you are running ooniprobe. This means that if running -network measurement tests is something considered to be illegal in your country -then you could be spotted. +Running ooniprobe can potentially be a risky activity. This largely depends on the laws and jurisdiction of the country you are running ooniprobe from, as well as on the type of test you are running. Technically, it is possible for a person observing your internet connection to be aware of the fact that you are running ooniprobe. This means that if running network measurement tests is something that is considered to be illegal in your country then you could be spotted. + +Furthermore, ooniprobe takes no precautions to protect the install target machine from forensics analysis. If the fact that you have installed or used ooniprobe is a liability for you, please be aware of this risk. + +Using ooniprobe +=============== + +**Net test** is a set of measurements to assess what kind of internet censorship is occurring. + +**Decks** are collections of ooniprobe nettests with some associated inputs. + +**Collector** is a service used to report the results of measurements. + +**Test helper** is a service used by a probe for successfully performing its measurements. -Furthermore, ooniprobe takes no precautions to protect the install target machine -from forensics analysis. If the fact that you have installed or used ooni -probe is a liability for you, please be aware of this risk. +**Bouncer** is a service used to discover the addresses of test helpers and collectors. OONI in 5 minutes ================= @@ -91,8 +86,7 @@ This should generate the home and allow you to run oonideckgen. The output from the last command will tell you how to run ooniprobe to perform the measurement. -If you would like to contribute measurements to OONI daily you can also add -this to your crontab:: +If you would like to contribute measurements to OONI daily you can also add this to your crontab:: @daily ooniprobe $THE_OONI_COMMAND @@ -185,19 +179,6 @@ ooniprobe will be installed in ``/ooni``. ooniprobe blocking/http_requests -f /ooni/example_inputs/alexa-top-1k.txt -Using ooniprobe -=============== - -**Net test** is a set of measurements to assess what kind of internet censorship is occurring. - -**Decks** are collections of ooniprobe nettests with some associated inputs. - -**Collector** is a service used to report the results of measurements. - -**Test helper** is a service used by a probe for successfully performing its measurements. - -**Bouncer** is a service used to discover the addresses of test helpers and collectors. - Configuring ooniprobe --------------------- @@ -217,10 +198,10 @@ This can be done with:: ooniresources --update-inputs -If you get a permission error, you may have to run the command as root or +If you get a permission error, you might have to run the command as root or change the ooniprobe data directory inside of `ooniprobe.conf`. -On some platforms, for example debian contrib, you will not get all the geoip +On some platforms, such as debian contrib, you will not get all the geoip related files needed. In that case it is possible to manually download them with ``ooniresources``:: @@ -229,7 +210,7 @@ with ``ooniresources``:: Generating decks ---------------- -You can generate decks for your country thanks to the oonideckgen command. +You can generate decks for your country with the oonideckgen command. If you wish, for example, to generate a deck to be run in the country of Italy, you can do so (be sure to have updated the input resources first) by running:: @@ -238,7 +219,8 @@ you can do so (be sure to have updated the input resources first) by running:: You will now have in your home a folder called `deck-it`, containing the ooni deck (ends with .deck) and the inputs. -Note: that you should not move the `deck-*` directory once it has been + +**Note:** You should not move the `deck-*` directory once it has been generated as the paths to the inputs referenced by the test in the deck are absolute. If you want your deck to live in another directory you must regenerated it. @@ -327,6 +309,7 @@ obfsproxy is installed). The tor.bridges option in ooniprobe.conf sets the path to a file that should contain a set of "bridge" lines (of the same format as used in torrc, and as returned by https://bridges.torproject.org) If obfsproxy bridges are to be used, the path to the obfsproxy binary must be configured. + See option advanced.obfsproxy_binary, in ooniprobe.conf. (Optional) Install obfsproxy @@ -371,7 +354,7 @@ https://github.com/TheTorProject/ooni-probe Read this article to learn how to create a pull request on github (https://help.github.com/articles/creating-a-pull-request) -If you prefer not to use github (or don't have an account), you may also submit +If you prefer not to use github (or don't have an account), you can also submit patches as attachments to tickets. Be sure to format the patch (given that you are working on a feature branch @@ -441,7 +424,7 @@ Tests that don't do a measurement but are useful for scanning can be found in: * `ooni/nettests/scanning <https://gitweb.torproject.org/ooni-probe.git/tree/HEAD:/ooni/nettests/scann…>`_ -Tests that involve running third party tools may be found in: +Tests that involve running third party tools can be found in: * `ooni/nettests/third_party <https://gitweb.torproject.org/ooni-probe.git/tree/HEAD:/ooni/nettests/third…>`_ @@ -449,7 +432,7 @@ Tests that involve running third party tools may be found in: ooni-backend ------------ -This is the server side component of ooniprobe. It will store that data +This is the server side component of ooniprobe. It will store data collected from ooniprobes and it will run a series of Test Helpers that assist `Traffic Manipulation Tests`_ in performing their measurements. @@ -476,7 +459,7 @@ Threat Model Our adversary is capable of doing country wide network surveillance and manipulation of network traffic. -The goals of our adversary are: +The goals of our adversary are to: * Restrict access to certain content, while not degrading overall quality of the network @@ -489,14 +472,15 @@ More specifc to the running of network filtering detection tests: 2. Fool people running such tests into believing that the network is unrestricted -*Note* that while 2) => 1) it is not true that 1) => 2) as the identification of +**Note:** While 2) => 1) it is not true that 1) => 2) as the identification of such actors does not necessarily have to happen in real time. -While our intention is to minimize the risk of users running OONI probe to be -identified, this comes with a tradeoff in accuracy. It is therefore necessary in -certain tests to trade-off fingerprintability in favour of tests accuracy. -This is why we divide tests based on what risk the user running it can face, -allowing the user to freely choose what threat model they wish to adere to. +While our intention is to minimize the risk of users running OONI probe being +identified, this comes with a trade-off in accuracy. It is therefore necessary in +certain tests to trade-off fingerprintability in favour of test accuracy. + +This is why we divide tests based on what risk the users running them can face, +allowing users to freely choose what threat model they wish to adere to. More developer documentation

1 0

[ooni-probe/master] OpenVPN connection circumvention test
by art＠torproject.org 31 Jan '16

31 Jan '16

commit 716913e40e6737b49263d43fbdcaf98effdf8d4d Author: srvetus <srvetus(a)users.noreply.github.com> Date: Thu Sep 24 01:43:14 2015 +0200 OpenVPN connection circumvention test This test attempts to connect to an OpenVPN server specified in an OpenVPN config file. A HTTP request is sent if the VPN connection is successful. This basic test can be expanded to parse more of the output from the OpenVPN client. The output could provide more information about why a connection might be failing. --- ooni/nettests/third_party/openvpn.py | 117 +++++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) diff --git a/ooni/nettests/third_party/openvpn.py b/ooni/nettests/third_party/openvpn.py new file mode 100644 index 0000000..b681222 --- /dev/null +++ b/ooni/nettests/third_party/openvpn.py @@ -0,0 +1,117 @@ +from twisted.internet import defer, reactor +from twisted.python import usage +from twisted.web.client import Agent, readBody +from ooni.templates.process import ProcessTest +from ooni.utils import log +from ooni.errors import handleAllFailures + +import distutils.spawn +import re + + +class UsageOptions(usage.Options): + optParameters = [ + ['url', 'u', None, 'Specify a single URL on the OpenVPN subnet to test.'], + ['openvpn-config', 'c', None, 'Specify an OpenVPN configuration file.'], + ] + + +class OpenVPNTest(ProcessTest): + + """ + This class tests OpenVPN connections. + + test_openvpn_circumvent + Starts an OpenVPN client on Linux and determines + if it connects successfully to an OpenVPN server. + Then, it make a HTTP request for http://google.com + and records the response body or failure string. + + """ + + name = "OpenVPN Client Test" + description = "Connects to an OpenVPN server and does a HTTP GET for the specified URL" + author = "srvetus " + version = "0.0.1" + timeout = 20 + usageOptions = UsageOptions + requiredOptions = ['url', 'openvpn-config'] + requiresRoot = True + + def setUp(self): + self.bootstrapped = defer.Deferred() + self.command = [distutils.spawn.find_executable("openvpn")] + self.exited = False + self.url = self.localOptions.get('url') + + if self.localOptions.get('openvpn-config'): + openvpn_config = self.localOptions.get('openvpn-config') + self.command.extend(['--config', openvpn_config]) + + def stop(self, reason=None): + """Stop the running OpenVPN process and close the connection""" + if not self.exited: + self.processDirector.close() + + # OpenVPN needs to be sent SIGTERM to end cleanly + self.processDirector.transport.signalProcess('TERM') + self.exited = True + + def handleRead(self, stdout=None, stderr=None): + """handleRead is called with each chunk of data from stdout and stderr + + stdout only contains the latest data chunk, self.processDirector.stdout + contains the combined stdout data. + """ + + # Read OpenVPN output until bootstrapping succeeds or fails + if not self.bootstrapped.called: + + # TODO: Determine other OpenVPN messages which indicate connection failure + if re.search(r'connect to .* failed', self.processDirector.stdout): + log.debug("OpenVPN connection failed") + + # Bootstrapping failed + self.bootstrapped.errback(Exception("openvpn_connection_failed")) + + # Check if OpenVPN has bootstrapped and connected successfully + elif "Initialization Sequence Completed" in self.processDirector.stdout: + log.debug("OpenVPN connection successful") + self.processDirector.cancelTimer() + self.bootstrapped.callback("bootstrapped") + + def test_openvpn_circumvent(self): + + def addResultToReport(result): + log.debug("request_successful") + self.report['body'] = result + self.report['success'] = True + + def addFailureToReport(failure): + log.debug("failed: %s" % handleAllFailures(failure)) + self.report['failure'] = handleAllFailures(failure) + self.report['success'] = False + + def doRequest(noreason): + """Make a HTTP request over initialized VPN connection""" + agent = Agent(reactor) + + log.debug("Doing HTTP request to the OpenVPN subnet: %s" % self.url) + request = agent.request("GET", self.url) + request.addCallback(readBody) + request.addCallback(addResultToReport) + request.addErrback(addFailureToReport) + return request + + log.debug("Spawning OpenVPN") + self.d = self.run(self.command) + + # Try to make a request when the OpenVPN connection successfully bootstraps + self.bootstrapped.addCallback(doRequest) + + # Fire failure if OpenVPN connection fails + self.bootstrapped.addErrback(addFailureToReport) + + # Close OpenVPN after each successful or failed test + self.bootstrapped.addBoth(self.stop) + return self.d

1 0

[ooni-probe/master] Merge pull request #440 from TheTorProject/hotfix/disable-twisted-15.5.0
by art＠torproject.org 31 Jan '16

31 Jan '16

commit a52ab0267a777d9a0f1ecddd3b5124ef7a69b9a1 Merge: 0c67cab 0e40771 Author: Simone Basso <bassosimone(a)gmail.com> Date: Wed Dec 2 14:10:51 2015 +0100 Merge pull request #440 from TheTorProject/hotfix/disable-twisted-15.5.0 Avoid installing Twisted 15.5 to avoid bugs with txtorcon requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0