- tor-commits - lists.torproject.org

[vidalia-plugins/master] Make tbb.js respect the new path criteria
by chiiph＠torproject.org 09 Jul '12

09 Jul '12

commit 543e96e4af7e8c77f10790232bf5d5913ec8254f Author: Tomás Touceda <chiiph(a)torproject.org> Date: Thu May 17 23:06:04 2012 -0300 Make tbb.js respect the new path criteria --- tbb/tbb.js | 32 ++++++++++++++++++-------------- 1 files changed, 18 insertions(+), 14 deletions(-) diff --git a/tbb/tbb.js b/tbb/tbb.js index 8955d9d..c034fdb 100644 --- a/tbb/tbb.js +++ b/tbb/tbb.js @@ -42,7 +42,11 @@ var tbb = { // Load the GUI file this.tab = new VidaliaTab("Browser Bundle Settings", "TBB"); - var file = new QFile(pluginPath+"/tbb/tbb.ui"); + var uiPath = pluginPath+"/tbb/tbb.ui"; + if((new QDir(uiPath)).isRelative()) + uiPath = QCoreApplication.applicationDirPath()+"/"+uiPath; + + var file = new QFile(uiPath); var loader = new QUiLoader(this.tab); file.open(QIODevice.ReadOnly); this.widget = loader.load(file); @@ -205,7 +209,7 @@ var tbb = { vdebug("TBB@launchBrowserFromDirectory"); /** Directory for the browser */ var browserDirectory = this.tab.getSetting(this.BrowserDirectory, ""); - if(QDir(browserDirectory).isRelative()) + if(new QDir(browserDirectory).isRelative()) browserDirectory = QDir.toNativeSeparators(QCoreApplication.applicationDirPath() + "/" + browserDirectory); @@ -223,7 +227,7 @@ var tbb = { /** Relative path to the default plugins directory from the browserDirectory */ var defaultPluginsDirectory = QDir.toNativeSeparators(this.tab.getSetting(this.DefaultPluginsDirectory, "")); - var profileDir = browserDirectory + "/" + profileDirectory; + var profileDir = (new QDir(browserDirectory + "/" + profileDirectory)).canonicalPath(); this.browserProcess.setEnvironment(this.updateBrowserEnv()); @@ -232,22 +236,22 @@ var tbb = { /* Copy the profile directory if it's not already there */ if (!browserDirObj.exists(profileDirectory)) { browserDirObj.mkdir(profileDirectory); - this.copy_dir(browserDirectory + "/" + defaultProfileDirectory, - browserDirectory + "/" + profileDirectory); + this.copy_dir((new QDir(browserDirectory + "/" + defaultProfileDirectory)).canonicalPath(), + (new QDir(browserDirectory + "/" + profileDirectory)).canonicalPath()); } /* Copy the plugins directory if it's not already there */ if (!browserDirObj.exists(pluginsDirectory)) { browserDirObj.mkdir(pluginsDirectory); - this.copy_dir(browserDirectory + "/" + defaultPluginsDirectory, - browserDirectory + "/" + pluginsDirectory); + this.copy_dir((new QDir(browserDirectory + "/" + defaultPluginsDirectory)).canonicalPath(), + (new QDir(browserDirectory + "/" + pluginsDirectory)).canonicalPath()); } /* Build the command line arguments */ /* Is this better or worse than MOZ_NO_REMOTE? */ var commandLine = "-no-remote "; - commandLine += "-profile "; - commandLine += profileDir; + commandLine += "-profile"; + commandLine += "\"" + profileDir + "\""; /* Launch the browser */ this.browserProcess.start(browserExecutable, commandLine); @@ -268,10 +272,6 @@ var tbb = { QCoreApplication.processEvents(); } - if(!torControl.isRunning() || - !torControl.isConnected()) - return; - var proxyExecutable = this.tab.getSetting(this.ProxyExecutable, ""); var runAtStart = this.tab.getSetting(this.RunProxyAtStart, ""); var proxyExecutableArguments = this.tab.getSetting(this.ProxyExecutableArguments, ""); @@ -362,7 +362,11 @@ var tbb = { }, showCloseDialog: function() { - var file = new QFile(pluginPath+"/tbb/reopen.ui"); + var uiPath = pluginPath+"/tbb/reopen.ui"; + if((new QDir(uiPath)).isRelative()) + uiPath = QCoreApplication.applicationDirPath()+"/"+uiPath; + + var file = new QFile(uiPath); var loader = new QUiLoader(); file.open(QIODevice.ReadOnly); var dialog = loader.load(file);

1 0

[flashproxy/master] Use width="70" in place of width="70px" (same for height) in iframe.
by dcf＠torproject.org 09 Jul '12

09 Jul '12

commit 3977cf8e6ffd2b6fbcaf85fd0d42744b48c1e939 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jul 9 12:02:01 2012 -0700 Use width="70" in place of width="70px" (same for height) in iframe. The W3C validator complained about this. --- README | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/README b/README index 34b33ff..f81201b 100644 --- a/README +++ b/README @@ -126,7 +126,7 @@ Add this line to torrc to make the relay use the external proxy: Paste in this HTML where you want the badge to appear: -<iframe src="//crypto.stanford.edu/flashproxy/embed.html" width="70px" height="23px" frameBorder="0" scrolling="no"></iframe> +<iframe src="//crypto.stanford.edu/flashproxy/embed.html" width="70" height="23" frameBorder="0" scrolling="no"></iframe> == For developers

1 0

[flashproxy/master] Use http not https in static link to stanford flashproxy page.
by dcf＠torproject.org 09 Jul '12

09 Jul '12

commit 163669c56300b1b0c9fcbd0a99b083341e10a33a Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jul 9 12:02:54 2012 -0700 Use http not https in static link to stanford flashproxy page. See 1caa8dad for previous changes in this vein. --- embed.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/embed.html b/embed.html index 0b55f00..fce05ff 100644 --- a/embed.html +++ b/embed.html @@ -55,7 +55,7 @@ body { flashproxy_badge_insert().start(); </script> <noscript> -<div id="flashproxy-badge"><a href="https://crypto.stanford.edu/flashproxy/" target="_parent"><img src="badge.png" border="0" alt="I support Internet freedom"></a></div> +<div id="flashproxy-badge"><a href="http://crypto.stanford.edu/flashproxy/" target="_parent"><img src="badge.png" border="0" alt="I support Internet freedom"></a></div> </noscript> </body> </html>

1 0

[flashproxy/master] Put a charset on embed.html.
by dcf＠torproject.org 09 Jul '12

09 Jul '12

commit 346452577a6ff7b6cd064bcca6ce11c79e0369bc Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jul 9 12:13:59 2012 -0700 Put a charset on embed.html. --- embed.html | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/embed.html b/embed.html index fce05ff..a5fd275 100644 --- a/embed.html +++ b/embed.html @@ -1,6 +1,7 @@ <!DOCTYPE html> <html> <head> +<meta charset="utf-8"> <meta http-equiv="refresh" content="86400"> <style type="text/css"> body {

1 0

[stem/master] Minor revisions for LOADCONF and prior cleanup
by atagar＠torproject.org 09 Jul '12

09 Jul '12

commit ab553f54e70ea21d8bd117cf912e1b208417e5d5 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jul 9 11:34:33 2012 -0700 Minor revisions for LOADCONF and prior cleanup --- stem/__init__.py | 2 +- stem/control.py | 3 ++- stem/descriptor/__init__.py | 2 +- stem/response/__init__.py | 2 +- stem/util/__init__.py | 2 +- stem/version.py | 1 + test/__init__.py | 2 +- test/integ/__init__.py | 2 +- test/integ/control/controller.py | 29 +++++++++++++++-------------- test/unit/__init__.py | 2 +- 10 files changed, 25 insertions(+), 22 deletions(-) diff --git a/stem/__init__.py b/stem/__init__.py index a2f00a1..faee5db 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -17,6 +17,6 @@ __all__ = [ "prereq", "process", "socket", - "version" + "version", ] diff --git a/stem/control.py b/stem/control.py index f68183e..51804cc 100644 --- a/stem/control.py +++ b/stem/control.py @@ -19,6 +19,7 @@ interacting at a higher level. |- set_conf - sets the value of a configuration option |- reset_conf - reverts configuration options to their default values |- set_options - sets or resets the values of multiple configuration options + |- load_conf - loads configuration information as if it was in the torrc |- get_version - convenience method to get tor version |- authenticate - convenience method to authenticate the controller +- protocolinfo - convenience method to get the protocol info @@ -760,7 +761,7 @@ class Controller(BaseController): def load_conf(self, configtext): """ Sends the configuration text to Tor and loads it as if it has been read from - disk. + the torrc. :param str configtext: the configuration text diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 2328bf5..f3b40c5 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -18,7 +18,7 @@ __all__ = [ "extrainfo_descriptor", "server_descriptor", "parse_file", - "Descriptor" + "Descriptor", ] import os diff --git a/stem/response/__init__.py b/stem/response/__init__.py index 2d7f028..5a665b6 100644 --- a/stem/response/__init__.py +++ b/stem/response/__init__.py @@ -32,7 +32,7 @@ __all__ = [ "authchallenge", "convert", "ControlMessage", - "ControlLine" + "ControlLine", ] import re diff --git a/stem/util/__init__.py b/stem/util/__init__.py index 6bc70e4..78fe9e1 100644 --- a/stem/util/__init__.py +++ b/stem/util/__init__.py @@ -10,6 +10,6 @@ __all__ = [ "proc", "system", "term", - "tor_tools" + "tor_tools", ] diff --git a/stem/version.py b/stem/version.py index c63a92a..d0228b1 100644 --- a/stem/version.py +++ b/stem/version.py @@ -232,6 +232,7 @@ safecookie_req.greater_than(Version("0.2.3.13")) Requirement = stem.util.enum.Enum( ("AUTH_SAFECOOKIE", safecookie_req), ("GETINFO_CONFIG_TEXT", Version("0.2.2.7")), + ("LOADCONF", Version("0.2.1.1")), ("TORRC_CONTROL_SOCKET", Version("0.2.0.30")), ("TORRC_DISABLE_DEBUGGER_ATTACHMENT", Version("0.2.3.9")), ) diff --git a/test/__init__.py b/test/__init__.py index adb29e4..c0297aa 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -6,6 +6,6 @@ __all__ = [ "check_whitespace", "mocking", "output", - "runner" + "runner", ] diff --git a/test/integ/__init__.py b/test/integ/__init__.py index ec9d1ca..3cc4a7f 100644 --- a/test/integ/__init__.py +++ b/test/integ/__init__.py @@ -9,6 +9,6 @@ __all__ = [ "process", "socket", "util", - "version" + "version", ] diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index bcd76fb..857799d 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -274,25 +274,26 @@ class TestController(unittest.TestCase): """ if test.runner.require_control(self): return + elif test.runner.require_version(self, stem.version.Requirement.LOADCONF): return runner = test.runner.get_runner() with runner.get_tor_controller() as controller: oldconf = runner.get_torrc_contents() - # invalid requests - self.assertRaises(stem.socket.InvalidRequest, controller.load_conf, "ContactInfo confloaded") try: - controller.load_conf("Blahblah blah") - except stem.socket.InvalidArguments, exc: - self.assertEqual(["Blahblah"], exc.arguments) - else: - self.fail() - - # valid config - controller.load_conf(runner.get_torrc_contents() + "\nContactInfo confloaded\n") - self.assertEqual("confloaded", controller.get_conf("ContactInfo")) - - # reload original valid config - controller.load_conf(oldconf) + # invalid requests + self.assertRaises(stem.socket.InvalidRequest, controller.load_conf, "ContactInfo confloaded") + try: + controller.load_conf("Blahblah blah") + self.fail() + except stem.socket.InvalidArguments, exc: + self.assertEqual(["Blahblah"], exc.arguments) + + # valid config + controller.load_conf(runner.get_torrc_contents() + "\nContactInfo confloaded\n") + self.assertEqual("confloaded", controller.get_conf("ContactInfo")) + finally: + # reload original valid config + controller.load_conf(oldconf) diff --git a/test/unit/__init__.py b/test/unit/__init__.py index 6c77f6f..6bbec07 100644 --- a/test/unit/__init__.py +++ b/test/unit/__init__.py @@ -7,6 +7,6 @@ __all__ = [ "descriptor", "socket", "util", - "version" + "version", ]

1 0

[stem/master] Remove ugly if-elif tree in favour of a dict
by atagar＠torproject.org 09 Jul '12

09 Jul '12

commit c5472856c9895bd118af79297ccdce59fcba2e13 Author: Ravi Chandra Padmala <neenaoffline(a)gmail.com> Date: Mon Jul 9 10:12:23 2012 +0530 Remove ugly if-elif tree in favour of a dict --- stem/response/__init__.py | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/stem/response/__init__.py b/stem/response/__init__.py index 995cc69..2d7f028 100644 --- a/stem/response/__init__.py +++ b/stem/response/__init__.py @@ -84,17 +84,18 @@ def convert(response_type, message, **kwargs): if not isinstance(message, ControlMessage): raise TypeError("Only able to convert stem.response.ControlMessage instances") - if response_type == "GETINFO": - response_class = stem.response.getinfo.GetInfoResponse - elif response_type == "GETCONF": - response_class = stem.response.getconf.GetConfResponse - elif response_type == "SINGLELINE": - response_class = SingleLineResponse - elif response_type == "PROTOCOLINFO": - response_class = stem.response.protocolinfo.ProtocolInfoResponse - elif response_type == "AUTHCHALLENGE": - response_class = stem.response.authchallenge.AuthChallengeResponse - else: raise TypeError("Unsupported response type: %s" % response_type) + response_types = { + "GETINFO": stem.response.getinfo.GetInfoResponse, + "GETCONF": stem.response.getconf.GetConfResponse, + "SINGLELINE": SingleLineResponse, + "PROTOCOLINFO": stem.response.protocolinfo.ProtocolInfoResponse, + "AUTHCHALLENGE": stem.response.authchallenge.AuthChallengeResponse, + } + + try: + response_class = response_types[response_type] + except TypeError: + raise TypeError("Unsupported response type: %s" % response_type) message.__class__ = response_class message._parse_message(**kwargs)

1 0

[stem/master] Aesthetic changes to __init__.py files
by atagar＠torproject.org 09 Jul '12

09 Jul '12

commit ac0d2183f04838790c64ff3194ae29f90fd4ed93 Author: Ravi Chandra Padmala <neenaoffline(a)gmail.com> Date: Mon Jul 9 09:55:38 2012 +0530 Aesthetic changes to __init__.py files Making __all__ lists multiline when they're long and awkward. --- stem/__init__.py | 12 +++++++++++- stem/descriptor/__init__.py | 9 ++++++++- stem/response/__init__.py | 10 +++++++++- stem/util/__init__.py | 11 ++++++++++- test/__init__.py | 7 ++++++- test/integ/__init__.py | 10 +++++++++- test/unit/__init__.py | 8 +++++++- 7 files changed, 60 insertions(+), 7 deletions(-) diff --git a/stem/__init__.py b/stem/__init__.py index 8f5add1..a2f00a1 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -8,5 +8,15 @@ __contact__ = 'atagar(a)torproject.org' __url__ = 'http://www.atagar.com/stem/' __license__ = 'LGPLv3' -__all__ = ["descriptor", "response", "util", "connection", "control", "prereq", "process", "socket", "version"] +__all__ = [ + "descriptor", + "response", + "util", + "connection", + "control", + "prereq", + "process", + "socket", + "version" +] diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 4bddbc5..2328bf5 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -12,7 +12,14 @@ Package for parsing and processing descriptor data. +- __str__ - string that the descriptor was made from """ -__all__ = ["descriptor", "reader", "extrainfo_descriptor", "server_descriptor", "parse_file", "Descriptor"] +__all__ = [ + "descriptor", + "reader", + "extrainfo_descriptor", + "server_descriptor", + "parse_file", + "Descriptor" +] import os import re diff --git a/stem/response/__init__.py b/stem/response/__init__.py index 1d96988..995cc69 100644 --- a/stem/response/__init__.py +++ b/stem/response/__init__.py @@ -25,7 +25,15 @@ Parses replies from the control socket. from __future__ import with_statement -__all__ = ["getinfo", "getconf", "protocolinfo", "authchallenge", "convert", "ControlMessage", "ControlLine"] +__all__ = [ + "getinfo", + "getconf", + "protocolinfo", + "authchallenge", + "convert", + "ControlMessage", + "ControlLine" +] import re import threading diff --git a/stem/util/__init__.py b/stem/util/__init__.py index 5f6bb24..6bc70e4 100644 --- a/stem/util/__init__.py +++ b/stem/util/__init__.py @@ -2,5 +2,14 @@ Utility functions used by the stem library. """ -__all__ = ["conf", "connection", "enum", "log", "proc", "system", "term", "tor_tools"] +__all__ = [ + "conf", + "connection", + "enum", + "log", + "proc", + "system", + "term", + "tor_tools" +] diff --git a/test/__init__.py b/test/__init__.py index eb03299..adb29e4 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -2,5 +2,10 @@ Unit and integration tests for the stem library. """ -__all__ = ["check_whitespace", "mocking", "output", "runner"] +__all__ = [ + "check_whitespace", + "mocking", + "output", + "runner" +] diff --git a/test/integ/__init__.py b/test/integ/__init__.py index a9bb9ef..ec9d1ca 100644 --- a/test/integ/__init__.py +++ b/test/integ/__init__.py @@ -2,5 +2,13 @@ Integration tests for the stem library. """ -__all__ = ["connection", "control", "descriptor", "process", "socket", "util", "version"] +__all__ = [ + "connection", + "control", + "descriptor", + "process", + "socket", + "util", + "version" +] diff --git a/test/unit/__init__.py b/test/unit/__init__.py index e3dbe9a..6c77f6f 100644 --- a/test/unit/__init__.py +++ b/test/unit/__init__.py @@ -2,5 +2,11 @@ Unit tests for the stem library. """ -__all__ = ["connection", "descriptor", "socket", "util", "version"] +__all__ = [ + "connection", + "descriptor", + "socket", + "util", + "version" +]

1 0

[stem/master] Implement Controller.load_conf
by atagar＠torproject.org 09 Jul '12

09 Jul '12

commit 6cc4e195452bc573e34f0b2de295b1028a20eb4a Author: Ravi Chandra Padmala <neenaoffline(a)gmail.com> Date: Fri Jun 29 00:25:17 2012 +0530 Implement Controller.load_conf --- stem/control.py | 20 ++++++++++++++++++++ test/integ/control/controller.py | 28 ++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 0 deletions(-) diff --git a/stem/control.py b/stem/control.py index 2c12d43..f68183e 100644 --- a/stem/control.py +++ b/stem/control.py @@ -756,6 +756,26 @@ class Controller(BaseController): raise stem.socket.InvalidRequest(response.code, response.message) else: raise stem.socket.ProtocolError("%s returned unexpected status code" % command) + + def load_conf(self, configtext): + """ + Sends the configuration text to Tor and loads it as if it has been read from + disk. + + :param str configtext: the configuration text + + :raises: :class:`stem.socket.ControllerError` if the call fails + """ + + response = self.msg("LOADCONF\n%s" % configtext) + stem.response.convert("SINGLELINE", response) + + if response.code in ("552", "553"): + if response.code == "552" and response.message.startswith("Invalid config file: Failed to parse/validate config: Unknown option"): + raise stem.socket.InvalidArguments(response.code, response.message, [response.message[70:response.message.find('.', 70) - 1]]) + raise stem.socket.InvalidRequest(response.code, response.message) + elif not response.is_ok(): + raise stem.socket.ProtocolError("+LOADCONF Received unexpected response\n%s" % str(response)) def _case_insensitive_lookup(entries, key, default = UNDEFINED): """ diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 65dfe18..bcd76fb 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -267,4 +267,32 @@ class TestController(unittest.TestCase): ), reset = True) shutil.rmtree(tmpdir) + + def test_loadconf(self): + """ + Exercises Controller.load_conf with valid and invalid requests. + """ + + if test.runner.require_control(self): return + + runner = test.runner.get_runner() + + with runner.get_tor_controller() as controller: + oldconf = runner.get_torrc_contents() + + # invalid requests + self.assertRaises(stem.socket.InvalidRequest, controller.load_conf, "ContactInfo confloaded") + try: + controller.load_conf("Blahblah blah") + except stem.socket.InvalidArguments, exc: + self.assertEqual(["Blahblah"], exc.arguments) + else: + self.fail() + + # valid config + controller.load_conf(runner.get_torrc_contents() + "\nContactInfo confloaded\n") + self.assertEqual("confloaded", controller.get_conf("ContactInfo")) + + # reload original valid config + controller.load_conf(oldconf)

1 0

[ooni-probe/master] Rewrote captive portal tests and added requisite options to the .conf file.
by art＠torproject.org 09 Jul '12

09 Jul '12

commit 3002dd3a1afbe92d02734fb5120aa80b6c8c38eb Author: Isis Lovecruft <isis(a)patternsinthevoid.net> Date: Sun Apr 8 02:10:38 2012 -0700 Rewrote captive portal tests and added requisite options to the .conf file. --- ooni-probe.conf | 10 +++ tests/captiveportal.py | 191 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 201 insertions(+), 0 deletions(-) diff --git a/ooni-probe.conf b/ooni-probe.conf index 161a008..a744fcf 100644 --- a/ooni-probe.conf +++ b/ooni-probe.conf @@ -38,6 +38,16 @@ dns_control_server = 91.191.136.152 # on positive results. dns_reverse_lookup = true +### captiveportal testing configuration parameters + +# The default User Agent that ooni-probe should send for +# HTTP requests (pretend we're a Windows box running FF10): +default_ua = Mozilla/5.0 (Windows NT 6.1; WOW64; rv:10.0.2) Gecko/20100101 Firefox/10.0.2 + +# This is the list of captive portal tests, in the format: +# test_name, experiment_url, control_result, control_code +captive_portal = captive_portal_tests.txt + ### traceroute testing related config parameters # This is the list of ips to traceroute to diff --git a/tests/captiveportal.py b/tests/captiveportal.py new file mode 100644 index 0000000..324d3cc --- /dev/null +++ b/tests/captiveportal.py @@ -0,0 +1,191 @@ +# -*- coding: utf-8 -*- +""" + captiveportal + ************* + + This test is a collection of tests to detect the presence of a + captive portal. Code is taken, in part from the old ooni-probe, + which was written by Jacob Appelbaum and Arturo Filastò. + + :copyright: (c) 2012 Isis Lovecruft + :license: see LICENSE for more details +""" +import os +import re +import urllib2 +from urlparse import urlparse + +from plugoo.assets import Asset +from plugoo.tests import Test + +__plugoo__ = "captiveportal" +__desc__ = "Captive portal detection test" + +class CaptivePortalAsset(Asset): + """ + Parses captive_portal_test.txt into an Asset. + """ + def __init__(self, file=None): + self = Asset.__init__(self, file) + + def parse_line(self, line): + self = Asset.parse_line(self, line) + return line.replace('\n', '').split(', ') + + ''' + def next_asset(self): + self = Asset.next_asset(self) + with self.fh as fh: + asset_list = [] + lines = fh.readlines() + for line in lines: + parsed_line = self.parse_line(line) + if parsed_line: + asset_list.append(parsed_line) + else: + fh.seek(0) + raise StopIteration + return asset_list + ''' + +class CaptivePortal(Test): + """ + Compares content and status codes of HTTP responses, and attempts + to determine if content has been altered. + + TODO: compare headers + """ + def __init__(self, ooni): + Test.__init__(self, ooni, name='test') + self.default_ua = ooni.config.tests.default_ua + + def http_fetch(self, url, headers=None): + """ + Parses an HTTP url, fetches it, and returns a urllib2 response + object. + """ + url = urlparse(url).geturl() + request = urllib2.Request(url, None, headers) + response = urllib2.urlopen(request) + return response + + def http_content_match_fuzzy_opt(self, experimental_url, control_result, + fuzzy=False): + """ + Makes an HTTP request on port 80 for experimental_url, then + compares the response_content of experimental_url with the + control_result. Optionally, if the fuzzy parameter is set to + True, the response_content is compared with a regex of the + control_result. If the response_content from the + experimental_url and the control_result match, returns True + with the HTTP status code, False if otherwise. + """ + log = self.logger + default_ua = self.default_ua + + response = self.http_fetch(experimental_url, + headers={'User-Agent': default_ua}) + response_content = response.read() + response_code = response.code + if response_content is not None: + if fuzzy: + pattern = re.compile(control_result) + match = pattern.search(response_content) + if not match: + log.info("Fuzzy HTTP content comparison of experiment" \ + " URL '%s' and the expected control result" \ + " do not match." % experimental_url) + return False, response_code + else: + log.info("Fuzzy HTTP content comparison of experiment" \ + " URL '%s' and the expected control result" \ + " yielded a match." % experimental_url) + return True, response_code + else: + if str(response_content) != str(control_result): + log.info("HTTP content comparison of experiment URL" \ + " '%s' and the expected control result" \ + " do not match." % experimental_url) + return False, response_code + else: + return True, response_code + else: + log.warn("HTTP connection appears to have failed.") + return False, False + + def http_status_code_match(self, experiment_code, control_code): + """ + Compare two HTTP status codes, returns True if they match. + """ + if int(experiment_code) != int(control_code): + return False + return True + + def http_status_code_no_match(self, experiment_code, control_code): + """ + Compare two HTTP status codes, returns True if they do not match. + """ + if self.http_status_code_match(experiment_code, control_code): + return False + return True + + def experiment(self, *a, **kw): + """ + Compares the content and status code of the HTTP response for + experiment_url with the control_result and control_code + respectively. If the status codes match, but the experimental + content and control_result do not match, fuzzy matching is enabled + to determine if the control_result is at least included somewhere + in the experimental content. Returns True if matches are found, + and False if otherwise. + """ + test_name = kw['data'][0] + experiment_url = kw['data'][1] + control_result = kw['data'][2] + control_code = kw['data'][3] + + cm = self.http_content_match_fuzzy_opt + sm = self.http_status_code_match + + log = self.logger + log.info("Running the %s test..." % test_name) + + content_match, experiment_code = cm(experiment_url, control_result) + status_match = sm(experiment_code, control_code) + + if status_match and content_match: + log.info("The %s test was unable to detect a captive portal." + % test_name) + return True + elif status_match and not content_match: + log.info("The %s test detected mismatched content, retrying with " \ + "fuzzy match enabled." % test_name) + content_fuzzy_match, experiment_code = cm(experiment_url, + control_result, + fuzzy=True) + if content_fuzzy_match: + return True + else: + return False + else: + log.info("The %s test shows that your network is filtered, possibly " \ + "due to a captive portal." % test_name) + return False + + return False + +def run(ooni): + """ + Run the CaptivePortal(Test). + """ + config = ooni.config + log = ooni.logger + assets = [CaptivePortalAsset(os.path.join(config.main.assetdir, + config.tests.captive_portal))] + + captiveportal = CaptivePortal(ooni) + log.info("Starting captive portal test...") + captiveportal.run(assets, {'index': 1}) + log.info("Captive portal test finished!") + +

1 0

[ooni-probe/master] Hardcoded vendor tests in separate function which optionally runs through setting in config, user-defined tests are optionally specified in asset file.
by art＠torproject.org 09 Jul '12

09 Jul '12

commit 6d57e84a19699a6f0dd2c6152ecafc87edacec9e Author: Isis Lovecruft <isis(a)patternsinthevoid.net> Date: Mon Apr 9 19:32:12 2012 -0700 Hardcoded vendor tests in separate function which optionally runs through setting in config, user-defined tests are optionally specified in asset file. --- assets/captive_portal_tests.txt | 4 + ooni-probe.conf | 13 ++- tests/captiveportal.py | 208 ++++++++++++++++++++++++++++----------- 3 files changed, 166 insertions(+), 59 deletions(-) diff --git a/assets/captive_portal_tests.txt b/assets/captive_portal_tests.txt new file mode 100644 index 0000000..1bd016f --- /dev/null +++ b/assets/captive_portal_tests.txt @@ -0,0 +1,4 @@ + +http://ooni.nu, Open Observatory of Network Interference, 200 +http://www.patternsinthevoid.net/2CDB8B35pub.asc, mQINBE5qkHABEADVnasCm9w9hUff1E4iKnzcAdp4lx6XU5USmYdwKg2RQt2VFqWQ, 200 +http://www.google.com, Search the world's information, 200 diff --git a/ooni-probe.conf b/ooni-probe.conf index a744fcf..a19c1d0 100644 --- a/ooni-probe.conf +++ b/ooni-probe.conf @@ -40,13 +40,20 @@ dns_reverse_lookup = true ### captiveportal testing configuration parameters +# This is an optional list of user defined captive portal tests, +# one per line, with each line in the format: +# experiment_url, control_result, control_code +# where experiment_url is the test page to retrieve, +# control_result is some unique text found on the test page, +# and control_code is the expected HTTP status code. +captive_portal = captive_portal_tests.txt + # The default User Agent that ooni-probe should send for # HTTP requests (pretend we're a Windows box running FF10): default_ua = Mozilla/5.0 (Windows NT 6.1; WOW64; rv:10.0.2) Gecko/20100101 Firefox/10.0.2 -# This is the list of captive portal tests, in the format: -# test_name, experiment_url, control_result, control_code -captive_portal = captive_portal_tests.txt +# Enable vendor tests for captive portals: +do_captive_portal_vendor_tests = true ### traceroute testing related config parameters diff --git a/tests/captiveportal.py b/tests/captiveportal.py index 324d3cc..494a4c3 100644 --- a/tests/captiveportal.py +++ b/tests/captiveportal.py @@ -23,7 +23,7 @@ __desc__ = "Captive portal detection test" class CaptivePortalAsset(Asset): """ - Parses captive_portal_test.txt into an Asset. + Parses captive_portal_tests.txt into an Asset. """ def __init__(self, file=None): self = Asset.__init__(self, file) @@ -32,28 +32,13 @@ class CaptivePortalAsset(Asset): self = Asset.parse_line(self, line) return line.replace('\n', '').split(', ') - ''' - def next_asset(self): - self = Asset.next_asset(self) - with self.fh as fh: - asset_list = [] - lines = fh.readlines() - for line in lines: - parsed_line = self.parse_line(line) - if parsed_line: - asset_list.append(parsed_line) - else: - fh.seek(0) - raise StopIteration - return asset_list - ''' - class CaptivePortal(Test): """ Compares content and status codes of HTTP responses, and attempts to determine if content has been altered. - TODO: compare headers + TODO: compare headers, random URL requests with control obtained + through Tor. """ def __init__(self, ooni): Test.__init__(self, ooni, name='test') @@ -70,7 +55,7 @@ class CaptivePortal(Test): return response def http_content_match_fuzzy_opt(self, experimental_url, control_result, - fuzzy=False): + headers=None, fuzzy=False): """ Makes an HTTP request on port 80 for experimental_url, then compares the response_content of experimental_url with the @@ -78,13 +63,15 @@ class CaptivePortal(Test): True, the response_content is compared with a regex of the control_result. If the response_content from the experimental_url and the control_result match, returns True - with the HTTP status code, False if otherwise. + with the HTTP status code, False and status code if otherwise. """ log = self.logger - default_ua = self.default_ua - response = self.http_fetch(experimental_url, - headers={'User-Agent': default_ua}) + if headers is None: + default_ua = self.default_ua + headers = {'User-Agent': default_ua} + + response = self.http_fetch(experimental_url, headers) response_content = response.read() response_code = response.code if response_content is not None: @@ -129,6 +116,89 @@ class CaptivePortal(Test): return False return True + def run_vendor_tests(self, *a, **kw): + """ + These are several vendor tests used to detect the presence of + a captive portal. Each test compares HTTP status code and + content to the control results and has its own User-Agent + string, in order to emulate the test as it would occur on the + device it was intended for. Vendor tests are defined in the + format: + [experimental_url, control_response, control_code, ua, test_name] + """ + cm = self.http_content_match_fuzzy_opt + sm = self.http_status_code_match + snm = self.http_status_code_no_match + + log = self.logger + + vendor_tests = [['http://www.apple.com/library/test/success.html', + 'Success', + '200', + 'Mozilla/5.0 (iPhone; U; CPU like Mac OS X; en) AppleWebKit/420+ (KHTML, like Gecko) Version/3.0 Mobile/1A543a Safari/419.3', + 'Apple HTTP Captive Portal'], + ['http://tools.ietf.org/html/draft-nottingham-http-portal-02', + '428 Network Authentication Required', + '428', + 'Mozilla/5.0 (Windows NT 6.1; rv:5.0) Gecko/20100101 Firefox/5.0', + 'W3 Captive Portal'], + ['http://www.msftncsi.com/ncsi.txt', + 'Microsoft NCSI', + '200', + 'Microsoft NCSI', + 'MS HTTP Captive Portal',]] + + log.debug("Getting vendor test data") + + for vt in vendor_tests: + experiment_url = vt[0] + control_result = vt[1] + control_code = vt[2] + ua = vt[3] + test_name = vt[4] + + if test_name == "MS HTTP Captive Portal": + log.info("Running the %s test..." % test_name) + content_match, experiment_code = cm(experiment_url, control_result, + headers={'User-Agent': ua}) + status_match = sm(experiment_code, control_code) + if status_match and content_match: + log.info("The %s test was unable to detect a captive portal." + % test_name) + else: + log.info("The %s test shows that your network is filtered." + % test_name) + + elif test_name == "Apple HTTP Captive Portal": + log.info("Running the %s test..." % test_name) + content_fuzzy_match, experiment_code = cm(experiment_url, + control_result, + headers={'User-Agent': ua}, + fuzzy=True) + status_match = sm(experiment_code, control_code) + if status_match and content_fuzzy_match: + log.info("The %s test was unable to detect a captive portal." + % test_name) + else: + log.info("The %s test shows that your network is filtered." + % test_name) + + elif test_name == "W3 Captive Portal": + log.info("Running the %s test..." % test_name) + content_fuzzy_match, experiment_code = cm(experiment_url, + control_result, + headers={'User-Agent': ua}, + fuzzy=True) + status_no_match = snm(experiment_code, control_code) + if status_no_match and content_fuzzy_match: + log.info("The %s test was unable to detect a captive portal." + % test_name) + else: + log.info("The %s test shows that your network is filtered." + % test_name) + else: + log.warn("Ooni is trying to run an undefined CP vendor test.") + def experiment(self, *a, **kw): """ Compares the content and status code of the HTTP response for @@ -139,53 +209,79 @@ class CaptivePortal(Test): in the experimental content. Returns True if matches are found, and False if otherwise. """ - test_name = kw['data'][0] - experiment_url = kw['data'][1] - control_result = kw['data'][2] - control_code = kw['data'][3] - + if (os.path.isfile(os.path.join(self.config.main.assetdir, + self.config.tests.captive_portal))): + kw['data'].append(None) + kw['data'].append('user defined') + + experiment_url = kw['data'][0] + control_result = kw['data'][1] + control_code = kw['data'][2] + ua = kw['data'][3] + test_name = kw['data'][4] + cm = self.http_content_match_fuzzy_opt sm = self.http_status_code_match - + snm = self.http_status_code_no_match + log = self.logger - log.info("Running the %s test..." % test_name) - content_match, experiment_code = cm(experiment_url, control_result) - status_match = sm(experiment_code, control_code) - - if status_match and content_match: - log.info("The %s test was unable to detect a captive portal." - % test_name) - return True - elif status_match and not content_match: - log.info("The %s test detected mismatched content, retrying with " \ - "fuzzy match enabled." % test_name) - content_fuzzy_match, experiment_code = cm(experiment_url, - control_result, - fuzzy=True) - if content_fuzzy_match: - return True + if test_name == "user defined": + log.info("Running the %s test for %s..." % (test_name, experiment_url)) + content_match, experiment_code = cm(experiment_url, control_result) + status_match = sm(experiment_code, control_code) + if status_match and content_match: + log.info("The %s test was unable to detect a captive portal." + % test_name) + return True, test_name + elif status_match and not content_match: + log.info("The %s test detected mismatched content, retrying " + "with fuzzy match enabled." % test_name) + content_fuzzy_match, experiment_code = cm(experiment_url, + control_result, + fuzzy=True) + if content_fuzzy_match: + return True, test_name + else: + return False, test_name else: - return False + log.info("The %s test shows that your network is filtered." + % test_name) + return False, test_name + else: - log.info("The %s test shows that your network is filtered, possibly " \ - "due to a captive portal." % test_name) - return False - - return False + log.warn("Ooni is trying to run an undefined captive portal test.") + return False, test_name + def run(ooni): """ - Run the CaptivePortal(Test). + Runs the CaptivePortal(Test). + + If do_captive_portal_vendor_tests is set to true, then vendor + specific captive portal tests will be run. + + If captive_portal = filename.txt, then user-specified tests + will be run. + + Either vendor tests or user-defined tests can be run, or both. """ config = ooni.config log = ooni.logger - assets = [CaptivePortalAsset(os.path.join(config.main.assetdir, - config.tests.captive_portal))] + assets = [] + if (os.path.isfile(os.path.join(config.main.assetdir, + config.tests.captive_portal))): + assets.append(CaptivePortalAsset(os.path.join(config.main.assetdir, + config.tests.captive_portal))) + captiveportal = CaptivePortal(ooni) log.info("Starting captive portal test...") + log.info("Running user defined tests...") captiveportal.run(assets, {'index': 1}) - log.info("Captive portal test finished!") - + + if config.tests.do_captive_portal_vendor_tests: + log.info("Running vendor tests...") + captiveportal.run_vendor_tests() + log.info("Captive portal test finished!")

1 0