September 2016 - tor-commits - lists.torproject.org

[ooni-probe/master] Add a configuration option that allows to prioritise non-onion backends
by art＠torproject.org 19 Sep '16

19 Sep '16

commit 2eab4fe68b0dfbb082f3253ace5321afb79777dc Author: Arturo Filastò <arturo(a)filasto.net> Date: Thu Jun 16 20:03:57 2016 +0300 Add a configuration option that allows to prioritise non-onion backends This option allows a user to specify that they wish to use either a https, cloudfronted or onion backend server. Write unittests to use the priority address --- ooni/oonicli.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ooni/oonicli.py b/ooni/oonicli.py index 23c0b85..2eb1d9f 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -44,9 +44,9 @@ class Options(usage.Options): ["collector", "c", None, "Specify the address of the collector for " "test results. In most cases a user will " "prefer to specify a bouncer over this."], - ["bouncer", "b", CANONICAL_BOUNCER_ONION, "Specify the bouncer used to " - "obtain the address of the " - "collector and test helpers."], + ["bouncer", "b", None, "Specify the bouncer used to " + "obtain the address of the " + "collector and test helpers."], ["logfile", "l", None, "Write to this logs to this filename."], ["pcapfile", "O", None, "Write a PCAP of the ooniprobe session to " "this filename."],

1 0

[ooni-probe/master] Implementing bridge failover in ooniprobe
by art＠torproject.org 19 Sep '16

19 Sep '16

commit 90ec4fb643841b4a2c97fa2985e66d7138049467 Author: Arturo Filastò <arturo(a)filasto.net> Date: Tue Jun 14 16:15:44 2016 +0300 Implementing bridge failover in ooniprobe We support failing over to obfs4 and meek when vanilla tor does not work. * This implements #538 --- ooni/oonicli.py | 6 +++--- ooni/utils/onion.py | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ooni/oonicli.py b/ooni/oonicli.py index 2eb1d9f..23c0b85 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -44,9 +44,9 @@ class Options(usage.Options): ["collector", "c", None, "Specify the address of the collector for " "test results. In most cases a user will " "prefer to specify a bouncer over this."], - ["bouncer", "b", None, "Specify the bouncer used to " - "obtain the address of the " - "collector and test helpers."], + ["bouncer", "b", CANONICAL_BOUNCER_ONION, "Specify the bouncer used to " + "obtain the address of the " + "collector and test helpers."], ["logfile", "l", None, "Write to this logs to this filename."], ["pcapfile", "O", None, "Write a PCAP of the ooniprobe session to " "this filename."], diff --git a/ooni/utils/onion.py b/ooni/utils/onion.py index e18a6ee..cd13640 100644 --- a/ooni/utils/onion.py +++ b/ooni/utils/onion.py @@ -237,6 +237,7 @@ class TorLauncherWithRetries(object): continue setattr(new_tor_config, key, getattr(self.tor_config, key)) self.tor_config = new_tor_config + self.timeout = timeout def _progress_updates(self, prog, tag, summary): log.msg("%d%%: %s" % (prog, summary))

1 0

[ooni-probe/master] Use the ConfigTestCase also for test_nettest
by art＠torproject.org 19 Sep '16

19 Sep '16

commit 0842d2158ab879e34957168f509c6dfad9c3cb7a Author: Arturo Filastò <arturo(a)filasto.net> Date: Wed Jun 29 20:50:40 2016 +0200 Use the ConfigTestCase also for test_nettest --- ooni/tests/test_nettest.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ooni/tests/test_nettest.py b/ooni/tests/test_nettest.py index 4298fe9..239080a 100644 --- a/ooni/tests/test_nettest.py +++ b/ooni/tests/test_nettest.py @@ -223,6 +223,7 @@ class TestNetTest(ConfigTestCase): timeout = 1 def setUp(self): + super(TestNetTest, self).setUp() self.filename = "" with open(dummyInputFile, 'w') as f: for i in range(10): @@ -230,6 +231,7 @@ class TestNetTest(ConfigTestCase): super(TestNetTest, self).setUp() def tearDown(self): + super(TestNetTest, self).tearDown() os.remove(dummyInputFile) if self.filename != "": os.remove(self.filename)

