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

[flashproxy/master] Refactoring and formatting changes about the "lang" parameter.
by dcf＠torproject.org 04 May '13

04 May '13

commit c8f7f2b17fa37a169928e2cf2ed98c9411b5ce3d Author: David Fifield <david(a)bamsoftware.com> Date: Sat May 4 12:14:12 2013 -0700 Refactoring and formatting changes about the "lang" parameter. --- proxy/flashproxy.js | 60 ++++++++++++++++++++++---------------------------- 1 files changed, 26 insertions(+), 34 deletions(-) diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index 719fba5..13ce055 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -43,14 +43,8 @@ * disables the limit. The default is DEFAULT_RATE_LIMIT. There is a * sanity-check minimum of "10K". * - * lang=<LANGUAGE> - * What language in which to display the Flashproxy badge. - * We use the IETF BCP 47 standard for language tags. - * See http://www.w3.org/International/articles/language-tags/ for a - * description of the standard and - * http://www.iana.org/assignments/language-subtag-registry - * for the full list of possible values. - * + * lang=<CODE> + * Display language of the badge, as an IETF language tag. */ /* WebSocket links. @@ -81,18 +75,6 @@ var DEFAULT_RATE_LIMIT = undefined; var MIN_RATE_LIMIT = 10 * 1024; var RATE_LIMIT_HISTORY = 5.0; -/* Set default language for flashproxy badge, and define alt strings for the - different languages - */ -var DEFAULT_LANGUAGE = "en"; - -/* List of supported languages for the flashproxy badge with alt text. */ -var LANGUAGES = { - "en": { filename: "badge-en.png", alt: "Internet Freedom"}, - "de": { filename: "badge-de.png", alt: "Internetfreiheit"}, - "ru": { filename: "badge-ru.png", alt: "Свобода Интернета"} -}; - /* Name of cookie that controls opt-in/opt-out. */ var OPT_IN_COOKIE = "flashproxy-allow"; @@ -876,14 +858,26 @@ function escape_html(s) { return s.replace(/&<>'"/, function(x) { return HTML_ESCAPES[x] }); } -function get_badge_filename_and_alt() { - //Check to see that a language argument was provided - var lang_code=get_param_string(query,"lang",DEFAULT_LANGUAGE); - - //If there's no localization for that language, default to English. - if(LANGUAGES[lang_code] === undefined) - return { filename: "badge.png", alt: "Internet Freedom" }; - else return LANGUAGES[lang_code]; +var LOCALIZATIONS = { + "en": { filename: "badge-en.png", text: "Internet Freedom" }, + "de": { filename: "badge-de.png", text: "Internetfreiheit" }, + "ru": { filename: "badge-ru.png", text: "Свобода Интернета" } +}; +var DEFAULT_LOCALIZATION = { filename: "badge.png", text: "Internet Freedom" }; +/* Return an object with "filename" and "text" keys appropriate for the language + code in the "lang" query string parameter. Returns a default value if no + language is specified. */ +function get_badge_localization() { + var code, result; + + code = get_param_string(query, "lang"); + if (code === undefined) + return DEFAULT_LOCALIZATION; + result = LOCALIZATIONS[code]; + if (result === undefined) + return DEFAULT_LOCALIZATION; + + return result; } /* The usual embedded HTML badge. The "elem" member is a DOM element that can be @@ -892,7 +886,7 @@ function Badge() { /* Number of proxy pairs currently connected. */ this.num_proxy_pairs = 0; - var table, tr, td, a, img, img_info; + var table, tr, td, a, img; table = document.createElement("table"); tr = document.createElement("tr"); @@ -904,11 +898,9 @@ function Badge() { a.setAttribute("target", "_blank"); td.appendChild(a); img = document.createElement("img"); - - img_info=get_badge_filename_and_alt(); - img.setAttribute("src", img_info.filename); - img.setAttribute("alt", img_info.alt); - + var localization = get_badge_localization(); + img.setAttribute("src", localization.filename); + img.setAttribute("alt", localization.text); a.appendChild(img); this.elem = table;

1 0

[flashproxy/master] Export badge-{en,de,ru}.png. Symlink badge.png → badge-en.png.
by dcf＠torproject.org 04 May '13

04 May '13

