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

[ooni-probe/master] Include the GeoIP data files as part of the source distribution
by art＠torproject.org 04 Jan '14

04 Jan '14

commit 6c3accabfe4c7f465afc02593d46bab4b29026a2 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Jan 3 16:05:19 2014 +0100 Include the GeoIP data files as part of the source distribution * Install the geoip data files to /usr/share/geoip --- MANIFEST.in | 7 ++-- data/ooniprobe.conf.sample | 4 +-- requirements.txt | 4 +-- setup.py | 77 ++++++++++++++++++++++++++++++++++++++------ 4 files changed, 76 insertions(+), 16 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index adcc182..92586f8 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,6 +1,7 @@ include README.md ChangeLog.md requirements.txt -recursive-include data/ui/app * recursive-include data/decks * -recursive-include data/inputs * -include data/Makefile +include data/inputs/ +include data/GeoIP.dat +include data/GeoIPASNum.dat +include data/GeoLiteCity.dat include data/ooniprobe.conf.sample diff --git a/data/ooniprobe.conf.sample b/data/ooniprobe.conf.sample index 83c1ebc..8a4e0f7 100644 --- a/data/ooniprobe.conf.sample +++ b/data/ooniprobe.conf.sample @@ -21,7 +21,7 @@ reports: pcap: null collector: 'httpo://nkvphnp3p6agi5qq.onion' advanced: - geoip_data_dir: /usr/share/ooni/ + geoip_data_dir: /usr/share/geoip debug: false # enable if auto detection fails #tor_binary: /usr/sbin/tor @@ -46,7 +46,7 @@ advanced: # How many reports to perform concurrently reporting_concurrency: 15 # Specify here a custom data_dir path - data_dir: /usr/share/ooni/ + data_dir: /usr/share/ooni oonid_api_port: 8042 tor: #socks_port: 8801 diff --git a/requirements.txt b/requirements.txt index 5fb1ff9..638b33b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,8 +5,8 @@ docutils>=0.9.1 ipaddr>=2.1.10 pyOpenSSL>=0.13 # XXX fix this once the following issue is resolved: https://github.com/appliedsec/pygeoip/issues/56 -https://github.com/appliedsec/pygeoip/archive/master.zip -#pygeoip>=0.3.1 +https://github.com/appliedsec/pygeoip/archive/master.zip#egg=pygeoip-0.3.1 +pygeoip>=0.3.1 txtorcon>=0.7 txsocksx>=0.0.2 Pyrex>=0.9.8.6 diff --git a/setup.py b/setup.py index 8eccd4e..f761f30 100644 --- a/setup.py +++ b/setup.py @@ -2,41 +2,101 @@ #-*- coding: utf-8 -*- from ooni import __version__ +import urllib2 import os +import gzip from os.path import join as pj import sys from setuptools import setup -dependency_links = [ - 'https://people.torproject.org/~ioerror/src/mirrors/ooniprobe' -] +def download_geoip_files(): + urls = [ + 'http://www.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz', + 'http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat…', + 'http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz' + ] + for url in urls: + target_gz_file = pj('data', os.path.basename(url)) + target_file = target_gz_file.replace('.gz', '') + + if os.path.isfile(target_file): + print "%s already exists. Skipping." % target_file + continue + + print "Downloading %s" % url + response = urllib2.urlopen(url) + + with open(target_gz_file, 'w+') as f: + f.write(response.read()) + + with open(target_file, 'w+') as f: + gf = gzip.open(target_gz_file, 'rb') + f.write(gf.read()) + gf.close() + + os.unlink(target_gz_file) + +download_geoip_files() usr_share_path = '/usr/share/ooni' # If this is true then it means we are in a virtualenv +# therefore we should not place our data files inside /usr/share/ooni, but +# place them inside the virtual env system prefix. if hasattr(sys, 'real_prefix'): - usr_share_path = pj(sys.prefix, 'share', 'ooni') + usr_share_path = os.path.abspath(pj(sys.prefix, 'share', 'ooni')) + if not os.path.isdir(usr_share_path): + os.makedirs(usr_share_path) 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) + elif line.startswith(' geoip_data_dir: /usr/share/'): + w.write(' geoip_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 = [] + data_files = [( + usr_share_path + '/', + [ + 'data/GeoIP.dat', + 'data/GeoIPASNum.dat', + 'data/GeoLiteCity.dat' + ] + )] +else: + data_files = [( + '/usr/share/geoip/', + [ + 'data/GeoIP.dat', + 'data/GeoIPASNum.dat', + 'data/GeoLiteCity.dat' + ] + )] + 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)) + if file_name.endswith('.pyc'): + continue + elif file_name.endswith('.dat') and \ + file_name.startswith('Geo'): + continue + files.append(pj(root, file_name)) data_files.append([pj(usr_share_path, root.replace('data/', '')), files]) install_requires = [] +dependency_links = [ + 'https://people.torproject.org/~ioerror/src/mirrors/ooniprobe' +] with open('requirements.txt') as f: for line in f: - if line.startswith("#") or line.startswith('http'): + if line.startswith("#"): + continue + if line.startswith('https'): + dependency_links.append(line) continue install_requires.append(line) @@ -54,7 +114,6 @@ setup( 'ooni.nettests.blocking', 'ooni.nettests.third_party', 'ooni.templates', 'ooni.tests', 'ooni.utils'], - scripts=["bin/ooniprobe"], dependency_links=dependency_links, install_requires=install_requires

