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

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 28 Feb '14

28 Feb '14

commit 08c2c3e2e314e5ea7f91d7c2191194638f1f1ff8 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 28 15:15:31 2014 +0000 Update translations for tor-launcher-properties_completed --- nb/torlauncher.properties | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nb/torlauncher.properties b/nb/torlauncher.properties index 9dac98a..5535bf8 100644 --- a/nb/torlauncher.properties +++ b/nb/torlauncher.properties @@ -7,6 +7,7 @@ torlauncher.tor_exited=Tor ble uventet avsluttet. torlauncher.please_restart_app=Vennligst start denne applikasjonen på nytt. torlauncher.tor_controlconn_failed=Kunne ikke koble til Tor kontrollport. torlauncher.tor_failed_to_start=Tor kunne ikke starte. +torlauncher.tor_control_failed=Feilet i ta kontroll over Tor. torlauncher.tor_bootstrap_failed=Tor fikk ikke etablert en forbindelse til Tor-nettverket. torlauncher.tor_bootstrap_failed_details=%1$S feilet (%2$S). @@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Vennligst sjekk at Tor kjører. torlauncher.error_proxy_addr_missing=Du må spesifisere både IP-adresse eller vertsnavn og et portnummer for å konfigurere Tor til å bruke en proxy for å koble til Internett. torlauncher.error_proxy_type_missing=Du må velge proxytypen torlauncher.error_bridges_missing=Du må velge én eller flere broer. +torlauncher.error_default_bridges_type_missing=Du må velge en tilkoblingstype for standardbroene. +torlauncher.error_bridge_bad_default_type=Ingen standardbroer av tilkoblingstypen %S er tilgjengelig. Vennligst juster innstillingene dine. + +torlauncher.recommended_bridge=(anbefalt) torlauncher.connect=Koble til torlauncher.quit=Avslutt

1 0

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

28 Feb '14

commit c6c1045bce1a4fc8a0a5194c0eab5977fd4b155e Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 28 15:15:28 2014 +0000 Update translations for tor-launcher-properties --- nb/torlauncher.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nb/torlauncher.properties b/nb/torlauncher.properties index 021a7f8..5535bf8 100644 --- a/nb/torlauncher.properties +++ b/nb/torlauncher.properties @@ -7,7 +7,7 @@ torlauncher.tor_exited=Tor ble uventet avsluttet. torlauncher.please_restart_app=Vennligst start denne applikasjonen på nytt. torlauncher.tor_controlconn_failed=Kunne ikke koble til Tor kontrollport. torlauncher.tor_failed_to_start=Tor kunne ikke starte. -# torlauncher.tor_control_failed=Failed to take control of Tor. +torlauncher.tor_control_failed=Feilet i ta kontroll over Tor. torlauncher.tor_bootstrap_failed=Tor fikk ikke etablert en forbindelse til Tor-nettverket. torlauncher.tor_bootstrap_failed_details=%1$S feilet (%2$S). @@ -24,8 +24,8 @@ torlauncher.ensure_tor_is_running=Vennligst sjekk at Tor kjører. torlauncher.error_proxy_addr_missing=Du må spesifisere både IP-adresse eller vertsnavn og et portnummer for å konfigurere Tor til å bruke en proxy for å koble til Internett. torlauncher.error_proxy_type_missing=Du må velge proxytypen torlauncher.error_bridges_missing=Du må velge én eller flere broer. -# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges. -# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings. +torlauncher.error_default_bridges_type_missing=Du må velge en tilkoblingstype for standardbroene. +torlauncher.error_bridge_bad_default_type=Ingen standardbroer av tilkoblingstypen %S er tilgjengelig. Vennligst juster innstillingene dine. torlauncher.recommended_bridge=(anbefalt)

1 0

[tor/release-0.2.4] give it a release blurb and date
by arma＠torproject.org 28 Feb '14

28 Feb '14

commit 505962724c05445fa0f0354e990e6cb60ef193e9 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Feb 28 10:11:36 2014 -0500 give it a release blurb and date and also copy the changelog into ReleaseNotes --- ChangeLog | 6 +++++- ReleaseNotes | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ab4e1b4..40e54d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,8 @@ -Changes in version 0.2.4.21 - 2014-02-2? +Changes in version 0.2.4.21 - 2014-02-28 + Tor 0.2.4.21 further improves security against potential adversaries who + find breaking 1024-bit crypto doable, and backports several stability + and robustness patches from the 0.2.5 branch. + o Major features (client security): - When we choose a path for a 3-hop circuit, make sure it contains at least one relay that supports the NTor circuit extension diff --git a/ReleaseNotes b/ReleaseNotes index 54195f8..8709d0d 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -3,6 +3,67 @@ This document summarizes new features and bugfixes in each stable release of Tor. If you want to see more detailed descriptions of the changes in each development snapshot, see the ChangeLog file. +Changes in version 0.2.4.21 - 2014-02-28 + Tor 0.2.4.21 further improves security against potential adversaries who + find breaking 1024-bit crypto doable, and backports several stability + and robustness patches from the 0.2.5 branch. + + o Major features (client security): + - When we choose a path for a 3-hop circuit, make sure it contains + at least one relay that supports the NTor circuit extension + handshake. Otherwise, there is a chance that we're building + a circuit that's worth attacking by an adversary who finds + breaking 1024-bit crypto doable, and that chance changes the game + theory. Implements ticket 9777. + + o Major bugfixes: + - Do not treat streams that fail with reason + END_STREAM_REASON_INTERNAL as indicating a definite circuit failure, + since it could also indicate an ENETUNREACH connection error. Fixes + part of bug 10777; bugfix on 0.2.4.8-alpha. + + o Code simplification and refactoring: + - Remove data structures which were introduced to implement the + CellStatistics option: they are now redundant with the new timestamp + field in the regular packed_cell_t data structure, which we did + in 0.2.4.18-rc in order to resolve bug 9093. Resolves ticket 10870. + + o Minor features: + - Always clear OpenSSL bignums before freeing them -- even bignums + that don't contain secrets. Resolves ticket 10793. Patch by + Florent Daigniere. + - Build without warnings under clang 3.4. (We have some macros that + define static functions only some of which will get used later in + the module. Starting with clang 3.4, these give a warning unless the + unused attribute is set on them.) Resolves ticket 10904. + - Update geoip and geoip6 files to the February 7 2014 Maxmind + GeoLite2 Country database. + + o Minor bugfixes: + - Set the listen() backlog limit to the largest actually supported + on the system, not to the value in a header file. Fixes bug 9716; + bugfix on every released Tor. + - Treat ENETUNREACH, EACCES, and EPERM connection failures at an + exit node as a NOROUTE error, not an INTERNAL error, since they + can apparently happen when trying to connect to the wrong sort + of netblocks. Fixes part of bug 10777; bugfix on 0.1.0.1-rc. + - Fix build warnings about missing "a2x" comment when building the + manpages from scratch on OpenBSD; OpenBSD calls it "a2x.py". + Fixes bug 10929; bugfix on 0.2.2.9-alpha. Patch from Dana Koch. + - Avoid a segfault on SIGUSR1, where we had freed a connection but did + not entirely remove it from the connection lists. Fixes bug 9602; + bugfix on 0.2.4.4-alpha. + - Fix a segmentation fault in our benchmark code when running with + Fedora's OpenSSL package, or any other OpenSSL that provides + ECDH but not P224. Fixes bug 10835; bugfix on 0.2.4.8-alpha. + - Turn "circuit handshake stats since last time" log messages into a + heartbeat message. Fixes bug 10485; bugfix on 0.2.4.17-rc. + + o Documentation fixes: + - Document that all but one DirPort entry must have the NoAdvertise + flag set. Fixes bug 10470; bugfix on 0.2.3.3-alpha / 0.2.3.16-alpha. + + Changes in version 0.2.4.20 - 2013-12-22 Tor 0.2.4.20 fixes potentially poor random number generation for users who 1) use OpenSSL 1.0.0 or later, 2) set "HardwareAccel 1" in their