commit 40ade97c7128637d95685fdef5792674051c34d8 Author: David Fifield <david(a)bamsoftware.com> Date: Sat May 4 11:37:30 2013 -0700 Export badge-{en,de,ru}.png. Symlink badge.png → badge-en.png. --- proxy/badge-de.png | Bin 0 -> 282 bytes proxy/badge-en.png | Bin 0 -> 254 bytes proxy/badge-ru.png | Bin 0 -> 387 bytes proxy/badge.png | Bin 254 -> 12 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/proxy/badge-de.png b/proxy/badge-de.png new file mode 100644 index 0000000..f00fec6 Binary files /dev/null and b/proxy/badge-de.png differ diff --git a/proxy/badge-en.png b/proxy/badge-en.png new file mode 100644 index 0000000..068cf78 Binary files /dev/null and b/proxy/badge-en.png differ diff --git a/proxy/badge-ru.png b/proxy/badge-ru.png new file mode 100644 index 0000000..9bfc626 Binary files /dev/null and b/proxy/badge-ru.png differ diff --git a/proxy/badge.png b/proxy/badge.png deleted file mode 100644 index 068cf78..0000000 Binary files a/proxy/badge.png and /dev/null differ diff --git a/proxy/badge.png b/proxy/badge.png new file mode 120000 index 0000000..fdd103c --- /dev/null +++ b/proxy/badge.png @@ -0,0 +1 @@ +badge-en.png \ No newline at end of file

1 0

[oonib/master] Fix formatting in the README which was causes half the page show up as code.
by isis＠torproject.org 04 May '13

04 May '13

commit 0f1625658aef7252f4c0bb908b17881f49d76639 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat May 4 17:41:50 2013 +0000 Fix formatting in the README which was causes half the page show up as code. * [ci skip] CI unneeded; docfix. --- README.md | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index fd3380e..14a30be 100644 --- a/README.md +++ b/README.md @@ -88,8 +88,7 @@ If you want to use the HTTPS test helper, you will need to create a certificate: rm server.csr If you decide to put your certificate and key somewhere else, don't forget to -update oonib.conf options ```helpers.ssl.private_key``` and -```helpers.ssl.certificate```! +update oonib.conf options ```helpers.ssl.private_key``` and ```helpers.ssl.certificate``` ! ## Redirect low ports with iptables The following iptables commands will map connections on low ports to those @@ -104,13 +103,13 @@ bound by oonib: # Map port 53 tcp to config.helpers.dns.tcp_port (default: 57005) iptables -t nat -A PREROUTING -p tcp -m tcp --dport 53 -j REDIRECT --tor-ports -# (For Experts Only) Tor2webmode: +# (For Experts Only) Tor2webmode: +**WARNING**: provides no anonymity! Use only if you know what you are doing! +Tor2webmode will improve the performance of the collector Hidden Service by +discarding server-side anonymity. -WARNING: provides no anonymity! Use only if you know what you are doing! -Tor2webmode will improve the performance of the collector Hidden Service -by discarding server-side anonymity. - -You will need to build Tor from source. At the time of writing, the latest stable Tor is tor-0.2.3.25. You should use the most recent stable Tor. +You will need to build Tor from source. At the time of writing, the latest +stable Tor is tor-0.2.3.25. You should use the most recent stable Tor. Example:

1 0

[oonib/master] Add Vagrantfile for automating testing deploying of oonib
by isis＠torproject.org 04 May '13

04 May '13