1 0

[ooni-probe/master] Fix travis build.
by art＠torproject.org 04 Jan '14

04 Jan '14

commit 2f3e334a5eadfbad7aa52e4845f9764aae480b9b Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Jan 4 13:28:48 2014 +0100 Fix travis build. --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0a7ae5b..1ceb9e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,6 @@ python: install: - pip install pyrex - pip install coveralls - - pip install -r requirements.txt --use-mirrors - python setup.py install # command to run tests, e.g. python setup.py test script:

1 0

[ooni-probe/master] REABSE
by art＠torproject.org 04 Jan '14

04 Jan '14

commit d7ef9dd9aa2531b81220956b21a3a029b878a211 Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Jan 4 17:37:54 2014 +0100 REABSE --- ooni/templates/httpt.py | 2 +- ooni/utils/net.py | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/ooni/templates/httpt.py b/ooni/templates/httpt.py index f9b9d36..fdcbc3e 100644 --- a/ooni/templates/httpt.py +++ b/ooni/templates/httpt.py @@ -231,7 +231,7 @@ class HTTPTest(NetTestCase): self.processResponseHeaders(response_headers_dict) try: - content_length = response.headers.getRawHeaders('content-length') + content_length = int(response.headers.getRawHeaders('content-length')[0]) except IndexError: content_length = None diff --git a/ooni/utils/net.py b/ooni/utils/net.py index 1cc1046..845cf4c 100644 --- a/ooni/utils/net.py +++ b/ooni/utils/net.py @@ -65,8 +65,6 @@ class BodyReceiver(protocol.Protocol): def __init__(self, finished, content_length=None, body_processor=None): self.finished = finished self.data = "" - if content_length: - content_length = int(content_length[0]) self.bytes_remaining = content_length self.body_processor = body_processor

1 0

[ooni-probe/master] Fix bug inside of BodyProducer code
by art＠torproject.org 04 Jan '14

04 Jan '14

commit 510e51f8fb4dfde4d445264f40a8353394b97b1a Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Jan 4 16:55:48 2014 +0100 Fix bug inside of BodyProducer code --- ooni/utils/net.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ooni/utils/net.py b/ooni/utils/net.py index 845cf4c..1cc1046 100644 --- a/ooni/utils/net.py +++ b/ooni/utils/net.py @@ -65,6 +65,8 @@ class BodyReceiver(protocol.Protocol): def __init__(self, finished, content_length=None, body_processor=None): self.finished = finished self.data = "" + if content_length: + content_length = int(content_length[0]) self.bytes_remaining = content_length self.body_processor = body_processor

1 0

[ooni-probe/master] Implement workaround a race condition that happens when calling next on generator.
by art＠torproject.org 04 Jan '14

04 Jan '14

commit 8058d81e0dc5307808fd300267e17b5997d1e1dd Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Jan 3 20:03:00 2014 +0100 Implement workaround a race condition that happens when calling next on generator. --- ooni/managers.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ooni/managers.py b/ooni/managers.py index 348343f..f6af282 100644 --- a/ooni/managers.py +++ b/ooni/managers.py @@ -58,6 +58,11 @@ class TaskManager(object): self._run(task) except StopIteration: break + except ValueError as exc: + # XXX this is a workaround the race condition that leads the + # _tasks generator to throw the exception + # ValueError: generator already called. + continue def _run(self, task): """

1 0

[ooni-probe/master] Update the installation and usage sections of the README
by art＠torproject.org 04 Jan '14

04 Jan '14

