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

[ooni-probe/master] Properly expand the home directory to that of the user running ooniprobe.
by art＠torproject.org 06 Feb '14

06 Feb '14

commit bd56669bb78bd6d248492adb16bee719a201a4d3 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Feb 5 13:46:32 2014 +0100 Properly expand the home directory to that of the user running ooniprobe. Previously when running ooniprobe under sudo you would not get the correct home directory because $HOME was set to that of the user running sudo. --- ooni/settings.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ooni/settings.py b/ooni/settings.py index de24a76..c1071b9 100644 --- a/ooni/settings.py +++ b/ooni/settings.py @@ -1,6 +1,8 @@ import os import sys import yaml +import getpass + from shutil import copyfile from os.path import abspath, expanduser @@ -11,6 +13,7 @@ from ooni.utils import Storage class OConfig(object): def __init__(self): + self.current_user = getpass.getuser() self.global_options = {} self.reports = Storage() self.scapyFactory = None @@ -39,7 +42,7 @@ class OConfig(object): self.nettest_directory = abspath(os.path.join(__file__, '..', 'nettests')) - self.ooni_home = os.path.join(expanduser('~'), '.ooni') + self.ooni_home = os.path.join(expanduser('~'+self.current_user), '.ooni') self.inputs_directory = os.path.join(self.ooni_home, 'inputs') self.decks_directory = os.path.join(self.ooni_home, 'decks') self.reports_directory = os.path.join(self.ooni_home, 'reports')

1 0

[ooni-probe/master] Silence the dummy protocol
by art＠torproject.org 06 Feb '14

06 Feb '14

commit 823acb79def9091f6efe6d88623253da2ee65c2b Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Feb 3 16:43:11 2014 +0100 Silence the dummy protocol --- ooni/tests/test_nettest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ooni/tests/test_nettest.py b/ooni/tests/test_nettest.py index 718fca7..73cddd1 100644 --- a/ooni/tests/test_nettest.py +++ b/ooni/tests/test_nettest.py @@ -275,7 +275,7 @@ class TestNettestTimeout(unittest.TestCase): class DummyProtocol(Protocol): def dataReceived(self, data): - print data + pass class DummyFactory(Factory): def __init__(self):

1 0

[ooni-probe/master] Merge pull request #272 from TheTorProject/fix/oonibclient
by art＠torproject.org 06 Feb '14

06 Feb '14

commit 6d5cf42602085274f62248322a6ec9b8f6b856d8 Merge: 1e23f26 064e9ab Author: aagbsn <aagbsn(a)extc.org> Date: Thu Jan 30 09:56:26 2014 -0800 Merge pull request #272 from TheTorProject/fix/oonibclient Fix/oonibclient ooni/oonibclient.py | 10 +++++++++- ooni/tests/test_oonibclient.py | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-)

1 0

[ooni-probe/master] Add tests for the oonib reporting API
by art＠torproject.org 06 Feb '14

06 Feb '14

commit 064e9ab510901db095433f526536a199bac8ce85 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Jan 29 21:22:21 2014 +0100 Add tests for the oonib reporting API --- ooni/tests/test_oonibclient.py | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/ooni/tests/test_oonibclient.py b/ooni/tests/test_oonibclient.py index b5957c4..f166ae7 100644 --- a/ooni/tests/test_oonibclient.py +++ b/ooni/tests/test_oonibclient.py @@ -111,3 +111,39 @@ class TestOONIBClient(unittest.TestCase): for path in ['/bouncer']: self.oonibclient.address = 'http://127.0.0.1:8888' yield all_requests(path) + + @defer.inlineCallbacks + def test_create_report(self): + res = yield self.oonibclient.queryBackend('POST', '/report', { + 'software_name': 'spam', + 'software_version': '2.0', + 'probe_asn': 'AS0', + 'probe_cc': 'ZZ', + 'test_name': 'foobar', + 'test_version': '1.0', + 'input_hashes': [] + }) + assert isinstance(res['report_id'], unicode) + + @defer.inlineCallbacks + def test_report_lifecycle(self): + res = yield self.oonibclient.queryBackend('POST', '/report', { + 'software_name': 'spam', + 'software_version': '2.0', + 'probe_asn': 'AS0', + 'probe_cc': 'ZZ', + 'test_name': 'foobar', + 'test_version': '1.0', + 'input_hashes': [] + }) + report_id = str(res['report_id']) + + res = yield self.oonibclient.queryBackend('POST', '/report/'+report_id, { + 'content': '---\nspam: ham\n...\n' + }) + + res = yield self.oonibclient.queryBackend('POST', '/report/'+report_id, { + 'content': '---\nspam: ham\n...\n' + }) + + res = yield self.oonibclient.queryBackend('POST', '/report/'+report_id+'/close')