commit 4edc04b154305d3e05bbab81f5894549229dbe1a Author: Arturo Filastò <art(a)fuffa.org> Date: Sat May 4 16:41:14 2013 +0200 Add Vagrantfile for automating testing deploying of oonib --- Vagrantfile | 164 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 164 insertions(+), 0 deletions(-) diff --git a/Vagrantfile b/Vagrantfile new file mode 100644 index 0000000..01e401a --- /dev/null +++ b/Vagrantfile @@ -0,0 +1,164 @@ +# -*- mode: ruby -*- +# vi: set ft=ruby : + +Vagrant.configure("2") do |config| + # All Vagrant configuration is done here. The most common configuration + # options are documented and commented below. For a complete reference, + # please see the online documentation at vagrantup.com. + + # Every Vagrant virtual environment requires a box to build off of. + config.vm.box = "precise32" + + # The url from where the 'config.vm.box' box will be fetched if it + # doesn't already exist on the user's system. + config.vm.box_url = "http://files.vagrantup.com/precise32.box" + + # Create a forwarded port mapping which allows access to a specific port + # within the machine from a port on the host machine. In the example below, + # accessing "localhost:8080" will access port 80 on the guest machine. + # config.vm.network :forwarded_port, guest: 80, host: 8080 + + # Create a private network, which allows host-only access to the machine + # using a specific IP. + # config.vm.network :private_network, ip: "192.168.33.10" + + # Create a public network, which generally matched to bridged network. + # Bridged networks make the machine appear as another physical device on + # your network. + # config.vm.network :public_network + + # Share an additional folder to the guest VM. The first argument is + # the path on the host to the actual folder. The second argument is + # the path on the guest to mount the folder. And the optional third + # argument is a set of non-required options. + config.vm.synced_folder ".", "/data/oonib" + + # Provider-specific configuration so you can fine-tune various + # backing providers for Vagrant. These expose provider-specific options. + # Example for VirtualBox: + # + # config.vm.provider :virtualbox do |vb| + # # Don't boot with headless mode + # vb.gui = true + # + # # Use VBoxManage to customize the VM. For example to change memory: + # vb.customize ["modifyvm", :id, "--memory", "1024"] + # end + # + # View the documentation for the provider you're using for more + # information on available options. + + # Enable provisioning with Puppet stand alone. Puppet manifests + # are contained in a directory path relative to this Vagrantfile. + # You will need to create the manifests directory and a manifest in + # the file precise32.pp in the manifests_path directory. + # + # An example Puppet manifest to provision the message of the day: + # + # # group { "puppet": + # # ensure => "present", + # # } + # # + # # File { owner => 0, group => 0, mode => 0644 } + # # + # # file { '/etc/motd': + # # content => "Welcome to your Vagrant-built virtual machine! + # # Managed by Puppet.\n" + # # } + # + # config.vm.provision :puppet do |puppet| + # puppet.manifests_path = "manifests" + # puppet.manifest_file = "init.pp" + # end + + # Enable provisioning with chef solo, specifying a cookbooks path, roles + # path, and data_bags path (all relative to this Vagrantfile), and adding + # some recipes and/or roles. + # + # config.vm.provision :chef_solo do |chef| + # chef.cookbooks_path = "../my-recipes/cookbooks" + # chef.roles_path = "../my-recipes/roles" + # chef.data_bags_path = "../my-recipes/data_bags" + # chef.add_recipe "mysql" + # chef.add_role "web" + # + # # You may also specify custom JSON attributes: + # chef.json = { :mysql_password => "foo" } + # end + + # Enable provisioning with chef server, specifying the chef server URL, + # and the path to the validation key (relative to this Vagrantfile). + # + # The Opscode Platform uses HTTPS. Substitute your organization for + # ORGNAME in the URL and validation key. + # + # If you have your own Chef Server, use the appropriate URL, which may be + # HTTP instead of HTTPS depending on your configuration. Also change the + # validation key to validation.pem. + # + # config.vm.provision :chef_client do |chef| + # chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME" + # chef.validation_key_path = "ORGNAME-validator.pem" + # end + # + # If you're using the Opscode platform, your validator client is + # ORGNAME-validator, replacing ORGNAME with your organization name. + # + # If you have your own Chef Server, the default validation client name is + # chef-validator, unless you changed the configuration. + # + # chef.validation_client_name = "ORGNAME-validator" +end + +$setup_script = <<SCRIPT +apt-get -y install curl python-setuptools python-dev + +echo "Updating to the latest version of PIP" +cd /tmp/ + +curl -O https://raw.github.com/pypa/pip/master/contrib/get-pip.py +python ./get-pip.py ## pip (>=1.3.0) is recommended for security reasons + +sudo update-alternatives --install /usr/bin/pip pip /usr/local/bin/pip 0 + +echo "Installing virtualenv and virtualenvwrapper..." + +pip install --upgrade virtualenv virtualenvwrapper +export WORKON_HOME=~/.virtualenvs && mkdir -p $WORKON_HOME + +source /usr/local/bin/virtualenvwrapper.sh + +mkvirtualenv -a $PWD --unzip-setuptools --setuptools --no-site-packages oonib + +echo "Installing Tor..." + +echo "deb http://deb.torproject.org/torproject.org precise main" >> /etc/apt/source.list + +gpg --keyserver keys.gnupg.net --recv 886DDD89 +gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | apt-key add - + +apt-get update +apt-get install deb.torproject.org-keyring tor tor-geoipdb + +cd /data/oonib + +echo "Generating SSL keys" + +openssl genrsa -out private.key 4096 +openssl req -new -key private.key -out server.csr -subj '/CN=www.example.com/O=Example/C=AU' + +openssl x509 -req -days 365 -in server.csr -signkey private.key -out certificate.crt + +cp oonib.conf.example oonib.conf + +echo "Installing oonib depedencies" +pip install -r requirements.txt --use-mirrors + +echo "Installing oonib" +python setup.py install + +SCRIPT + +Vagrant.configure("2") do |config| + config.vm.provision :shell, :inline => $setup_script +end