commit 4eea35a6fcff61b840c087703c9e708c7d6c0506 Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Jan 4 17:55:30 2014 +0100 Update the installation and usage sections of the README * Add a description to every core shipped test --- README.md | 244 ++++---------------- Vagrantfile | 10 +- ooni/nettests/blocking/dnsconsistency.py | 2 +- ooni/nettests/blocking/http_requests.py | 1 + ooni/nettests/blocking/tcp_connect.py | 1 + ooni/nettests/manipulation/daphne.py | 1 + ooni/nettests/manipulation/dnsspoof.py | 1 + .../manipulation/http_header_field_manipulation.py | 1 + ooni/nettests/manipulation/http_host.py | 3 +- .../manipulation/http_invalid_request_line.py | 1 + ooni/nettests/manipulation/traceroute.py | 1 + 11 files changed, 58 insertions(+), 208 deletions(-) diff --git a/README.md b/README.md index 2d0aee1..6f09ca1 100644 --- a/README.md +++ b/README.md @@ -19,14 +19,28 @@ with others, so that you and others may better understand your network? If so, please read this document and we hope ooniprobe will help you to gather network data that will assist you with your endeavors! -## Disclaimer +#### Disclaimer Note: ooni-probe 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. +## Installation -## Getting started with ooniprobe is easy (with Vagrant) +### Linux + +We believe that ooniprobe runs reasonably well on Debian GNU/Linux wheezy as +well as versions of Ubuntu such as natty and later releases. Running ooniprobe +without installing it is supported with the following commands: + +``` +git clone https://git.torproject.org/ooni-probe.git +cd ooni-probe +./setup-dependencies.sh +python setup.py install +``` + +### Other platforms (with Vagrant) 0) [Install Vagrant](http://downloads.vagrantup.com/) and [Install Virtualbox](https://www.virtualbox.org/wiki/Downloads) @@ -34,7 +48,7 @@ probe is a liability for you, please be aware of this risk. On OSX: -If youd don't have it install homebrew http://mxcl.github.io/homebrew/ +If you don't have it install homebrew http://mxcl.github.io/homebrew/ ``` brew install git @@ -68,232 +82,69 @@ ooniprobe will be installed in `/ooni`. ooniprobe blocking/http_requests -f /ooni/inputs/input-pack/alexa-top-1k.txt ``` -## The easy way to prep your system for running ooniprobe - -We believe that ooniprobe runs reasonably well on Debian GNU/Linux wheezy as -well as versions of Ubuntu such as natty and later releases. Running ooniprobe -without installing it is supported with the following commands: - -``` -git clone https://git.torproject.org/ooni-probe.git -cd ooni-probe -./setup-dependencies.sh -./bin/ooniprobe --asciilulz -``` - -## Your first network test - -We run ooniprobe with a test deck - this is a collection of tests in a single -file that tells ooniprobe how to run and what data to check or process: - -``` -./bin/ooniprobe -i decks/before_i_commit.testdeck -``` - -The report output files from the above command will be located in the reports/ -directory of the source code checkout. The report output ends with the .yamloo -suffix. - -## The details - -We haven't actually installed ooniprobe - we just added the ooniprobe python -to your PYTHONPATH. We also installed all of the dependencies with your native -package manager or into a local directory managed by your user. - -## ooniprobe requirements explained - -Basic system requirements: - - * Git: http://git-scm.com/book/en/Getting-Started-Installing-Git - * Python >= 2.6: http://www.python.org/download/releases/ - * pip: http://www.pip-installer.org/en/latest/ - - -## The more detailed way follows - -On Debian or Ubuntu GNU/Linux based systems these can be installed with: - -``` -sudo apt-get install git-core python python-pip python-dev build-essential tor tor-geoipdb tcpdump python-geoip python-docutils python-ipaddr python-scapy python-pyrex -``` - -Other packages that may be of interest: +## Using ooniprobe -``` -libdumbnet python-dumbnet python-libpcap python-pypcap pcapy dnspython -python-virtualenv virtualenvwrapper -``` +**Net test** is a set of measurements to assess what kind of internet censorship is occurring. -The Python dependencies required for running ooniprobe are: +**Decks** are collections of ooniprobe nettests with precabled inputs. - * Tor (>2.2.x): https://torproject.org/ - * Twisted (>12.1.0): https://twistedmatrix.com/trac/ - * PyYAML: http://pyyaml.org/ - * Scapy: http://www.secdev.org/projects/scapy/ - * pypcap: https://code.google.com/p/pypcap/ - * libdnet: https://code.google.com/p/libdnet/ - * txtorcon: https://github.com/meejah/txtorcon - * txsocksx: https://github.com/habnabit/txsocksx - * pygeoip: https://github.com/appliedsec/pygeoip - * parsley: http://launchpad.net/parsley - * docutils: http://docutils.sourceforge.net - * ipaddr: http://code.google.com/p/ipaddr-py/ - * Pyrex: http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex +**Collector** is a service used to report the results of measurements. -## Install Tor +**Test helper** is a service used by a probe for successfully performing it's measurements. -Install the latest version of Tor for your platform: +**Bouncer** is a service used to discover the addresses of test helpers and collectors. -[Download Tor](https://www.torproject.org/download/download.html) +### Configuring ooniprobe -## (Optional) Install obfsproxy +You may edit the configuration for ooniprobe by editing the configuration file +found inside of `~/.ooni/ooniprobe.conf`. -Install the latest version of obfsproxy for your platform. - -[Download Obfsproxy](https://www.torproject.org/projects/obfsproxy.html.en) - -## Configurating a virtual environment - -You are highly recommended to install python packages from inside of a virtual -environment, since pip does not download the packages via SSL and you will need -to install it system wide. - -This will require you to have installed virtualenv. - -``` -sudo apt-get install python-virtualenv virtualenvwrapper -``` - -To create a new virtual environment do - -``` -mkdir $HOME/.virtualenvs -mkvirtualenv ooni-probe -``` - -You will automatically enter the environment. To re-enter this environment in the future, type: - -``` -workon ooni-probe -``` - -For convenience, you may want to add the following to your .bashrc: - -``` -if [ -e ~/ooni-probe/bin ]; then - export PATH=~/ooni-probe/bin:$PATH -fi -if [ -e ~/ooni-probe ]; then - export PYTHONPATH=$PYTHONPATH:~/ooni-probe -fi -``` - -Add the following to $HOME/.virtualenvs/ooni-probe/bin/postactivate to automatically cd into the working directory upon activation. - -``` -if [ -e ~/ooni-probe ] ; then - cd ~/ooni-probe -fi -``` - -## Installing ooni-probe - -Clone the ooniprobe repository: - -``` -git clone https://git.torproject.org/ooni-probe.git -cd ooni-probe -``` - -Then install OONI with: - -``` -pip install -r requirements.txt -``` - -If you are not in a virtualenv you will have to run the above command as root: - -``` -sudo pip install -r requirements.txt -``` - -## Install libdnet and pypcap python bindings - -It's ideal to install these manually since the ones in debian or ubuntu are not -up to date. - -The version of pypcap and libdnet ooniprobe is current tested with are -libdnet-1.12 and pypcap 1.1, any other version should be considered untested. +By default ooniprobe will not include personal identifying information in the +test result, nor create a pcap file. This behavior can be personalized. -For libdnet: +### Running decks -``` -wget https://libdnet.googlecode.com/files/libdnet-1.12.tgz -tar xzf libdnet-1.12.tgz -cd libdnet-1.12 -./configure && make -cd python/ -python setup.py install -cd ../../ && rm -rf libdnet-1.12* -``` +You will find all the installed decks inside of `/usr/share/ooni/decks`. -For pypcap: +You may then run a deck by using the command line option `-i`: ``` -git clone https://github.com/hellais/pypcap -cd pypcap/ -pip install pyrex -python setup.py install -cd ../ && rm -rf pypcap +ooniprobe -i /usr/share/decks/basic.deck ``` -## Including your geo data in the test report +### Running net tests -Including geografical information on where your probe is located helps us -better assess the value of the test. You can personalize these setting from -inside of ooniprobe.conf - -If you wish to include geografical data in the test report, you will have to go -to the data/ directory and run: +You may list all the installed stable net tests with: ``` -make geoip +ooniprobe -s ``` -Then edit your ooniprobe.conf to point to the absolute path of where the data/ -directory is located for example: +You may then run a nettest by specifying it's name for example: ``` -geoip_data_dir: /home/your_user/ooni-probe/data/ +ooniprobe manipulation/http_header_field_manipulation ``` -## Running some tests - -To see the possible command line options run: +It is also possible to specify inputs to tests as URLs: ``` -./bin/ooniprobe --help +ooniprobe blocking/http_requests -f httpo://ihiderha53f36lsd.onion/input/37e60e13536f6afe47a830bfb6b371b5cf65da66d7ad65137344679b24fdccd1 ``` -For interesting tests to run look in the nettests/core/ directory. - -To run a test you can do so with: +You can find the result of the test in your current working directory. -``` -./bin/ooniprobe -o report_file_name path/to/test.py -``` +By default the report result will be collected by the default ooni collector +and the addresses of test helpers will be obtained from the default bouncer. -Normally tests take options, you can see them with: +You may also specify your own collector or bouncer with the options `-c` and +`-b`. -``` -./bin/ooniprobe -o report_file_name path/to/test.py --help -``` +## (Optional) Install obfsproxy -## Configuration +Install the latest version of obfsproxy for your platform. -By default ooniprobe will not include personal identifying information in the -test result, nor create a pcap file. This behavior can be personalized by -editing your ooniprobe.conf configuration file. +[Download Obfsproxy](https://www.torproject.org/projects/obfsproxy.html.en) ## Bridges and obfsproxy bridges @@ -314,4 +165,3 @@ If your distributation supports capabilities you can avoid needing to run OONI a ``` setcap cap_net_admin,cap_net_raw+eip /path/to/your/virtualenv's/python ``` - diff --git a/Vagrantfile b/Vagrantfile index a4e9fbe..9a9e490 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -18,10 +18,6 @@ export USE_VIRTUALENV=0 ./setup-dependencies.sh -y python setup.py install -cd /usr/share/ooni/ -echo "[+] Building geoip stuff.." -make geoip 2>&1 > /dev/null - mkdir -p ~/.ooni cp /usr/share/ooni/ooniprobe.conf.sample ~/.ooni/ooniprobe.conf @@ -31,12 +27,8 @@ make lists 2>&1 > /dev/null # https://code.google.com/p/pypcap/issues/detail?id=27 # pip install pydnet pypcap -/ooni/bin/oonid -echo "You may now visit http://localhost:8042/ to start running some ooniprobe tests" -echo "" -echo "Or if you are a bit more h4x0r you can ssh into the box and use the ooniprobe CLI" echo "Login using 'vagrant ssh', and dont forget to run ooniprobe as root." -echo "First run: 'sudo su; cd /usr/share/ooni; ooniprobe -i decks/before_i_commit.testdeck'" +echo "First run: 'sudo su; cd /usr/share/ooni; ooniprobe -i decks/basic.testdeck'" SCRIPT diff --git a/ooni/nettests/blocking/dnsconsistency.py b/ooni/nettests/blocking/dnsconsistency.py index 8c02841..f10a48c 100644 --- a/ooni/nettests/blocking/dnsconsistency.py +++ b/ooni/nettests/blocking/dnsconsistency.py @@ -37,7 +37,7 @@ class UsageOptions(usage.Options): class DNSConsistencyTest(dnst.DNSTest): name = "DNS Consistency" - description = "DNS censorship detection test" + description = "Checks to see if the DNS responses from a set of DNS resolvers are consistent." version = "0.6" authors = "Arturo Filastò, Isis Lovecruft" requirements = None diff --git a/ooni/nettests/blocking/http_requests.py b/ooni/nettests/blocking/http_requests.py index c3c72af..790b554 100644 --- a/ooni/nettests/blocking/http_requests.py +++ b/ooni/nettests/blocking/http_requests.py @@ -28,6 +28,7 @@ class HTTPRequestsTest(httpt.HTTPTest): lengths match. """ name = "HTTP Requests Test" + description = "Performs a HTTP GET request over Tor and one over the local network and compares the two results." author = "Arturo Filastò" version = "0.2.3" diff --git a/ooni/nettests/blocking/tcp_connect.py b/ooni/nettests/blocking/tcp_connect.py index 5b432e0..129a2d5 100644 --- a/ooni/nettests/blocking/tcp_connect.py +++ b/ooni/nettests/blocking/tcp_connect.py @@ -15,6 +15,7 @@ class TCPFactory(Factory): class TCPConnectTest(nettest.NetTestCase): name = "TCP Connect" + description = "Performs a TCP connect scan of all the host port combinations given as input." author = "Arturo Filastò" version = "0.1" inputFile = ['file', 'f', None, diff --git a/ooni/nettests/manipulation/daphne.py b/ooni/nettests/manipulation/daphne.py index 09279fa..936111a 100644 --- a/ooni/nettests/manipulation/daphne.py +++ b/ooni/nettests/manipulation/daphne.py @@ -63,6 +63,7 @@ class daphn3Args(usage.Options): class daphn3Test(nettest.NetTestCase): name = "Daphn3" + description = "Bisects the censors fingerprint by mutating the given input packets." usageOptions = daphn3Args inputFile = ['file', 'f', None, 'Specify the pcap or YAML file to be used as input to the test'] diff --git a/ooni/nettests/manipulation/dnsspoof.py b/ooni/nettests/manipulation/dnsspoof.py index 58465d7..82fb325 100644 --- a/ooni/nettests/manipulation/dnsspoof.py +++ b/ooni/nettests/manipulation/dnsspoof.py @@ -23,6 +23,7 @@ class UsageOptions(usage.Options): class DNSSpoof(scapyt.ScapyTest): name = "DNS Spoof" + description = "Used to validate if the type of censorship happening is DNS spoofing or not." author = "Arturo Filastò" version = "0.0.1" timeout = 2 diff --git a/ooni/nettests/manipulation/http_header_field_manipulation.py b/ooni/nettests/manipulation/http_header_field_manipulation.py index 49bc98c..e059c42 100644 --- a/ooni/nettests/manipulation/http_header_field_manipulation.py +++ b/ooni/nettests/manipulation/http_header_field_manipulation.py @@ -42,6 +42,7 @@ class HTTPHeaderFieldManipulation(httpt.HTTPTest): the ones we sent, then we have detected tampering. """ name = "HTTP Header Field Manipulation" + description = "Checks if the HTTP request the server sees is the same as the one that the client has created." author = "Arturo Filastò" version = "0.1.3" diff --git a/ooni/nettests/manipulation/http_host.py b/ooni/nettests/manipulation/http_host.py index 41b21f1..4adb1d3 100644 --- a/ooni/nettests/manipulation/http_host.py +++ b/ooni/nettests/manipulation/http_host.py @@ -34,6 +34,7 @@ class HTTPHost(httpt.HTTPTest): got back matches the input block page. """ name = "HTTP Host" + description = "Tests a variety of different filter bypassing techniques based on the HTTP Host header field." author = "Arturo Filastò" version = "0.2.3" @@ -111,7 +112,7 @@ class HTTPHost(httpt.HTTPTest): with a rule that will allow to detect that the body of the result is that of a censored site. """ - # If we don't see a json array we know that something is wrong for + # If we don't see a json dict we know that something is wrong for # sure if not body.startswith("{"): log.msg("This does not appear to be JSON") diff --git a/ooni/nettests/manipulation/http_invalid_request_line.py b/ooni/nettests/manipulation/http_invalid_request_line.py index 8ba124e..2c99760 100644 --- a/ooni/nettests/manipulation/http_invalid_request_line.py +++ b/ooni/nettests/manipulation/http_invalid_request_line.py @@ -20,6 +20,7 @@ class HTTPInvalidRequestLine(tcpt.TCPTest): ascii letters or numbers ('XxXx' will be 4). """ name = "HTTP Invalid Request Line" + description = "Performs out of spec HTTP requests in the attempt to trigger a proxy error message." version = "0.2" authors = "Arturo Filastò" diff --git a/ooni/nettests/manipulation/traceroute.py b/ooni/nettests/manipulation/traceroute.py index aaa977a..7639060 100644 --- a/ooni/nettests/manipulation/traceroute.py +++ b/ooni/nettests/manipulation/traceroute.py @@ -22,6 +22,7 @@ class UsageOptions(usage.Options): class TracerouteTest(scapyt.BaseScapyTest): name = "Multi Protocol Traceroute Test" + description = "Performs a UDP, TCP, ICMP traceroute with destination port number set to 0, 22, 23, 53, 80, 123, 443, 8080 and 65535" author = "Arturo Filastò" version = "0.2"

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 04 Jan '14