1 0

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

28 Feb '14

commit 5d937d17f3f36d1dcc8fc6d8fdf5460318ff2251 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 28 14:45:37 2014 +0000 Update translations for tor-launcher-network-settings --- ar/network-settings.dtd | 4 ++-- nb/network-settings.dtd | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ar/network-settings.dtd b/ar/network-settings.dtd index 0c0f382..d48faa7 100644 --- a/ar/network-settings.dtd +++ b/ar/network-settings.dtd @@ -53,11 +53,11 @@ <!ENTITY torsettings.copyLog "نسخ سجل تور إلي الحافظة"> <!ENTITY torsettings.bridgeHelpTitle "المساعدة الخاصة بالجسور المُرحلة"> -<!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 unlisted relays that are more difficult to block."> +<!ENTITY torsettings.bridgeHelp1 "قد يكون السبب في عدم قدرتك علي الاتصال بشبكة تورهو ان مزود خدمة الإنترنت الخاص بك (ISP) أو منظمة اخري يمنع محاولات الاتصال بشبكة تور. وغالباً، تستطيع تخطي هذا المنع عن طريق استخدام جسور تور و الجسور عبارة عن مُرحلات مخفية صعب منعها."> <!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "Send email 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 a gmail.com or yahoo.com email address."> +<!ENTITY torsettings.bridgeHelp3 "ارسل بريد إلكتروني إلى bridges(a)torproject.org يحتوي علي 'get bridges' في قلب البريد. و حتي تضمن وصول ذلك البريد لنا بنجاح استخدم إما gmail.com أو yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.&#160; Please note that a person will need to respond to each request."> diff --git a/nb/network-settings.dtd b/nb/network-settings.dtd index c89bb93..91835b1 100644 --- a/nb/network-settings.dtd +++ b/nb/network-settings.dtd @@ -23,7 +23,7 @@ <!ENTITY torSettings.firewallHelp "Hvis du ikke er sikker på hvordan du skal svare på dette spørsmålet, velg nei. Hvis du støter på problemer med å koble til Tor-nettverket, endrer du denne innstillingen."> <!ENTITY torSettings.enterFirewall "Skriv inn en liste, adskilt med komma, over porter som er tillatt av brannmuren."> <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeHelp "Hvis du er usikker på hva du skal svare på dette spørsmålet, velg Nei.&#160; Hvis du velger Ja, vil du bli bedt om å konfigurere Tor-broer, som er ulistede reléer som gjør det vanskeligere å blokkere tilkoblinger til Tor-nettverket."> <!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">  @@ -47,14 +47,14 @@ <!ENTITY torsettings.firewall.allowedPorts "Tillatte Porter:"> <!ENTITY torsettings.useBridges.checkbox "Min Internettleverandør (ISP) blokkerer tilkoblinger til Tor-nettverket"> <!ENTITY torsettings.useBridges.default "Use Default Bridges of Type"> -<!ENTITY torsettings.useBridges.custom "Use Custom Bridges"> +<!ENTITY torsettings.useBridges.custom "Bruk egendefinerte broer"> <!ENTITY torsettings.useBridges.label "Skriv inn en, eller fler bro-reléer (èn pr linje)."> <!ENTITY torsettings.useBridges.placeholder "type address:port"> <!ENTITY torsettings.copyLog "Kopier Torloggen til Utklippstavlen"> <!ENTITY torsettings.bridgeHelpTitle "Bro-relé Hjelp"> <!ENTITY torsettings.bridgeHelp1 "Hvis du ikke får koblet til Tor-nettverket, kan det være at internettleverandøren din (ISP), eller et annet byrå/institusjon/etat blokkerer Tor.&#160; Som regel kan du omgå dette problemet ved å bruke Tor-broer, som er ulistede reléer og derfor vanskeligere å blokkere."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "Du kan bruke de standard prekonfigurerte bro-adressene eller du kan skaffe deg egendefinerte adresser ved å bruke en av følgende tre metoder:"> <!ENTITY torsettings.bridgeHelp2Heading "Via nettet"> <!ENTITY torsettings.bridgeHelp2 "Bruk en nettleser for å besøke https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Via e-post autosvar">

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 28 Feb '14