1 0

[oonib/master] Merge branch 'fix/install-requirements' into develop
by isis＠torproject.org 04 May '13

04 May '13

commit cf31c9783f520552239ba5290679a25c0ea3e591 Merge: 848b73f 30a1e07 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat May 4 15:20:40 2013 +0000 Merge branch 'fix/install-requirements' into develop README.md | 3 --- scripts/init/initialize.sh | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-)

1 0

[oonib/master] Fix indendation of setup.py
by isis＠torproject.org 04 May '13

04 May '13

commit 59bba75c9934eb52cf516c8a6d05d953b9c73590 Author: Arturo Filastò <art(a)fuffa.org> Date: Sat May 4 16:41:42 2013 +0200 Fix indendation of setup.py Skip comments and requirements directives --- setup.py | 34 ++++++++++++++++++---------------- 1 files changed, 18 insertions(+), 16 deletions(-) diff --git a/setup.py b/setup.py index 6151a72..45a7908 100644 --- a/setup.py +++ b/setup.py @@ -2,24 +2,26 @@ from __future__ import with_statement from setuptools import setup, find_packages def get_requirements(): - with open('requirements.txt', 'r') as f: - requirements = f.read().splitlines() + with open('requirements.txt', 'r') as f: + requirements = f.read().splitlines() - # For urls such as https://hg.secdev.org/scapy/archive/tip.zip#egg=scapy in - # requirements.txt we need to add the package name to install_requires and - # the entire url to dependency_links. That way setuptools will be able to - # satisfy the dependency using that url (as long as it is in standard sdist - # format, a single .py file or an egg). - pypi_packages = [] - dependency_links = [] - for package_desc in requirements: - if '#egg=' in package_desc: - dependency_links.append(package_desc) - pypi_packages.append(package_desc.split('#egg=')[-1]) - else: - pypi_packages.append(package_desc) + # For urls such as https://hg.secdev.org/scapy/archive/tip.zip#egg=scapy in + # requirements.txt we need to add the package name to install_requires and + # the entire url to dependency_links. That way setuptools will be able to + # satisfy the dependency using that url (as long as it is in standard sdist + # format, a single .py file or an egg). + pypi_packages = [] + dependency_links = [] + for package_desc in requirements: + if package_desc.startswith("#") or package_desc.startswith("-i"): + continue + if '#egg=' in package_desc: + dependency_links.append(package_desc) + pypi_packages.append(package_desc.split('#egg=')[-1]) + else: + pypi_packages.append(package_desc) - return pypi_packages, dependency_links + return pypi_packages, dependency_links install_requires, dependency_links = get_requirements() setup(

1 0

[oonib/master] Add a note on how to test oonib with vagrant
by isis＠torproject.org 04 May '13

04 May '13

commit 848b73fa3aa4875ec508d79a1aba61920da40dbd Author: Arturo Filastò <art(a)fuffa.org> Date: Sat May 4 16:45:00 2013 +0200 Add a note on how to test oonib with vagrant --- README.md | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/README.md b/README.md index 06d5013..bd50347 100644 --- a/README.md +++ b/README.md @@ -161,3 +161,13 @@ The following supervisord config will use the virtual environment in autostart=true user=oonib directory=/home/oonib/ + +# Testing with vagrant + +To test the deployment of oonib you may use [vagrant](http://www.vagrantup.com). + +Once installed you will be able to install oonib in the virtual machine via: + +``` +vagrant up +```