04 Jan '14

commit 3de155d42c214e66f1e6ed7a890cad459d293d67 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 4 12:46:10 2014 +0000 Update translations for tor-launcher-properties --- ro/torlauncher.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ro/torlauncher.properties b/ro/torlauncher.properties index 59f2122..72f5a31 100644 --- a/ro/torlauncher.properties +++ b/ro/torlauncher.properties @@ -6,11 +6,11 @@ torlauncher.error_title=Lansator Tor torlauncher.tor_exited=Tor a ieșit în mod neașteptat. torlauncher.please_restart_app=Vă rugăm reporniți aplicația. torlauncher.tor_controlconn_failed=Nu sa putut conecta la portul de control Tor. -# torlauncher.tor_failed_to_start=Tor failed to start. -# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.\n\n%S +torlauncher.tor_failed_to_start=Tor nu poate porni. +torlauncher.tor_bootstrap_failed=Tor nu se poate conecta la rețaua Tor. -torlauncher.unable_to_start_tor=Unable to start Tor. -# torlauncher.tor_missing=The Tor executable is missing. +torlauncher.unable_to_start_tor=Tor nu poate porni. +torlauncher.tor_missing=Fișierul executabil Tor lipsește. torlauncher.torrc_missing=Fișierul torrc lipsește # torlauncher.datadir_missing=The Tor data directory does not exist. # torlauncher.password_hash_missing=Failed to get hashed password.

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 04 Jan '14

