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

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 07 Jul '14

07 Jul '14

commit 9e221e9815b55a92ec2bafed41c6dcdd71d9df2b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 7 18:15:09 2014 +0000 Update translations for torcheck --- de/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/torcheck.po b/de/torcheck.po index 92ff52d..37b8aeb 100644 --- a/de/torcheck.po +++ b/de/torcheck.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-07-07 17:40+0000\n" +"PO-Revision-Date: 2014-07-07 17:50+0000\n" "Last-Translator: annskaja <annskaja(a)riseup.net>\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n"

1 0

[torspec/master] Add some words about meek in proposal 203
by nickm＠torproject.org 07 Jul '14

07 Jul '14

commit f67983d1cd30f68c811cfed88b0bbdbf8f9647e5 Author: Lunar <lunar(a)torproject.org> Date: Wed Jun 25 12:05:33 2014 +0200 Add some words about meek in proposal 203 This is mostly David Fifield's words from an email exchange. --- proposals/203-https-frontend.txt | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/proposals/203-https-frontend.txt b/proposals/203-https-frontend.txt index 26101b3..df30cd5 100644 --- a/proposals/203-https-frontend.txt +++ b/proposals/203-https-frontend.txt @@ -245,3 +245,31 @@ Side note: What to put on the webserver? "Something to add to your HTTPS website" rather than as a standalone installation. +Related work: + + meek [1] is a pluggable transport that uses HTTP for carrying bytes + and TLS for obfuscation. Traffic is relayed through a third-party + server (Google App Engine). It uses a trick to talk to the third + party so that it looks like it is talking to an unblocked server. + + meek itself is not really about HTTP at all. It uses HTTP only + because it's convenient and the big Internet services we use as cover + also use HTTP. meek uses HTTP as a transport, and TLS for + obfuscation, but the key idea is really "domain fronting," where it + appears to the censor you are talking to one domain (www.google.com) + but behind the scenes you are talking to another + (meek-reflect.appspot.com) The meek-server program is an ordinary + HTTP (not necessarily even HTTPS!) server, whose communication is + easily fingerprintable; but that doesn't matter because the censor + never sees that part of the communication, only the communication + between the client and CDN. + + One way to think about the difference: if a censor (somehow) learns + the IP address of a bridge as described in this proposal, it's easy + and low-cost for the censor to block that bridge by IP address. meek + aims to make it much more expensive: even if you know a domain is + being used (in part) for circumvention, in order to block it have to + block something important like the Google frontend or CloudFlare + (high collateral damage). + +1. https://trac.torproject.org/projects/tor/wiki/doc/meek

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 07 Jul '14

07 Jul '14

commit bf15c49f9c386da60da7fead8a8ce27f76f0952b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 7 17:45:20 2014 +0000 Update translations for torcheck_completed --- de/torcheck.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/de/torcheck.po b/de/torcheck.po index 133ae37..92ff52d 100644 --- a/de/torcheck.po +++ b/de/torcheck.po @@ -2,6 +2,7 @@ # Copyright (C) 2008-2013 The Tor Project, Inc # # Translators: +# annskaja <annskaja(a)riseup.net>, 2014 # axcer <axcer(a)gmx.de>, 2014 # LaKoon <lakoon(a)posteo.org>, 2011 # Mario Baier <mario.baier26(a)gmx.de>, 2013 @@ -12,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-06-16 17:01+0000\n" -"Last-Translator: Tobias Bannert\n" +"PO-Revision-Date: 2014-07-07 17:40+0000\n" +"Last-Translator: annskaja <annskaja(a)riseup.net>\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -72,7 +73,7 @@ msgstr "Weitere Informationen zu diesem Ausgangrelais:" 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 "Das Tor-Projekt ist nach dem US-Gesetz US 501(c)(3) eine gemeinnützig Organisation und widmet sich der Erforschung, Entwicklung und Schulung von Anonymität und Datenschutz im Netz." +msgstr "Das Tor-Projekt ist nach dem US-Gesetz US 501(c)(3) eine gemeinnützige Organisation und widmet sich der Erforschung, Entwicklung und Schulung von Anonymität und Datenschutz im Netz." msgid "Learn More »" msgstr "Mehr erfahren »"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 07 Jul '14

