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

[ooni-probe/master] Update debian changelog
by art＠torproject.org 24 Mar '14

24 Mar '14

commit eb01352ab3d580147ff23118a320db65269ffcb6 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Mar 14 17:44:23 2014 +0100 Update debian changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 70a154f..150b378 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ooniprobe (1.0.1-1) stable; urgency=low + + * ooniprobe 1.0.1 + + -- OONI Developers (signing key) <ooni-dev(a)lists.torproject.org> Fri, 14 Mar 2014 17:14:46 +0200 + ooniprobe (1.0.0-rc6-1) stable; urgency=low * ooniprobe 1.0.0-rc6

1 0

[ooni-probe/master] Add /usr/local/bin to $PATH
by art＠torproject.org 24 Mar '14

24 Mar '14

commit 31068203629bc83d31306da7949d6ebc733121b8 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Mar 19 00:47:23 2014 +0100 Add /usr/local/bin to $PATH --- scripts/install_on_planetlab.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install_on_planetlab.sh b/scripts/install_on_planetlab.sh index 123851f..eb75375 100644 --- a/scripts/install_on_planetlab.sh +++ b/scripts/install_on_planetlab.sh @@ -140,7 +140,7 @@ cat /usr/share/ooni/ooniprobe.conf.sample | sed s/'start_tor: true'/'start_tor: mkdir /home/$USER/bridge_reachability/ # Add cronjob to run ooniprobe daily -{ crontab -l; echo "0 0 * * * /usr/local/bin/ooniprobe -c httpo://e2nl5qgtkzp7cibx.onion blocking/bridge_reachability -f /home/$USER/bridge_reachability/bridges.txt -t 300"; } | crontab +{ crontab -l; echo "PATH=\$PATH:/usr/local/bin/\n0 0 * * * /usr/local/bin/ooniprobe -c httpo://e2nl5qgtkzp7cibx.onion blocking/bridge_reachability -f /home/$USER/bridge_reachability/bridges.txt -t 300"; } | crontab sudo /etc/init.d/crond start sudo /sbin/chkconfig crond on sudo chmod 777 /var/mail

1 0

[ooni-probe/master] Make improvements to the setup.py install script.
by art＠torproject.org 24 Mar '14

24 Mar '14

commit b58085b41a655d0b030e5df9d6abac2efa3357e3 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Mar 14 17:21:46 2014 +0100 Make improvements to the setup.py install script. * Download the GeoIP data files directly into the /usr/share directory * Move the logic for overriding the config file keys to settings.py --- ooni/settings.py | 14 +++++++++++- setup.py | 62 ++++++++++++++++++------------------------------------ 2 files changed, 34 insertions(+), 42 deletions(-) diff --git a/ooni/settings.py b/ooni/settings.py index c1071b9..1c4f42d 100644 --- a/ooni/settings.py +++ b/ooni/settings.py @@ -69,7 +69,19 @@ class OConfig(object): target_config_file = os.path.join(self.ooni_home, 'ooniprobe.conf') print "Creating it for you in '%s'." % target_config_file - copyfile(sample_config_file, target_config_file) + usr_share_path = '/usr/share' + if hasattr(sys, 'real_prefix'): + usr_share_path = os.path.abspath(os.path.join(sys.prefix, 'share')) + + with open(sample_config_file) as f: + with open(target_config_file, 'w+') as w: + for line in f: + if line.startswith(' data_dir: '): + w.write(' data_dir: %s\n' % os.path.join(usr_share_path, 'ooni')) + elif line.startswith(' geoip_data_dir: '): + w.write(' geoip_data_dir: %s\n' % os.path.join(usr_share_path, 'GeoIP')) + else: + w.write(line) def read_config_file(self): try: diff --git a/setup.py b/setup.py index 1410dd7..9fff96c 100644 --- a/setup.py +++ b/setup.py @@ -9,14 +9,16 @@ from os.path import join as pj import sys from setuptools import setup -def download_geoip_files(): +def download_geoip_files(dst): 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' ] + if not os.path.exists(dst): + os.makedirs(dst) for url in urls: - target_gz_file = pj('data', os.path.basename(url)) + target_gz_file = pj(dst, os.path.basename(url)) target_file = target_gz_file.replace('.gz', '') if os.path.isfile(target_file): @@ -26,55 +28,35 @@ def download_geoip_files(): print "Downloading %s" % url response = urllib2.urlopen(url) + CHUNK = 4 * 1024 with open(target_gz_file, 'w+') as f: - f.write(response.read()) + while True: + chunk = response.read(CHUNK) + if not chunk: break + f.write(chunk) with open(target_file, 'w+') as f: gf = gzip.open(target_gz_file, 'rb') - f.write(gf.read()) + while True: + chunk = gf.read(CHUNK) + if not chunk: break + f.write(chunk) gf.close() os.unlink(target_gz_file) -download_geoip_files() - -usr_share_path = '/usr/share/ooni' +usr_share_path = '/usr/share' # 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 = 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: '): - w.write(' data_dir: %s\n' % usr_share_path) - elif line.startswith(' geoip_data_dir: '): - 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')) + usr_share_path = os.path.abspath(pj(sys.prefix, 'share')) + +download_geoip_files(pj(usr_share_path, 'GeoIP')) - data_files = [( - usr_share_path + '/', - [ - 'data/GeoIP.dat', - 'data/GeoIPASNum.dat', - 'data/GeoLiteCity.dat' - ] - )] -else: - data_files = [( - '/usr/share/ooni/geoip/', - [ - 'data/GeoIP.dat', - 'data/GeoIPASNum.dat', - 'data/GeoLiteCity.dat' - ] - )] +install_requires = [] +dependency_links = [] +data_files = [] for root, dirs, file_names in os.walk('data/'): files = [] @@ -85,10 +67,8 @@ for root, dirs, file_names in os.walk('data/'): file_name.startswith('Geo'): continue files.append(pj(root, file_name)) - data_files.append([pj(usr_share_path, root.replace('data/', '')), files]) + data_files.append([pj(usr_share_path, 'ooni', root.replace('data/', '')), files]) -install_requires = [] -dependency_links = [] with open('requirements.txt') as f: for line in f: if line.startswith("#"):

