November 2015 - tor-commits - lists.torproject.org

[ooni-probe/master] Downgrading Twisted version is not needed
by art＠torproject.org 20 Nov '15

20 Nov '15

commit ab57cb58cacbbc9f046fa323fa256cf9fa1aaf32 Author: anadahz <kojgelo(a)inbox.com> Date: Tue Nov 17 21:50:08 2015 +0100 Downgrading Twisted version is not needed Thanks to @bassosimone --- README.rst | 6 ------ 1 file changed, 6 deletions(-) diff --git a/README.rst b/README.rst index 7c624dc..bf52114 100644 --- a/README.rst +++ b/README.rst @@ -60,12 +60,6 @@ On unix systems:: sudo pip install ooniprobe -**BUG** Note: Twisted version needs to be >=12.2.0 and <=14.0.0 -unistall/downgrage Twisted:: - - sudo pip uninstall Twisted - sudo pip install 'Twisted>=12.2.0,<=14.0.0' - To install it from the current master run:: sudo pip install https://github.com/TheTorProject/ooni-probe/archive/master.zip

1 0

[ooni-probe/master] Add description to meek test
by art＠torproject.org 20 Nov '15

20 Nov '15

commit 387a3113287cf6a86c299e517a23d8154c6fb740 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] Improve Readme and fix typo in test_settings
by art＠torproject.org 20 Nov '15

20 Nov '15

commit f2e717b8be93b3c292727ec7355b6ea2e15963ec Author: Arturo <art(a)fuffa.org> Date: Fri Nov 20 13:49:49 2015 +0100 Improve Readme and fix typo in test_settings --- README.rst | 25 +++++++++++++++++++------ ooni/tests/test_settings.py | 2 +- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/README.rst b/README.rst index 2934c20..71a253e 100644 --- a/README.rst +++ b/README.rst @@ -40,7 +40,7 @@ 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. -Futhermore, ooniprobe takes no precautions to protect the install target machine +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. @@ -53,13 +53,19 @@ On debian testing or unstable:: If you are running debian stable you can get it from backports via:: - sudo sh -c 'echo "deb http://http.debian.net/debian wheezy-backports main" >> /etc/apt/sources.list' + sudo sh -c 'echo "deb http://http.debian.net/debian jessie-backports main" >> /etc/apt/sources.list' sudo apt-get update && sudo apt-get install ooniprobe On unix systems:: sudo pip install ooniprobe +**BUG** Note: Twisted version needs to be >=12.2.0 and <=14.0.0 +unistall/downgrage Twisted:: + + sudo pip uninstall Twisted + sudo pip install 'Twisted>=12.2.0,<=14.0.0' + To install it from the current master run:: sudo pip install https://github.com/TheTorProject/ooni-probe/archive/master.zip @@ -374,9 +380,16 @@ that is different from master) with:: Setting up development environment ---------------------------------- -On debian based systems this can be done with:: +On Debian based systems a development environment can be setup as follows: (prerequisites include build essentials, python-dev, and tor; for tor see https://www.torproject.org/docs/debian.html.en) - sudo apt-get install libgeoip-dev python-virtualenv virtualenvwrapper - mkvirtualenv ooniprobe - python setup.py install + + sudo apt-get install python-pip python-virtualenv virtualenv virtualenvwrapper + sudo apt-get install libgeoip-dev libffi-dev libdumbnet-dev libssl-dev libpcap-dev + git clone https://github.com/TheTorProject/ooni-probe + cd ooni-probe + mkvirtualenv ooniprobe # . ~/.virtualenvs/ooniprobe/bin/activate to access later + pip install -r requirements.txt pip install -r requirements-dev.txt + python setup.py install + ooniprobe -s # if all went well, lists available tests + diff --git a/ooni/tests/test_settings.py b/ooni/tests/test_settings.py index 1d36b83..dca4485 100644 --- a/ooni/tests/test_settings.py +++ b/ooni/tests/test_settings.py @@ -79,7 +79,7 @@ class TestSettings(ConfigTestCase): @defer.inlineCallbacks def test_check_tor_correct(self): """ - This test has been disabled because there is a starge concatenation of + This test has been disabled because there is a strange concatenation of conditions that make it not possible to run it on travis. The tests need to be run as root on travis so that the ones that use scapy will work properly. When running tor as root, though, it will by