1 0

[ooni-probe/master] Merge pull request #271 from TheTorProject/fix/vagrantfile
by art＠torproject.org 06 Feb '14

06 Feb '14

commit 1e23f26c40e17d0d474f7bf820d4749eb04969be Merge: 39884fc 83c7650 Author: aagbsn <aagbsn(a)extc.org> Date: Thu Jan 30 09:55:40 2014 -0800 Merge pull request #271 from TheTorProject/fix/vagrantfile Use the debian package instead of setup-dependencies Vagrantfile | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-)

1 0

[ooni-probe/master] Fix the unittests for the oonibclient.
by art＠torproject.org 06 Feb '14

06 Feb '14

commit 565e6ddd4fed36fce77d4c8d1c94190c9db6b1de Author: Arturo Filastò <art(a)fuffa.org> Date: Tue Jan 28 15:43:53 2014 +0100 Fix the unittests for the oonibclient. --- ooni/oonibclient.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ooni/oonibclient.py b/ooni/oonibclient.py index 1fa2e5b..e257ef8 100644 --- a/ooni/oonibclient.py +++ b/ooni/oonibclient.py @@ -3,6 +3,7 @@ import json from hashlib import sha256 +from twisted.web.client import Agent from twisted.internet import defer, reactor from twisted.internet.endpoints import TCP4ClientEndpoint @@ -54,6 +55,10 @@ class OONIBClient(object): elif address.startswith('https://'): log.err("HTTPS based bouncers are currently not supported.") + elif address.startswith('http://'): + log.msg("Warning using unencrypted collector") + self.address = address + self.agent = Agent(reactor) def _request(self, method, urn, genReceiver, bodyProducer=None): attempts = 0 @@ -67,7 +72,10 @@ class OONIBClient(object): @d.addCallback def callback(response): - content_length = int(response.headers.getRawHeaders('content-length')[0]) + try: + content_length = int(response.headers.getRawHeaders('content-length')[0]) + except: + content_length = None response.deliverBody(genReceiver(finished, content_length)) def errback(err, attempts):

1 0

[ooni-probe/master] Use the debian package instead of setup-dependencies
by art＠torproject.org 06 Feb '14

06 Feb '14

commit 83c76501e0005ce3ef7787a53efa73638a5b17f9 Author: Arturo Filastò <art(a)fuffa.org> Date: Tue Jan 28 22:24:16 2014 +0100 Use the debian package instead of setup-dependencies --- Vagrantfile | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 9a9e490..1b41dee 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -13,22 +13,25 @@ Vagrant.configure("2") do |config| end $script = <<SCRIPT -cd /ooni/ -export USE_VIRTUALENV=0 -./setup-dependencies.sh -y -python setup.py install -mkdir -p ~/.ooni -cp /usr/share/ooni/ooniprobe.conf.sample ~/.ooni/ooniprobe.conf +echo "deb http://deb.ooni.nu/ooni wheezy main" >> /etc/apt/sources.list +echo "deb http://deb.torproject.org/torproject.org precise main" >> /etc/apt/sources.list -cd /usr/share/ooni/inputs -make lists 2>&1 > /dev/null +# Install deb.ooni.nu key +gpg --keyserver pgp.mit.edu --recv-key 0x49B8CDF4 +gpg --export 89AB86D4788F3785FE9EDA31F9E2D9B049B8CDF4 | apt-key add - -# https://code.google.com/p/pypcap/issues/detail?id=27 -# pip install pydnet pypcap +# Install deb.torproject.org key +gpg --keyserver keys.gnupg.net --recv 886DDD89 +gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | apt-key add - + +apt-get update + +apt-get install -y tor deb.torproject.org-keyring +apt-get install -y ooniprobe 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/basic.testdeck'" +echo "First run: 'sudo ooniprobe -i /usr/share/ooni/decks/fast.deck'" SCRIPT @@ -38,5 +41,4 @@ SCRIPT Vagrant.configure("2") do |config| config.vm.provision :shell, :inline => $script - config.vm.network :forwarded_port, guest: 8042, host: 8042 end

1 0

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 06 Feb '14

06 Feb '14