28 Feb '14

commit 5df751281fc17991d985fd79199b5a897bf220e3 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 28 14:45:32 2014 +0000 Update translations for tor-launcher-properties_completed --- ar/torlauncher.properties | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ar/torlauncher.properties b/ar/torlauncher.properties index 477bb27..c9870b2 100644 --- a/ar/torlauncher.properties +++ b/ar/torlauncher.properties @@ -7,6 +7,7 @@ torlauncher.tor_exited=توقف تور عن العمل بشكل غير متوق torlauncher.please_restart_app=يرجي إعادة تشغيل هذا البرنامج. torlauncher.tor_controlconn_failed=تعذر الاتصال بمنفذ التحكم الخاص بتور. torlauncher.tor_failed_to_start=تور فشل في بدء التشغيل. +torlauncher.tor_control_failed=تعذر التحكم في تور. torlauncher.tor_bootstrap_failed=فشل تور في إنشاء اتصال بشبكة تور. torlauncher.tor_bootstrap_failed_details=%1$S فشل(%2$S). @@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=الرجاء التأكد أن تور يعمل torlauncher.error_proxy_addr_missing=من الضروري تحديد كل من عنوان الانترنت IP أو عنوان مستضيف واحد و منفذ وذلك لتهيئة تور لأستخدام بروكسي حتي يستطيع الوصول إلي شبكة الانترنت. torlauncher.error_proxy_type_missing=من الضروري تحديد نوع البروكسي. torlauncher.error_bridges_missing=من الضروري تحديد جسر واحد أو أكثر. +torlauncher.error_default_bridges_type_missing=يجب تحديد نوع الجسور الافتراضية. +torlauncher.error_bridge_bad_default_type=لا يوجد نوع للجسور الافتراضية %S محدد. الرجاء تعديل إعداداتك. + +torlauncher.recommended_bridge=(موصى به) torlauncher.connect=اتصل torlauncher.quit=إنهاء

1 0

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

28 Feb '14

commit 3b075c6a5387e7f4c79c2fdfd400e8ffab255aba Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 28 14:45:29 2014 +0000 Update translations for tor-launcher-properties --- ar/torlauncher.properties | 8 ++++---- nb/torlauncher.properties | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ar/torlauncher.properties b/ar/torlauncher.properties index ef90ed7..c9870b2 100644 --- a/ar/torlauncher.properties +++ b/ar/torlauncher.properties @@ -7,7 +7,7 @@ torlauncher.tor_exited=توقف تور عن العمل بشكل غير متوق torlauncher.please_restart_app=يرجي إعادة تشغيل هذا البرنامج. torlauncher.tor_controlconn_failed=تعذر الاتصال بمنفذ التحكم الخاص بتور. torlauncher.tor_failed_to_start=تور فشل في بدء التشغيل. -# torlauncher.tor_control_failed=Failed to take control of Tor. +torlauncher.tor_control_failed=تعذر التحكم في تور. torlauncher.tor_bootstrap_failed=فشل تور في إنشاء اتصال بشبكة تور. torlauncher.tor_bootstrap_failed_details=%1$S فشل(%2$S). @@ -24,10 +24,10 @@ torlauncher.ensure_tor_is_running=الرجاء التأكد أن تور يعمل torlauncher.error_proxy_addr_missing=من الضروري تحديد كل من عنوان الانترنت IP أو عنوان مستضيف واحد و منفذ وذلك لتهيئة تور لأستخدام بروكسي حتي يستطيع الوصول إلي شبكة الانترنت. torlauncher.error_proxy_type_missing=من الضروري تحديد نوع البروكسي. torlauncher.error_bridges_missing=من الضروري تحديد جسر واحد أو أكثر. -# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges. -# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings. +torlauncher.error_default_bridges_type_missing=يجب تحديد نوع الجسور الافتراضية. +torlauncher.error_bridge_bad_default_type=لا يوجد نوع للجسور الافتراضية %S محدد. الرجاء تعديل إعداداتك. -# torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(موصى به) torlauncher.connect=اتصل torlauncher.quit=إنهاء diff --git a/nb/torlauncher.properties b/nb/torlauncher.properties index 9298f70..021a7f8 100644 --- a/nb/torlauncher.properties +++ b/nb/torlauncher.properties @@ -27,7 +27,7 @@ torlauncher.error_bridges_missing=Du må velge én eller flere broer. # torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges. # torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings. -# torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(anbefalt) torlauncher.connect=Koble til torlauncher.quit=Avslutt

1 0

[ooni-probe/master] Write unittests for deck related code.
by art＠torproject.org 28 Feb '14

28 Feb '14

