tor-commits August 2014

tor-commits@lists.torproject.org

21 participants
1599 discussions

[tor-browser/esr24] Bug 850721 - Fix social blocklist oranges by not enabling the default update server. r=mixedpuppy, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 4fd7f4e3c1226049e4815d1cc01a5a99a473c121 Author: Mark Hammond <mhammond(a)skippinet.com.au> Date: Fri Feb 7 12:07:04 2014 +1100 Bug 850721 - Fix social blocklist oranges by not enabling the default update server. r=mixedpuppy, a=test-only --- browser/base/content/test/social/head.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/browser/base/content/test/social/head.js b/browser/base/content/test/social/head.js index 1e5d841..5b77729 100644 --- a/browser/base/content/test/social/head.js +++ b/browser/base/content/test/social/head.js @@ -252,14 +252,24 @@ function updateBlocklist(aCallback) { blocklistNotifier.notify(null); } +var _originalTestBlocklistURL = null; function setAndUpdateBlocklist(aURL, aCallback) { + if (!_originalTestBlocklistURL) + _originalTestBlocklistURL = Services.prefs.getCharPref("extensions.blocklist.url"); Services.prefs.setCharPref("extensions.blocklist.url", aURL); updateBlocklist(aCallback); } function resetBlocklist(aCallback) { - Services.prefs.clearUserPref("extensions.blocklist.url"); - updateBlocklist(aCallback); + // XXX - this has "forked" from the head.js helpers in our parent directory :( + // But let's reuse their blockNoPlugins.xml. Later, we should arrange to + // use their head.js helpers directly + let noBlockedURL = "http://example.com/browser/browser/base/content/test/general/blockNoPlugins…"; + setAndUpdateBlocklist(noBlockedURL, function() { + Services.prefs.setCharPref("extensions.blocklist.url", _originalTestBlocklistURL); + if (aCallback) + aCallback(); + }); } function setManifestPref(name, manifest) {

1 0

[tor-browser/esr24] Bug 968461 - Fix imgStatusTracker.h to build with gcc 4.4. r=jdm, a=sledru
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit db4963336805dbc8609691d3fe4e77960b8cb4e3 Author: Mike Hommey <mh(a)glandium.org> Date: Thu Feb 6 07:07:18 2014 +0900 Bug 968461 - Fix imgStatusTracker.h to build with gcc 4.4. r=jdm, a=sledru --- image/src/imgStatusTracker.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image/src/imgStatusTracker.h b/image/src/imgStatusTracker.h index d3f36b3..b19b239 100644 --- a/image/src/imgStatusTracker.h +++ b/image/src/imgStatusTracker.h @@ -212,7 +212,7 @@ public: nsIntRect GetInvalidRect() const { return mInvalidRect; } - typedef nsTObserverArray<mozilla::WeakPtr<imgRequestProxy>> ProxyArray; + typedef nsTObserverArray<mozilla::WeakPtr<imgRequestProxy> > ProxyArray; private: friend class imgStatusNotifyRunnable; friend class imgRequestNotifyRunnable;

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 29 Aug '14

29 Aug '14

commit a39bbbe7ff15ef4acbfc5ea031ff8c9df7f08c45 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 29 03:45:55 2014 +0000 Update translations for torbutton-torbuttonproperties --- fa/torbutton.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fa/torbutton.properties b/fa/torbutton.properties index 754c9cb..811125e 100644 --- a/fa/torbutton.properties +++ b/fa/torbutton.properties @@ -49,9 +49,9 @@ torbutton.popup.never_ask_again = دیگر هیچگاه این را از من ن # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data? -canvas.notNow=Not Now +canvas.notNow=نه در حال حاضر canvas.notNowAccessKey=N -canvas.allow=Allow in the future +canvas.allow=اجازه دهید در آینده canvas.allowAccessKey=A -canvas.never=Never for this site (recommended) +canvas.never=هرگز برای این سایت (توصیه شده) canvas.neverAccessKey=e

1 0

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

29 Aug '14

commit c6ea54cd1ce829ef6763e69f561af036a435d3ce Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 29 03:45:42 2014 +0000 Update translations for tor-launcher-network-settings --- fa/network-settings.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fa/network-settings.dtd b/fa/network-settings.dtd index cb1eeab..3b755f8 100644 --- a/fa/network-settings.dtd +++ b/fa/network-settings.dtd @@ -8,8 +8,8 @@ <!ENTITY torSettings.no "نه"> <!ENTITY torSettings.firstQuestion "کدام یک از موارد زیر وضعیت شما را بهتر بیان می‌کند؟"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings."> +<!ENTITY torSettings.configurePrompt1 "اتصال به اینترنت این کامپیوتر یا فیلترینگ شدید دارد و یا پراکسی دارد."> +<!ENTITY torSettings.configurePrompt2 "من نیاز به پیکربندی پل و یا تنظیمات پروکسی دارم."> <!ENTITY torSettings.configure "پیکربندی"> <!ENTITY torSettings.connectPrompt2 "تمایل دارم مستقیما به شبکه‌ی تور متصل شوم."> <!ENTITY torSettings.connectPrompt3 "این در بیشتر مواقع کار خواهد کرد."> @@ -58,6 +58,6 @@ <!ENTITY torsettings.bridgeHelp2 "با استفاده از یک مرورگر به آدرس https://bridges.torproject.org بروید."> <!ENTITY torsettings.bridgeHelp3Heading "از طریق آدرس ایمیل پاسخگوی خودکار"> <!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> +<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, یا https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "از طریق واحد کمک رسانی"> <!ENTITY torsettings.bridgeHelp4 "اگر از طریق هیچ کدام از راه حل های فوق به نتیجه نرسیدید، یک درخواست مودبانه به آدرس help(a)rt.torproject.org ارسال کنید.  در نظر داشته باشید که یک نفر باید ایمیل شما را بخواند و به آن پاسخ دهد. پس صبور باشید.">

1 0

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

29 Aug '14

commit 00c2767cfb26d6534d78772c18ca38f2d7f56f10 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 29 03:45:37 2014 +0000 Update translations for tor-launcher-properties_completed --- fa/torlauncher.properties | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/fa/torlauncher.properties b/fa/torlauncher.properties index ab718b4..bdd5c09 100644 --- a/fa/torlauncher.properties +++ b/fa/torlauncher.properties @@ -3,8 +3,8 @@ torlauncher.error_title=اجرا کننده تور -torlauncher.tor_exited=تور به‌دلیلی نامشخص خارج شد. -torlauncher.tor_connection_lost=تماس شما با شبکه تور قطع شده است. +torlauncher.tor_exited=Tor به طور غیر منتظره خارج شد. ممکن است به علت یک اشکال در Tor و یا یک برنامه دیگر بر روی سیستم شما و یا یک سخت افزار معیوب اتفاق افتاده باشد، تا زمانی که دوباره Tor را اجرا نمائید. مرورگر Tor قادر است به هر سایتی دسترسی داشته باشد. اگر این مشکل ادامه داشت، لطفا یک کپی از Log Tor خود را به تیم پشتیبانی ارسال کنید. +torlauncher.tor_exited2=شروع مجدد، Tor نمی تواند زبانه های مرورگر را ببندد. torlauncher.tor_controlconn_failed=اتصال به پورت کنترل تور امکان پذیر نمی‌باشد. torlauncher.tor_failed_to_start=خطا در راه اندازی. torlauncher.tor_control_failed=به‌دست گرفتن کنترل تور ناموفق بود. @@ -30,13 +30,15 @@ torlauncher.error_bridge_bad_default_type=هیچ پلی از نوع %S موجو torlauncher.recommended_bridge=(توصیه شده) torlauncher.connect=اتصال -torlauncher.reconnect=دوباده وصل کنید. +torlauncher.restart_tor=تور را دوباره شوروع کنید. torlauncher.quit=خروج torlauncher.quit_win=خروج torlauncher.done=انجام شد torlauncher.forAssistance=برای دریافت کمک٫ با %S تماس بگیرید +torlauncher.copiedNLogMessages=کپی کامل شد. %S پیامهای ثبت شده آماده است تا Paste شود در ویرایشگر متن یا یک ایمیل. + torlauncher.bootstrapStatus.conn_dir=اتصال به یک فهرست بازپخش torlauncher.bootstrapStatus.handshake_dir=برپایی یک اتصال فهرست رمزبندی شده torlauncher.bootstrapStatus.requesting_status=بازیابی وضیعت شبکه

1 0

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

29 Aug '14

commit 4f20b9c4432a0a632890dd3bff5484d6871ad211 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 29 03:45:35 2014 +0000 Update translations for tor-launcher-properties --- fa/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fa/torlauncher.properties b/fa/torlauncher.properties index 4733a0e..bdd5c09 100644 --- a/fa/torlauncher.properties +++ b/fa/torlauncher.properties @@ -3,7 +3,7 @@ torlauncher.error_title=اجرا کننده تور -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. +torlauncher.tor_exited=Tor به طور غیر منتظره خارج شد. ممکن است به علت یک اشکال در Tor و یا یک برنامه دیگر بر روی سیستم شما و یا یک سخت افزار معیوب اتفاق افتاده باشد، تا زمانی که دوباره Tor را اجرا نمائید. مرورگر Tor قادر است به هر سایتی دسترسی داشته باشد. اگر این مشکل ادامه داشت، لطفا یک کپی از Log Tor خود را به تیم پشتیبانی ارسال کنید. torlauncher.tor_exited2=شروع مجدد، Tor نمی تواند زبانه های مرورگر را ببندد. torlauncher.tor_controlconn_failed=اتصال به پورت کنترل تور امکان پذیر نمی‌باشد. torlauncher.tor_failed_to_start=خطا در راه اندازی.

1 0

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

29 Aug '14

commit 33efeab661910f48a5c4b2c6b718d42bcd8ab03e Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 29 03:15:30 2014 +0000 Update translations for tor-launcher-properties --- fa/torlauncher.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fa/torlauncher.properties b/fa/torlauncher.properties index 8a7feb2..4733a0e 100644 --- a/fa/torlauncher.properties +++ b/fa/torlauncher.properties @@ -4,7 +4,7 @@ torlauncher.error_title=اجرا کننده تور torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. -torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. +torlauncher.tor_exited2=شروع مجدد، Tor نمی تواند زبانه های مرورگر را ببندد. torlauncher.tor_controlconn_failed=اتصال به پورت کنترل تور امکان پذیر نمی‌باشد. torlauncher.tor_failed_to_start=خطا در راه اندازی. torlauncher.tor_control_failed=به‌دست گرفتن کنترل تور ناموفق بود. @@ -37,7 +37,7 @@ torlauncher.done=انجام شد torlauncher.forAssistance=برای دریافت کمک٫ با %S تماس بگیرید -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=کپی کامل شد. %S پیامهای ثبت شده آماده است تا Paste شود در ویرایشگر متن یا یک ایمیل. torlauncher.bootstrapStatus.conn_dir=اتصال به یک فهرست بازپخش torlauncher.bootstrapStatus.handshake_dir=برپایی یک اتصال فهرست رمزبندی شده

1 0

[tor-browser/tor-browser-24.7.0esr-4.x-2] fixup! Backport two integer overflow patches.
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit b19c32010424180d9e524503c90eb05344d39bd0 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Aug 28 18:30:06 2014 -0700 fixup! Backport two integer overflow patches. These are in the mozilla namespace. --- image/src/imgFrame.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image/src/imgFrame.cpp b/image/src/imgFrame.cpp index 33d1b3a..0e2ef3f 100644 --- a/image/src/imgFrame.cpp +++ b/image/src/imgFrame.cpp @@ -55,7 +55,7 @@ static bool AllowedImageSize(int32_t aWidth, int32_t aHeight) } // check to make sure we don't overflow a 32-bit - CheckedInt32 requiredBytes = CheckedInt32(aWidth) * CheckedInt32(aHeight) * 4; + mozilla::CheckedInt32 requiredBytes = mozilla::CheckedInt32(aWidth) * mozilla::CheckedInt32(aHeight) * 4; if (MOZ_UNLIKELY(!requiredBytes.isValid())) { NS_WARNING("width or height too large"); return false;