commit fe45c5dd2a3b5d8f2634eb0f598df88f411714a2 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 6 12:15:30 2014 +0000 Update translations for mat-gui_completed --- sv.po | 104 ++++++++++++++++++++++++++++++++++++++++------------------------- 1 file changed, 65 insertions(+), 39 deletions(-) diff --git a/sv.po b/sv.po index ae14f98..9602761 100644 --- a/sv.po +++ b/sv.po @@ -3,15 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Translators: # Dan West <acc(a)dnw.st>, 2013 # Jimjgr, 2013 -# WinterFairy <winterfairy(a)riseup.net>, 2013 +# WinterFairy <winterfairy(a)riseup.net>, 2013-2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-07-01 19:26+0200\n" -"PO-Revision-Date: 2013-09-30 12:09+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-01-19 14:48+0000\n" +"PO-Revision-Date: 2014-02-06 11:50+0000\n" "Last-Translator: WinterFairy <winterfairy(a)riseup.net>\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/torproject/language/sv/)\n" "MIME-Version: 1.0\n" @@ -20,93 +21,118 @@ msgstr "" "Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mat-gui:65 mat-gui:375 mat-gui:387 +#: mat-gui:61 mat-gui:403 mat-gui:422 msgid "Ready" msgstr "Redo" -#: mat-gui:134 +#: mat-gui:128 msgid "Choose files" msgstr "Välj filer" -#: mat-gui:141 +#: mat-gui:135 msgid "All files" msgstr "Alla filer" -#: mat-gui:148 +#: mat-gui:142 msgid "Supported files" msgstr "Stöd för filer" -#: mat-gui:164 +#: mat-gui:157 msgid "No metadata found" msgstr "Ingen metadata hittades" -#: mat-gui:165 mat-gui:370 mat-gui:385 data/mat.ui:227 +#: mat-gui:158 mat-gui:398 mat-gui:420 msgid "Clean" msgstr "Städa" -#: mat-gui:167 mat-gui:372 +#: mat-gui:160 mat-gui:400 msgid "Dirty" msgstr "Smutsig" -#: mat-gui:172 +#: mat-gui:165 #, python-format msgid "%s's metadata" msgstr "%ss metadata" -#: mat-gui:183 +#: mat-gui:176 msgid "Trash your meta, keep your data" msgstr "Kassera din meta, behåll din data" -#: mat-gui:188 +#: mat-gui:181 msgid "Website" msgstr "Webbsida" -#: mat-gui:214 data/mat.ui:107 +#: mat-gui:207 data/mat.ui:107 msgid "Preferences" msgstr "Inställningar" -#: mat-gui:228 +#: mat-gui:220 msgid "Reduce PDF quality" msgstr "Förminska PDF kvalitet" -#: mat-gui:231 +#: mat-gui:223 msgid "Reduce the produced PDF size and quality" msgstr "Förminska den producerade PDF storleken och kvaliteten" -#: mat-gui:234 +#: mat-gui:226 msgid "Add unsupported file to archives" msgstr "Lägg till ej stötta filer till arkivet" -#: mat-gui:238 +#: mat-gui:229 msgid "Add non-supported (and so non-anonymised) file to output archive" msgstr "Lägg till fil utan stöd (det vill säga ej anonymiserad) till arkivet" -#: mat-gui:283 +#: mat-gui:268 msgid "Unknown" msgstr "Okänd" -#: mat-gui:330 +#: mat-gui:310 msgid "Not-supported" msgstr "Icke-stödda" -#: mat-gui:347 -msgid "Unknown mimetype" -msgstr "Okänd filtyp" +#: mat-gui:324 +msgid "Harmless fileformat" +msgstr "Oskyldigt filformat" + +#: mat-gui:326 +msgid "Fileformat not supported" +msgstr "Filformatet stöds inte" -#: mat-gui:354 data/mat.ui:291 +#: mat-gui:329 +msgid "These files can not be processed:" +msgstr "Dessa filer kan inte behandlas:" + +#: mat-gui:334 mat-gui:363 data/mat.ui:292 msgid "Filename" msgstr "Filnamn" -#: mat-gui:356 -msgid "Mimetype" -msgstr "Filtyp" +#: mat-gui:336 +msgid "Reason" +msgstr "Anledning" + +#: mat-gui:348 +msgid "Non-supported files in archive" +msgstr "Icke-stödda filer i arkivet" + +#: mat-gui:349 data/mat.ui:227 +msgid "Scour" +msgstr "Skura" + +#: mat-gui:362 +msgid "Include" +msgstr "Inkludera" + +#: mat-gui:378 +#, python-format +msgid "MAT is not able to clean the following files, found in the %s archive" +msgstr "MAT kunde inte städa följande filer från arkivet %s" -#: mat-gui:366 +#: mat-gui:394 #, python-format msgid "Checking %s" msgstr "Kontrollerar %s" -#: mat-gui:381 +#: mat-gui:409 #, python-format msgid "Cleaning %s" msgstr "Städar %s" @@ -139,38 +165,38 @@ msgstr "Lägg till" msgid "Check" msgstr "Kontrollera" -#: data/mat.ui:308 +#: data/mat.ui:309 msgid "State" msgstr "Tillstånd" -#: data/mat.ui:346 data/mat.ui:495 +#: data/mat.ui:347 data/mat.ui:499 msgid "Metadata" msgstr "Metadata" -#: data/mat.ui:400 +#: data/mat.ui:376 msgid "Name" msgstr "Namn" -#: data/mat.ui:414 +#: data/mat.ui:390 msgid "Content" msgstr "Innehåll" -#: data/mat.ui:448 +#: data/mat.ui:452 msgid "Supported formats" msgstr "Stöd för format" -#: data/mat.ui:482 +#: data/mat.ui:486 msgid "Support" msgstr "Stöd" -#: data/mat.ui:508 +#: data/mat.ui:512 msgid "Method" msgstr "Metod" -#: data/mat.ui:521 +#: data/mat.ui:525 msgid "Remaining" msgstr "Återstår" -#: data/mat.ui:556 +#: data/mat.ui:560 msgid "Fileformat" msgstr "Filformat"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 06 Feb '14