commit 3617cfd102ee727182f244b41ae2276dfbaf3534 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Jan 30 17:15:37 2014 +0100 Write unittests for deck related code. --- ooni/tests/test_deck.py | 112 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 95 insertions(+), 17 deletions(-) diff --git a/ooni/tests/test_deck.py b/ooni/tests/test_deck.py index 627bad9..3a330c0 100644 --- a/ooni/tests/test_deck.py +++ b/ooni/tests/test_deck.py @@ -1,30 +1,54 @@ import os +from twisted.internet import defer from twisted.trial import unittest from hashlib import sha256 -from ooni.deck import InputFile - -dummy_deck_content = """- options: - collector: null - help: 0 - logfile: null - no-default-reporter: 0 - parallelism: null - pcapfile: null - reportfile: null - resume: 0 - subargs: [] - test_file: some_dummy_test - testdeck: null +from ooni.deck import InputFile, Deck + +net_test_string = """ +from twisted.python import usage +from ooni.nettest import NetTestCase + +class UsageOptions(usage.Options): + optParameters = [['spam', 's', None, 'ham']] + +class DummyTestCase(NetTestCase): + + usageOptions = UsageOptions + requiredTestHelpers = {'spam': 'test-helper-typeA'} + + def test_a(self): + self.report['bar'] = 'bar' + + def test_b(self): + self.report['foo'] = 'foo' """ -class TestInputFile(unittest.TestCase): + +class BaseTestCase(unittest.TestCase): + def setUp(self): + self.cwd = os.getcwd() + self.dummy_deck_content = """- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [] + test_file: %s/dummy_test.py + testdeck: null + """ % self.cwd + +class TestInputFile(BaseTestCase): def test_file_cached(self): - file_hash = sha256(dummy_deck_content).hexdigest() + file_hash = sha256(self.dummy_deck_content).hexdigest() input_file = InputFile(file_hash, base_path='.') with open(file_hash, 'w+') as f: - f.write(dummy_deck_content) + f.write(self.dummy_deck_content) assert input_file.fileCached def test_file_invalid_hash(self): @@ -50,3 +74,57 @@ class TestInputFile(unittest.TestCase): assert os.path.isfile(file_id) assert input_file.descriptorCached + +class MockOONIBClient(object): + def lookupTestHelpers(self, required_test_helpers): + ret = { + 'default': { + 'address': '127.0.0.1', + 'collector': 'httpo://thirteenchars1234.onion' + } + } + for required_test_helper in required_test_helpers: + ret[required_test_helper] = { + 'address': '127.0.0.1', + 'collector': 'httpo://thirteenchars1234.onion' + } + return defer.succeed(ret) + +class TestDeck(BaseTestCase): + def setUp(self): + super(TestDeck, self).setUp() + self.deck_file = os.path.join(self.cwd, + '4145fd06158ce16e45469fc6b41c3d79a93b958925484ffa93c205d9f3b2e30a') + with open(self.deck_file, 'w+') as f: + f.write(self.dummy_deck_content) + with open(os.path.join(self.cwd, 'dummy_test.py'), 'w+') as f: + f.write(net_test_string) + + def test_open_deck(self): + deck = Deck(deckFile=self.deck_file, decks_directory=".") + assert len(deck.netTestLoaders) == 1 + + def test_save_deck_descriptor(self): + deck = Deck(deckFile=self.deck_file, decks_directory=".") + deck.load({'name': 'spam', + 'id': 'spam', + 'version': 'spam', + 'author': 'spam', + 'date': 'spam', + 'description': 'spam' + }) + deck.save() + deck.verify() + + @defer.inlineCallbacks + def test_lookuptest_helpers(self): + deck = Deck(deckFile=self.deck_file, decks_directory=".") + deck.oonibclient = MockOONIBClient() + yield deck.lookupTestHelpers() + + assert deck.netTestLoaders[0].collector == 'httpo://thirteenchars1234.onion' + + required_test_helpers = deck.netTestLoaders[0].requiredTestHelpers + assert len(required_test_helpers) == 1 + assert required_test_helpers[0]['test_class'].localOptions['spam'] == '127.0.0.1' +

1 0

[ooni-probe/master] Remove dead code.
by art＠torproject.org 28 Feb '14

28 Feb '14

commit 2da8195f5677fe99d832a902a7497f39111eb5b0 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Jan 30 17:19:32 2014 +0100 Remove dead code. --- ooni/utils/onion.py | 704 --------------------------------------------------- 1 file changed, 704 deletions(-) diff --git a/ooni/utils/onion.py b/ooni/utils/onion.py deleted file mode 100644 index 58b4c02..0000000 --- a/ooni/utils/onion.py +++ /dev/null @@ -1,704 +0,0 @@ -# -# onion.py -# ---------- -# Utilities for working with Tor. -# -# This code is largely taken from txtorcon and its documentation, and as such -# any and all credit should go to Meejah. Minor adjustments have been made to -# use OONI's logging system, and to build custom circuits without actually -# attaching streams. -# -# :author: Meejah, Isis Lovecruft -# :license: see included LICENSE file -# :copyright: copyright (c) 2012 The Tor Project, Inc. -# :version: 0.1.0-alpha -# -# XXX TODO add report keys for onion methods - -import random -import sys - -from twisted.internet import defer -from zope.interface import implements - -from txtorcon import CircuitListenerMixin, IStreamAttacher -from txtorcon import TorState, TorConfig -from ooni.utils import log -from ooni.utils.timer import deferred_timeout, TimeoutError - -# XXX This can be refactored to os.path.abspath -# os.path.abspath(path) -# Return a normalized absolutized version of the pathname path. On most -# platforms, this is equivalent to normpath(join(os.getcwd(), path)). -def parse_data_dir(data_dir): - """ - Parse a string that a has been given as a DataDirectory and determine - its absolute path on the filesystem. - - :param data_dir: - A directory for Tor's DataDirectory, to be parsed. - :return: - The absolute path of :param:data_dir. - """ - from os import path, getcwd - import sys - - try: - assert isinstance(data_dir, str), \ - "Parameter type(data_dir) must be str" - except AssertionError, ae: - log.err(ae) - - if data_dir.startswith('~'): - data_dir = path.expanduser(data_dir) - elif data_dir.startswith('/'): - data_dir = path.join(getcwd(), data_dir) - elif data_dir.startswith('./'): - data_dir = path.abspath(data_dir) - else: - data_dir = path.join(getcwd(), data_dir) - - try: - assert path.isdir(data_dir), "Could not find %s" % data_dir - except AssertionError, ae: - log.err(ae) - sys.exit() - else: - return data_dir - -# XXX txtorcon handles this already. -# Also this function is called write_torrc but it has hardcoded inside of it -# bridget-tordata. -def write_torrc(conf, data_dir=None): - """ - Create a torrc in our data_dir. If we don't yet have a data_dir, create a - temporary one. Any temporary files or folders are added to delete_list. - - :param conf: - A :class:`ooni.lib.txtorcon.TorConfig` object, with all configuration - values saved. - :param data_dir: - The Tor DataDirectory to use. - :return: torrc, data_dir, delete_list - """ - try: - from os import write, close - from tempfile import mkstemp, mkdtemp - except ImportError, ie: - log.err(ie) - - delete_list = [] - - if data_dir is None: - data_dir = mkdtemp(prefix='bridget-tordata') - delete_list.append(data_dir) - conf.DataDirectory = data_dir - - (fd, torrc) = mkstemp(dir=data_dir) - delete_list.append(torrc) - write(fd, conf.create_torrc()) - close(fd) - - return torrc, data_dir, delete_list - -def delete_files_or_dirs(delete_list): - """ - Given a list of files or directories to delete, delete all and suppress - all errors. - - :param delete_list: - A list of files or directories to delete. - """ - try: - from os import unlink - from shutil import rmtree - except ImportError, ie: - log.err(ie) - - for temp in delete_list: - try: - unlink(temp) - except OSError: - rmtree(temp, ignore_errors=True) - -def remove_node_from_list(node, list): - for item in list: ## bridges don't match completely - if item.startswith(node): ## due to the :<port>. - try: - log.msg("Removing %s because it is a public relay" % node) - list.remove(item) - except ValueError, ve: - log.err(ve) - -def remove_public_relays(state, bridges): - """ - Remove bridges from our bridge list which are also listed as public - relays. This must be called after Tor has fully bootstrapped and we have a - :class:`ooni.lib.txtorcon.TorState` with the - :attr:`ooni.lib.txtorcon.TorState.routers` attribute assigned. - - XXX Does state.router.values() have all of the relays in the consensus, or - just the ones we know about so far? - - XXX FIXME: There is a problem in that Tor needs a Bridge line to already be - configured in order to bootstrap. However, after bootstrapping, we grab the - microdescriptors of all the relays and check if any of our bridges are - listed as public relays. Because of this, the first bridge does not get - checked for being a relay. - """ - IPs = map(lambda addr: addr.split(':',1)[0], bridges['all']) - both = set(state.routers.values()).intersection(IPs) - - if len(both) > 0: - try: - updated = map(lambda node: remove_node_from_list(node), both) - log.debug("Bridges in both: %s" % both) - log.debug("Updated = %s" % updated) - #if not updated: - # defer.returnValue(state) - #else: - # defer.returnValue(state) - return state - except Exception, e: - log.err("Removing public relays %s from bridge list failed:\n%s" - % (both, e)) - -# XXX It is unclear to me how all of these functions would be reused. Why must -# hey be inside of a module? -def setup_done(proto): - log.msg("Setup Complete") - state = TorState(proto.tor_protocol) - state.post_bootstrap.addCallback(state_complete) - state.post_bootstrap.addErrback(setup_fail) - - -def setup_fail(proto): - log.msg("Setup Failed:\n%s" % proto) - return proto - #reactor.stop() - -def state_complete(state): - """Called when we've got a TorState.""" - log.msg("We've completely booted up a Tor version %s at PID %d" - % (state.protocol.version, state.tor_pid)) - log.msg("This Tor has the following %d Circuits:" - % len(state.circuits)) - for circ in state.circuits.values(): - log.msg("%s" % circ) - return state - -def updates(_progress, _tag, _summary): - """Log updates on the Tor bootstrapping process.""" - log.msg("%d%%: %s" % (_progress, _summary)) - -def bootstrap(ctrl): - """ - Bootstrap Tor from an instance of - :class:`ooni.lib.txtorcon.TorControlProtocol`. - """ - conf = TorConfig(ctrl) - conf.post_bootstrap.addCallback(setup_done).addErrback(setup_fail) - log.msg("Tor process connected, bootstrapping ...") - -# XXX txtorcon does this already for us. -def start_tor(reactor, config, control_port, tor_binary, data_dir, - report=None, progress=updates, - process_cb=None, process_eb=None): - """ - Use a txtorcon.TorConfig() instance, config, to write a torrc to a - tempfile in our DataDirectory, data_dir. If data_dir is None, a temp - directory will be created. Finally, create a TCP4ClientEndpoint at our - control_port, and connect it to our reactor and a spawned Tor - process. Compare with :meth:`txtorcon.launch_tor` for differences. - - :param reactor: - An instance of class:`twisted.internet.reactor`. - :param config: - An instance of class:`txtorcon.TorConfig` with all torrc options - already configured. ivar:`config.ControlPort`, - ivar:`config.SocksPort`, ivar:`config.CookieAuthentication`, should - already be set, as well as ivar:`config.UseBridges` and - ivar:`config.Bridge` if bridges are to be used. - ivar:`txtorcon.DataDirectory` does not need to be set. - :param control_port: - The port number to use for Tor's ControlPort. - :param tor_binary: - The full path to the Tor binary to use. - :param data_dir: - The directory to use as Tor's DataDirectory. - :param report: - The class:`ooni.plugoo.reports.Report` instance. - :param progress: - A non-blocking function to handle bootstrapping updates, which takes - three parameters: _progress, _tag, and _summary. - :param process_cb: - The function to callback to after - class:`ooni.lib.txtorcon.TorProcessProtocol` returns with the fully - bootstrapped Tor process. - :param process_eb: - The function to errback to if - class:`ooni.lib.txtorcon.TorProcessProtocol` fails. - :return: - The result of the callback of a - class:`ooni.lib.txtorcon.TorProcessProtocol` which callbacks with a - class:`txtorcon.TorControlProtocol` as .protocol. - """ - try: - from functools import partial - from twisted.internet.endpoints import TCP4ClientEndpoint - from ooni.lib.txtorcon import TorProtocolFactory - from ooni.lib.txtorcon import TorProcessProtocol - except ImportError, ie: - log.err(ie) - - ## TODO: add option to specify an already existing torrc, which - ## will require prior parsing to enforce necessary lines - (torrc, data_dir, to_delete) = write_torrc(config, data_dir) - - log.msg("Starting Tor ...") - log.msg("Using the following as our torrc:\n%s" % config.create_torrc()) - if report is None: - report = {'torrc': config.create_torrc()} - else: - report.update({'torrc': config.create_torrc()}) - - end_point = TCP4ClientEndpoint(reactor, 'localhost', control_port) - connection_creator = partial(end_point.connect, TorProtocolFactory()) - process_protocol = TorProcessProtocol(connection_creator, progress) - process_protocol.to_delete = to_delete - - if process_cb is not None and process_eb is not None: - process_protocol.connected_cb.addCallbacks(process_cb, process_eb) - - reactor.addSystemEventTrigger('before', 'shutdown', - partial(delete_files_or_dirs, to_delete)) - try: - transport = reactor.spawnProcess(process_protocol, - tor_binary, - args=(tor_binary,'-f',torrc), - env={'HOME': data_dir}, - path=data_dir) - transport.closeStdin() - except RuntimeError, e: - log.err("Starting Tor failed:") - process_protocol.connected_cb.errback(e) - except NotImplementedError, e: - url = "http://starship.python.net/crew/mhammond/win32/Downloads.html" - log.msg("Running bridget on Windows requires pywin32: %s" % url) - process_protocol.connected_cb.errback(e) - - return process_protocol.connected_cb - -(a)defer.inlineCallbacks -def start_tor_filter_nodes(reactor, config, control_port, tor_binary, - data_dir, bridges): - """ - Bootstrap a Tor process and return a fully-setup - :class:`ooni.lib.txtorcon.TorState`. Then search for our bridges - to test in the list of known public relays, - :ivar:`ooni.lib.txtorcon.TorState.routers`, and remove any bridges - which are known public relays. - - :param reactor: - The :class:`twisted.internet.reactor`. - :param config: - An instance of :class:`ooni.lib.txtorcon.TorConfig`. - :param control_port: - The port to use for Tor's ControlPort. If already configured in - the TorConfig instance, this can be given as - TorConfig.config.ControlPort. - :param tor_binary: - The full path to the Tor binary to execute. - :param data_dir: - The full path to the directory to use as Tor's DataDirectory. - :param bridges: - A dictionary which has a key 'all' which is a list of bridges to - test connecting to, e.g.: - bridges['all'] = ['1.1.1.1:443', '22.22.22.22:9001'] - :return: - A fully initialized :class:`ooni.lib.txtorcon.TorState`. - """ - setup = yield start_tor(reactor, config, control_port, - tor_binary, data_dir, - process_cb=setup_done, process_eb=setup_fail) - filter_nodes = yield remove_public_relays(setup, bridges) - defer.returnValue(filter_nodes) - -# XXX Why is this needed? -(a)defer.inlineCallbacks -def start_tor_with_timer(reactor, config, control_port, tor_binary, data_dir, - bridges, timeout): - """ - Start bootstrapping a Tor process wrapped with an instance of the class - decorator :func:`ooni.utils.timer.deferred_timeout` and complete callbacks - to either :func:`setup_done` or :func:`setup_fail`. Return a fully-setup - :class:`ooni.lib.txtorcon.TorState`. Then search for our bridges to test - in the list of known public relays, - :ivar:`ooni.lib.txtorcon.TorState.routers`, and remove any bridges which - are listed as known public relays. - - :param reactor: - The :class:`twisted.internet.reactor`. - :param config: - An instance of :class:`ooni.lib.txtorcon.TorConfig`. - :param control_port: - The port to use for Tor's ControlPort. If already configured in - the TorConfig instance, this can be given as - TorConfig.config.ControlPort. - :param tor_binary: - The full path to the Tor binary to execute. - :param data_dir: - The full path to the directory to use as Tor's DataDirectory. - :param bridges: - A dictionary which has a key 'all' which is a list of bridges to - test connecting to, e.g.: - bridges['all'] = ['1.1.1.1:443', '22.22.22.22:9001'] - :param timeout: - The number of seconds to attempt to bootstrap the Tor process before - raising a :class:`ooni.utils.timer.TimeoutError`. - :return: - If the timeout limit is not exceeded, return a fully initialized - :class:`ooni.lib.txtorcon.TorState`, else return None. - """ - error_msg = "Bootstrapping has exceeded the timeout limit..." - with_timeout = deferred_timeout(timeout, e=error_msg)(start_tor) - try: - setup = yield with_timeout(reactor, config, control_port, tor_binary, - data_dir, process_cb=setup_done, - process_eb=setup_fail) - except TimeoutError, te: - log.err(te) - defer.returnValue(None) - #except Exception, e: - # log.err(e) - # defer.returnValue(None) - else: - state = yield remove_public_relays(setup, bridges) - defer.returnValue(state) - -# XXX This is a copy and paste of the above class with just an extra argument. -(a)defer.inlineCallbacks -def start_tor_filter_nodes_with_timer(reactor, config, control_port, - tor_binary, data_dir, bridges, timeout): - """ - Start bootstrapping a Tor process wrapped with an instance of the class - decorator :func:`ooni.utils.timer.deferred_timeout` and complete callbacks - to either :func:`setup_done` or :func:`setup_fail`. Then, filter our list - of bridges to remove known public relays by calling back to - :func:`remove_public_relays`. Return a fully-setup - :class:`ooni.lib.txtorcon.TorState`. Then search for our bridges to test - in the list of known public relays, - :ivar:`ooni.lib.txtorcon.TorState.routers`, and remove any bridges which - are listed as known public relays. - - :param reactor: - The :class:`twisted.internet.reactor`. - :param config: - An instance of :class:`ooni.lib.txtorcon.TorConfig`. - :param control_port: - The port to use for Tor's ControlPort. If already configured in - the TorConfig instance, this can be given as - TorConfig.config.ControlPort. - :param tor_binary: - The full path to the Tor binary to execute. - :param data_dir: - The full path to the directory to use as Tor's DataDirectory. - :param bridges: - A dictionary which has a key 'all' which is a list of bridges to - test connecting to, e.g.: - bridges['all'] = ['1.1.1.1:443', '22.22.22.22:9001'] - :param timeout: - The number of seconds to attempt to bootstrap the Tor process before - raising a :class:`ooni.utils.timer.TimeoutError`. - :return: - If the timeout limit is not exceeded, return a fully initialized - :class:`ooni.lib.txtorcon.TorState`, else return None. - """ - error_msg = "Bootstrapping has exceeded the timeout limit..." - with_timeout = deferred_timeout(timeout, e=error_msg)(start_tor_filter_nodes) - try: - state = yield with_timeout(reactor, config, control_port, - tor_binary, data_dir, bridges) - except TimeoutError, te: - log.err(te) - defer.returnValue(None) - #except Exception, e: - # log.err(e) - # defer.returnValue(None) - else: - defer.returnValue(state) - -class CustomCircuit(CircuitListenerMixin): - """ - Utility class for controlling circuit building. See - 'attach_streams_by_country.py' in the txtorcon documentation. - - :param state: - A fully bootstrapped instance of :class:`ooni.lib.txtorcon.TorState`. - :param relays: - A dictionary containing a key 'all', which is a list of relays to - test connecting to. - :ivar waiting_circuits: - The list of circuits which we are waiting to attach to. You shouldn't - need to touch this. - """ - # XXX - # 14:57 < meejah> to build a custom circuit (with no streams) in txtorcon, - # call TorState.build_circuit -- the Deferred callbacks with the circid - - implements(IStreamAttacher) - - def __init__(self, state, relays=None): - self.state = state - self.waiting_circuits = [] - self.relays = relays - - def waiting_on(self, circuit): - """ - Whether or not we are waiting on the given circuit before attaching to - it. - - :param circuit: - An item from :ivar:`ooni.lib.txtorcon.TorState.circuits`. - :return: - True if we are waiting on the circuit, False if not waiting. - """ - for (circid, d) in self.waiting_circuits: - if circuit.id == circid: - return True - return False - - def circuit_extend(self, circuit, router): - "ICircuitListener" - if circuit.purpose != 'GENERAL': - return - if self.waiting_on(circuit): - log.msg("Circuit %d (%s)" % (circuit.id, router.id_hex)) - - def circuit_built(self, circuit): - "ICircuitListener" - if circuit.purpose != 'GENERAL': - return - log.msg("Circuit %s built ..." % circuit.id) - log.msg("Full path of %s: %s" % (circuit.id, circuit.path)) - for (circid, d) in self.waiting_circuits: - if circid == circuit.id: - self.waiting_circuits.remove((circid, d)) - d.callback(circuit) - - def circuit_failed(self, circuit, reason): - """ - If building a circuit has failed, try to remove it from our list of - :ivar:`waiting_circuits`, else request to build it. - - :param circuit: - An item from :ivar:`ooni.lib.txtorcon.TorState.circuits`. - :param reason: - A :class:`twisted.python.fail.Failure` instance. - :return: - None - """ - if self.waiting_on(circuit): - log.msg("Circuit %s failed for reason %s" % (circuit.id, reason)) - circid, d = None, None - for c in self.waiting_circuits: - if c[0] == circuit.id: - circid, d = c - if d is None: - raise Exception("Expected to find circuit.") - - self.waiting_circuits.remove((circid, d)) - log.msg("Trying to build a circuit for %s" % circid) - self.request_circuit_build(d) - - def check_circuit_route(self, router): - """ - Check if a relay is a hop in one of our already built circuits. - - :param router: - An item from the list - :func:`ooni.lib.txtorcon.TorState.routers.values()`. - """ - for circ in self.state.circuits.values(): - if router in circ.path: - #router.update() ## XXX can i use without args? no. - TorInfo.dump(self) - - def request_circuit_build(self, deferred, path=None): - """ - Request a custom circuit. - - :param deferred: - A :class:`twisted.internet.defer.Deferred` for this circuit. - :param path: - A list of router ids to build a circuit from. The length of this - list must be at least three. - """ - if path is None: - - pick = self.relays['all'].pop - n = self.state.entry_guards.values() - choose = random.choice - - first, middle, last = (None for i in range(3)) - - if self.relays['remaining']() >= 3: - first, middle, last = (pick() for i in range(3)) - elif self.relays['remaining']() < 3: - first = choose(n) - middle = pick() - if self.relays['remaining'] == 2: - middle, last = (pick() for i in range(2)) - elif self.relay['remaining'] == 1: - middle = pick() - last = choose(n) - else: - log.msg("Qu'est-que fuque?") - else: - middle, last = (random.choice(self.state.routers.values()) - for i in range(2)) - - path = [first, middle, last] - - else: - assert isinstance(path, list), \ - "Circuit path must be a list of relays!" - assert len(path) >= 3, \ - "Circuit path must be at least three hops!" - - log.msg("Requesting a circuit: %s" - % '->'.join(map(lambda node: node, path))) - - class AppendWaiting: - def __init__(self, attacher, deferred): - self.attacher = attacher - self.d = deferred - def __call__(self, circ): - """ - Return from build_circuit is a Circuit, however, - we want to wait until it is built before we can - issue an attach on it and callback to the Deferred - we issue here. - """ - log.msg("Circuit %s is in progress ..." % circ.id) - self.attacher.waiting_circuits.append((circ.id, self.d)) - - return self.state.build_circuit(path).addCallback( - AppendWaiting(self, deferred)).addErrback( - log.err) - -class TxtorconImportError(ImportError): - """ - Raised when ooni.lib.txtorcon cannot be imported from. Checks our current - working directory and the path given to see if txtorcon has been - initialized via /ooni/lib/Makefile. - """ - from os import getcwd, path - - cwd, tx = getcwd(), 'lib/txtorcon/torconfig.py' - try: - log.msg("Unable to import from ooni.lib.txtorcon") - if cwd.endswith('ooni'): - check = path.join(cwd, tx) - elif cwd.endswith('utils'): - check = path.join(cwd, '../'+tx) - else: - check = path.join(cwd, 'ooni/'+tx) - assert path.isfile(check) - except: - log.msg("Error: Some OONI libraries are missing!") - log.msg("Please go to /ooni/lib/ and do \"make all\"") - -class PTNoBridgesException(Exception): - """Raised when a pluggable transport is specified, but not bridges.""" - def __init__(self): - log.msg("Pluggable transport requires the bridges option") - return sys.exit() - -class PTNotFoundException(Exception): - def __init__(self, transport_type): - m = "Pluggable Transport type %s was unaccounted " % transport_type - m += "for, please contact isis(at)torproject(dot)org and it will " - m += "get included." - log.msg("%s" % m) - return sys.exit() - -(a)defer.inlineCallbacks -def __start_tor_with_timer__(reactor, config, control_port, tor_binary, - data_dir, bridges=None, relays=None, timeout=None, - retry=None): - """ - A wrapper for :func:`start_tor` which wraps the bootstrapping of a Tor - process and its connection to a reactor with a - :class:`twisted.internet.defer.Deferred` class decorator utility, - :func:`ooni.utils.timer.deferred_timeout`, and a mechanism for resets. - - ## XXX fill me in - """ - raise NotImplementedError - - class RetryException(Exception): - pass - - import sys - from ooni.utils.timer import deferred_timeout, TimeoutError - - def __make_var__(old, default, _type): - if old is not None: - assert isinstance(old, _type) - new = old - else: - new = default - return new - - reactor = reactor - timeout = __make_var__(timeout, 120, int) - retry = __make_var__(retry, 1, int) - - with_timeout = deferred_timeout(timeout)(start_tor) - - @defer.inlineCallbacks - def __start_tor__(rc=reactor, cf=config, cp=control_port, tb=tor_binary, - dd=data_dir, br=bridges, rl=relays, cb=setup_done, - eb=setup_fail, af=remove_public_relays, retry=retry): - try: - setup = yield with_timeout(rc,cf,cp,tb,dd) - except TimeoutError: - retry -= 1 - defer.returnValue(retry) - else: - if setup.callback: - setup = yield cb(setup) - elif setup.errback: - setup = yield eb(setup) - else: - setup = setup - - if br is not None: - state = af(setup,br) - else: - state = setup - defer.returnValue(state) - - @defer.inlineCallbacks - def __try_until__(tries): - result = yield __start_tor__() - try: - assert isinstance(result, int) - except AssertionError: - defer.returnValue(result) - else: - if result >= 0: - tried = yield __try_until__(result) - defer.returnValue(tried) - else: - raise RetryException - try: - tried = yield __try_until__(retry) - except RetryException: - log.msg("All retry attempts to bootstrap Tor have timed out.") - log.msg("Exiting ...") - defer.returnValue(sys.exit()) - else: - defer.returnValue(tried) -

