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

[ooni-probe/master] Log failure when OpenVPN process hangs for user input
by art＠torproject.org 30 Jan '16

30 Jan '16

commit 1fb05dc3b77ca5600303f9d0433b5446081861be Author: srvetus <srvetus(a)users.noreply.github.com> Date: Thu Dec 10 21:03:58 2015 +0100 Log failure when OpenVPN process hangs for user input --- ooni/nettests/third_party/openvpn.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/ooni/nettests/third_party/openvpn.py b/ooni/nettests/third_party/openvpn.py index 028bf17..bc2f0ea 100644 --- a/ooni/nettests/third_party/openvpn.py +++ b/ooni/nettests/third_party/openvpn.py @@ -57,6 +57,15 @@ class OpenVPNTest(ProcessTest): self.processDirector.transport.signalProcess('TERM') self.exited = True + def inConnectionLost(self): + """Monkeypatch inConnectionLost to log failure if the process ends + unexpectedly before OpenVPN bootstraps. + """ + log.debug("inConnectionLost") + + if not self.bootstrapped.called: + self.bootstrapped.errback(Exception("openvpn_exited_unexpectedly")) + def processExited(self, reason): """Monkeypatch processExited to log failure if the process ends unexpectedly before OpenVPN bootstraps. @@ -64,9 +73,11 @@ class OpenVPNTest(ProcessTest): log.debug("Exited %s" % handleAllFailures(reason)) # Process exited before OpenVPN bootstrapped. Add failure to report + # if it is not added already if not self.bootstrapped.called: self.bootstrapped.errback(Exception("openvpn_exited_unexpectedly")) + def handleRead(self, stdout=None, stderr=None): """handleRead is called with each chunk of data from stdout and stderr @@ -116,7 +127,8 @@ class OpenVPNTest(ProcessTest): log.debug("Spawning OpenVPN") self.d = self.run(self.command) - # Monkeypatch processExited to log when OpenVPN exits early + # Monkeypatch inConnectionLost and processExited to log when OpenVPN exits early + self.processDirector.inConnectionLost = self.inConnectionLost self.processDirector.processExited = self.processExited # Try to make a request when the OpenVPN connection successfully bootstraps

1 0

[ooni-probe/master] Merge pull request #447 from TheTorProject/fix/lantern
by art＠torproject.org 30 Jan '16

30 Jan '16

commit 592935063718b0836bd04ba6173fb58ada8b2ac5 Merge: b792e1e 7a83298 Author: anadahz <anadahz(a)users.noreply.github.com> Date: Fri Dec 11 12:42:00 2015 +0000 Merge pull request #447 from TheTorProject/fix/lantern Fix lantern test Replace check bootstrap text for "Connected to proxy on localhost" Change lantern executable name ooni/nettests/third_party/lantern.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[ooni-probe/master] We no longer need to avoid twisted 15.5.0
by art＠torproject.org 30 Jan '16

30 Jan '16

commit 649228fb9745523a27616b699353468cebe4f2ea Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Dec 3 13:09:39 2015 +0100 We no longer need to avoid twisted 15.5.0 Thanks to @meejah for releasing a fix so quickly --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b052adb..8b8d5ca 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ PyYAML>=3.10 -Twisted>=12.2.0,<15.5.0 +Twisted>=12.2.0 ipaddr>=2.1.10 pyOpenSSL>=0.13 geoip

1 0

[ooni-probe/master] Fix lantern test
by art＠torproject.org 30 Jan '16

30 Jan '16

