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

[ooni-probe/master] Use a correct humans.txt in the example for lantern
by art＠torproject.org 29 Apr '16

29 Apr '16

commit f058349ee84de84c6ce491e02d5e022858693796 Author: Arturo Filastò <arturo(a)filasto.net> Date: Tue Apr 26 23:19:51 2016 +0200 Use a correct humans.txt in the example for lantern --- docs/source/tests/lantern.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/tests/lantern.rst b/docs/source/tests/lantern.rst index 9f3ee09..7be4d49 100644 --- a/docs/source/tests/lantern.rst +++ b/docs/source/tests/lantern.rst @@ -34,7 +34,7 @@ How to run the test For advanced usages you may also configure a different URL and expected body for the response with the `--url` and `--expected-body` command line options. -`ooniprobe nettests/third_party/lantern.py --url http://www.github.com/humans.txt --expected-body '/* TEAM */'` +`ooniprobe nettests/third_party/lantern.py --url http://humanstxt.org/humans.txt --expected-body '/* TEAM */'` Sample report =============

1 0

[ooni-probe/master] Improve the installation instructions for ooniprobe
by art＠torproject.org 29 Apr '16

29 Apr '16

commit 652fe233c4b74011841420d947485be6779c0733 Author: Arturo Filastò <arturo(a)filasto.net> Date: Wed Apr 27 13:21:15 2016 +0200 Improve the installation instructions for ooniprobe --- README.rst | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.rst b/README.rst index a6dcb2c..b42d755 100644 --- a/README.rst +++ b/README.rst @@ -107,10 +107,19 @@ Make sure you have installed the following dependencies: * libffi-dev * tor (>=0.2.5.1 to run all the tor related tests) +On debian based systems this can generally be done by running:: + + sudo apt-get install -y build-essential libdumbnet-dev libpcap-dev libgeoip-dev libffi-dev python-dev python-pip + Then you should be able to install ooniprobe by running:: + sudo pip install ooniprobe + +or as a user to install inside a virtualenv:: + pip install ooniprobe + Other platforms (with Vagrant) ------------------------------

1 0

[ooni-probe/master] Bump to version 1.4.0
by art＠torproject.org 29 Apr '16

29 Apr '16

commit 943dbec8d344be7b02fb7f6e8ae6f9e0fc6fcbe1 Author: Arturo Filastò <arturo(a)filasto.net> Date: Wed Apr 27 19:48:05 2016 +0200 Bump to version 1.4.0 --- ooni/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ooni/__init__.py b/ooni/__init__.py index a9c6112..5ccd2da 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.2" +__version__ = "1.4.0" __all__ = ['config', 'inputunit', 'kit', 'lib', 'nettest', 'oonicli', 'report', 'reporter',

1 0

[ooni-probe/master] Bump to version 1.4.2
by art＠torproject.org 29 Apr '16

29 Apr '16