06 Feb '14

commit 151b53a620fbcd4919f3382b498f762d2c8cbdb4 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 6 12:15:27 2014 +0000 Update translations for mat-gui --- sv.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sv.po b/sv.po index 732be3c..9602761 100644 --- a/sv.po +++ b/sv.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-19 14:48+0000\n" -"PO-Revision-Date: 2014-02-06 11:45+0000\n" +"PO-Revision-Date: 2014-02-06 11:50+0000\n" "Last-Translator: WinterFairy <winterfairy(a)riseup.net>\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/torproject/language/sv/)\n" "MIME-Version: 1.0\n" @@ -96,11 +96,11 @@ msgstr "Oskyldigt filformat" #: mat-gui:326 msgid "Fileformat not supported" -msgstr "" +msgstr "Filformatet stöds inte" #: mat-gui:329 msgid "These files can not be processed:" -msgstr "" +msgstr "Dessa filer kan inte behandlas:" #: mat-gui:334 mat-gui:363 data/mat.ui:292 msgid "Filename" @@ -112,7 +112,7 @@ msgstr "Anledning" #: mat-gui:348 msgid "Non-supported files in archive" -msgstr "" +msgstr "Icke-stödda filer i arkivet" #: mat-gui:349 data/mat.ui:227 msgid "Scour"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 06 Feb '14

06 Feb '14

commit 066776c65ee910da181f0d67dd90b44cffa3bfaa Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 6 11:45:27 2014 +0000 Update translations for mat-gui --- sv.po | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/sv.po b/sv.po index 82c7688..732be3c 100644 --- a/sv.po +++ b/sv.po @@ -3,16 +3,17 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Translators: # Dan West <acc(a)dnw.st>, 2013 # Jimjgr, 2013 -# WinterFairy <winterfairy(a)riseup.net>, 2013 +# WinterFairy <winterfairy(a)riseup.net>, 2013-2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-19 14:48+0000\n" -"PO-Revision-Date: 2014-01-21 09:26+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-02-06 11:45+0000\n" +"Last-Translator: WinterFairy <winterfairy(a)riseup.net>\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/torproject/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -91,7 +92,7 @@ msgstr "Icke-stödda" #: mat-gui:324 msgid "Harmless fileformat" -msgstr "" +msgstr "Oskyldigt filformat" #: mat-gui:326 msgid "Fileformat not supported" @@ -107,7 +108,7 @@ msgstr "Filnamn" #: mat-gui:336 msgid "Reason" -msgstr "" +msgstr "Anledning" #: mat-gui:348 msgid "Non-supported files in archive" @@ -115,16 +116,16 @@ msgstr "" #: mat-gui:349 data/mat.ui:227 msgid "Scour" -msgstr "" +msgstr "Skura" #: mat-gui:362 msgid "Include" -msgstr "" +msgstr "Inkludera" #: mat-gui:378 #, python-format msgid "MAT is not able to clean the following files, found in the %s archive" -msgstr "" +msgstr "MAT kunde inte städa följande filer från arkivet %s" #: mat-gui:394 #, python-format

1 0