1 0

[ooni-probe/master] Merge branch 'master' of github.com:TheTorProject/ooni-probe
by art＠torproject.org 24 Mar '14

24 Mar '14

commit 2bf70e5a7485074c03e451c73a755fdb3eb22f94 Merge: 058dab4 d553127 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Mar 24 16:00:33 2014 +0100 Merge branch 'master' of github.com:TheTorProject/ooni-probe * 'master' of github.com:TheTorProject/ooni-probe: Add required package libpcap0.8-dev Fix links in Documentation. docs/source/index.rst | 8 ++++---- docs/source/tests/dnsconsistency.rst | 4 ++-- docs/source/tests/dnsspoof.rst | 4 ++-- docs/source/tests/http_header_field_manipulation.rst | 4 ++-- docs/source/tests/http_host.rst | 4 ++-- docs/source/tests/http_invalid_request_line.rst | 4 ++-- docs/source/tests/http_requests.rst | 2 +- docs/source/tests/tcpconnect.rst | 2 +- docs/source/tests/traceroute.rst | 2 +- setup-dependencies.sh | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-)

1 0

[ooni-probe/master] Skip tests that require an internet connection if such is not available
by art＠torproject.org 24 Mar '14

24 Mar '14

commit 058dab430435dc8b8b1e7f42796e5f2c95ac296c Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Mar 24 15:59:14 2014 +0100 Skip tests that require an internet connection if such is not available --- ooni/tests/__init__.py | 10 ++++++++++ ooni/tests/test_geoip.py | 3 +++ ooni/tests/test_oonicli.py | 4 ++++ 3 files changed, 17 insertions(+) diff --git a/ooni/tests/__init__.py b/ooni/tests/__init__.py index 5663ccf..2df8646 100644 --- a/ooni/tests/__init__.py +++ b/ooni/tests/__init__.py @@ -1,4 +1,14 @@ +import socket from ooni.settings import config config.logging = False config.advanced.debug = False + +def is_internet_connected(): + s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + try: + s.connect(('torproject.org', 80)) + s.shutdown(2) + return True + except Exception: + return False diff --git a/ooni/tests/test_geoip.py b/ooni/tests/test_geoip.py index 6ae31f3..49d2ea3 100644 --- a/ooni/tests/test_geoip.py +++ b/ooni/tests/test_geoip.py @@ -1,6 +1,7 @@ from twisted.internet import defer from twisted.trial import unittest +from ooni.tests import is_internet_connected from ooni.settings import config from ooni import geoip @@ -17,6 +18,8 @@ class TestGeoIP(unittest.TestCase): @defer.inlineCallbacks def test_probe_ip(self): + if not is_internet_connected(): + self.skipTest("You must be connected to the internet to run this test") probe_ip = geoip.ProbeIP() res = yield probe_ip.lookup() assert len(res.split('.')) == 4 diff --git a/ooni/tests/test_oonicli.py b/ooni/tests/test_oonicli.py index ab10000..7050c5a 100644 --- a/ooni/tests/test_oonicli.py +++ b/ooni/tests/test_oonicli.py @@ -2,10 +2,12 @@ import os import sys import yaml import signal +import socket from twisted.internet import base, defer from twisted.trial import unittest +from ooni.tests import is_internet_connected from ooni.settings import config from ooni.oonicli import runWithDirector @@ -26,6 +28,8 @@ def verify_entry(entry): class TestRunDirector(unittest.TestCase): def setUp(self): + if not is_internet_connected(): + self.skipTest("You must be connected to the internet to run this test") config.tor.socks_port = 9050 config.tor.control_port = None with open('example-input.txt', 'w+') as f:

1 0

[ooni-probe/master] Merge pull request #294 from anadahz/ooni-documentation_fix
by art＠torproject.org 24 Mar '14

24 Mar '14

commit d5531273c62b1e26056ad54fafae01c555dce158 Merge: 1c3ee7e f7ebab5 Author: Arturo Filastò <hellais(a)users.noreply.github.com> Date: Mon Mar 24 11:12:29 2014 +0100 Merge pull request #294 from anadahz/ooni-documentation_fix Fix links in Documentation. docs/source/index.rst | 8 ++++---- docs/source/tests/dnsconsistency.rst | 4 ++-- docs/source/tests/dnsspoof.rst | 4 ++-- docs/source/tests/http_header_field_manipulation.rst | 4 ++-- docs/source/tests/http_host.rst | 4 ++-- docs/source/tests/http_invalid_request_line.rst | 4 ++-- docs/source/tests/http_requests.rst | 2 +- docs/source/tests/tcpconnect.rst | 2 +- docs/source/tests/traceroute.rst | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-)

1 0

[ooni-probe/master] Merge pull request #295 from anadahz/set_deps-fix
by art＠torproject.org 24 Mar '14

24 Mar '14

commit 1c3ee7e0627443000ddf9d9fae974ab44d5b86d0 Merge: 3106820 3c240ee Author: Arturo Filastò <hellais(a)users.noreply.github.com> Date: Mon Mar 24 11:11:58 2014 +0100 Merge pull request #295 from anadahz/set_deps-fix Add required package libpcap0.8-dev setup-dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[ooni-probe/master] Write a quick and dirty implementation of bridget.
by art＠torproject.org 24 Mar '14

24 Mar '14

commit 46d428c6547262c5632adc9f6fb7d922e80beb4b Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Mar 16 01:18:26 2013 +0100 Write a quick and dirty implementation of bridget. --- nettests/experimental/bridget.py | 59 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/nettests/experimental/bridget.py b/nettests/experimental/bridget.py new file mode 100644 index 0000000..8f31e80 --- /dev/null +++ b/nettests/experimental/bridget.py @@ -0,0 +1,59 @@ +import random + +from twisted.python import usage +from twisted.internet import defer + +import txtorcon +from txtorcon.torconfig import TorSetupTimeout + +from ooni.utils import log +from ooni import nettest + +class UsageOptions(usage.Options): + optParameters = [['timeout', 't', 30, + 'Specify the timeout after which to consider the Tor bootstrapping process to have failed'] + ] + +class KeywordFiltering(nettest.NetTestCase): + name = "Bridget, at it's bare minimum" + author = "Arturo Filastò" + version = "0.1" + + usageOptions = UsageOptions + + inputFile = ['file', 'f', None, + 'File containing bridges to test reachability for (they should be one per line IP:ORPort)'] + + def setUp(self): + self.tor_progress = 0 + self.timeout = int(self.localOptions['timeout']) + self.report['timeout'] = self.timeout + + def test_full_tor_connection(self): + config = txtorcon.TorConfig() + config.OrPort = random.randint(2**14, 2**16) + config.SocksPort = random.randint(2**14, 2**16) + config.Bridge = self.input + config.UseBridges = 1 + + def updates(prog, tag, summary): + self.report['tor_progress'] = int(prog) + + d = txtorcon.launch_tor(config, reactor, progress_updates=updates, self.timeout) + @d.addCallback + def setup_complete(proto): + self.report['failed'] = False + + @d.addErrback + def setup_failed(failure): + failure.trap(TorSetupTimeout) + if isinstance(failure, TorSetupTimeout): + self.report['failure'] = 'timedout' + else: + self.report['failure'] = 'unknown' + self.report['failed'] = True + + return d + + def test_connect_scan(self): + pass

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 24 Mar '14

