- tor-commits - lists.torproject.org

[ooni-probe/master] Fix typos in Readme.md
by art＠torproject.org 29 Apr '16

29 Apr '16

commit 305bef050c6be3e34acb48c39cb1fe6a3cae96c7 Author: Prayag Verma <prayag.verma(a)gmail.com> Date: Tue Feb 2 19:05:58 2016 +0530 Fix typos in Readme.md Found some spelling mistakes while reading Readme.md `depedencies` > `dependencies` `distributation` > `distribution` `Projec` > `Project` --- README.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index a1b6386..59c7afa 100644 --- a/README.rst +++ b/README.rst @@ -127,7 +127,7 @@ You can install ooniprobe on OSX if you have installed homebrew (http://mxcl.git Unix systems (with pip) ----------------------- -Make sure you have installed the following depedencies: +Make sure you have installed the following dependencies: * build-essential * python (>=2.7) @@ -330,7 +330,7 @@ Download Obfsproxy: https://www.torproject.org/projects/obfsproxy.html.en Setting capabilities on your virtualenv python binary ===================================================== -If your distributation supports capabilities you can avoid needing to run OONI as root:: +If your distribution supports capabilities you can avoid needing to run OONI as root:: setcap cap_net_admin,cap_net_raw+eip /path/to/your/virtualenv's/python @@ -339,7 +339,7 @@ If your distributation supports capabilities you can avoid needing to run OONI a Reporting bugs ============== -You can report bugs and issues you find with ooni-probe on The Tor Projec issue +You can report bugs and issues you find with ooni-probe on The Tor Project issue tracker filing them under the "Ooni" component: https://trac.torproject.org/projects/tor/newticket?component=Ooni. You can either register an account or use the group account "cypherpunks" with

1 0

[ooni-probe/master] deal with existing, but empty, reporting.yml
by art＠torproject.org 29 Apr '16

29 Apr '16

commit da614dfd225ddf493b6d039111539cce7acf95eb Author: Simone Basso <bassosimone(a)gmail.com> Date: Thu Nov 5 14:47:13 2015 +0100 deal with existing, but empty, reporting.yml Spotted while helping @anadahz to debug lepidopter. --- ooni/reporter.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ooni/reporter.py b/ooni/reporter.py index 5e702bb..a62cb6b 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -404,6 +404,8 @@ class OONIBReportLog(object): def get_report_log(self): with open(self.file_name) as f: report_log = yaml.safe_load(f) + if not report_log: + report_log = {} # consumers expect dictionary structure return report_log @property

1 0

[ooni-probe/master] Make bin/ooniprobe-dev portable
by art＠torproject.org 29 Apr '16

29 Apr '16

commit 5cbf718350a7aacab0d2a273424f3ccd33c1f9e3 Author: Simone Basso <bassosimone(a)gmail.com> Date: Fri Oct 9 09:38:42 2015 +0200 Make bin/ooniprobe-dev portable - use a portable recipe to get the absolute path of the toplevel directory where ooni-probe sources are located [1] - make sure we exit with a meaningful error message if it is not possible to get the toplevel directory name - while there put quotes around $@ since according to [2] this is the best way to forward shell script arguments .. [1] http://serverfault.com/questions/40144 .. [2] http://stackoverflow.com/questions/255898/how-to-iterate-over-arguments-in-… --- bin/ooniprobe-dev | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bin/ooniprobe-dev b/bin/ooniprobe-dev index b85d3a3..7eaaf40 100755 --- a/bin/ooniprobe-dev +++ b/bin/ooniprobe-dev @@ -2,5 +2,9 @@ # Developer script for running ooniprobe directly from the repository. # We don't automatically add "$PWD" to PYTHONPATH as that is a security risk # when run as /usr/bin/ooniprobe on an end user's computer. -cd "$(realpath "$(dirname "$0")")/.." -PYTHONPATH="$PWD" exec ./bin/ooniprobe $@ +ROOTDIR=$(cd $(dirname $(dirname $0)) && pwd -P) +if [ $? -ne 0 ]; then + echo "$0: cannot determine toplevel directory" 1>&2 + exit 1 +fi +PYTHONPATH="$ROOTDIR" exec ./bin/ooniprobe "$@"

1 0

[ooni-probe/master] Add Bridge Reachability Test documentation
by art＠torproject.org 29 Apr '16

29 Apr '16

commit 9617f31aa5dede2b49460cf4ae9e70139c7f61db Author: anadahz <kojgelo(a)inbox.com> Date: Tue Oct 13 06:03:57 2015 +0200 Add Bridge Reachability Test documentation --- docs/source/tests/bridge_reachability.rst | 129 ++++++++++++++++++++++++++++++ 1 file changed, 129 insertions(+) diff --git a/docs/source/tests/bridge_reachability.rst b/docs/source/tests/bridge_reachability.rst new file mode 100644 index 0000000..3f8999b --- /dev/null +++ b/docs/source/tests/bridge_reachability.rst @@ -0,0 +1,129 @@ +Details +======= + +*Test Name*: Bridge Reachability Test + +*Current version*: 0.1.2 + +*NetTest*: HTTP Requests (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/ooni/nettests/block…) + +*Test Helper*: None + +*Test Type*: Content Blocking + +*Requires Root*: No + +Description +=========== + +This test detects which Tor bridges are working from the given network vantage +point and which ones are not. For every bridge specified as input a new tor +instance is started and it is instructed to connect to Tor using that bridge. +It will try to bootstrap to 100% and either succeed or timeout after a default +time of 120 seconds. + +How to run the test +=================== + +`ooniprobe blocking/bridge_reachability.py -f <input_file>` + +*input file* a list of TransportType IP:ORPort bridges (ex. obfs3 +198.51.100.45:9045) or IP:ORPort (ex. 203.0.113.27:1828) to test reachability +for. + +Optional test options +===================== + +*-t* Specify the timeout after which to consider the Tor bootstrapping process +to have failed. The default is 120 seconds. + +Sample report +============= + +`ooniprobe blocking/bridge_reachability.py` + +:: + +########################################### +# OONI Probe Report for bridge_reachability (0.1) +# Thu Aug 7 16:10:50 2014 +########################################### +--- +input_hashes: [595c8ad9b63ff9f142eca6296021990df6367ab03b3c4eb1c69a8747f0cd41a1] +options: [-f, bridges.txt] +probe_asn: AS3269 +probe_cc: IT +probe_city: null +probe_ip: 127.0.0.1 +software_name: ooniprobe +software_version: 1.0.2 +start_time: 1407420650.560137 +test_name: bridge_reachability +test_version: '0.1' +... +--- +{bridge_address: '169.229.59.74:31493', error: null, input: 'obfs3 169.229.59.74:31493 + AF9F66B7B04F8FF6F32D455F05135250A16543C9', success: true, timeout: 120, tor_log: null, + tor_progress: 100, tor_progress_summary: Done, tor_progress_tag: done, tor_version: 0.2.4.20, + transport_name: obfs3} +... +--- +{bridge_address: '169.229.59.75:46328', error: null, input: 'obfs3 169.229.59.75:46328 + AF9F66B7B04F8FF6F32D455F05135250A16543C9', success: true, timeout: 120, tor_log: null, + tor_progress: 100, tor_progress_summary: Done, tor_progress_tag: done, tor_version: 0.2.4.20, + transport_name: obfs3} +... +--- +{bridge_address: '208.79.90.242:35658', error: null, input: 'obfs3 208.79.90.242:35658 + BA61757846841D64A83EA2514C766CB92F1FB41F', success: true, timeout: 120, tor_log: null, + tor_progress: 100, tor_progress_summary: Done, tor_progress_tag: done, tor_version: 0.2.4.20, + transport_name: obfs3} +... +--- +{bridge_address: '83.212.100.216:47870', error: null, input: 'obfs2 83.212.100.216:47870 + 1F01A7BB60F49FC96E0850A6BAD6D076DFEFAF80', success: false, timeout: 120, tor_log: '', + tor_progress: 0, tor_progress_summary: null, tor_progress_tag: null, tor_version: 0.2.4.20, + transport_name: obfs2} +... +--- +{bridge_address: '83.212.96.182:46602', error: null, input: 'obfs2 83.212.96.182:46602 + 6F058CBEF888EB20D1DEB9886909F1E812245D41', success: false, timeout: 120, tor_log: '', + tor_progress: 0, tor_progress_summary: null, tor_progress_tag: null, tor_version: 0.2.4.20, + transport_name: obfs2} +... +--- +{bridge_address: '70.182.182.109:54542', error: null, input: 'obfs2 70.182.182.109:54542 + 94C9E691688FAFDEC701A0788BD15BE8AD34ED35', success: false, timeout: 120, tor_log: '', + tor_progress: 0, tor_progress_summary: null, tor_progress_tag: null, tor_version: 0.2.4.20, + transport_name: obfs2} +... +--- +{bridge_address: '128.31.0.34:1051', error: null, input: 'obfs2 128.31.0.34:1051 CA7434F14A898C7D3427B8295A7F83446BC7F496', + success: false, timeout: 120, tor_log: '', tor_progress: 0, tor_progress_summary: null, + tor_progress_tag: null, tor_version: 0.2.4.20, transport_name: obfs2} +... +--- +{bridge_address: '83.212.101.2:45235', error: null, input: 'obfs2 83.212.101.2:45235 + 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D', success: false, timeout: 120, tor_log: '', + tor_progress: 0, tor_progress_summary: null, tor_progress_tag: null, tor_version: 0.2.4.20, + transport_name: obfs2} +... +--- +{bridge_address: '83.212.101.2:42782', error: null, input: 'obfs3 83.212.101.2:42782 + 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D', success: false, timeout: 120, tor_log: '', + tor_progress: 0, tor_progress_summary: null, tor_progress_tag: null, tor_version: 0.2.4.20, + transport_name: obfs3} +... +--- +{bridge_address: '83.212.101.2:443', error: null, input: 'obfs3 83.212.101.2:443 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D', + success: false, timeout: 120, tor_log: '', tor_progress: 0, tor_progress_summary: null, + tor_progress_tag: null, tor_version: 0.2.4.20, transport_name: obfs3} +... +--- +{bridge_address: '209.141.36.236:45496', error: null, input: 'obfs3 209.141.36.236:45496 + 58D91C3A631F910F32E18A55441D5A0463BA66E2', success: false, timeout: 120, tor_log: '', + tor_progress: 0, tor_progress_summary: null, tor_progress_tag: null, tor_version: 0.2.4.20, + transport_name: obfs3} +... + ... +

1 0

[ooni-probe/master] Merge pull request #458 from pra85/patch-2
by art＠torproject.org 29 Apr '16

29 Apr '16

commit 1fac7cd1d1c3ad306044ecde04cc7ac2681b3bd1 Merge: 5b4ce0e 305bef0 Author: Arturo Filastò <arturo(a)filasto.net> Date: Tue Feb 2 15:41:36 2016 +0100 Merge pull request #458 from pra85/patch-2 Fix typos in Readme.md README.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

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

29 Apr '16

commit 71c79a749cb4d77ab2df97260ef9e4f9faa87788 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] Update README.rst
by art＠torproject.org 29 Apr '16