1 0

[oonib/master] Implement policy aware bouncing support in the backend
by art＠torproject.org 28 Aug '14

28 Aug '14

commit cd5992e9bc2877b1105a1584a168136de83148b3 Author: kudrom <kudrom(a)riseup.net> Date: Mon Aug 25 17:19:38 2014 +0200 Implement policy aware bouncing support in the backend --- data/bouncer.yaml | 17 +++++++- oonib/bouncer/handlers.py | 102 +++++++++++++++++++++++++++++++++++---------- oonib/errors.py | 10 +++++ oonib/handlers.py | 3 +- 4 files changed, 108 insertions(+), 24 deletions(-) diff --git a/data/bouncer.yaml b/data/bouncer.yaml index 9ab2dc0..acf2a9a 100644 --- a/data/bouncer.yaml +++ b/data/bouncer.yaml @@ -1,3 +1,18 @@ collector: httpo://ihiderha53f36lsd.onion: - test-helper: {dns: '93.95.227.200:57004', http-return-json-headers: 'http://93.95.227.200', ssl: 'https://93.95.227.20', tcp-echo: '213.138.109.232', traceroute: '93.95.227.200'} + policy: + input: + - {id: 37e60e13536f6afe47a830bfb6b371b5cf65da66d7ad65137344679b24fdccd1} + - {id: e0611ecd28bead38a7afeb4dda8ae3449d0fc2e1ba53fa7355f2799dce9af290} + nettest: + - {name: dns_consistency, version: '0.5'} + - {name: http_requests_test, version: 0.2.3} + - {name: tcp_connect, version: '0.1'} + - {name: captivep, version: '0.2'} + - {name: daphn3, version: '0.1'} + - {name: dns_spoof, version: '0.2'} + - {name: http_header_field_manipulation, version: 0.1.3} + - {name: http_invalid_request_line, version: 0.1.4} + - {name: multiprotocol_traceroute_test, version: 0.1.1} + test-helper: {dns: '93.95.227.200:57004', http-return-json-headers: 'http://93.95.227.200', + ssl: 'https://93.95.227.20', tcp-echo: 213.138.109.232, traceroute: 93.95.227.200} diff --git a/oonib/bouncer/handlers.py b/oonib/bouncer/handlers.py index 81d13f3..c49338e 100644 --- a/oonib/bouncer/handlers.py +++ b/oonib/bouncer/handlers.py @@ -7,24 +7,30 @@ from oonib.config import config class Bouncer(object): - def __init__(self): - with open(config.main.bouncer_file) as f: - bouncerFile = yaml.safe_load(f) - self.updateKnownHelpers(bouncerFile) - self.updateKnownCollectors(bouncerFile) - def updateKnownCollectors(self, bouncerFile): + def __init__(self, bouncer_file): + with open(bouncer_file) as f: + self.bouncerFile = yaml.safe_load(f) + self.updateKnownHelpers() + self.updateKnownCollectors() + + def updateKnownCollectors(self): """ Initialize the list of all known collectors """ - self.knownCollectors = [] - for collectorName, helpers in bouncerFile['collector'].items(): - if collectorName not in self.knownCollectors: - self.knownCollectors.append(collectorName) - - def updateKnownHelpers(self, bouncerFile): + self.knownCollectorsWithPolicy = [] + self.knownCollectorsWithoutPolicy = [] + for collectorName, content in self.bouncerFile['collector'].items(): + if content.get('policy') is not None and \ + collectorName not in self.knownCollectorsWithPolicy: + self.knownCollectorsWithPolicy.append(collectorName) + elif content.get('policy') is None and \ + collectorName not in self.knownCollectorsWithoutPolicy: + self.knownCollectorsWithoutPolicy.append(collectorName) + + def updateKnownHelpers(self): self.knownHelpers = {} - for collectorName, helpers in bouncerFile['collector'].items(): + for collectorName, helpers in self.bouncerFile['collector'].items(): for helperName, helperAddress in helpers['test-helper'].items(): if helperName not in self.knownHelpers.keys(): self.knownHelpers[helperName] = [] @@ -106,14 +112,63 @@ class Bouncer(object): response = {'error': 'test-helper-not-found'} return response - response['default'] = {'collector': - random.choice(self.knownCollectors)} + if len(self.knownCollectorsWithoutPolicy) > 0: + default_collector = random.choice( + self.knownCollectorsWithoutPolicy) + else: + default_collector = None + response['default'] = {'collector': default_collector} return response + def collectorAccepting(self, net_test_name, input_hashes, test_helpers): + for collector_address in self.knownCollectorsWithPolicy: + collector = self.bouncerFile['collector'][collector_address] + supported_net_tests = [x['name'] for x in collector['policy']['nettest']] + supported_input_hashes = [x['id'] for x in collector['policy']['input']] + if net_test_name not in supported_net_tests: + continue + if any([input_hash not in supported_input_hashes for input_hash in input_hashes]): + continue + if all([x in collector['test-helper'].keys() for x in test_helpers]): + return collector_address + if len(self.knownCollectorsWithoutPolicy) > 0: + return random.choice(self.knownCollectorsWithoutPolicy) + else: + raise e.CollectorNotFound + + def filterByNetTests(self, requested_nettests): + """ + Here we will return a list containing test helpers and collectors for + the required nettests. + We give favour to the collectors that have a stricter policy and if + those fail we will resort to using the collectors with a more lax + policy. + """ + nettests = [] + for requested_nettest in requested_nettests: + collector = self.collectorAccepting( + requested_nettest['name'], + requested_nettest['input-hashes'], + requested_nettest['test-helpers']) + test_helpers = {} + for test_helper in requested_nettest['test-helpers']: + test_helpers[test_helper] = self.bouncerFile['collector'][collector]['test-helper'][test_helper] + + nettest = { + 'name': requested_nettest['name'], + 'version': requested_nettest['version'], + 'input-hashes': requested_nettest['input-hashes'], + 'test-helpers': test_helpers, + 'collector': collector, + } + nettests.append(nettest) + return {'net-tests': nettests} + class BouncerQueryHandler(OONIBHandler): + def initialize(self): - self.bouncer = Bouncer() + self.bouncer = Bouncer(config.main.bouncer_file) def post(self): try: @@ -121,13 +176,16 @@ class BouncerQueryHandler(OONIBHandler): except ValueError: raise e.InvalidRequest - try: + if 'test-helpers' in query: requested_helpers = query['test-helpers'] - except KeyError: - raise e.TestHelpersKeyMissing + if not isinstance(requested_helpers, list): + raise e.InvalidRequest + response = self.bouncer.filterHelperAddresses(requested_helpers) - if not isinstance(requested_helpers, list): - raise e.InvalidRequest + elif 'net-tests' in query: + response = self.bouncer.filterByNetTests(query['net-tests']) + + else: + raise e.TestHelpersOrNetTestsKeyMissing - response = self.bouncer.filterHelperAddresses(requested_helpers) self.write(response) diff --git a/oonib/errors.py b/oonib/errors.py index 3f1167a..e20d471 100644 --- a/oonib/errors.py +++ b/oonib/errors.py @@ -83,6 +83,11 @@ class ReportNotFound(OONIBError): log_message = "report-not-found" +class CollectorNotFound(OONIBError): + status_code = 404 + log_message = "collector-not-found" + + class NoValidCollector(OONIBError): pass @@ -92,6 +97,11 @@ class TestHelpersKeyMissing(OONIBError): log_message = "test-helpers-key-missing" +class TestHelpersOrNetTestsKeyMissing(OONIBError): + status_code = 400 + log_message = "test-helpers-or-net-test-key-missing" + + class TestHelperNotFound(OONIBError): status_code = 404 log_message = "test-helper-not-found" diff --git a/oonib/handlers.py b/oonib/handlers.py index bbf8ade..1417cc5 100644 --- a/oonib/handlers.py +++ b/oonib/handlers.py @@ -7,6 +7,7 @@ from oonib import log class OONIBHandler(web.RequestHandler): + def write_error(self, status_code, exception=None, **kw): self.set_status(status_code) if hasattr(exception, 'log_message') and exception.log_message is not None: @@ -14,7 +15,7 @@ class OONIBHandler(web.RequestHandler): elif 400 <= status_code < 600: self.write({'error': status_code}) else: - log.error(exception) + log.exception(exception) self.write({'error': 'error'}) def write(self, chunk):