1 0

[ooni-probe/master] Merge pull request #428 from TheTorProject/fix/travis
by art＠torproject.org 20 Nov '15

20 Nov '15

commit ca3f9902285e468c0003e0ca2e1bd4588ffcfb25 Merge: 6fadb73 528f965 Author: Simone Basso <bassosimone(a)gmail.com> Date: Wed Nov 18 16:27:23 2015 +0100 Merge pull request #428 from TheTorProject/fix/travis Remove duplicate package .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[ooni-probe/master] Update ooniprobe to 1.3.2
by art＠torproject.org 20 Nov '15

20 Nov '15

commit 083ccc01bd152e01df934e4b9a865f8ef9efa5aa 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 9b874f3..e4bace6 100644 --- a/setup.py +++ b/setup.py @@ -207,6 +207,7 @@ setup( "bin/oonireport", "bin/ooniresources"], 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] Merge branch 'master' of github.com:TheTorProject/ooni-probe
by art＠torproject.org 20 Nov '15

20 Nov '15

commit 4d2804d5ff5beba979e495e07770d09af4139313 Merge: f2e717b ca3f990 Author: Arturo <art(a)fuffa.org> Date: Fri Nov 20 13:50:58 2015 +0100 Merge branch 'master' of github.com:TheTorProject/ooni-probe * 'master' of github.com:TheTorProject/ooni-probe: (67 commits) Downgrading Twisted version is not needed Remove duplicate package Remove unneeded space Add IRC travis build notifications Add all supported twisted version, revise build dependencies Skip failing tests Proper fix for issue reported by @anadahz in #401 psiphon: fix bug that psiphon hangs ooniprobe -ng Remove script to install psiphon psiphon.py: prepare for merge with master Minor improvements commented on https://github.com/TheTorProject/ooni-probe/pull/410 psiphon: use the python provided by sys.executable change the way HTTP request errors are handled add psiphon_install.sh, code should be improved initial psiphon test. Failure cases doesn't fail propertly Properly add BTC address Update README.rst Update README.rst deal with existing, but empty, reporting.yml Fix misleading error message ... .travis.yml | 23 +- HACKING | 2 +- README.rst | 17 +- Vagrantfile | 2 +- bin/ooniprobe-dev | 8 +- bin/oonireport | 2 +- data/ooniprobe.1 | 2 +- docs/source/index.rst | 2 +- docs/source/tests/bridge_reachability.rst | 129 +++++++ docs/source/tests/meek_fronted_requests.rst | 176 ++++++++++ ooni/errors.py | 8 +- ooni/geoip.py | 2 +- ooni/nettests/blocking/meek_fronted_requests.py | 2 +- .../experimental/bridge_reachability/echo.py | 2 +- ooni/nettests/manipulation/dns_spoof.py | 2 +- ooni/nettests/scanning/http_url_list.py | 2 +- ooni/nettests/third_party/psiphon.py | 134 ++++++++ ooni/reporter.py | 4 +- ooni/templates/process.py | 23 +- ooni/tests/test_oonicli.py | 4 + ooni/tests/test_settings.py | 4 +- ooni/utils/hacks.py | 27 -- ooni/utils/trueheaders.py | 24 +- ooni/utils/txscapy.py | 2 +- requirements.txt | 2 +- scripts/install.sh | 352 ++++++++++++++++++++ setup.py | 2 +- var/old_notes.txt | 2 +- var/proxooni-spec.txt | 2 +- 29 files changed, 897 insertions(+), 66 deletions(-)

1 0

[ooni-probe/master] Make sure bin/ooniprobe-dev can be called from anywhere
by art＠torproject.org 20 Nov '15