1 0

[ooni-probe/master] Add unittest for the YAMLReporter
by art＠torproject.org 28 Feb '14

28 Feb '14

commit 8484bfe2870968e43c46b764688202d3c74213c0 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Jan 30 17:54:25 2014 +0100 Add unittest for the YAMLReporter --- ooni/tests/test_reporter.py | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/ooni/tests/test_reporter.py b/ooni/tests/test_reporter.py new file mode 100644 index 0000000..0a4d240 --- /dev/null +++ b/ooni/tests/test_reporter.py @@ -0,0 +1,39 @@ +import yaml +import time + +from twisted.trial import unittest + +from ooni.reporter import YAMLReporter + +class MockTest(object): + _start_time = time.time() + report = {'report_content': 'ham'} + input = 'spam' + +class TestYAMLReporter(unittest.TestCase): + def setUp(self): + pass + + def test_write_report(self): + test_details = { + 'test_name': 'spam', + 'test_version': '1.0' + } + test = MockTest() + + y_reporter = YAMLReporter(test_details) + y_reporter.createReport() + y_reporter.testDone(test, 'spam') + with open(y_reporter.report_path) as f: + report_entries = yaml.safe_load_all(f) + # Check for keys in header + entry = report_entries.next() + assert all(x in entry for x in ['test_name', 'test_version']) + + entry = report_entries.next() + # Check for first entry of report + assert all(x in entry \ + for x in ['report_content', 'input', \ + 'test_name', 'test_started', \ + 'test_runtime']) +

