June 2013 - tor-commits - lists.torproject.org

[ooni-probe/develop] Merge pull request #75 from hellais/feature/ui
by isis＠torproject.org 26 Jun '13

26 Jun '13

commit d32048774026c5f0a7a437bd7b8f412cd8cb8dd6 Merge: e2e8559 5d45d7f Author: aagbsn <aagbsn(a)extc.org> Date: Mon Jun 17 05:22:47 2013 -0700 Merge pull request #75 from hellais/feature/ui Tested on debian. Adds bin/oonid which provides a web UI on port 8042 (default). .travis.yml | 1 - Vagrantfile | 16 +- bin/oonid | 7 + data/nettests/blocking/__init__.py | 1 + data/nettests/blocking/dnsconsistency.py | 173 + data/nettests/blocking/http_requests.py | 130 + data/nettests/blocking/tcpconnect.py | 69 + data/nettests/examples/example_dns_http.py | 11 + data/nettests/examples/example_dnst.py | 13 + data/nettests/examples/example_http_checksum.py | 27 + data/nettests/examples/example_httpt.py | 36 + data/nettests/examples/example_myip.py | 21 + data/nettests/examples/example_scapyt.py | 29 + data/nettests/examples/example_scapyt_yield.py | 25 + data/nettests/examples/example_simple.py | 8 + data/nettests/examples/example_tcpt.py | 21 + .../experimental/bridge_reachability/bridget.py | 462 + .../experimental/bridge_reachability/echo.py | 132 + data/nettests/experimental/chinatrigger.py | 108 + data/nettests/experimental/dns_injection.py | 63 + data/nettests/experimental/domclass_collector.py | 33 + .../experimental/http_filtering_bypassing.py | 84 + .../experimental/http_keyword_filtering.py | 45 + data/nettests/experimental/http_trix.py | 47 + .../experimental/http_uk_mobile_networks.py | 85 + data/nettests/experimental/keyword_filtering.py | 52 + data/nettests/experimental/parasitictraceroute.py | 129 + data/nettests/experimental/squid.py | 117 + data/nettests/manipulation/captiveportal.py | 650 + data/nettests/manipulation/daphne.py | 119 + data/nettests/manipulation/dnsspoof.py | 69 + .../manipulation/http_header_field_manipulation.py | 189 + data/nettests/manipulation/http_host.py | 151 + .../manipulation/http_invalid_request_line.py | 106 + data/nettests/manipulation/traceroute.py | 143 + data/nettests/scanning/http_url_list.py | 98 + data/nettests/third_party/Makefile | 3 + data/nettests/third_party/README | 14 + data/nettests/third_party/netalyzr.py | 58 + data/ooniprobe.conf.sample | 58 + data/ui/.bowerrc | 5 + data/ui/app/index.html | 39 + data/ui/app/libs/angular-resource/README.md | 4 + .../app/libs/angular-resource/angular-resource.js | 445 + data/ui/app/libs/angular-resource/component.json | 17 + data/ui/app/libs/angular/angular.js |14733 ++++++++++++++++++++ data/ui/app/libs/angular/component.json | 14 + data/ui/app/libs/bootstrap/component.json | 9 + .../libs/bootstrap/css/bootstrap-responsive.css | 1109 ++ data/ui/app/libs/bootstrap/css/bootstrap.css | 6158 ++++++++ .../bootstrap/img/glyphicons-halflings-white.png | Bin 0 -> 8777 bytes .../libs/bootstrap/img/glyphicons-halflings.png | Bin 0 -> 12799 bytes data/ui/app/libs/bootstrap/js/bootstrap.js | 2276 +++ data/ui/app/libs/jquery/component.json | 14 + data/ui/app/libs/jquery/composer.json | 23 + data/ui/app/libs/jquery/jquery.js | 9472 +++++++++++++ data/ui/app/libs/ng-upload/ng-upload.js | 107 + data/ui/app/scripts/app.js | 30 + data/ui/app/scripts/controllers.js | 96 + data/ui/app/scripts/directives.js | 5 + data/ui/app/scripts/filters.js | 5 + data/ui/app/scripts/services.js | 27 + data/ui/app/styles/app.css | 21 + data/ui/app/views/inputs.html | 31 + data/ui/app/views/sidebar.html | 10 + data/ui/app/views/test.html | 48 + data/ui/component.json | 9 + decks/before_i_commit.testdeck | 12 +- decks/short_no_root.deck | 10 +- nettests/blocking/__init__.py | 1 - nettests/blocking/dnsconsistency.py | 173 - nettests/blocking/http_requests.py | 130 - nettests/blocking/tcpconnect.py | 69 - nettests/examples/example_dns_http.py | 11 - nettests/examples/example_dnst.py | 13 - nettests/examples/example_http_checksum.py | 27 - nettests/examples/example_httpt.py | 36 - nettests/examples/example_myip.py | 17 - nettests/examples/example_scapyt.py | 29 - nettests/examples/example_scapyt_yield.py | 25 - nettests/examples/example_simple.py | 8 - nettests/examples/example_tcpt.py | 21 - .../experimental/bridge_reachability/bridget.py | 462 - nettests/experimental/bridge_reachability/echo.py | 132 - nettests/experimental/chinatrigger.py | 108 - nettests/experimental/dns_injection.py | 63 - nettests/experimental/domclass_collector.py | 33 - nettests/experimental/http_filtering_bypassing.py | 84 - nettests/experimental/http_keyword_filtering.py | 45 - nettests/experimental/http_trix.py | 47 - nettests/experimental/http_uk_mobile_networks.py | 85 - nettests/experimental/keyword_filtering.py | 52 - nettests/experimental/parasitictraceroute.py | 129 - nettests/experimental/squid.py | 117 - nettests/manipulation/captiveportal.py | 650 - nettests/manipulation/daphne.py | 119 - nettests/manipulation/dnsspoof.py | 69 - .../manipulation/http_header_field_manipulation.py | 189 - nettests/manipulation/http_host.py | 151 - nettests/manipulation/http_invalid_request_line.py | 106 - nettests/manipulation/traceroute.py | 143 - nettests/scanning/http_url_list.py | 98 - nettests/third_party/Makefile | 3 - nettests/third_party/README | 14 - nettests/third_party/netalyzr.py | 58 - nettests/tls-handshake.py | 32 - ooni/api/spec.py | 253 + ooni/config.py | 128 - ooni/director.py | 50 +- ooni/errors.py | 3 + ooni/geoip.py | 3 +- ooni/managers.py | 18 +- ooni/nettest.py | 178 +- ooni/oonicli.py | 18 +- ooni/oonid.py | 20 + ooni/reporter.py | 8 +- ooni/settings.py | 98 + ooni/tasks.py | 13 +- ooni/templates/httpt.py | 2 +- ooni/templates/scapyt.py | 2 +- ooni/tests/mocks.py | 8 +- ooni/tests/test_managers.py | 8 + ooni/tests/test_nettest.py | 7 +- ooni/utils/log.py | 10 +- ooni/utils/txscapy.py | 2 +- ooniprobe.conf.sample | 57 - setup.py | 30 +- 127 files changed, 38985 insertions(+), 3812 deletions(-)