04 Jan '14

commit 60a9d5da9c5f2a281a2e8adb4b3284b7d66694ce Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 4 12:16:14 2014 +0000 Update translations for tor-launcher-network-settings --- ro/network-settings.dtd | 64 +++++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/ro/network-settings.dtd b/ro/network-settings.dtd index 9b00d94..b4b8131 100644 --- a/ro/network-settings.dtd +++ b/ro/network-settings.dtd @@ -1,55 +1,55 @@ -<!ENTITY torsettings.dialog.title ""> +<!ENTITY torsettings.dialog.title "Tor Network Settings">  -<!ENTITY torsettings.prompt ""> +<!ENTITY torsettings.prompt "Before the Tor Browser Bundle tries to connect to the Tor network, you need to provide information about this computer's Internet connection."> <!ENTITY torSettings.yes "Da"> <!ENTITY torSettings.no "Nu"> -<!ENTITY torSettings.firstQuestion ""> -<!ENTITY torSettings.configurePrompt1 ""> -<!ENTITY torSettings.configurePrompt2 ""> -<!ENTITY torSettings.configure ""> -<!ENTITY torSettings.connectPrompt1 ""> -<!ENTITY torSettings.connectPrompt2 ""> -<!ENTITY torSettings.connect ""> +<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> +<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> +<!ENTITY torSettings.configurePrompt2 "I need to configure network settings."> +<!ENTITY torSettings.configure "Configure"> +<!ENTITY torSettings.connectPrompt1 "This computer's Internet connection is clear of obstacles."> +<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> +<!ENTITY torSettings.connect "Conectare"> -<!ENTITY torSettings.proxyQuestion ""> +<!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?">  -<!ENTITY torSettings.proxyHelp ""> -<!ENTITY torSettings.enterProxy ""> -<!ENTITY torSettings.firewallQuestion ""> -<!ENTITY torSettings.firewallHelp ""> -<!ENTITY torSettings.enterFirewall ""> -<!ENTITY torSettings.bridgeQuestion ""> +<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> +<!ENTITY torSettings.enterProxy "Enter the proxy settings."> +<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> +<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting."> +<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> +<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">  -<!ENTITY torsettings.startingTor ""> +<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> <!ENTITY torsettings.restart "Reporneste"> -<!ENTITY torsettings.optional ""> +<!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox ""> -<!ENTITY torsettings.useProxy.type ""> +<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet"> +<!ENTITY torsettings.useProxy.type "Proxy Type:"> <!ENTITY torsettings.useProxy.address "Adresă:"> -<!ENTITY torsettings.useProxy.address.placeholder ""> +<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> <!ENTITY torsettings.useProxy.username "Nume utilizator:"> <!ENTITY torsettings.useProxy.password "Parola:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox ""> +<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Porturi permise:"> -<!ENTITY torsettings.useBridges.checkbox ""> -<!ENTITY torsettings.useBridges.label ""> -<!ENTITY torsettings.useBridges.placeholder ""> - -<!ENTITY torsettings.copyLog ""> -<!ENTITY torsettings.bridgeHelpTitle ""> -<!ENTITY torsettings.bridgeHelp1 ""> -<!ENTITY torsettings.bridgeHelp2 ""> -<!ENTITY torsettings.bridgeHelp3 ""> -<!ENTITY torsettings.bridgeHelp4 ""> +<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> +<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> +<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port"> + +<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> +<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> +<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges which are hidden relays that are more difficult to block."> +<!ENTITY torsettings.bridgeHelp2 "To obtain some bridge relays, use a web browser to visit the following page: https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3 "Another way to find public bridge addresses is to send mail to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from an email address at one of the following domains: gmail.com or yahoo.com."> +<!ENTITY torsettings.bridgeHelp4 "You can also request bridge relays by sending mail to help(a)rt.torproject.org.">

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 04 Jan '14