29 Apr '16

commit 8f0895fd657450057ca9d16a38051c379c283cd1 Author: Arturo Filastò <arturo(a)filasto.net> Date: Wed Nov 11 19:12:25 2015 +0100 Update README.rst --- README.rst | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.rst b/README.rst index 71a253e..930426c 100644 --- a/README.rst +++ b/README.rst @@ -393,3 +393,12 @@ On Debian based systems a development environment can be setup as follows: (prer python setup.py install ooniprobe -s # if all went well, lists available tests + +Donate +------- + +Send bitcoins to: +![bitcoin address](http://i.imgur.com/CIWHb5R.png) +``` +1Ai9d4dhDBjxYVkKKf1pFXptEGfM1vxFBf +```

1 0

[ooni-probe/master] Update README.rst
by art＠torproject.org 29 Apr '16

29 Apr '16

commit 043af3853b8b8e8423c3084e7d7156e301ac52cd Author: Arturo Filastò <arturo(a)filasto.net> Date: Wed Nov 11 19:13:55 2015 +0100 Update README.rst --- README.rst | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index 930426c..e4174d3 100644 --- a/README.rst +++ b/README.rst @@ -398,7 +398,8 @@ Donate ------- Send bitcoins to: -![bitcoin address](http://i.imgur.com/CIWHb5R.png) -``` -1Ai9d4dhDBjxYVkKKf1pFXptEGfM1vxFBf -``` + +.. image:: http://i.imgur.com/CIWHb5R.png + :target: http://www.coindesk.com/information/how-can-i-buy-bitcoins/ + + 1Ai9d4dhDBjxYVkKKf1pFXptEGfM1vxFBf

1 0

[ooni-probe/master] Correct sample report test command
by art＠torproject.org 29 Apr '16

29 Apr '16

commit d099693c84508e6283565a1ac61063ca1340b6bb 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

[ooni-probe/master] Properly add BTC address
by art＠torproject.org 29 Apr '16

29 Apr '16

commit 0b1d79f26de4a92ad9377067d2e107a7371fc262 Author: Arturo Filastò <arturo(a)filasto.net> Date: Wed Nov 11 19:15:12 2015 +0100 Properly add BTC address --- README.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index e4174d3..7c624dc 100644 --- a/README.rst +++ b/README.rst @@ -397,9 +397,10 @@ On Debian based systems a development environment can be setup as follows: (prer Donate ------- -Send bitcoins to: +Send bitcoins to .. image:: http://i.imgur.com/CIWHb5R.png :target: http://www.coindesk.com/information/how-can-i-buy-bitcoins/ - 1Ai9d4dhDBjxYVkKKf1pFXptEGfM1vxFBf + +1Ai9d4dhDBjxYVkKKf1pFXptEGfM1vxFBf

1 0