1 0

[ooni-probe/develop] Add oonid port
by isis＠torproject.org 26 Jun '13

26 Jun '13

commit 5d45d7f20e964dc340c3d61068aa6aa72aef3b1c Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Jun 17 14:15:55 2013 +0200 Add oonid port --- data/ooniprobe.conf.sample | 1 + 1 file changed, 1 insertion(+) diff --git a/data/ooniprobe.conf.sample b/data/ooniprobe.conf.sample index 6eb7a5b..f0c2fef 100644 --- a/data/ooniprobe.conf.sample +++ b/data/ooniprobe.conf.sample @@ -46,6 +46,7 @@ advanced: reporting_concurrency: 20 # Specify here a custom data_dir path data_dir: /usr/share/ooni/ + oonid_api_port: 8042 tor: socks_port: 9050 #control_port: 9051

1 0

[ooni-probe/develop] Remove superfluous line in travis
by isis＠torproject.org 26 Jun '13

26 Jun '13

commit c3bd09729e61f1ac1477c3199b97a1728d8644cb Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Jun 17 13:30:53 2013 +0200 Remove superfluous line in travis --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8a3f99c..fed5d7c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,5 +13,4 @@ install: # command to run tests, e.g. python setup.py test script: # To be activated after merge of PR#64 - - cp ooniprobe.conf.sample ooniprobe.conf - trial ooni

1 0

[ooni-probe/develop] Fix installation for virtualenv
by isis＠torproject.org 26 Jun '13

26 Jun '13