commit 4ddac3ecf1aa4e797214cbbcbb6a7930adc0c0f8 Author: Arturo Filastò <arturo(a)filasto.net> Date: Fri Apr 29 11:28:22 2016 +0200 Bump to version 1.4.2 --- ChangeLog.rst | 8 ++++++++ ooni/__init__.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog.rst b/ChangeLog.rst index c24d46d..56dd061 100644 --- a/ChangeLog.rst +++ b/ChangeLog.rst @@ -1,6 +1,14 @@ Changelog ========= +v1.4.2 (Fri, 29 Apr 2016) +------------------------- + +* Hotfix for bug in serialising binary response bodies + +* Use the most recent scapy version + + v1.4.1 (Wed, 27 Apr 2016) ------------------------- diff --git a/ooni/__init__.py b/ooni/__init__.py index cbf84b7..8e05068 100644 --- a/ooni/__init__.py +++ b/ooni/__init__.py @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*- __author__ = "Open Observatory of Network Interference" -__version__ = "1.4.1" +__version__ = "1.4.2" __all__ = ['config', 'inputunit', 'kit', 'lib', 'nettest', 'oonicli', 'report', 'reporter',

1 0

[ooni-probe/master] Properly represent also the packets that are sent
by art＠torproject.org 29 Apr '16

29 Apr '16

commit 8215d8807b3f6c43c766baf4a04f454d83038eea Author: Arturo Filastò <arturo(a)filasto.net> Date: Fri Apr 29 10:51:08 2016 +0200 Properly represent also the packets that are sent --- ooni/templates/scapyt.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ooni/templates/scapyt.py b/ooni/templates/scapyt.py index f4b6280..2bb9139 100644 --- a/ooni/templates/scapyt.py +++ b/ooni/templates/scapyt.py @@ -148,7 +148,7 @@ class BaseScapyTest(NetTestCase): scapySender.stopSending() for sent_packet in packets: - self.report['sent_packets'].append(sent_packet) + self.report['sent_packets'].append(_representPacket(sent_packet)) ScapyTest = BaseScapyTest

1 0

[ooni-probe/master] Check to ensure response_body is either a str or unicode before sanitising it (#485)
by art＠torproject.org 29 Apr '16

29 Apr '16

commit 4598237c15331cf97fb99b53593b99e8fb182ee7 Author: Arturo Filastò <arturo(a)filasto.net> Date: Thu Apr 28 12:10:15 2016 +0200 Check to ensure response_body is either a str or unicode before sanitising it (#485) --- ooni/templates/httpt.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ooni/templates/httpt.py b/ooni/templates/httpt.py index fd6c8ab..e608f8f 100644 --- a/ooni/templates/httpt.py +++ b/ooni/templates/httpt.py @@ -172,7 +172,8 @@ class HTTPTest(NetTestCase): else: response_body = '' # Attempt to redact the IP address of the probe from the responses - if config.privacy.includeip is False and config.probe_ip.address is not None: + if (config.privacy.includeip is False and config.probe_ip.address is not None and + (isinstance(response_body, str) or isinstance(response_body, unicode))): response_body = response_body.replace(config.probe_ip.address, "[REDACTED]") session['response'] = { 'headers': _representHeaders(response.headers),

1 0

[ooni-probe/master] Update Changelog and put a release date on it.
by art＠torproject.org 29 Apr '16

29 Apr '16

commit 3ca8cb86c732fef3d3c27221b0025ad953465e70 Author: Arturo Filastò <arturo(a)filasto.net> Date: Tue Apr 26 23:22:39 2016 +0200 Update Changelog and put a release date on it. --- ChangeLog.rst | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog.rst b/ChangeLog.rst index 47851e1..82d04cd 100644 --- a/ChangeLog.rst +++ b/ChangeLog.rst @@ -1,7 +1,7 @@ Changelog ========= -v1.4.0 (XXX, XX Apr 2016) +v1.4.0 (Wed, 27 Apr 2016) ------------------------- * Support for reporting using JSON @@ -12,11 +12,16 @@ v1.4.0 (XXX, XX Apr 2016) * OpenVPN censorship circumvention test +* Add test for vanilla Tor + * Support for disabling reporting to disk * Improvements to HTTP response body decoding (includes fix that lead to empty bodies being misrepresented) +* Attempt to scrub the probe IP address from the body of HTTP responses + + v1.3.2 (Fri, 20 Nov 2015) -------------------------

1 0

[ooni-probe/master] The upload of the release failed and hence need to re-issue upload
by art＠torproject.org 29 Apr '16

29 Apr '16

commit bff00ebbf32730f0d2a44a41e40a7c5e3b0027c0 Author: Arturo Filastò <arturo(a)filasto.net> Date: Wed Apr 27 20:27:24 2016 +0200 The upload of the release failed and hence need to re-issue upload --- ChangeLog.rst | 6 ++++++ ooni/__init__.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog.rst b/ChangeLog.rst index 471e282..c24d46d 100644 --- a/ChangeLog.rst +++ b/ChangeLog.rst @@ -1,6 +1,12 @@ Changelog ========= +v1.4.1 (Wed, 27 Apr 2016) +------------------------- + +* Fix problem with uploading of release + + v1.4.0 (Wed, 27 Apr 2016) ------------------------- diff --git a/ooni/__init__.py b/ooni/__init__.py index 5ccd2da..cbf84b7 100644 --- a/ooni/__init__.py +++ b/ooni/__init__.py @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*- __author__ = "Open Observatory of Network Interference" -__version__ = "1.4.0" +__version__ = "1.4.1" __all__ = ['config', 'inputunit', 'kit', 'lib', 'nettest', 'oonicli', 'report', 'reporter',

1 0

[ooni-probe/master] Use the official scapy repository instead of the dev fork
by art＠torproject.org 29 Apr '16

29 Apr '16

commit 8af20fbfad44ef87564dbb4c421d539f4aa76016 Author: Arturo Filastò <arturo(a)filasto.net> Date: Fri Apr 29 11:26:28 2016 +0200 Use the official scapy repository instead of the dev fork --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 7aeaabc..7107d9e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,7 +11,7 @@ pyOpenSSL>=0.13 geoip txtorcon>=0.7 txsocksx>=0.0.2 -scapy-real>=2.2.0-dev +scapy>=2.2.0 pypcap>=1.1 service-identity pydumbnet

1 0

[ooni-probe/master] Set the input to be the specified URL in the http_requests test
by art＠torproject.org 29 Apr '16

29 Apr '16

commit 76298b89ba341380ec4d1ab8e640eb7a4a9ca531 Author: Arturo Filastò <arturo(a)filasto.net> Date: Wed Mar 30 14:07:43 2016 +0200 Set the input to be the specified URL in the http_requests test --- ooni/nettests/blocking/http_requests.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ooni/nettests/blocking/http_requests.py b/ooni/nettests/blocking/http_requests.py index e2c9671..abc7efc 100644 --- a/ooni/nettests/blocking/http_requests.py +++ b/ooni/nettests/blocking/http_requests.py @@ -68,6 +68,7 @@ class HTTPRequestsTest(httpt.HTTPTest): self.url = self.localOptions['url'] else: raise Exception("No input specified") + self.report['input'] = self.url self.factor = self.localOptions['factor'] self.report['control_failure'] = None

1 0