07 Jul '14

commit b9b6b0ba2538a366fd55598bb77870c15172e745 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 7 17:45:15 2014 +0000 Update translations for torcheck --- de/torcheck.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/de/torcheck.po b/de/torcheck.po index 133ae37..92ff52d 100644 --- a/de/torcheck.po +++ b/de/torcheck.po @@ -2,6 +2,7 @@ # Copyright (C) 2008-2013 The Tor Project, Inc # # Translators: +# annskaja <annskaja(a)riseup.net>, 2014 # axcer <axcer(a)gmx.de>, 2014 # LaKoon <lakoon(a)posteo.org>, 2011 # Mario Baier <mario.baier26(a)gmx.de>, 2013 @@ -12,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-06-16 17:01+0000\n" -"Last-Translator: Tobias Bannert\n" +"PO-Revision-Date: 2014-07-07 17:40+0000\n" +"Last-Translator: annskaja <annskaja(a)riseup.net>\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -72,7 +73,7 @@ msgstr "Weitere Informationen zu diesem Ausgangrelais:" 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 "Das Tor-Projekt ist nach dem US-Gesetz US 501(c)(3) eine gemeinnützig Organisation und widmet sich der Erforschung, Entwicklung und Schulung von Anonymität und Datenschutz im Netz." +msgstr "Das Tor-Projekt ist nach dem US-Gesetz US 501(c)(3) eine gemeinnützige Organisation und widmet sich der Erforschung, Entwicklung und Schulung von Anonymität und Datenschutz im Netz." msgid "Learn More »" msgstr "Mehr erfahren »"

1 0

[flashproxy/master] Remove LearnCircuitBuildTimeout CircuitBuildTimeout from exercise.sh.
by dcf＠torproject.org 07 Jul '14

07 Jul '14

commit edbd259a32ccfa9b47b88a9b85f229aee66936e2 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jul 7 10:36:38 2014 -0700 Remove LearnCircuitBuildTimeout CircuitBuildTimeout from exercise.sh. I think I left these in because the host I was running the exercise script on had an old tor, but they're not needed anymore. Cf. 4f7b24b30abbb8af4cd83bdf171e6f8ea25b18ca. --- experiments/exercise/exercise.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/experiments/exercise/exercise.sh b/experiments/exercise/exercise.sh index efefde7..1f46d96 100755 --- a/experiments/exercise/exercise.sh +++ b/experiments/exercise/exercise.sh @@ -26,7 +26,7 @@ PIDS_TO_KILL+=($!) sleep 20 -"$TOR" ClientTransportPlugin "flashproxy socks4 127.0.0.1:$LOCAL_PORT" UseBridges 1 Bridge "flashproxy 0.0.1.0:1" LearnCircuitBuildTimeout 0 CircuitBuildTimeout 60 & +"$TOR" ClientTransportPlugin "flashproxy socks4 127.0.0.1:$LOCAL_PORT" UseBridges 1 Bridge "flashproxy 0.0.1.0:1" & PIDS_TO_KILL+=($!) sleep 60

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 07 Jul '14

07 Jul '14

commit d69a638b225caaa89c30422b67a638c10af2a766 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 7 11:15:02 2014 +0000 Update translations for bridgedb --- ar/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ar/LC_MESSAGES/bridgedb.po b/ar/LC_MESSAGES/bridgedb.po index 77f8762..e83da35 100644 --- a/ar/LC_MESSAGES/bridgedb.po +++ b/ar/LC_MESSAGES/bridgedb.po @@ -17,7 +17,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2014-06-06 21:46+0000\n" -"PO-Revision-Date: 2014-07-07 10:41+0000\n" +"PO-Revision-Date: 2014-07-07 10:51+0000\n" "Last-Translator: AnonymousLady <farah.jaza(a)hotmail.com>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/language/ar/)\n" "MIME-Version: 1.0\n"

1 0

[ooni-probe/master] Correct typo in dnsspoof.py test name
by art＠torproject.org 07 Jul '14

07 Jul '14