commit 3e3843515d3ca6179b10f1652e930f54151655e5 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Jun 17 13:13:27 2013 +0200 Fix installation for virtualenv --- setup.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 7912924..ec4b353 100644 --- a/setup.py +++ b/setup.py @@ -18,13 +18,18 @@ dependency_links = [ 'https://people.torproject.org/~ioerror/src/mirrors/ooniprobe' ] +usr_share_path = '/usr/share/ooni' +# If this is true then it means we are in a virtualenv +if hasattr(sys, 'real_prefix'): + usr_share_path = pj(sys.prefix, 'share', 'ooni') + data_files = [] for root, dirs, file_names in os.walk('data/'): files = [] for file_name in file_names: if not file_name.endswith('.pyc'): files.append(pj(root, file_name)) - data_files.append([pj('/usr/share/ooni', root), files]) + data_files.append([pj(usr_share_path, root), files]) with open('requirements.txt') as f: for line in f:

1 0

[ooni-probe/develop] Merge branch 'master' of github.com:TheTorProject/ooni-probe
by isis＠torproject.org 26 Jun '13

26 Jun '13

commit 317d4a700bc058c0117fd58abce78e1ac7d0086d Merge: 5338414 e2e8559 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Jun 17 13:03:27 2013 +0200 Merge branch 'master' of github.com:TheTorProject/ooni-probe * 'master' of github.com:TheTorProject/ooni-probe: Update install README.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)

1 0

[ooni-probe/develop] Place the right paths in the ooniprobe sample config
by isis＠torproject.org 26 Jun '13

26 Jun '13

commit aafc5b726d33b5af9caba8e3693548f5c5284e43 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Jun 17 13:28:15 2013 +0200 Place the right paths in the ooniprobe sample config --- setup.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/setup.py b/setup.py index ec4b353..5f221d0 100644 --- a/setup.py +++ b/setup.py @@ -22,6 +22,15 @@ usr_share_path = '/usr/share/ooni' # If this is true then it means we are in a virtualenv if hasattr(sys, 'real_prefix'): usr_share_path = pj(sys.prefix, 'share', 'ooni') + with open(pj('data', 'ooniprobe.conf.sample.new'), 'w+') as w: + with open(pj('data', 'ooniprobe.conf.sample')) as f: + for line in f: + if line.startswith(' data_dir: /usr/share/ooni'): + w.write(' data_dir: %s\n' % usr_share_path) + else: + w.write(line) + os.rename(pj('data', 'ooniprobe.conf.sample.new'), + pj('data', 'ooniprobe.conf.sample')) data_files = [] for root, dirs, file_names in os.walk('data/'):

1 0

[ooni-probe/develop] Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe
by isis＠torproject.org 26 Jun '13

26 Jun '13

commit 533841454da554359ef8a722f15b5d09b819923f Merge: af03b56 4164537 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Jun 17 13:03:15 2013 +0200 Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe * 'master' of ssh://git-rw.torproject.org/ooni-probe: Add bridge and obfsproxy support to director when starting Tor ooni/director.py | 16 ++++++++++++++++ ooniprobe.conf.sample | 1 + 2 files changed, 17 insertions(+)

1 0

[ooni-probe/develop] Merge branch 'feature/ui' into staging
by isis＠torproject.org 26 Jun '13

26 Jun '13