24 Mar '14

commit 137bd00b33571f83fe7f39ddc12181fdc0d61b1c Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 24 14:15:41 2014 +0000 Update translations for tails-misc_completed --- fr.po | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/fr.po b/fr.po index 2d6f548..14b062a 100644 --- a/fr.po +++ b/fr.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-06 14:52+0100\n" -"PO-Revision-Date: 2014-03-10 11:20+0000\n" -"Last-Translator: tneskovic <antoine_ecuador(a)yahoo.fr>\n" +"POT-Creation-Date: 2014-03-23 08:55+0100\n" +"PO-Revision-Date: 2014-03-24 14:00+0000\n" +"Last-Translator: chioubaca <chioubaca(a)gmail.com>\n" "Language-Team: French (http://www.transifex.com/projects/p/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,11 +23,11 @@ msgstr "" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:31 +#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:43 msgid "Tor is ready" msgstr "Tor est prêt" -#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:32 +#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:44 msgid "You can now access the Internet." msgstr "Vous pouvez maintenant accéder à Internet." @@ -350,6 +350,29 @@ msgid "" "following directory for more information:" msgstr "Quelque chose a mal tourné lors du démarrage de I2P. Regardez dans les journaux du répertoire suivant pour plus d'informations :" +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:19 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57 +msgid "error:" +msgstr "erreur:" + +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:20 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58 +msgid "Error" +msgstr "Erreur" + +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:40 +msgid "" +"Not enough memory available to check for upgrades.\n" +"\n" +"Make sure this system satisfies the requirements for running Tails.\n" +"See file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n" +"\n" +"Try to restart Tails to check for upgrades again.\n" +"\n" +"Or do a manual upgrade.\n" +"See https://tails.boum.org/doc/first_steps/upgrade#manual" +msgstr "Pas assez de mémoire système pour vérifier les mises à jour.\n\nAssurez vous que votre système correspond aux pré-requis pour lancer Tails.\nAllez sur file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nEssayez de redémarrer Tails afin de vérifier les mises à jour à nouveau.\n\nOu bien exécutez la mise à jour manuellement.\nAllez ici: https://tails.boum.org/doc/first_steps/upgrade#manual" + #: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:53 msgid "Warning: virtual machine detected!" msgstr "Attention : machine virtuelle détectée !" @@ -367,14 +390,6 @@ msgid "" " more...</a>" msgstr "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.fr.html'>En savoir plus...</a>" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57 -msgid "error:" -msgstr "erreur:" - -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58 -msgid "Error" -msgstr "Erreur" - #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:68 msgid "Do you really want to launch the Unsafe Browser?" msgstr "Êtes-vous sûr de vouloir utiliser le Navigateur Non-sécurisé ?"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 24 Mar '14

24 Mar '14

commit d8abc6be72578686dea841c54902e7d5699fcb52 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 24 14:15:38 2014 +0000 Update translations for tails-misc --- fr.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fr.po b/fr.po index 6397b1a..14b062a 100644 --- a/fr.po +++ b/fr.po @@ -14,8 +14,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-23 08:55+0100\n" -"PO-Revision-Date: 2014-03-23 08:50+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-03-24 14:00+0000\n" +"Last-Translator: chioubaca <chioubaca(a)gmail.com>\n" "Language-Team: French (http://www.transifex.com/projects/p/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -371,7 +371,7 @@ msgid "" "\n" "Or do a manual upgrade.\n" "See https://tails.boum.org/doc/first_steps/upgrade#manual" -msgstr "" +msgstr "Pas assez de mémoire système pour vérifier les mises à jour.\n\nAssurez vous que votre système correspond aux pré-requis pour lancer Tails.\nAllez sur file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nEssayez de redémarrer Tails afin de vérifier les mises à jour à nouveau.\n\nOu bien exécutez la mise à jour manuellement.\nAllez ici: https://tails.boum.org/doc/first_steps/upgrade#manual" #: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:53 msgid "Warning: virtual machine detected!"

1 0