1 0

[oonib/master] Fix missing "#egg=scapy" specification in requirements.txt.
by isis＠torproject.org 04 May '13

04 May '13

commit 309d1b83e9d358d963dce64e8ef86529155c70e9 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Apr 19 18:57:38 2013 +0000 Fix missing "#egg=scapy" specification in requirements.txt. --- requirements.txt | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/requirements.txt b/requirements.txt index e647724..5a21cf2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,13 +7,10 @@ docutils>=0.9.1 ipaddr>=2.1.10 pyOpenSSL>=0.13 pygeoip>=0.2.5 -# -# This is a Tor Project mirror with valid SSL/TLS certs that is stable and fast -# # Originally fetched from the hg repo on secdev.org: # https://hg.secdev.org/scapy/archive/tip.zip#egg=scapy -# Mirrored on Tor's webserver: -https://people.torproject.org/~ioerror/src/mirrors/ooniprobe/scapy-02-25-2013-tip.zip#egg= +# This is a Tor Project mirror with valid SSL/TLS certs that is stable and fast: +https://people.torproject.org/~ioerror/src/mirrors/ooniprobe/scapy-02-25-2013-tip.zip#egg=scapy storm>=0.19 transaction>=1.3.0 txtorcon

1 0

[oonib/master] Update install documentation.
by isis＠torproject.org 04 May '13

04 May '13

commit 1eb5b25a39eb202527081df29a82df1e5eff9cfb Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Apr 19 18:58:33 2013 +0000 Update install documentation. * Add set of commands for getting oonib up and running, with a safe version of pip, in a virtualenv. --- README.md | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-) diff --git a/README.md b/README.md index 78777ee..ae0d52b 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,31 @@ The extra dependencies necessary to run OONIB are: * twisted-names * cyclone: https://github.com/fiorix/cyclone -We recommend that you use a python virtualenv. See OONI's README.md. +We recommend that you use a python virtualenv. The recommended commands for +setting up an ooni-backend are: + + # Get git, python, and setuptools: + sudo apt-get install git python python-setuptools + cd + # Grab the get-pip installer to make sure we have pip>=1.3.0 [1] + curl -O https://raw.github.com/pypa/pip/master/contrib/get-pip.py + sudo python ./get-pip.py ## pip (>=1.3.0) is recommended for security reasons + # We recommend using a virtualenv and virtualenvwrapper makes this easier: + sudo pip install virtualenv virtualenvwrapper + # Setup the virtualenv directory: + export WORKON_HOME=~/.virtualenvs && mkdir -p $WORKON_HOME + source /usr/local/bin/virtualenvwrapper.sh + # Clone ooni-backend: + git clone https://github.com/TheTorProject/ooni-backend.git + cd ooni-backend + # Create the virtualenv for ooni-backend... + mkvirtualenv -a $PWD --unzip-setuptools --setuptools --no-site-packages oonib + # ...and install ooni-backend (sudo is not necessary since we're in a virtualenv): + python setpy.py install + +[1] Note: pip>=1.3.0 is recommended because it included several security + patches, including using forcing the use of HTTPS and checking package hash + sums before installation. # Generate self signed certs for OONIB

1 0

[oonib/master] Add python2.7-dev to the commands for installing dependencies.
by isis＠torproject.org 04 May '13

04 May '13

commit 42c8bdf3ad0ca4900faea3534af3afeb3eb90763 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Apr 19 19:13:12 2013 +0000 Add python2.7-dev to the commands for installing dependencies. * Change commands to explicitly require Python2.7, because we can guarantee that version works. --- README.md | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/README.md b/README.md index ae0d52b..bcc3a6b 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ We recommend that you use a python virtualenv. The recommended commands for setting up an ooni-backend are: # Get git, python, and setuptools: - sudo apt-get install git python python-setuptools + sudo apt-get install git python2.7 python2.7-dev python-setuptools cd # Grab the get-pip installer to make sure we have pip>=1.3.0 [1] curl -O https://raw.github.com/pypa/pip/master/contrib/get-pip.py

1 0