commit 2bb5d8719b7c3c6fc8b7242354f4fe4da8367e6a Merge: 317d4a7 da535b9 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Jun 17 13:04:00 2013 +0200 Merge branch 'feature/ui' into staging * feature/ui: (39 commits) Fix bug that resulted in inconsistencies in test_id Add example on data_dir Actually we are already root, no need for sudo Run setup.py script as root Install the stable pip, before upgrading Fix bug in importing of geodata Place data files into proper sub-directory structure Fix import lost in merge Fix bug in HTTP api Add oonid script to run ooni daemon Include jquery as dep Bump to version 0.1.0 Add cyclone as a dependency Implement XSRF protection in the HTTP API Point to data directory in short-not-root deck Implement in-browser input file selection views Improve setup.py, fixup paths for reporting. Remove oonib related data from ooniprobe Add support for viewing test results and uploading inputs Initial commit of ooni-probe user interface Implement starting and stopping of tests via the HTTP API ... Conflicts: data/ooniprobe.conf.sample Vagrantfile | 16 +- bin/oonid | 7 + data/nettests/blocking/__init__.py | 1 + data/nettests/blocking/dnsconsistency.py | 173 + data/nettests/blocking/http_requests.py | 130 + data/nettests/blocking/tcpconnect.py | 69 + data/nettests/examples/example_dns_http.py | 11 + data/nettests/examples/example_dnst.py | 13 + data/nettests/examples/example_http_checksum.py | 27 + data/nettests/examples/example_httpt.py | 36 + data/nettests/examples/example_myip.py | 21 + data/nettests/examples/example_scapyt.py | 29 + data/nettests/examples/example_scapyt_yield.py | 25 + data/nettests/examples/example_simple.py | 8 + data/nettests/examples/example_tcpt.py | 21 + .../experimental/bridge_reachability/bridget.py | 462 + .../experimental/bridge_reachability/echo.py | 132 + data/nettests/experimental/chinatrigger.py | 108 + data/nettests/experimental/dns_injection.py | 63 + data/nettests/experimental/domclass_collector.py | 33 + .../experimental/http_filtering_bypassing.py | 84 + .../experimental/http_keyword_filtering.py | 45 + data/nettests/experimental/http_trix.py | 47 + .../experimental/http_uk_mobile_networks.py | 85 + data/nettests/experimental/keyword_filtering.py | 52 + data/nettests/experimental/parasitictraceroute.py | 129 + data/nettests/experimental/squid.py | 117 + data/nettests/manipulation/captiveportal.py | 650 + data/nettests/manipulation/daphne.py | 119 + data/nettests/manipulation/dnsspoof.py | 69 + .../manipulation/http_header_field_manipulation.py | 189 + data/nettests/manipulation/http_host.py | 151 + .../manipulation/http_invalid_request_line.py | 106 + data/nettests/manipulation/traceroute.py | 143 + data/nettests/scanning/http_url_list.py | 98 + data/nettests/third_party/Makefile | 3 + data/nettests/third_party/README | 14 + data/nettests/third_party/netalyzr.py | 58 + data/ooniprobe.conf.sample | 57 + data/ui/.bowerrc | 5 + data/ui/app/index.html | 39 + data/ui/app/libs/angular-resource/README.md | 4 + .../app/libs/angular-resource/angular-resource.js | 445 + data/ui/app/libs/angular-resource/component.json | 17 + data/ui/app/libs/angular/angular.js |14733 ++++++++++++++++++++ data/ui/app/libs/angular/component.json | 14 + data/ui/app/libs/bootstrap/component.json | 9 + .../libs/bootstrap/css/bootstrap-responsive.css | 1109 ++ data/ui/app/libs/bootstrap/css/bootstrap.css | 6158 ++++++++ .../bootstrap/img/glyphicons-halflings-white.png | Bin 0 -> 8777 bytes .../libs/bootstrap/img/glyphicons-halflings.png | Bin 0 -> 12799 bytes data/ui/app/libs/bootstrap/js/bootstrap.js | 2276 +++ data/ui/app/libs/jquery/component.json | 14 + data/ui/app/libs/jquery/composer.json | 23 + data/ui/app/libs/jquery/jquery.js | 9472 +++++++++++++ data/ui/app/libs/ng-upload/ng-upload.js | 107 + data/ui/app/scripts/app.js | 30 + data/ui/app/scripts/controllers.js | 96 + data/ui/app/scripts/directives.js | 5 + data/ui/app/scripts/filters.js | 5 + data/ui/app/scripts/services.js | 27 + data/ui/app/styles/app.css | 21 + data/ui/app/views/inputs.html | 31 + data/ui/app/views/sidebar.html | 10 + data/ui/app/views/test.html | 48 + data/ui/component.json | 9 + decks/before_i_commit.testdeck | 12 +- decks/short_no_root.deck | 10 +- nettests/blocking/__init__.py | 1 - nettests/blocking/dnsconsistency.py | 173 - nettests/blocking/http_requests.py | 130 - nettests/blocking/tcpconnect.py | 69 - nettests/examples/example_dns_http.py | 11 - nettests/examples/example_dnst.py | 13 - nettests/examples/example_http_checksum.py | 27 - nettests/examples/example_httpt.py | 36 - nettests/examples/example_myip.py | 17 - nettests/examples/example_scapyt.py | 29 - nettests/examples/example_scapyt_yield.py | 25 - nettests/examples/example_simple.py | 8 - nettests/examples/example_tcpt.py | 21 - .../experimental/bridge_reachability/bridget.py | 462 - nettests/experimental/bridge_reachability/echo.py | 132 - nettests/experimental/chinatrigger.py | 108 - nettests/experimental/dns_injection.py | 63 - nettests/experimental/domclass_collector.py | 33 - nettests/experimental/http_filtering_bypassing.py | 84 - nettests/experimental/http_keyword_filtering.py | 45 - nettests/experimental/http_trix.py | 47 - nettests/experimental/http_uk_mobile_networks.py | 85 - nettests/experimental/keyword_filtering.py | 52 - nettests/experimental/parasitictraceroute.py | 129 - nettests/experimental/squid.py | 117 - nettests/manipulation/captiveportal.py | 650 - nettests/manipulation/daphne.py | 119 - nettests/manipulation/dnsspoof.py | 69 - .../manipulation/http_header_field_manipulation.py | 189 - nettests/manipulation/http_host.py | 151 - nettests/manipulation/http_invalid_request_line.py | 106 - nettests/manipulation/traceroute.py | 143 - nettests/scanning/http_url_list.py | 98 - nettests/third_party/Makefile | 3 - nettests/third_party/README | 14 - nettests/third_party/netalyzr.py | 58 - nettests/tls-handshake.py | 32 - ooni/api/spec.py | 253 + ooni/config.py | 128 - ooni/director.py | 50 +- ooni/errors.py | 3 + ooni/geoip.py | 3 +- ooni/managers.py | 18 +- ooni/nettest.py | 178 +- ooni/oonicli.py | 16 +- ooni/oonid.py | 20 + ooni/reporter.py | 8 +- ooni/settings.py | 98 + ooni/tasks.py | 12 +- ooni/templates/httpt.py | 2 +- ooni/templates/scapyt.py | 2 +- ooni/tests/mocks.py | 8 +- ooni/tests/test_managers.py | 8 + ooni/tests/test_nettest.py | 7 +- ooni/utils/log.py | 10 +- ooni/utils/txscapy.py | 2 +- ooniprobe.conf.sample | 57 - setup.py | 16 +- 126 files changed, 38968 insertions(+), 3810 deletions(-)