commit 74d98d1ced512c8ab444c020c5ba58d16e7139cc Author: anadahz <kojgelo(a)inbox.com> Date: Fri Jun 27 22:39:04 2014 +0300 Correct typo in dnsspoof.py test name --- docs/source/tests/dnsspoof.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/source/tests/dnsspoof.rst b/docs/source/tests/dnsspoof.rst index a3b43d5..21c9cb4 100644 --- a/docs/source/tests/dnsspoof.rst +++ b/docs/source/tests/dnsspoof.rst @@ -5,7 +5,7 @@ Details *Current version*: 0.1 -*NetTest*: DNSSpoof (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/ooni/nettests/manip…) +*NetTest*: DNSSpoof (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/ooni/nettests/manip…) *Test Helper*: DNS Test Helper (https://gitweb.torproject.org/oonib.git/blob/HEAD:/oonib/testhelpers/dns_he…) @@ -21,7 +21,7 @@ This test performs A queries to a test resolver and a known good control resolve How to run the test =================== -`./bin/ooniprobe nettests/manipulation/dnsspoof.py [-s] [-k] [-i] -r <test resolver> -h <hostname> -b IP:PORT` +`./bin/ooniprobe nettests/manipulation/dns_spoof.py [-s] [-k] [-i] -r <test resolver> -h <hostname> -b IP:PORT` *test resolver* is a single test resolver (IP address). *hostname* is the hostname to query. @@ -35,7 +35,7 @@ Sample report ============= From running: -`./bin/ooniprobe nettests/manipulation/dnsspoof.py -h torproject.org -r 4.2.2.2:53` +`./bin/ooniprobe nettests/manipulation/dns_spoof.py -h torproject.org -r 4.2.2.2:53` :: @@ -52,7 +52,7 @@ From running: reportfile: null resume: 0 subargs: [-h, torproject.org, -r, '4.2.2.2:53'] - test: nettests/manipulation/dnsspoof.py + test: nettests/manipulation/dns_spoof.py probe_asn: null probe_cc: null probe_ip: 127.0.0.1

1 0

[ooni-probe/master] Merge pull request #332 from anadahz/fix/doc
by art＠torproject.org 07 Jul '14

07 Jul '14

commit 2dcac0e88cd3b2182543eeb97ed5656e394386d1 Merge: 1628c56 74d98d1 Author: Arturo Filastò <hellais(a)users.noreply.github.com> Date: Mon Jun 30 15:41:59 2014 +0200 Merge pull request #332 from anadahz/fix/doc Correct typo in dnsspoof.py test name docs/source/tests/dnsspoof.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

1 0

[ooni-probe/master] Fixed bug when a deck was missing some argument of a test. Also fixed some various quirks
by art＠torproject.org 07 Jul '14

07 Jul '14

commit a9a24464b4b61800fe5787497db9f5ca11ce4855 Author: kudrom <kudrom(a)riseup.net> Date: Sat Jun 28 00:16:43 2014 +0200 Fixed bug when a deck was missing some argument of a test. Also fixed some various quirks --- ooni/deck.py | 2 +- ooni/errors.py | 12 ++++++- ooni/nettest.py | 9 +++-- .../manipulation/http_header_field_manipulation.py | 12 +++---- ooni/oonicli.py | 7 ++-- ooni/tests/test_nettest.py | 36 +++++++++----------- 6 files changed, 45 insertions(+), 33 deletions(-) diff --git a/ooni/deck.py b/ooni/deck.py index f38b098..adf1d69 100644 --- a/ooni/deck.py +++ b/ooni/deck.py @@ -144,7 +144,7 @@ class Deck(InputFile): net_test_loader.checkOptions() if net_test_loader.requiresTor: self.requiresTor = True - except e.MissingRequiredOption, missing_options: + except e.MissingRequiredOption as missing_options: if not self.bouncer: raise for missing_option in missing_options.message: diff --git a/ooni/errors.py b/ooni/errors.py index d5673ed..d8c0911 100644 --- a/ooni/errors.py +++ b/ooni/errors.py @@ -6,6 +6,8 @@ from twisted.internet.error import ConnectionRefusedError, TCPTimedOutError from twisted.internet.error import DNSLookupError, ConnectError, ConnectionLost from twisted.internet.error import TimeoutError as GenericTimeoutError +from twisted.python import usage + from txsocksx.errors import SOCKSError from txsocksx.errors import MethodsNotAcceptedError, AddressNotSupported from txsocksx.errors import ConnectionError, NetworkUnreachable @@ -241,8 +243,16 @@ class NetTestNotFound(Exception): class MissingRequiredOption(Exception): - pass + def __init__(self, message, net_test_loader): + super(MissingRequiredOption, self).__init__() + self.net_test_loader = net_test_loader + self.message = message + +class OONIUsageError(usage.UsageError): + def __init__(self, net_test_loader): + super(OONIUsageError, self).__init__() + self.net_test_loader = net_test_loader class FailureToLoadNetTest(Exception): pass diff --git a/ooni/nettest.py b/ooni/nettest.py index 1547617..eccde78 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -1,6 +1,7 @@ import os import re import time +import sys from hashlib import sha256 from twisted.internet import defer @@ -342,7 +343,11 @@ class NetTestLoader(object): """ for klass in self.testClasses: options = self.usageOptions() - options.parseOptions(self.options) + try: + options.parseOptions(self.options) + except usage.UsageError: + tb = sys.exc_info()[2] + raise e.OONIUsageError(self), None, tb if options: klass.localOptions = options @@ -764,7 +769,7 @@ class NetTestCase(object): self.localOptions[required_option] is None: missing_options.append(required_option) if missing_options: - raise e.MissingRequiredOption(missing_options) + raise e.MissingRequiredOption(missing_options, self) def __repr__(self): return "<%s inputs=%s>" % (self.__class__, self.inputs) diff --git a/ooni/nettests/manipulation/http_header_field_manipulation.py b/ooni/nettests/manipulation/http_header_field_manipulation.py index 8378924..4e47040 100644 --- a/ooni/nettests/manipulation/http_header_field_manipulation.py +++ b/ooni/nettests/manipulation/http_header_field_manipulation.py @@ -50,7 +50,7 @@ class HTTPHeaderFieldManipulation(httpt.HTTPTest): 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.4" + version = "0.1.5" randomizeUA = False usageOptions = UsageOptions @@ -60,6 +60,10 @@ class HTTPHeaderFieldManipulation(httpt.HTTPTest): requiresTor = False requiresRoot = False + def setUp(self): + super(HTTPHeaderFieldManipulation, self).setUp() + self.url = self.localOptions['backend'] + def get_headers(self): headers = {} if self.localOptions['headers']: @@ -96,12 +100,6 @@ class HTTPHeaderFieldManipulation(httpt.HTTPTest): headers[new_key] = v return headers - def processInputs(self): - if self.localOptions['backend']: - self.url = self.localOptions['backend'] - else: - raise Exception("No backend specified") - def processResponseBody(self, data): self.check_for_tampering(data) diff --git a/ooni/oonicli.py b/ooni/oonicli.py index f84ac2d..8313822 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -183,14 +183,15 @@ def runWithDirector(logging=True, start_tor=True): deck.insert(net_test_loader) except errors.MissingRequiredOption as option_name: log.err('Missing required option: "%s"' % option_name) - print net_test_loader.usageOptions().getUsage() + incomplete_net_test_loader = option_name.net_test_loader + print incomplete_net_test_loader.usageOptions().getUsage() sys.exit(2) except errors.NetTestNotFound as path: log.err('Requested NetTest file not found (%s)' % path) sys.exit(3) - except usage.UsageError as e: + except errors.OONIUsageError as e: log.err(e) - print net_test_loader.usageOptions().getUsage() + print e.net_test_loader.usageOptions().getUsage() sys.exit(4) except Exception as e: log.err(e) diff --git a/ooni/tests/test_nettest.py b/ooni/tests/test_nettest.py index 94db4b3..7828c4b 100644 --- a/ooni/tests/test_nettest.py +++ b/ooni/tests/test_nettest.py @@ -6,7 +6,7 @@ from twisted.internet import defer, reactor from twisted.python.usage import UsageError from ooni.settings import config -from ooni.errors import MissingRequiredOption +from ooni.errors import MissingRequiredOption, OONIUsageError from ooni.nettest import NetTest, NetTestLoader from ooni.director import Director @@ -67,6 +67,7 @@ class UsageOptions(usage.Options): class DummyTestCase(NetTestCase): inputFile = ['file', 'f', None, 'The input File'] + requiredOptions = ['foo', 'bar'] usageOptions = UsageOptions def test_a(self): @@ -74,8 +75,6 @@ class DummyTestCase(NetTestCase): def test_b(self): self.report['foo'] = 'foo' - - requiredOptions = ['foo', 'bar'] """ http_net_test = """ @@ -115,12 +114,15 @@ class TestNetTest(unittest.TestCase): timeout = 1 def setUp(self): + self.filename = "" with open(dummyInputFile, 'w') as f: for i in range(10): f.write("%s\n" % i) def tearDown(self): os.remove(dummyInputFile) + if self.filename != "": + os.remove(self.filename) def assertCallable(self, thing): self.assertIn('__call__', dir(thing)) @@ -181,14 +183,10 @@ class TestNetTest(unittest.TestCase): self.assertIn(option, test_klass.usageOptions()) def test_load_with_invalid_option(self): - try: - ntl = NetTestLoader(dummyInvalidArgs) - ntl.loadNetTestString(net_test_string) - - ntl.checkOptions() - raise Exception - except UsageError: - pass + ntl = NetTestLoader(dummyInvalidArgs) + ntl.loadNetTestString(net_test_string) + self.assertRaises(UsageError, ntl.checkOptions) + self.assertRaises(OONIUsageError, ntl.checkOptions) def test_load_with_required_option(self): ntl = NetTestLoader(dummyArgsWithRequiredOptions) @@ -197,12 +195,9 @@ class TestNetTest(unittest.TestCase): self.assertIsInstance(ntl, NetTestLoader) def test_load_with_missing_required_option(self): - try: - ntl = NetTestLoader(dummyArgs) - ntl.loadNetTestString(net_test_string_with_required_option) - - except MissingRequiredOption: - pass + ntl = NetTestLoader(dummyArgs) + ntl.loadNetTestString(net_test_string_with_required_option) + self.assertRaises(MissingRequiredOption, ntl.checkOptions) def test_net_test_inputs(self): ntl = NetTestLoader(dummyArgsWithFile) @@ -247,7 +242,8 @@ class TestNetTest(unittest.TestCase): ntl.checkOptions() director = Director() - d = director.startNetTest(ntl, 'dummy_report.yaml') + self.filename = 'dummy_report.yaml' + d = director.startNetTest(ntl, self.filename) @d.addCallback def complete(result): @@ -301,6 +297,7 @@ class TestNettestTimeout(ConfigTestCase): super(TestNettestTimeout, self).tearDown() self.factory.stopFactory() self.port.stopListening() + os.remove(self.filename) def test_nettest_timeout(self): ntl = NetTestLoader(('-u', 'http://localhost:8007/')) @@ -309,7 +306,8 @@ class TestNettestTimeout(ConfigTestCase): ntl.checkOptions() director = Director() - d = director.startNetTest(ntl, 'dummy_report.yaml') + self.filename = 'dummy_report.yaml' + d = director.startNetTest(ntl, self.filename) @d.addCallback def complete(result):

1 0

[ooni-probe/master] Merge pull request #330 from kudrom/missing_requirements
by art＠torproject.org 07 Jul '14

07 Jul '14

commit 584a0ebea4f2748c4abc9a0570bfee4dd256fc45 Merge: 2dcac0e a9a2446 Author: Arturo Filastò <hellais(a)users.noreply.github.com> Date: Mon Jul 7 13:00:00 2014 +0200 Merge pull request #330 from kudrom/missing_requirements Fixed bug when a deck was missing some argument of a test. Also fixed so... ooni/deck.py | 2 +- ooni/errors.py | 12 ++++++- ooni/nettest.py | 9 +++-- .../manipulation/http_header_field_manipulation.py | 12 +++---- ooni/oonicli.py | 7 ++-- ooni/tests/test_nettest.py | 36 +++++++++----------- 6 files changed, 45 insertions(+), 33 deletions(-)

1 0