1 0

[ooni-probe/master] Move the creation of the Agent into the request
by art＠torproject.org 28 Feb '14

28 Feb '14

commit 47eb5dd08d0f0cc94bc2e8013cc38e8509b4d2a4 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Jan 30 17:51:12 2014 +0100 Move the creation of the Agent into the request Allowing dynamic changing of the address class attribute. Raise exception when an invalid URL is provided. --- ooni/errors.py | 3 +++ ooni/oonibclient.py | 17 ++++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ooni/errors.py b/ooni/errors.py index c167bbe..6896244 100644 --- a/ooni/errors.py +++ b/ooni/errors.py @@ -133,6 +133,9 @@ class UnableToStartTor(DirectorException): class InvalidOONIBCollectorAddress(Exception): pass +class InvalidOONIBBouncerAddress(Exception): + pass + class AllReportersFailed(Exception): pass diff --git a/ooni/oonibclient.py b/ooni/oonibclient.py index af4328b..6eff112 100644 --- a/ooni/oonibclient.py +++ b/ooni/oonibclient.py @@ -44,17 +44,20 @@ class OONIBClient(object): retries = 3 def __init__(self, address): - if address.startswith('httpo://'): - self.address = address.replace('httpo://', 'http://') - self.agent = TrueHeadersSOCKS5Agent(reactor, + self.address = address + + + def _request(self, method, urn, genReceiver, bodyProducer=None): + if self.address.startswith('httpo://'): + self.address = self.address.replace('httpo://', 'http://') + agent = TrueHeadersSOCKS5Agent(reactor, proxyEndpoint=TCP4ClientEndpoint(reactor, '127.0.0.1', config.tor.socks_port)) - elif address.startswith('https://'): + elif self.address.startswith('https://'): log.err("HTTPS based bouncers are currently not supported.") + raise e.InvalidOONIBBouncerAddress - - def _request(self, method, urn, genReceiver, bodyProducer=None): attempts = 0 finished = defer.Deferred() @@ -62,7 +65,7 @@ class OONIBClient(object): def perform_request(attempts): uri = self.address + urn headers = {} - d = self.agent.request(method, uri, bodyProducer=bodyProducer) + d = agent.request(method, uri, bodyProducer=bodyProducer) @d.addCallback def callback(response):

1 0