1 0

[ooni-probe/develop] Merge branch 'feature/ui' into staging
by isis＠torproject.org 26 Jun '13

26 Jun '13

commit da535b9bfbc7b89e5b196d8a88a374206684715f Merge: af03b56 eae2c1e Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Jun 17 12:34:42 2013 +0200 Merge branch 'feature/ui' into staging * feature/ui: (39 commits) Fix bug that resulted in inconsistencies in test_id Add example on data_dir Actually we are already root, no need for sudo Run setup.py script as root Install the stable pip, before upgrading Fix bug in importing of geodata Place data files into proper sub-directory structure Fix import lost in merge Fix bug in HTTP api Add oonid script to run ooni daemon Include jquery as dep Bump to version 0.1.0 Add cyclone as a dependency Implement XSRF protection in the HTTP API Point to data directory in short-not-root deck Implement in-browser input file selection views Improve setup.py, fixup paths for reporting. Remove oonib related data from ooniprobe Add support for viewing test results and uploading inputs Initial commit of ooni-probe user interface Implement starting and stopping of tests via the HTTP API ... Conflicts: ooni/__init__.py ooni/tasks.py setup.py Vagrantfile | 16 +- bin/oonid | 7 + data/nettests/blocking/__init__.py | 1 + data/nettests/blocking/dnsconsistency.py | 173 + data/nettests/blocking/http_requests.py | 130 + data/nettests/blocking/tcpconnect.py | 69 + data/nettests/examples/example_dns_http.py | 11 + data/nettests/examples/example_dnst.py | 13 + data/nettests/examples/example_http_checksum.py | 27 + data/nettests/examples/example_httpt.py | 36 + data/nettests/examples/example_myip.py | 21 + data/nettests/examples/example_scapyt.py | 29 + data/nettests/examples/example_scapyt_yield.py | 25 + data/nettests/examples/example_simple.py | 8 + data/nettests/examples/example_tcpt.py | 21 + .../experimental/bridge_reachability/bridget.py | 462 + .../experimental/bridge_reachability/echo.py | 132 + data/nettests/experimental/chinatrigger.py | 108 + data/nettests/experimental/dns_injection.py | 63 + data/nettests/experimental/domclass_collector.py | 33 + .../experimental/http_filtering_bypassing.py | 84 + .../experimental/http_keyword_filtering.py | 45 + data/nettests/experimental/http_trix.py | 47 + .../experimental/http_uk_mobile_networks.py | 85 + data/nettests/experimental/keyword_filtering.py | 52 + data/nettests/experimental/parasitictraceroute.py | 129 + data/nettests/experimental/squid.py | 117 + data/nettests/manipulation/captiveportal.py | 650 + data/nettests/manipulation/daphne.py | 119 + data/nettests/manipulation/dnsspoof.py | 69 + .../manipulation/http_header_field_manipulation.py | 189 + data/nettests/manipulation/http_host.py | 151 + .../manipulation/http_invalid_request_line.py | 106 + data/nettests/manipulation/traceroute.py | 143 + data/nettests/scanning/http_url_list.py | 98 + data/nettests/third_party/Makefile | 3 + data/nettests/third_party/README | 14 + data/nettests/third_party/netalyzr.py | 58 + data/ooniprobe.conf.sample | 57 + data/ui/.bowerrc | 5 + data/ui/app/index.html | 39 + data/ui/app/libs/angular-resource/README.md | 4 + .../app/libs/angular-resource/angular-resource.js | 445 + data/ui/app/libs/angular-resource/component.json | 17 + data/ui/app/libs/angular/angular.js |14733 ++++++++++++++++++++ data/ui/app/libs/angular/component.json | 14 + data/ui/app/libs/bootstrap/component.json | 9 + .../libs/bootstrap/css/bootstrap-responsive.css | 1109 ++ data/ui/app/libs/bootstrap/css/bootstrap.css | 6158 ++++++++ .../bootstrap/img/glyphicons-halflings-white.png | Bin 0 -> 8777 bytes .../libs/bootstrap/img/glyphicons-halflings.png | Bin 0 -> 12799 bytes data/ui/app/libs/bootstrap/js/bootstrap.js | 2276 +++ data/ui/app/libs/jquery/component.json | 14 + data/ui/app/libs/jquery/composer.json | 23 + data/ui/app/libs/jquery/jquery.js | 9472 +++++++++++++ data/ui/app/libs/ng-upload/ng-upload.js | 107 + data/ui/app/scripts/app.js | 30 + data/ui/app/scripts/controllers.js | 96 + data/ui/app/scripts/directives.js | 5 + data/ui/app/scripts/filters.js | 5 + data/ui/app/scripts/services.js | 27 + data/ui/app/styles/app.css | 21 + data/ui/app/views/inputs.html | 31 + data/ui/app/views/sidebar.html | 10 + data/ui/app/views/test.html | 48 + data/ui/component.json | 9 + decks/before_i_commit.testdeck | 12 +- decks/short_no_root.deck | 10 +- nettests/blocking/__init__.py | 1 - nettests/blocking/dnsconsistency.py | 173 - nettests/blocking/http_requests.py | 130 - nettests/blocking/tcpconnect.py | 69 - nettests/examples/example_dns_http.py | 11 - nettests/examples/example_dnst.py | 13 - nettests/examples/example_http_checksum.py | 27 - nettests/examples/example_httpt.py | 36 - nettests/examples/example_myip.py | 17 - nettests/examples/example_scapyt.py | 29 - nettests/examples/example_scapyt_yield.py | 25 - nettests/examples/example_simple.py | 8 - nettests/examples/example_tcpt.py | 21 - .../experimental/bridge_reachability/bridget.py | 462 - nettests/experimental/bridge_reachability/echo.py | 132 - nettests/experimental/chinatrigger.py | 108 - nettests/experimental/dns_injection.py | 63 - nettests/experimental/domclass_collector.py | 33 - nettests/experimental/http_filtering_bypassing.py | 84 - nettests/experimental/http_keyword_filtering.py | 45 - nettests/experimental/http_trix.py | 47 - nettests/experimental/http_uk_mobile_networks.py | 85 - nettests/experimental/keyword_filtering.py | 52 - nettests/experimental/parasitictraceroute.py | 129 - nettests/experimental/squid.py | 117 - nettests/manipulation/captiveportal.py | 650 - nettests/manipulation/daphne.py | 119 - nettests/manipulation/dnsspoof.py | 69 - .../manipulation/http_header_field_manipulation.py | 189 - nettests/manipulation/http_host.py | 151 - nettests/manipulation/http_invalid_request_line.py | 106 - nettests/manipulation/traceroute.py | 143 - nettests/scanning/http_url_list.py | 98 - nettests/third_party/Makefile | 3 - nettests/third_party/README | 14 - nettests/third_party/netalyzr.py | 58 - nettests/tls-handshake.py | 32 - ooni/api/spec.py | 253 + ooni/config.py | 128 - ooni/director.py | 50 +- ooni/errors.py | 3 + ooni/geoip.py | 3 +- ooni/managers.py | 18 +- ooni/nettest.py | 178 +- ooni/oonicli.py | 16 +- ooni/oonid.py | 20 + ooni/reporter.py | 8 +- ooni/settings.py | 98 + ooni/tasks.py | 12 +- ooni/templates/httpt.py | 2 +- ooni/templates/scapyt.py | 2 +- ooni/tests/mocks.py | 8 +- ooni/tests/test_managers.py | 8 + ooni/tests/test_nettest.py | 7 +- ooni/utils/log.py | 10 +- ooni/utils/txscapy.py | 2 +- ooniprobe.conf.sample | 56 - setup.py | 16 +- 126 files changed, 38968 insertions(+), 3809 deletions(-) diff --cc setup.py index c5329d8,c0487b1..7912924 --- a/setup.py +++ b/setup.py @@@ -1,8 -1,10 +1,11 @@@ #!/usr/bin/env python #-*- coding: utf-8 -*- +from ooni import __version__ - from setuptools import setup + import os + from os.path import join as pj + import sys + from distutils.core import setup install_requires = [ 'txsocksx>=0.0.2',