04 Jan '14

commit 169e36e55f6112f6e39b5c48933e0fa16b90c39f Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 4 12:16:07 2014 +0000 Update translations for tor-launcher-properties --- ro/torlauncher.properties | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ro/torlauncher.properties b/ro/torlauncher.properties index 231ab2c..59f2122 100644 --- a/ro/torlauncher.properties +++ b/ro/torlauncher.properties @@ -3,29 +3,29 @@ torlauncher.error_title=Lansator Tor -# torlauncher.tor_exited=Tor unexpectedly exited. -# torlauncher.please_restart_app=Please restart this application. -# torlauncher.tor_controlconn_failed=Could not connect to Tor control port. +torlauncher.tor_exited=Tor a ieșit în mod neașteptat. +torlauncher.please_restart_app=Vă rugăm reporniți aplicația. +torlauncher.tor_controlconn_failed=Nu sa putut conecta la portul de control Tor. # torlauncher.tor_failed_to_start=Tor failed to start. # torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.\n\n%S -# torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S +torlauncher.unable_to_start_tor=Unable to start Tor. # torlauncher.tor_missing=The Tor executable is missing. -# torlauncher.torrc_missing=The torrc file is missing. +torlauncher.torrc_missing=Fișierul torrc lipsește # torlauncher.datadir_missing=The Tor data directory does not exist. # torlauncher.password_hash_missing=Failed to get hashed password. # torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S # torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S -# torlauncher.ensure_tor_is_running=Please ensure that Tor is running. +torlauncher.ensure_tor_is_running=Vă rugăm asigurați-vă că Tor este pornit. torlauncher.error_proxy_addr_missing=Pentru a folosi Tor ca proxy, prin care să accesaţi internetul, este nevoie să specificaţi atât o adresă de IP, cât şi un port. torlauncher.error_proxy_type_missing=Trebuie să selectezi un tip de proxy. torlauncher.error_bridges_missing=Trebuie sa specifici una sau mai multe poduri. -# torlauncher.connect=Connect +torlauncher.connect=Conectare torlauncher.quit=Revocare torlauncher.quit_win=Ieşire torlauncher.done=Gata -# torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance=Pentru asistență, contactați

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 04 Jan '14