1 0

[ooni-probe/master] Implementing bridge failover in ooniprobe (#540)
by art＠torproject.org 19 Sep '16

19 Sep '16

commit 6f8fe6f7fa9197b2465bcbe3374722803f6a24d0 Author: Arturo Filastò <arturo(a)filasto.net> Date: Wed Jun 29 16:38:09 2016 +0200 Implementing bridge failover in ooniprobe (#540) * Implementing bridge failover in ooniprobe We support failing over to obfs4 and meek when vanilla tor does not work. * This implements #538 * Reset the DataDirectory when we the data_dir is not set Otherwise txtorcon will delete the datadirectory after it shutsdown and not re-create it. --- ooni/utils/onion.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/ooni/utils/onion.py b/ooni/utils/onion.py index cd13640..cc2f2ff 100644 --- a/ooni/utils/onion.py +++ b/ooni/utils/onion.py @@ -239,6 +239,19 @@ class TorLauncherWithRetries(object): self.tor_config = new_tor_config self.timeout = timeout + def _reset_tor_config(self): + """ + This is used to reset the Tor configuration to before launch_tor + modified it. This is in particular used to force the regeneration of the + DataDirectory. + """ + new_tor_config = TorConfig() + for key in self.tor_config: + if config.tor.data_dir is None and key == "DataDirectory": + continue + setattr(new_tor_config, key, getattr(self.tor_config, key)) + self.tor_config = new_tor_config + def _progress_updates(self, prog, tag, summary): log.msg("%d%%: %s" % (prog, summary))

1 0

[ooni-probe/master] Write the deck file to always the same filename deck/
by art＠torproject.org 19 Sep '16

19 Sep '16

commit 4239679d2d8d28828f6215b70678ab9c99887bd6 Author: Arturo Filastò <arturo(a)filasto.net> Date: Wed Jun 29 20:14:01 2016 +0200 Write the deck file to always the same filename deck/ * Add some basic unittests for oonideckgen --- ooni/deckgen/cli.py | 39 +++++++++++++++++++++++---------------- ooni/tests/bases.py | 1 + ooni/tests/test_oonideckgen.py | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 16 deletions(-) diff --git a/ooni/deckgen/cli.py b/ooni/deckgen/cli.py index a6046f3..9f2cc4c 100644 --- a/ooni/deckgen/cli.py +++ b/ooni/deckgen/cli.py @@ -1,7 +1,10 @@ +from __future__ import print_function + import os import sys import copy import errno +import shutil import yaml @@ -14,7 +17,6 @@ from ooni.settings import config from ooni.deckgen import __version__ from ooni.deckgen.processors import citizenlab_test_lists -from ooni.deckgen.processors import namebench_dns_servers from ooni.resources.update import download_resources class Options(usage.Options): @@ -70,7 +72,7 @@ class Deck(object): self.deck_entries.append(deck_entry) def pprint(self): - print yaml.safe_dump(self.deck_entries) + print(yaml.safe_dump(self.deck_entries)) def write_to_file(self, filename): with open(filename, "w+") as f: @@ -85,8 +87,8 @@ def generate_deck(options): options['output'] ) except Exception: - print "Could not generate country specific url list" - print "We will just use the global one." + print("Could not generate country specific url list") + print("We will just use the global one.") url_list_global = citizenlab_test_lists.generate_global_input( options['output'] @@ -105,9 +107,9 @@ def generate_deck(options): deck_filename = os.path.join(options['output'], "default-user.deck") deck.write_to_file(deck_filename) - print "Deck written to %s" % deck_filename - print "Run ooniprobe like so:" - print "ooniprobe -i %s" % deck_filename + print("Deck written to %s" % deck_filename) + print("Run ooniprobe like so:") + print("ooniprobe -i %s" % deck_filename) @defer.inlineCallbacks @@ -138,8 +140,8 @@ def run(): try: options.parseOptions() except usage.UsageError as error_message: - print "%s: %s" % (sys.argv[0], error_message) - print options + print("%s: %s" % (sys.argv[0], error_message)) + print(options) sys.exit(1) if not resources_up_to_date(): @@ -154,24 +156,29 @@ def run(): try: options['country-code'] = yield get_user_country_code() except errors.ProbeIPUnknown: - print "Could not determine your IP address." - print "Check your internet connection or specify a country code with -c." + print("Could not determine your IP address.") + print("Check your internet connection or specify a country code " + "with -c.") sys.exit(4) if len(options['country-code']) != 2: - print "%s: --country-code must be 2 characters" % sys.argv[0] + print("%s: --country-code must be 2 characters" % sys.argv[0]) sys.exit(2) if not os.path.isdir(options['output']): - print "%s: %s is not a directory" % (sys.argv[0], - options['output']) + print("%s: %s is not a directory" % (sys.argv[0], + options['output'])) sys.exit(3) options['country-code'] = options['country-code'].lower() output_dir = os.path.abspath(options['output']) - output_dir = os.path.join(output_dir, - "deck-%s" % options['country-code']) + output_dir = os.path.join(output_dir, "deck") + + if os.path.isdir(output_dir): + print("Found previous deck deleting content of it") + shutil.rmtree(output_dir) + options['output'] = output_dir try: diff --git a/ooni/tests/bases.py b/ooni/tests/bases.py index 31cbf94..904aaba 100644 --- a/ooni/tests/bases.py +++ b/ooni/tests/bases.py @@ -1,5 +1,6 @@ import os import shutil + from twisted.trial import unittest from ooni.settings import config diff --git a/ooni/tests/test_oonideckgen.py b/ooni/tests/test_oonideckgen.py new file mode 100644 index 0000000..4a52377 --- /dev/null +++ b/ooni/tests/test_oonideckgen.py @@ -0,0 +1,35 @@ +import os +import yaml +import tempfile + +from .bases import ConfigTestCase + +from ooni.deckgen import cli + +class TestOONIDeckgen(ConfigTestCase): + def setUp(self): + super(TestOONIDeckgen, self).setUp() + test_lists_dir = os.path.join(self.config.ooni_home, + "resources", + "citizenlab-test-lists") + try: + os.makedirs(test_lists_dir) + except Exception as exc: + pass + global_list = os.path.join(test_lists_dir, "global.csv") + + with open(global_list, 'w') as f: + f.write("url,category_code,category_description,date_added," + "source,notes\n") + f.write("http://example.com,FOO,Foo,2016-04-15,OONI,\n") + + def test_generate_deck(self): + temp_dir = tempfile.mkdtemp() + cli.generate_deck({ + "country-code": "it", + "output": temp_dir, + "collector": None, + "bouncer": None + }) + with open(os.path.join(temp_dir, "default-user.deck")) as f: + self.assertEqual(len(yaml.safe_load(f)), 3)

1 0

[ooni-probe/master] Add support for starting tests from the HTTP API
by art＠torproject.org 19 Sep '16

19 Sep '16

commit b2118234e7b85ad4381ef2caddb9ec37e131fba4 Author: Arturo Filastò <arturo(a)filasto.net> Date: Fri Apr 1 19:48:14 2016 +0200 Add support for starting tests from the HTTP API --- ooni/director.py | 2 +- ooni/web/resources.py | 172 ++++++++++++++++++++++++++++++++++++++++++++++++++ ooni/web/root.py | 40 ++++++++++++ ooni/webui.py | 57 +++++++++++++++++ 4 files changed, 270 insertions(+), 1 deletion(-) diff --git a/ooni/director.py b/ooni/director.py index d6503f2..9897ffd 100644 --- a/ooni/director.py +++ b/ooni/director.py @@ -134,7 +134,7 @@ class Director(object): elif config.tor.control_port and config.tor_state is None: yield connect_to_control_port() - if config.global_options['no-geoip']: + if config.global_options.get('no-geoip'): aux = [False] if config.global_options.get('annotations') is not None: annotations = [k.lower() for k in config.global_options['annotations'].keys()] diff --git a/ooni/web/resources.py b/ooni/web/resources.py new file mode 100644 index 0000000..336fdc0 --- /dev/null +++ b/ooni/web/resources.py @@ -0,0 +1,172 @@ +import json +from twisted.web import resource +from twisted.python import usage + +from ooni import errors +from ooni.nettest import NetTestLoader + + +class WuiResource(resource.Resource): + isLeaf = True + XSRF_HEADER = 'X-XSRF-TOKEN' + # XXX set this to true when stable version + XSRF_PROTECTION = False + + def __init__(self, director): + self.director = director + resource.Resource.__init__(self) + + def check_xsrf(self, request): + if self.XSRF_PROTECTION is False: + return True + if request.requestHeaders.hasHeader(self.XSRF_HEADER): + return True + return False + + def render(self, request): + if not self.check_xsrf(request): + obj = { + 'error_code': 400, + 'error_message': ('Missing cross site request forgery ' + 'header \'{}\''.format(self.XSRF_HEADER)) + } + request.setResponseCode(403) + return self.render_json(obj, request) + obj = resource.Resource.render(self, request) + return self.render_json(obj, request) + + def render_json(self, obj, request): + json_string = json.dumps(obj) + "\n" + request.setHeader('Content-Type', 'application/json') + request.setHeader('Content-Length', len(json_string)) + return json_string + + +class DecksGenerate(WuiResource): + def render_GET(self, request): + return {"generate": "deck"} + + +class DecksStart(WuiResource): + def __init__(self, director, deck_name): + WuiResource.__init__(self, director) + self.deck_name = deck_name + + def render_GET(self, request): + return {"start": self.deck_name} + + +class DecksStop(WuiResource): + def __init__(self, director, deck_id): + WuiResource.__init__(self, director) + self.deck_id = deck_id + + def render_GET(self, request): + return {"stop": self.deck_id} + + +class DecksStatus(WuiResource): + def __init__(self, director, deck_name): + WuiResource.__init__(self, director) + self.deck_name = deck_name + + def render_GET(self, request): + return {"deck": self.deck_name} + + +class DecksList(WuiResource): + def render_GET(self, request): + return {"deck": "list"} + + +def getNetTestLoader(test_options, test_file): + """ + Args: + test_options: (dict) containing as keys the option names. + + test_file: (string) the path to the test_file to be run. + Returns: + an instance of :class:`ooni.nettest.NetTestLoader` with the specified + test_file and the specified options. + """ + options = [] + for k, v in test_options.items(): + options.append('--'+k) + options.append(v) + + net_test_loader = NetTestLoader(options, + test_file=test_file) + return net_test_loader + +class TestsStart(WuiResource): + def __init__(self, director, test_name): + WuiResource.__init__(self, director) + self.test_name = test_name + + def render_POST(self, request): + try: + net_test = self.director.netTests[self.test_name] + except KeyError: + request.setResponseCode(500) + return { + 'error_code': 500, + 'error_message': 'Could not find the specified test' + } + test_options = json.load(request.content) + net_test_loader = getNetTestLoader(test_options, net_test['path']) + try: + net_test_loader.checkOptions() + # XXX we actually want to generate the report_filename in a smart + # way so that we can know where it is located and learn the results + # of the measurement. + report_filename = None + self.director.startNetTest(net_test_loader, report_filename) + except errors.MissingRequiredOption, option_name: + request.setResponseCode(500) + return { + 'error_code': 501, + 'error_message': ('Missing required option: ' + '\'{}\''.format(option_name)) + } + except usage.UsageError: + request.setResponseCode(500) + return { + 'error_code': 502, + 'error_message': 'Error in parsing options' + } + except errors.InsufficientPrivileges: + request.setResponseCode(500) + return { + 'error_code': 503, + 'error_message': 'Insufficient priviledges' + } + + return {"deck": "list"} + + +class TestsStop(WuiResource): + def __init__(self, director, test_id): + WuiResource.__init__(self, director) + self.test_id = test_id + + def render_GET(self, request): + return {"deck": "list"} + + +class TestsStatus(WuiResource): + def __init__(self, director, test_id): + WuiResource.__init__(self, director) + self.test_id = test_id + + def render_GET(self, request): + return {"deck": "list"} + + +class TestsList(WuiResource): + def render_GET(self, request): + return self.director.netTests + + +class Results(WuiResource): + def render_GET(self, request): + return {"result": "bar"} diff --git a/ooni/web/root.py b/ooni/web/root.py new file mode 100644 index 0000000..7ceba4a --- /dev/null +++ b/ooni/web/root.py @@ -0,0 +1,40 @@ +import os +import re +from twisted.web import resource, static + +from .resources import DecksGenerate, DecksStart, DecksStop +from .resources import DecksStatus, DecksList, TestsStart +from .resources import TestsStop, TestsStatus, TestsList +from .resources import Results + + +class OONIProbeWebRoot(resource.Resource): + routes = [ + ('^/decks/generate$', DecksGenerate), + ('^/decks/(.*)/start$', DecksStart), + ('^/decks/(.*)/stop$', DecksStop), + ('^/decks/(.*)$', DecksStatus), + ('^/decks$', DecksList), + ('^/tests/(.*)/start$', TestsStart), + ('^/tests/(.*)/stop$', TestsStop), + ('^/tests/(.*)$', TestsStatus), + ('^/tests$', TestsList), + ('^/results$', Results) + ] + + def __init__(self, config, director): + resource.Resource.__init__(self) + + self._director = director + self._config = config + self._route_map = map(lambda x: (re.compile(x[0]), x[1]), self.routes) + + wui_directory = os.path.join(self._config.data_directory, 'ui', 'app') + self._static = static.File(wui_directory) + + def getChild(self, path, request): + for route, r in self._route_map: + match = route.search(request.path) + if match: + return r(self._director, *match.groups()) + return self._static.getChild(path, request) diff --git a/ooni/webui.py b/ooni/webui.py new file mode 100644 index 0000000..e2fe450 --- /dev/null +++ b/ooni/webui.py @@ -0,0 +1,57 @@ +import os + +from twisted.scripts import twistd +from twisted.python import usage +from twisted.internet import reactor +from twisted.web import server +from twisted.application import service + +from ooni.web.root import OONIProbeWebRoot +from ooni.settings import config +from ooni.director import Director +from ooni.utils import log + +class WebUI(service.MultiService): + portNum = 8822 + def startService(self): + service.MultiService.startService(self) + config.set_paths() + config.initialize_ooni_home() + config.read_config_file() + def _started(res): + log.msg("Director started") + root = server.Site(OONIProbeWebRoot(config, director)) + self._port = reactor.listenTCP(self.portNum, root) + director = Director() + d = director.start() + d.addCallback(_started) + d.addErrback(self._startupFailed) + + def _startupFailed(self, err): + log.err("Failed to start the director") + log.exception(err) + os.abort() + + def stopService(self): + if self._port: + self._port.stopListening() + +class StartOoniprobeWebUIPlugin: + tapname = "ooniprobe" + def makeService(self, so): + return WebUI() + +class MyTwistdConfig(twistd.ServerOptions): + subCommands = [("StartOoniprobeWebUI", None, usage.Options, "ooniprobe web ui")] + +def start(): + twistd_args = ["--nodaemon"] + twistd_config = MyTwistdConfig() + twistd_args.append("StartOoniprobeWebUI") + try: + twistd_config.parseOptions(twistd_args) + except usage.error, ue: + print("ooniprobe: usage error from twistd: {}\n".format(ue)) + twistd_config.loadedPlugins = {"StartOoniprobeWebUI": StartOoniprobeWebUIPlugin()} + twistd.runApp(twistd_config) + return 0

1 0

[ooni-probe/master] Call setupBaseAddress after setting the settings
by art＠torproject.org 19 Sep '16

19 Sep '16

commit 503c8412828725871be129b073c005a10404df6d Author: Arturo Filastò <arturo(a)filasto.net> Date: Tue Jun 21 18:00:41 2016 +0200 Call setupBaseAddress after setting the settings This makes it possible to re-instantiate a BackendClient from the settings --- ooni/backend_client.py | 1 - 1 file changed, 1 deletion(-) diff --git a/ooni/backend_client.py b/ooni/backend_client.py index 1039124..506aba4 100644 --- a/ooni/backend_client.py +++ b/ooni/backend_client.py @@ -42,7 +42,6 @@ class OONIBClient(object): self.backend_type = guess_backend_type(self.base_address) self.backend_type = self.backend_type.encode('ascii') - self._setupBaseAddress() self.settings = { 'type': self.backend_type, 'address': self.base_address,

1 0

[ooni-probe/master] Fixes to support cloudfronting and https collectors
by art＠torproject.org 19 Sep '16

19 Sep '16

commit 409f8a595ec2b67f89d6fca0f621530b732cedc1 Author: Arturo Filastò <arturo(a)filasto.net> Date: Tue Jun 21 16:28:18 2016 +0200 Fixes to support cloudfronting and https collectors --- ooni/backend_client.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ooni/backend_client.py b/ooni/backend_client.py index 506aba4..1039124 100644 --- a/ooni/backend_client.py +++ b/ooni/backend_client.py @@ -42,6 +42,7 @@ class OONIBClient(object): self.backend_type = guess_backend_type(self.base_address) self.backend_type = self.backend_type.encode('ascii') + self._setupBaseAddress() self.settings = { 'type': self.backend_type, 'address': self.base_address,

1 0

[ooni-probe/master] Use the testing https and cloudfronted bouncer
by art＠torproject.org 19 Sep '16

19 Sep '16

commit acda284b56fa3a75acbe7d000fbdefb643839948 Author: Arturo Filastò <arturo(a)filasto.net> Date: Fri Jun 24 16:29:48 2016 +0200 Use the testing https and cloudfronted bouncer * Bump version number to 1.6.0rc1 --- ooni/constants.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ooni/constants.py b/ooni/constants.py index 6efa52e..38f85b4 100644 --- a/ooni/constants.py +++ b/ooni/constants.py @@ -1,5 +1,7 @@ CANONICAL_BOUNCER_ONION = 'httpo://nkvphnp3p6agi5qq.onion' -CANONICAL_BOUNCER_HTTPS = 'https://bouncer.ooni.io' +# XXX Change these two to the production ones once the release is made. +# CANONICAL_BOUNCER_HTTPS = 'https://bouncer.ooni.io' +CANONICAL_BOUNCER_HTTPS = 'https://bouncer.test.ooni.io' CANONICAL_BOUNCER_CLOUDFRONT = ( 'https://d3kr4emv7f56qa.cloudfront.net/', 'a0.awsstatic.com'

1 0

[ooni-probe/master] [Web UI] Refactoring of web UI
by art＠torproject.org 19 Sep '16

19 Sep '16

commit bd4458d07a7f6755b5c104c068e9c8dd86ce2852 Author: Arturo Filastò <arturo(a)filasto.net> Date: Mon Jun 13 00:44:58 2016 +0200 [Web UI] Refactoring of web UI * Move into the ooni/ui tree * Move the web UI related files to a separate repository --- ooni/ui/web/server.py | 3 + ooni/web/resources.py | 172 -------------------------------------------------- ooni/web/root.py | 40 ------------ ooni/webui.py | 57 ----------------- 4 files changed, 3 insertions(+), 269 deletions(-) diff --git a/ooni/ui/web/server.py b/ooni/ui/web/server.py index 3da6f58..5be581c 100644 --- a/ooni/ui/web/server.py +++ b/ooni/ui/web/server.py @@ -197,4 +197,7 @@ class WebUIAPI(object): path = rpath("build") print(path) return static.File(path) +<<<<<<< acda284b56fa3a75acbe7d000fbdefb643839948 +======= +>>>>>>> [Web UI] Refactoring of web UI diff --git a/ooni/web/resources.py b/ooni/web/resources.py deleted file mode 100644 index 336fdc0..0000000 --- a/ooni/web/resources.py +++ /dev/null @@ -1,172 +0,0 @@ -import json -from twisted.web import resource -from twisted.python import usage - -from ooni import errors -from ooni.nettest import NetTestLoader - - -class WuiResource(resource.Resource): - isLeaf = True - XSRF_HEADER = 'X-XSRF-TOKEN' - # XXX set this to true when stable version - XSRF_PROTECTION = False - - def __init__(self, director): - self.director = director - resource.Resource.__init__(self) - - def check_xsrf(self, request): - if self.XSRF_PROTECTION is False: - return True - if request.requestHeaders.hasHeader(self.XSRF_HEADER): - return True - return False - - def render(self, request): - if not self.check_xsrf(request): - obj = { - 'error_code': 400, - 'error_message': ('Missing cross site request forgery ' - 'header \'{}\''.format(self.XSRF_HEADER)) - } - request.setResponseCode(403) - return self.render_json(obj, request) - obj = resource.Resource.render(self, request) - return self.render_json(obj, request) - - def render_json(self, obj, request): - json_string = json.dumps(obj) + "\n" - request.setHeader('Content-Type', 'application/json') - request.setHeader('Content-Length', len(json_string)) - return json_string - - -class DecksGenerate(WuiResource): - def render_GET(self, request): - return {"generate": "deck"} - - -class DecksStart(WuiResource): - def __init__(self, director, deck_name): - WuiResource.__init__(self, director) - self.deck_name = deck_name - - def render_GET(self, request): - return {"start": self.deck_name} - - -class DecksStop(WuiResource): - def __init__(self, director, deck_id): - WuiResource.__init__(self, director) - self.deck_id = deck_id - - def render_GET(self, request): - return {"stop": self.deck_id} - - -class DecksStatus(WuiResource): - def __init__(self, director, deck_name): - WuiResource.__init__(self, director) - self.deck_name = deck_name - - def render_GET(self, request): - return {"deck": self.deck_name} - - -class DecksList(WuiResource): - def render_GET(self, request): - return {"deck": "list"} - - -def getNetTestLoader(test_options, test_file): - """ - Args: - test_options: (dict) containing as keys the option names. - - test_file: (string) the path to the test_file to be run. - Returns: - an instance of :class:`ooni.nettest.NetTestLoader` with the specified - test_file and the specified options. - """ - options = [] - for k, v in test_options.items(): - options.append('--'+k) - options.append(v) - - net_test_loader = NetTestLoader(options, - test_file=test_file) - return net_test_loader - -class TestsStart(WuiResource): - def __init__(self, director, test_name): - WuiResource.__init__(self, director) - self.test_name = test_name - - def render_POST(self, request): - try: - net_test = self.director.netTests[self.test_name] - except KeyError: - request.setResponseCode(500) - return { - 'error_code': 500, - 'error_message': 'Could not find the specified test' - } - test_options = json.load(request.content) - net_test_loader = getNetTestLoader(test_options, net_test['path']) - try: - net_test_loader.checkOptions() - # XXX we actually want to generate the report_filename in a smart - # way so that we can know where it is located and learn the results - # of the measurement. - report_filename = None - self.director.startNetTest(net_test_loader, report_filename) - except errors.MissingRequiredOption, option_name: - request.setResponseCode(500) - return { - 'error_code': 501, - 'error_message': ('Missing required option: ' - '\'{}\''.format(option_name)) - } - except usage.UsageError: - request.setResponseCode(500) - return { - 'error_code': 502, - 'error_message': 'Error in parsing options' - } - except errors.InsufficientPrivileges: - request.setResponseCode(500) - return { - 'error_code': 503, - 'error_message': 'Insufficient priviledges' - } - - return {"deck": "list"} - - -class TestsStop(WuiResource): - def __init__(self, director, test_id): - WuiResource.__init__(self, director) - self.test_id = test_id - - def render_GET(self, request): - return {"deck": "list"} - - -class TestsStatus(WuiResource): - def __init__(self, director, test_id): - WuiResource.__init__(self, director) - self.test_id = test_id - - def render_GET(self, request): - return {"deck": "list"} - - -class TestsList(WuiResource): - def render_GET(self, request): - return self.director.netTests - - -class Results(WuiResource): - def render_GET(self, request): - return {"result": "bar"} diff --git a/ooni/web/root.py b/ooni/web/root.py deleted file mode 100644 index 7ceba4a..0000000 --- a/ooni/web/root.py +++ /dev/null @@ -1,40 +0,0 @@ -import os -import re -from twisted.web import resource, static - -from .resources import DecksGenerate, DecksStart, DecksStop -from .resources import DecksStatus, DecksList, TestsStart -from .resources import TestsStop, TestsStatus, TestsList -from .resources import Results - - -class OONIProbeWebRoot(resource.Resource): - routes = [ - ('^/decks/generate$', DecksGenerate), - ('^/decks/(.*)/start$', DecksStart), - ('^/decks/(.*)/stop$', DecksStop), - ('^/decks/(.*)$', DecksStatus), - ('^/decks$', DecksList), - ('^/tests/(.*)/start$', TestsStart), - ('^/tests/(.*)/stop$', TestsStop), - ('^/tests/(.*)$', TestsStatus), - ('^/tests$', TestsList), - ('^/results$', Results) - ] - - def __init__(self, config, director): - resource.Resource.__init__(self) - - self._director = director - self._config = config - self._route_map = map(lambda x: (re.compile(x[0]), x[1]), self.routes) - - wui_directory = os.path.join(self._config.data_directory, 'ui', 'app') - self._static = static.File(wui_directory) - - def getChild(self, path, request): - for route, r in self._route_map: - match = route.search(request.path) - if match: - return r(self._director, *match.groups()) - return self._static.getChild(path, request) diff --git a/ooni/webui.py b/ooni/webui.py deleted file mode 100644 index e2fe450..0000000 --- a/ooni/webui.py +++ /dev/null @@ -1,57 +0,0 @@ -import os - -from twisted.scripts import twistd -from twisted.python import usage -from twisted.internet import reactor -from twisted.web import server -from twisted.application import service - -from ooni.web.root import OONIProbeWebRoot -from ooni.settings import config -from ooni.director import Director -from ooni.utils import log - -class WebUI(service.MultiService): - portNum = 8822 - def startService(self): - service.MultiService.startService(self) - config.set_paths() - config.initialize_ooni_home() - config.read_config_file() - def _started(res): - log.msg("Director started") - root = server.Site(OONIProbeWebRoot(config, director)) - self._port = reactor.listenTCP(self.portNum, root) - director = Director() - d = director.start() - d.addCallback(_started) - d.addErrback(self._startupFailed) - - def _startupFailed(self, err): - log.err("Failed to start the director") - log.exception(err) - os.abort() - - def stopService(self): - if self._port: - self._port.stopListening() - -class StartOoniprobeWebUIPlugin: - tapname = "ooniprobe" - def makeService(self, so): - return WebUI() - -class MyTwistdConfig(twistd.ServerOptions): - subCommands = [("StartOoniprobeWebUI", None, usage.Options, "ooniprobe web ui")] - -def start(): - twistd_args = ["--nodaemon"] - twistd_config = MyTwistdConfig() - twistd_args.append("StartOoniprobeWebUI") - try: - twistd_config.parseOptions(twistd_args) - except usage.error, ue: - print("ooniprobe: usage error from twistd: {}\n".format(ue)) - twistd_config.loadedPlugins = {"StartOoniprobeWebUI": StartOoniprobeWebUIPlugin()} - twistd.runApp(twistd_config) - return 0

1 0