1 0

[oonib/master] Review of policy aware changes
by art＠torproject.org 28 Aug '14

28 Aug '14

commit 77474ff012275df70cd63eb68c0e54bb3ab559a6 Author: kudrom <kudrom(a)riseup.net> Date: Mon Aug 25 23:10:45 2014 +0200 Review of policy aware changes --- data/bouncer.yaml | 2 +- data/policy.yaml | 2 +- oonib/test/handler_helpers.py | 19 +- oonib/test/test_bouncer.py | 440 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 459 insertions(+), 4 deletions(-) diff --git a/data/bouncer.yaml b/data/bouncer.yaml index acf2a9a..eb30cc9 100644 --- a/data/bouncer.yaml +++ b/data/bouncer.yaml @@ -8,7 +8,7 @@ collector: - {name: dns_consistency, version: '0.5'} - {name: http_requests_test, version: 0.2.3} - {name: tcp_connect, version: '0.1'} - - {name: captivep, version: '0.2'} + - {name: captiveportal, version: '0.2'} - {name: daphn3, version: '0.1'} - {name: dns_spoof, version: '0.2'} - {name: http_header_field_manipulation, version: 0.1.3} diff --git a/data/policy.yaml b/data/policy.yaml index fcc1df4..22a14e9 100644 --- a/data/policy.yaml +++ b/data/policy.yaml @@ -5,7 +5,7 @@ nettest: - {name: dns_consistency, version: 0.5} - {name: http_requests_test, version: 0.2.3} - {name: tcp_connect, version: 0.1} -- {name: captivep, version: 0.2} +- {name: captiveportal, version: 0.2} - {name: daphne3, version: 0.1} - {name: dns_spoof, version: 0.2} - {name: http_header_field_manipulation, version: 0.1.3} diff --git a/oonib/test/handler_helpers.py b/oonib/test/handler_helpers.py index 843d5c5..e6dc0ba 100644 --- a/oonib/test/handler_helpers.py +++ b/oonib/test/handler_helpers.py @@ -1,3 +1,4 @@ +import sys import os import socket import json @@ -6,6 +7,8 @@ import shutil from twisted.internet import reactor, defer from twisted.trial import unittest +from oonib.config import config + from cyclone import httpclient @@ -32,6 +35,7 @@ class HandlerTestCase(unittest.TestCase): app = None _port = None _listener = None + config_filename = '' @property def port(self): @@ -39,16 +43,27 @@ class HandlerTestCase(unittest.TestCase): self._port = random_unused_port() return self._port + def make_dir(self, dir): + if not os.path.exists(dir): + os.mkdir(dir) + self.directories.add(dir) + def setUp(self, *args, **kw): self.filenames = set() self.directories = set() + self.old_arguments = sys.argv + if self.config_filename != '': + sys.argv = ['test_oonib', '-c', self.config_filename] + config.load() if self.app: self._listener = reactor.listenTCP(self.port, self.app) - return unittest.TestCase.setUp(self, *args, **kw) + return super(HandlerTestCase, self).setUp() def tearDown(self): + sys.argv = self.old_arguments for filename in self.filenames: - os.remove(filename) + if os.path.exists(filename): + os.remove(filename) for dir in self.directories: shutil.rmtree(dir) if self._listener: diff --git a/oonib/test/test_bouncer.py b/oonib/test/test_bouncer.py new file mode 100644 index 0000000..6785c2f --- /dev/null +++ b/oonib/test/test_bouncer.py @@ -0,0 +1,440 @@ +# -*- encoding: utf8 -*- +import json + +from twisted.internet import defer + +from cyclone import web + +from oonib.bouncer.api import bouncerAPI +from oonib.test.handler_helpers import HandlerTestCase + +fake_bouncer_file = """ +collector: + fake_address: + policy: + input: + - {id: fake_id} + nettest: + - {name: fake_nettest, version: 1.0} + - {name: another_fake_nettest, version: 2.0} + test-helper: {fake_test_helper: 'fake_hostname'} +""" + +fake_default_collector = """ +collector: + fake_address: + policy: + input: + - {id: fake_id} + nettest: + - {name: fake_nettest, version: 1.0} + - {name: another_fake_nettest, version: 2.0} + test-helper: {fake_test_helper: 'fake_hostname'} + default_collector: + test-helper: {fake_test_helper: 'fake_hostname'} +""" + +fake_bouncer_file_multiple_collectors = """ +collector: + fake_addressA: + policy: + input: + - {id: fake_id} + nettest: + - {name: fake_nettest, version: 1.0} + - {name: another_fake_nettest, version: 2.0} + test-helper: {fake_test_helper: 'fake_hostname'} + + fake_addressB: + policy: + input: + - {id: fake_id} + nettest: + - {name: fake_nettest, version: 1.0} + - {name: another_fake_nettest, version: 2.0} + test-helper: {fake_test_helper: 'fake_hostname'} +""" + +fake_for_test_helper_request = """ +collector: + fake_addressA: + policy: + input: + - {id: fake_id} + nettest: + - {name: fake_nettest, version: 1.0} + test-helper: {fake_test_helper: 'fake_hostname', exotic_test_helper: 'fake_hostname'} + + fake_addressB: + test-helper: {fake_test_helper: 'fake_hostname'} +""" + +reports_dir = 'data/reports' +archive_dir = 'data/archive' +input_dir = 'data/inputs' +decks_dir = 'data/decks' +bouncer_filename = 'fake_bouncer_file.yaml' +fake_config_file = """ +main: + report_dir: %s + archive_dir: %s + input_dir: %s + deck_dir: %s + bouncer_file: %s + +helpers: + fake_test_helper: + attribute: value +""" % (reports_dir, archive_dir, input_dir, decks_dir, bouncer_filename) + + +class BaseTestBouncer(HandlerTestCase): + def setUp(self, *args, **kw): + self.make_dir(reports_dir) + self.make_dir(archive_dir) + self.make_dir(input_dir) + self.make_dir(decks_dir) + + self.config_filename = 'fake_config.conf' + with open(self.config_filename, 'w') as config_file: + config_file.write(fake_config_file) + + super(BaseTestBouncer, self).setUp() + self.filenames.add(bouncer_filename) + self.filenames.add(self.config_filename) + + +class TestBouncer(BaseTestBouncer): + app = web.Application(bouncerAPI, name='bouncerAPI') + + def setUp(self, *args, **kw): + with open(bouncer_filename, 'w') as bouncer_file: + bouncer_file.write(fake_bouncer_file) + super(TestBouncer, self).setUp() + + @defer.inlineCallbacks + def test_void_net_tests(self): + data = { + 'net-tests': [ + { + "test-helpers": ['fake_test_helper'], + "input-hashes": [], + "name": '', + "version": '', + }, + ] + } + + response = yield self.request('/bouncer', 'POST', data) + response_body = json.loads(response.body) + + self.assertIn('error', response_body) + self.assertEqual('collector-not-found', response_body['error']) + + @defer.inlineCallbacks + def test_net_tests(self): + data = { + 'net-tests': [ + { + "test-helpers": [], + "input-hashes": [], + "name": 'fake_nettest', + "version": '1.0', + }, + ] + } + + response = yield self.request('/bouncer', 'POST', data) + response_body = json.loads(response.body) + + self.assertIn('net-tests', response_body) + self.assertEqual(len(response_body['net-tests']), 1) + self.assertIn('name', response_body['net-tests'][0]) + self.assertEqual(response_body['net-tests'][0]['name'], 'fake_nettest') + self.assertIn('version', response_body['net-tests'][0]) + self.assertEqual(response_body['net-tests'][0]['version'], '1.0') + self.assertIn('input-hashes', response_body['net-tests'][0]) + self.assertEqual(len(response_body['net-tests'][0]['input-hashes']), 0) + self.assertIn('test-helpers', response_body['net-tests'][0]) + self.assertEqual(len(response_body['net-tests'][0]['test-helpers']), 0) + self.assertIn('collector', response_body['net-tests'][0]) + self.assertEqual(response_body['net-tests'][0]['collector'], 'fake_address') + + @defer.inlineCallbacks + def test_multiple_net_tests(self): + data = { + 'net-tests': [ + { + "test-helpers": [], + "input-hashes": [], + "name": 'fake_nettest', + "version": '1.0', + }, + { + "test-helpers": [], + "input-hashes": [], + "name": 'another_fake_nettest', + "version": '1.0', + } + ] + } + + response = yield self.request('/bouncer', 'POST', data) + response_body = json.loads(response.body) + + self.assertIn('net-tests', response_body) + self.assertEqual(len(response_body['net-tests']), 2) + self.assertIn('name', response_body['net-tests'][0]) + self.assertEqual(response_body['net-tests'][0]['name'], 'fake_nettest') + self.assertIn('name', response_body['net-tests'][1]) + self.assertEqual(response_body['net-tests'][1]['name'], 'another_fake_nettest') + + @defer.inlineCallbacks + def test_invalid_net_test(self): + data = { + 'net-tests': [ + { + "test-helpers": [], + "input-hashes": [], + "name": 'invalid_nettest', + "version": '1.0', + }, + ] + } + + response = yield self.request('/bouncer', 'POST', data) + response_body = json.loads(response.body) + + self.assertIn('error', response_body) + self.assertEqual('collector-not-found', response_body['error']) + + @defer.inlineCallbacks + def test_net_tests_with_input(self): + data = { + 'net-tests': [ + { + "test-helpers": [], + "input-hashes": ['fake_id'], + "name": 'fake_nettest', + "version": '1.0', + }, + ] + } + + response = yield self.request('/bouncer', 'POST', data) + response_body = json.loads(response.body) + + self.assertIn('net-tests', response_body) + self.assertEqual(len(response_body['net-tests']), 1) + self.assertIn('name', response_body['net-tests'][0]) + self.assertEqual(response_body['net-tests'][0]['name'], 'fake_nettest') + self.assertIn('input-hashes', response_body['net-tests'][0]) + self.assertEqual(len(response_body['net-tests'][0]['input-hashes']), 1) + self.assertEqual(response_body['net-tests'][0]['input-hashes'][0], 'fake_id') + + @defer.inlineCallbacks + def test_net_tests_with_input(self): + data = { + 'net-tests': [ + { + "test-helpers": [], + "input-hashes": ['invalid_id'], + "name": 'fake_nettest', + "version": '1.0', + }, + ] + } + + response = yield self.request('/bouncer', 'POST', data) + response_body = json.loads(response.body) + + self.assertIn('error', response_body) + self.assertEqual('collector-not-found', response_body['error']) + + @defer.inlineCallbacks + def test_net_tests_with_test_helper(self): + data = { + 'net-tests': [ + { + "test-helpers": ['fake_test_helper'], + "input-hashes": [], + "name": 'fake_nettest', + "version": '1.0', + }, + ] + } + + response = yield self.request('/bouncer', 'POST', data) + response_body = json.loads(response.body) + + self.assertIn('net-tests', response_body) + self.assertEqual(len(response_body['net-tests']), 1) + self.assertIn('name', response_body['net-tests'][0]) + self.assertEqual(response_body['net-tests'][0]['name'], 'fake_nettest') + self.assertIn('test-helpers', response_body['net-tests'][0]) + self.assertEqual(len(response_body['net-tests'][0]['test-helpers']), 1) + self.assertEqual(response_body['net-tests'][0]['test-helpers']['fake_test_helper'], 'fake_hostname') + + @defer.inlineCallbacks + def test_net_tests_with_invalid_test_helper(self): + data = { + 'net-tests': [ + { + "test-helpers": ['invalid_test_helper'], + "input-hashes": [], + "name": 'fake_nettest', + "version": '1.0', + }, + ] + } + + response = yield self.request('/bouncer', 'POST', data) + response_body = json.loads(response.body) + + self.assertIn('error', response_body) + self.assertEqual('collector-not-found', response_body['error']) + + @defer.inlineCallbacks + def test_invalid_request(self): + data = { + 'something_weird': 'nsa' + } + + response = yield self.request('/bouncer', 'POST', data) + response_body = json.loads(response.body) + + self.assertIn('error', response_body) + self.assertEqual('test-helpers-or-net-test-key-missing', response_body['error']) + + +class TestDefaultCollector(BaseTestBouncer): + app = web.Application(bouncerAPI, name='bouncerAPI') + + def setUp(self, *args, **kw): + with open(bouncer_filename, 'w') as bouncer_file: + bouncer_file.write(fake_default_collector) + super(TestDefaultCollector, self).setUp() + + @defer.inlineCallbacks + def test_default_collector(self): + data = { + 'net-tests': [ + { + "test-helpers": [], + "input-hashes": [], + "name": 'imaginary_nettest', + "version": '1.0', + }, + ] + } + + response = yield self.request('/bouncer', 'POST', data) + response_body = json.loads(response.body) + + self.assertIn('net-tests', response_body) + self.assertEqual(len(response_body['net-tests']), 1) + self.assertIn('name', response_body['net-tests'][0]) + self.assertEqual(response_body['net-tests'][0]['name'], 'imaginary_nettest') + self.assertIn('version', response_body['net-tests'][0]) + self.assertEqual(response_body['net-tests'][0]['version'], '1.0') + self.assertIn('input-hashes', response_body['net-tests'][0]) + self.assertEqual(len(response_body['net-tests'][0]['input-hashes']), 0) + self.assertIn('test-helpers', response_body['net-tests'][0]) + self.assertEqual(len(response_body['net-tests'][0]['test-helpers']), 0) + self.assertIn('collector', response_body['net-tests'][0]) + self.assertEqual(response_body['net-tests'][0]['collector'], 'default_collector') + + +class TestMultipleCollectors(BaseTestBouncer): + app = web.Application(bouncerAPI, name='bouncerAPI') + + def setUp(self, *args, **kw): + with open(bouncer_filename, 'w') as bouncer_file: + bouncer_file.write(fake_bouncer_file_multiple_collectors) + super(TestMultipleCollectors, self).setUp() + + @defer.inlineCallbacks + def test_multiple_collectors(self): + data = { + 'net-tests': [ + { + "test-helpers": [], + "input-hashes": [], + "name": 'fake_nettest', + "version": '1.0', + }, + ] + } + + response = yield self.request('/bouncer', 'POST', data) + response_body = json.loads(response.body) + + self.assertIn('net-tests', response_body) + self.assertEqual(len(response_body['net-tests']), 1) + self.assertIn('name', response_body['net-tests'][0]) + self.assertEqual(response_body['net-tests'][0]['name'], 'fake_nettest') + self.assertIn('version', response_body['net-tests'][0]) + self.assertEqual(response_body['net-tests'][0]['version'], '1.0') + self.assertIn('input-hashes', response_body['net-tests'][0]) + self.assertEqual(len(response_body['net-tests'][0]['input-hashes']), 0) + self.assertIn('test-helpers', response_body['net-tests'][0]) + self.assertEqual(len(response_body['net-tests'][0]['test-helpers']), 0) + self.assertIn('collector', response_body['net-tests'][0]) + self.assertIn(response_body['net-tests'][0]['collector'], ['fake_addressA', 'fake_addressB']) + + +class TestHelperTests(BaseTestBouncer): + app = web.Application(bouncerAPI, name='bouncerAPI') + + def setUp(self, *args, **kw): + with open(bouncer_filename, 'w') as bouncer_file: + bouncer_file.write(fake_for_test_helper_request) + super(TestHelperTests, self).setUp() + + @defer.inlineCallbacks + def test_invalid_helper(self): + data = { + 'test-helpers': ['invalid_test_helper'] + } + response = yield self.request('/bouncer', 'POST', data) + response_body = json.loads(response.body) + + self.assertIn('error', response_body) + self.assertEqual('test-helper-not-found', response_body['error']) + + @defer.inlineCallbacks + def test_multiple_collectors(self): + data = { + 'test-helpers': ['fake_test_helper'] + } + + response = yield self.request('/bouncer', 'POST', data) + response_body = json.loads(response.body) + + self.assertEqual(len(response_body), 2) + self.assertIn('fake_test_helper', response_body) + self.assertIn('collector', response_body['fake_test_helper']) + self.assertIn(response_body['fake_test_helper']['collector'], ['fake_addressA', 'fake_addressB']) + self.assertIn('address', response_body['fake_test_helper']) + self.assertEqual('fake_hostname', response_body['fake_test_helper']['address']) + + self.assertIn('default', response_body) + self.assertIn('collector', response_body['default']) + self.assertEqual('fake_addressB', response_body['default']['collector']) + + @defer.inlineCallbacks + def test_multiple_helpers(self): + data = { + 'test-helpers': ['fake_test_helper', 'exotic_test_helper'] + } + + response = yield self.request('/bouncer', 'POST', data) + response_body = json.loads(response.body) + + self.assertEqual(len(response_body), 3) + self.assertIn('fake_test_helper', response_body) + self.assertIn('exotic_test_helper', response_body) + self.assertIn('default', response_body) + self.assertIn(response_body['fake_test_helper']['collector'], ['fake_addressA', 'fake_addressB']) + self.assertEqual(response_body['exotic_test_helper']['collector'], 'fake_addressA') + self.assertEqual('fake_addressB', response_body['default']['collector'])

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits August 2014