1 0

[ooni-probe/develop] Fix #8353, catch error when OpenSSL not compiled with SSLv2 context.
by isis＠torproject.org 26 Jun '13

26 Jun '13

commit abcb946b2d9bc9534b5e5649a3fe3a747a09f84f Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Jun 15 04:12:50 2013 +0000 Fix #8353, catch error when OpenSSL not compiled with SSLv2 context. * Change code to fallback to testing TLSv1 (the default) instead, and display a message to the user that if they really wish to test SSLv2 handshakes that it will be necessary for them to recompile OpenSSL with SSLv2 support. --- nettests/experimental/tls_handshake.py | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/nettests/experimental/tls_handshake.py b/nettests/experimental/tls_handshake.py index 83b2868..5da2e8b 100644 --- a/nettests/experimental/tls_handshake.py +++ b/nettests/experimental/tls_handshake.py @@ -88,7 +88,12 @@ class SSLContextError(usage.UsageError): errors = { 'NO_CONTEXT': 'No SSL/TLS context chosen! Defaulting to TLSv1.', 'INCOMPATIBLE': str("Testing TLSv1 (option '--tls1') is incompatible " - + "with testing SSL ('--ssl2' and '--ssl3').") } + + "with testing SSL ('--ssl2' and '--ssl3')."), + 'MISSING_SSLV2': str("Your version of OpenSSL was compiled without " + + "support for SSLv2. This is normal on newer " + + "versions of OpenSSL, but it means that you " + + "will be unable to test SSLv2 handshakes " + + "without recompiling OpenSSL."), } def __init__(self, message): if message in self.errors.keys(): @@ -164,12 +169,22 @@ class HandshakeTest(nettest.NetTestCase): except SSLContextError as sce: log.err(sce.message) finally: log.msg('Defaulting to testing only TLSv1.') elif options['ssl2']: - if not options['ssl3']: - self.context = SSL.Context(SSL.SSLv2_METHOD) - else: - self.context = SSL.Context(SSL.SSLv23_METHOD) + try: + if not options['ssl3']: + context = SSL.Context(SSL.SSLv2_METHOD) + else: + context = SSL.Context(SSL.SSLv23_METHOD) + except ValueError as ve: + log.err(ve.message) + try: raise SSLContextError('MISSING_SSLV2') + except SSLContextError as sce: + log.err(sce.message) + log.msg("Falling back to testing only TLSv1.") + context = SSL.Context(SSL.TLSv1_METHOD) elif options['ssl3']: - self.context = SSL.Context(SSL.SSLv3_METHOD) + context = SSL.Context(SSL.SSLv3_METHOD) + ## finally, reset the context if the user's choice was okay: + if context: self.context = context ## if we weren't given a file with a list of ciphersuites to use, ## then use the firefox default list:

1 0