commit 7a83298091b46a485e0034820561e7ce9b130b02 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Dec 11 11:39:59 2015 +0100 Fix lantern test --- ooni/nettests/third_party/lantern.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ooni/nettests/third_party/lantern.py b/ooni/nettests/third_party/lantern.py index c7173ed..1f1b3b0 100644 --- a/ooni/nettests/third_party/lantern.py +++ b/ooni/nettests/third_party/lantern.py @@ -4,7 +4,7 @@ from twisted.python import usage from twisted.web.client import ProxyAgent, readBody from ooni.templates.process import ProcessTest, ProcessDirector from ooni.utils import log -from ooni.errors import handleAllFailures, TaskTimedOut +from ooni.errors import handleAllFailures import os.path from os import getenv @@ -34,7 +34,7 @@ class LanternProcessDirector(ProcessDirector): def outReceived(self, data): self.stdout += data # output received, see if we have bootstrapped - if not self.bootstrapped.called and "client (http) proxy at" in self.stdout: + if not self.bootstrapped.called and "Connected to proxy on localhost" in self.stdout: log.debug("Bootstrap Detected") self.cancelTimer() self.bootstrapped.callback("bootstrapped") @@ -62,7 +62,7 @@ class LanternTest(ProcessTest): requiredOptions = ['url'] def setUp(self): - self.command = ["lantern_linux", "--headless"] + self.command = ["lantern", "--headless"] self.d = defer.Deferred() self.processDirector = LanternProcessDirector(self.d, timeout=self.timeout) self.d.addCallback(self.processEnded, self.command)

1 0

[ooni-probe/master] No need to downgrade Twisted
by art＠torproject.org 30 Jan '16

30 Jan '16