04 Jan '14

commit 0354d9eaa0af10f7126082070a718bbf1ac24e3b Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 4 05:45:54 2014 +0000 Update translations for torcheck_completed --- ja/torcheck.po | 55 +++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 47 insertions(+), 8 deletions(-) diff --git a/ja/torcheck.po b/ja/torcheck.po index e1d408b..3675d36 100644 --- a/ja/torcheck.po +++ b/ja/torcheck.po @@ -1,17 +1,18 @@ # TorCheck gettext template -# Copyright (C) 2008-2012 The Tor Project, Inc +# Copyright (C) 2008-2013 The Tor Project, Inc # # Translators: # brt <87(a)itokei.info>, 2013 # Chris Harris <praisebe4him(a)gmail.com>, 2012 +# plazmism <gomidori(a)live.jp>, 2014 # Masaki Saito <rezoolab(a)gmail.com>, 2013 # siomiz <>, 2012 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2013-11-06 09:10+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-01-04 05:40+0000\n" +"Last-Translator: plazmism <gomidori(a)live.jp>\n" "Language-Team: Japanese (http://www.transifex.com/projects/p/torproject/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,14 +21,14 @@ msgstr "" "Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" -msgid "Congratulations. Your browser is configured to use Tor." -msgstr "おめでとうございます。あなたのブラウザはTorを使用するように設定されています。" +msgid "Congratulations. This browser is configured to use Tor." +msgstr "おめでとうございます。このブラウザはTorを使用するよう設定されました。" msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " "for further information about using Tor safely. You are now free to browse " "the Internet anonymously." -msgstr "Torを安全に利用するためのさらなる情報を得るには<a href=\"https://www.torproject.org/\">Tor ウェブサイト</a>をご覧ください。あなたは今、匿名でインターネットをブラウズできます。" +msgstr "Torの安全な利用に関する詳細につきましては、<a href=\"https://www.torproject.org/\">Tor ウェブサイト</a>をご覧ください。これからは、自由に匿名でインターネットをブラウズできます。" msgid "There is a security update available for the Tor Browser Bundle." msgstr "Tor Browser Bundleに、利用可能なセキュリティアップデートがあります" @@ -38,7 +39,7 @@ msgid "" msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">ここをクリックしてダウンロードページを表示</a>" msgid "Sorry. You are not using Tor." -msgstr "不成功でした。Torは動作していません。" +msgstr "申し訳ありません。現在Torを使用していません。" msgid "" "If you are attempting to use a Tor client, please refer to the <a " @@ -48,7 +49,7 @@ msgid "" msgstr "Torクライアントを使用しようとしているならば、<a href=\"https://www.torproject.org/\">Torウェブサイト</a>、そして特に<a href=\"https://www.torproject.org/docs/faq#DoesntWork\">Torクライアントを設定するために</a>を参照してください。" msgid "Sorry, your query failed or an unexpected response was received." -msgstr "実行に失敗しました。想定外の応答がありました。" +msgstr "申し訳ございません。クエリが失敗したか、想定外の応答がありました。" msgid "" "A temporary service outage prevents us from determining if your source IP " @@ -57,3 +58,41 @@ msgstr "一時的なサービス停止により、あなたのソースIPアド msgid "Your IP address appears to be: " msgstr "あなたのIPアドレスはこのように表示されます: 　" + +msgid "Are you using Tor?" +msgstr "Torを使用していますか？" + +msgid "This page is also available in the following languages:" +msgstr "また、このページは以下の言語でも利用できます:" + +msgid "For more information about this exit relay, see:" +msgstr "出口リレーに関してのさらなる情報はこちら:" + +msgid "" +"The Tor Project is a US 501(c)(3) non-profit dedicated to the research, " +"development, and education of online anonymity and privacy." +msgstr "Tor Projectはオンラインの匿名性とプライバシーの研究と開発、教育を専門に行うアメリカ合衆国の501(c)(3)に基づく非営利団体です。" + +msgid "Learn More »" +msgstr "詳細を知る »" + +msgid "Go" +msgstr "行く" + +msgid "Short User Manual" +msgstr "簡潔なユーザーマニュアル" + +msgid "Donate to Support Tor" +msgstr "Torをサポートするために寄付する" + +msgid "Tor Q&A Site" +msgstr "Tor Q&A サイト" + +msgid "Volunteer" +msgstr "ボランティア" + +msgid "JavaScript is enabled." +msgstr "JavaScript が有効です。" + +msgid "JavaScript is disabled." +msgstr "JavaScript が無効です。"

1 0