20 Nov '15

commit 8c53b36b94f7cefdaad045e4941503def5d9a121 Author: Simone Basso <bassosimone(a)gmail.com> Date: Tue Oct 13 12:01:25 2015 +0200 Make sure bin/ooniprobe-dev can be called from anywhere This was a feature or #412 that I initially overlooked since the developer script was performing a `cd`. Retain the property that you can call ooniprobe-dev from basically any directory you want. Example: ``` $ pwd /tmp $ $HOME/src/ooni/ooni-probe/bin/ooniprobe-dev -s WARNING: running ooniprobe involves some risk that varies greatly from country to country. You should be aware of this when running the tool. Read more about this in the manpage or README. Log opened. * TCP Connect (blocking/tcp_connect) Performs a TCP connect scan of all the host port combinations given as input. [snip] ``` --- bin/ooniprobe-dev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/ooniprobe-dev b/bin/ooniprobe-dev index 7eaaf40..c44a8a6 100755 --- a/bin/ooniprobe-dev +++ b/bin/ooniprobe-dev @@ -7,4 +7,4 @@ if [ $? -ne 0 ]; then echo "$0: cannot determine toplevel directory" 1>&2 exit 1 fi -PYTHONPATH="$ROOTDIR" exec ./bin/ooniprobe "$@" +PYTHONPATH="$ROOTDIR" exec $ROOTDIR/bin/ooniprobe "$@"

1 0

[ooni-probe/master] Fix typo in the meek tests
by art＠torproject.org 20 Nov '15

20 Nov '15

commit 83e079312fed91ee24aec19a57691e0d67e39010 Author: Paul Wise <pabs3(a)bonedaddy.net> Date: Thu Oct 15 17:31:09 2015 +0800 Fix typo in the meek tests Signed-off-by: Isis Lovecruft <isis(a)torproject.org> --- ooni/nettests/blocking/meek_fronted_requests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ooni/nettests/blocking/meek_fronted_requests.py b/ooni/nettests/blocking/meek_fronted_requests.py index 3795008..2ccd72e 100644 --- a/ooni/nettests/blocking/meek_fronted_requests.py +++ b/ooni/nettests/blocking/meek_fronted_requests.py @@ -48,7 +48,7 @@ class meekTest(httpt.HTTPTest): """ if self.input: - if (isinstance(self.input, tuple) or isinstace(self.input, list)): + if (isinstance(self.input, tuple) or isinstance(self.input, list)): self.domainName, self.header = self.input else: self.domainName, self.header = self.input.split(':')

1 0

[ooni-probe/master] Merge pull request #412 from TheTorProject/fix/developer_script
by art＠torproject.org 20 Nov '15

20 Nov '15

commit 7fab827752ca7d6b79c81e165714ca87e9372314 Merge: b2fdc20 52b02e0 Author: Simone Basso <bassosimone(a)gmail.com> Date: Tue Oct 13 11:53:08 2015 +0200 Merge pull request #412 from TheTorProject/fix/developer_script Fix developer script bin/ooniprobe-dev | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[ooni-probe/master] Correct sample report test command
by art＠torproject.org 20 Nov '15

20 Nov '15

commit 054625fb414a32d0b757fb72cdf5cbd45b2d5b26 Author: anadahz <kojgelo(a)inbox.com> Date: Fri Oct 16 01:31:43 2015 +0200 Correct sample report test command --- docs/source/tests/bridge_reachability.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/tests/bridge_reachability.rst b/docs/source/tests/bridge_reachability.rst index 3f8999b..dc93ec9 100644 --- a/docs/source/tests/bridge_reachability.rst +++ b/docs/source/tests/bridge_reachability.rst @@ -40,7 +40,7 @@ to have failed. The default is 120 seconds. Sample report ============= -`ooniprobe blocking/bridge_reachability.py` +`ooniprobe blocking/bridge_reachability.py -f bridges.txt` ::

1 0