commit 614f5b1e2811d3fa59de9422f8e6104810c33842 Author: anadahz <kojgelo(a)inbox.com> Date: Sun Dec 20 15:30:05 2015 +0100 No need to downgrade Twisted All Twister version are supported by ooniprobe! Fixed (https://trac.torproject.org/projects/tor/ticket/15944) --- scripts/install.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/install.sh b/scripts/install.sh index beb9f60..01318ce 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -324,10 +324,6 @@ case "$lsb_dist" in set -x $sh_c 'apt-get install -y -q curl git-core python python-dev python-setuptools build-essential libdumbnet1 python-dumbnet python-libpcap tor tor-geoipdb libgeoip-dev libpcap0.8-dev libssl-dev libffi-dev libdumbnet-dev' $sh_c "PYTHONPATH=$PYTHONPATH pip install --install-option=\"--prefix=$PYTHON_PREFIX\" ooniprobe" - # Unistall Twisted and install a version >=12.2.0,<=14.0.0 - # https://trac.torproject.org/projects/tor/ticket/15944 - $sh_c "PYTHONPATH=$PYTHONPATH pip uninstall -y Twisted" - $sh_c "PYTHONPATH=$PYTHONPATH pip install --install-option=\"--prefix=$PYTHON_PREFIX\" 'Twisted>=12.2.0,<=14.0.0'" ) fi

1 0

[ooni-probe/master] Merge pull request #449 from TheTorProject/fix/install-script
by art＠torproject.org 30 Jan '16

30 Jan '16

commit fa08060708eac7633cd57c51b860c5ab73056def Merge: 5929350 614f5b1 Author: Simone Basso <bassosimone(a)gmail.com> Date: Sun Dec 20 17:27:47 2015 +0100 Merge pull request #449 from TheTorProject/fix/install-script No need to downgrade Twisted scripts/install.sh | 4 ---- 1 file changed, 4 deletions(-)

1 0

[ooni-probe/master] Merge pull request #450 from TheTorProject/feature/add-lantern-doc
by art＠torproject.org 30 Jan '16

30 Jan '16

commit 774f0cdfe0a5da37a08483a2307fe55ce81b61f5 Merge: fa08060 a706068 Author: Joe Landers <joe(a)joelanders.net> Date: Mon Dec 21 20:53:46 2015 +0100 Merge pull request #450 from TheTorProject/feature/add-lantern-doc Add lantern test documentation docs/source/tests/lantern.rst | 60 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+)

1 0

[ooni-probe/master] Add lantern test documentation
by art＠torproject.org 30 Jan '16

30 Jan '16

commit a70606820696f656a06620741d54c0fa65556e1d Author: anadahz <kojgelo(a)inbox.com> Date: Mon Dec 21 02:32:47 2015 +0100 Add lantern test documentation --- docs/source/tests/lantern.rst | 60 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/docs/source/tests/lantern.rst b/docs/source/tests/lantern.rst new file mode 100644 index 0000000..0903c3a --- /dev/null +++ b/docs/source/tests/lantern.rst @@ -0,0 +1,60 @@ +Details +======= + +*Test Name*: Lantern + +*Current version*: 0.0.1 + +*NetTest*: Name (https://github.com/TheTorProject/ooni-probe/blob/master/ooni/nettests/third…) + +*Test Helper*: None + +*Test Type*: Third Party + +*Requires Root*: No + +Description +=========== + +This test launches Lantern in --headless mode, and parses output to determine +if it has bootstrapped. After bootstrap, it fetches the URL supplied by the +--url option using Lanterns http proxy interface listening on 127.0.0.1.8787. + +The specific string used to determine bootstrap from Lantern output in version +"2.0.10" is "client (http) proxy at" from standard output. + +How to run the test +=================== + +`ooniprobe nettests/third_party/lantern.py -u http://<url>` + +Sample report +============= + +From running: +`ooniprobe nettests/third_party/lantern.py -u http://www.google.com` + +:: + +--- +input_hashes: [] +options: [-u, google.com] +probe_asn: AS1234 +probe_cc: US +probe_city: null +probe_ip: 127.0.0.1 +software_name: ooniprobe +software_version: 1.2.3-rc1 +start_time: 1428344311.0 +test_name: lantern_circumvention_tool_test +test_version: 0.0.1 +... +--- +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" +bootstrapped: true +input: null +lantern --headless: {exit_reason: process_done, stderr: '', stdout: ''} +``` +

1 0

[ooni-probe/master] initialize success report variable
by art＠torproject.org 30 Jan '16

30 Jan '16

commit a450d6b64fcaf32ff3f11a982f6ea43fc14fa690 Author: juga0 <juga> Date: Tue Dec 22 21:08:32 2015 +0000 initialize success report variable --- ooni/nettests/third_party/psiphon.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ooni/nettests/third_party/psiphon.py b/ooni/nettests/third_party/psiphon.py index fb912a9..1e85c78 100644 --- a/ooni/nettests/third_party/psiphon.py +++ b/ooni/nettests/third_party/psiphon.py @@ -88,6 +88,7 @@ connect(False) log.debug('PsiphonTest.test_psiphon') self.report['success'] = None + self.report['psiphon_installed'] = None if not os.path.exists(self.psiphonpath): log.err('psiphon path does not exists, is it installed?') self.report['psiphon_installed'] = False

1 0

[ooni-probe/master] add success key to the report after doRequest
by art＠torproject.org 30 Jan '16

30 Jan '16

commit 36c4e194b4597323cdac78aac798e9945e922429 Author: juga0 <juga> Date: Tue Dec 22 21:14:21 2015 +0000 add success key to the report after doRequest --- ooni/nettests/third_party/psiphon.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/ooni/nettests/third_party/psiphon.py b/ooni/nettests/third_party/psiphon.py index 3129d5e..94dfa51 100644 --- a/ooni/nettests/third_party/psiphon.py +++ b/ooni/nettests/third_party/psiphon.py @@ -116,7 +116,19 @@ connect(False) usePTY=1) def callDoRequest(_): - return self.doRequest(self.url) + log.debug("PsiphonTest.callDoRequest: %r" %(_,)) + d = self.doRequest(self.url) + def addSuccessToReport(res): + log.debug("PsiphonTest.callDoRequest.addSuccessToReport") + self.report['success'] = True + return res + d.addCallback(addSuccessToReport) + def addFailureToReport(res): + log.debug("PsiphonTest.callDoRequest.addFailureToReport. res=%r" % (res,)) + self.report['success'] = False + return res + d.addErrback(addFailureToReport) + return d self.bootstrapped.addCallback(callDoRequest) def cleanup(_):

1 0