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

[ooni-probe/master] support unix-socket tor control ports #479 (#715)
by art＠torproject.org 22 Sep '17

22 Sep '17

commit 19a301c6a1b9bd66b237c3c5a231f75b1f2bded7 Author: E.Iosifidis <iosifidise(a)gmail.com> Date: Thu Jan 19 16:49:26 2017 +0200 support unix-socket tor control ports #479 (#715) * Added a space when printing the -g opt * support unix-socket tor control ports --- data/ooniprobe.conf.sample | 3 +++ ooni/settings.py | 27 ++++++++++++++++++++------- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/data/ooniprobe.conf.sample b/data/ooniprobe.conf.sample index e324c8a3..8a663824 100644 --- a/data/ooniprobe.conf.sample +++ b/data/ooniprobe.conf.sample @@ -67,6 +67,9 @@ advanced: tor: #socks_port: 8801 #control_port: 8802 + # Alternatively set control_port to the unix domain socket. Useful for Debian based systems + #control_port: unix:/var/run/tor/control + # # Specify the absolute path to the Tor bridges to use for testing #bridges: bridges.list # Specify path of the tor datadirectory. diff --git a/ooni/settings.py b/ooni/settings.py index eb4f052d..a59664cd 100644 --- a/ooni/settings.py +++ b/ooni/settings.py @@ -85,6 +85,9 @@ advanced: tor: #socks_port: 8801 #control_port: 8802 + # Alternatively set control_port to the unix domain socket. Useful for Debian based systems + #control_port: unix:/var/run/tor/control + # # Specify the absolute path to the Tor bridges to use for testing #bridges: bridges.list # Specify path of the tor datadirectory. @@ -520,13 +523,23 @@ class OConfig(object): incoherent.append('tor:socks_port') if self.tor.control_port is not None: - control_port_ep = TCP4ClientEndpoint(reactor, - "localhost", - self.tor.control_port) - try: - yield connectProtocol(control_port_ep, ConnectAndCloseProtocol()) - except Exception: - incoherent.append('tor:control_port') + if isinstance(self.tor.control_port, int): + control_port_ep = TCP4ClientEndpoint(reactor, + "localhost", + self.tor.control_port) + try: + yield connectProtocol(control_port_ep, ConnectAndCloseProtocol()) + except Exception: + incoherent.append('tor:control_port') + else: + conf_unix_socket_path = self.tor.control_port + if conf_unix_socket_path.lstrip.startswith("unix:"): + if os.path.exists(conf_unix_socket_path.lstrip("unix:")): + unix_socket_path = conf_unix_socket_path.lstrip("unix:") + else: + incoherent.append('tor:control_port') + else: + incoherent.append('tor:control_port') self.log_incoherences(incoherent)

1 0

[ooni-probe/master] Feature/test progress (#719)
by art＠torproject.org 22 Sep '17

22 Sep '17

commit b8d48b0887aa4ef8ba4ec4d26baa24515472c586 Author: Arturo Filastò <arturo(a)filasto.net> Date: Fri Jan 27 10:59:20 2017 +0000 Feature/test progress (#719) * Add support for showing the test progress * Add progress to API * Expose anomaly inside of top level measurement listing * Differentiate between danger and warning anomaly --- ooni/deck/deck.py | 5 +++-- ooni/director.py | 7 ++++++- ooni/measurements.py | 25 ++++++++++++++++++++--- ooni/nettest.py | 56 ++++++++++++++++++++++++++++++++++++++++++++++++--- ooni/ui/web/server.py | 10 ++++++++- 5 files changed, 93 insertions(+), 10 deletions(-) diff --git a/ooni/deck/deck.py b/ooni/deck/deck.py index cb52bb22..2060b6ec 100644 --- a/ooni/deck/deck.py +++ b/ooni/deck/deck.py @@ -37,13 +37,13 @@ def options_to_args(options): for k, v in options.items(): if v is None: continue - if v == False: + if v is False: continue if (len(k)) == 1: args.append('-'+k) else: args.append('--'+k) - if v == True: + if v is True: continue args.append(v) return args @@ -218,6 +218,7 @@ class NGDeck(object): generate_summary( measurement_dir.child("measurements.njson").path, measurement_dir.child("summary.json").path, + measurement_dir.child("anomaly").path, deck_id=self.id ) measurement_dir.child("running.pid").remove() diff --git a/ooni/director.py b/ooni/director.py index f7566f5f..0b949db6 100644 --- a/ooni/director.py +++ b/ooni/director.py @@ -72,6 +72,8 @@ class Director(object): self.activeNetTests = [] self.activeDecks = [] + self.activeMeasurements = {} + self.measurementManager = MeasurementManager() self.measurementManager.director = self @@ -307,7 +309,6 @@ class Director(object): log.error("Completed deck {0} is not actually running".format( deck_id)) - def isDeckRunning(self, deck_id, from_schedule): """ :param deck_id: the ID of the deck to check if it's running @@ -358,11 +359,15 @@ class Director(object): yield net_test.initialize() try: self.activeNetTests.append(net_test) + if measurement_id: + self.activeMeasurements[measurement_id] = net_test self.measurementManager.schedule(net_test.generateMeasurements()) yield net_test.done yield report.close() finally: + if measurement_id: + del self.activeMeasurements[measurement_id] self.netTestDone(net_test) def start_sniffing(self, test_details): diff --git a/ooni/measurements.py b/ooni/measurements.py index 2a4440ad..4188f66f 100644 --- a/ooni/measurements.py +++ b/ooni/measurements.py @@ -23,6 +23,10 @@ class MeasurementTypes(): result['anomaly'] = False if entry['test_keys']['blocking'] is not False: result['anomaly'] = True + if entry['test_keys']['blocking'] is None: + result['anomaly_type'] = 'warning' + else: + result['anomaly_type'] = 'danger' result['url'] = entry['input'] return result @@ -32,6 +36,7 @@ class MeasurementTypes(): result['anomaly'] = False if entry['test_keys']['connection'] != "success": result['anomaly'] = True + result['anomaly_type'] = 'danger' result['url'] = entry['input'] return result @@ -48,12 +53,15 @@ class MeasurementTypes(): ) ) result['anomaly'] = anomaly + if anomaly is True: + result['anomaly_type'] = 'danger' result['url'] = entry['input'] return result -def generate_summary(input_file, output_file, deck_id='none'): +def generate_summary(input_file, output_file, anomaly_file, deck_id='none'): results = {} + anomaly = False with open(input_file) as in_file: for idx, line in enumerate(in_file): entry = json.loads(line.strip()) @@ -61,6 +69,8 @@ def generate_summary(input_file, output_file, deck_id='none'): if entry['test_name'] in MeasurementTypes.supported_tests: result = getattr(MeasurementTypes, entry['test_name'])(entry) result['idx'] = idx + if result.get('anomaly', None) is True: + anomaly = True if not result.get('url', None): result['url'] = entry['input'] results['test_name'] = entry['test_name'] @@ -73,6 +83,8 @@ def generate_summary(input_file, output_file, deck_id='none'): with open(output_file, "w") as fw: json.dump(results, fw) + if anomaly is True: + with open(anomaly_file, 'w') as _: pass return results @@ -91,6 +103,7 @@ def get_measurement(measurement_id, compute_size=False): completed = True keep = False stale = False + anomaly = False if measurement.child("measurements.njson.progress").exists(): completed = False try: @@ -106,6 +119,9 @@ def get_measurement(measurement_id, compute_size=False): if measurement.child("keep").exists(): keep = True + if measurement.child("anomaly").exists(): + anomaly = True + if compute_size is True: size = directory_usage(measurement.path) @@ -125,7 +141,8 @@ def get_measurement(measurement_id, compute_size=False): "running": running, "stale": stale, "size": size, - "deck_id": deck_id + "deck_id": deck_id, + "anomaly": anomaly } @@ -142,11 +159,13 @@ def get_summary(measurement_id): return defer.fail(MeasurementInProgress) summary = measurement.child("summary.json") + anomaly = measurement.child("anomaly") if not summary.exists(): return deferToThread( generate_summary, measurement.child("measurements.njson").path, - summary.path + summary.path, + anomaly.path ) with summary.open("r") as f: diff --git a/ooni/nettest.py b/ooni/nettest.py index 5ff54858..edfd9cd7 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -1,7 +1,8 @@ import os import re -import time import sys +import copy +import time from twisted.internet import defer from twisted.python.filepath import FilePath @@ -503,6 +504,10 @@ class NetTest(object): self.testDetails = test_details self.testCases = test_cases + self._startTime = 0 + self._totalInputs = 0 + self._completedInputs = 0 + self.summary = {} # This will fire when all the measurements have been completed and @@ -533,6 +538,27 @@ class NetTest(object): if self.testDetails["report_id"]: log.msg("Report ID: %s" % self.testDetails["report_id"]) + @property + def completionRate(self): + return float(self._completedInputs) / (time.time() - self._startTime) + + @property + def completionPercentage(self): + if self._totalInputs == 0: + return 0.0 + # Never return 100% + if self._completedInputs >= self._totalInputs: + return 0.99 + return float(self._completedInputs) / float(self._totalInputs) + + @property + def completionEta(self): + remaining_inputs = self._totalInputs - self._completedInputs + # We adjust for negative values + if remaining_inputs <= 0: + return 1 + return (self.completionRate * remaining_inputs) * 1.5 # fudge factor + def doneReport(self, report_results): """ This will get called every time a report is done and therefore a @@ -541,6 +567,14 @@ class NetTest(object): The state for the NetTest is informed of the fact that another task has reached the done state. """ + self._completedInputs += 1 + log.msg("") + log.msg("Status") + log.msg("------") + log.msg("%d completed %d remaining" % (self._completedInputs, + self._totalInputs)) + log.msg("%0.1f%% (ETA: %ds)" % (self.completionPercentage * 100, + self.completionEta)) self.state.taskDone() return report_results @@ -574,11 +608,17 @@ class NetTest(object): @defer.inlineCallbacks def initialize(self): - for test_class, _ in self.testCases: + for test_class, test_cases in self.testCases: # Initialize Input Processor + test_instance = test_class() test_class.inputs = yield defer.maybeDeferred( - test_class().getInputProcessor + test_instance.getInputProcessor ) + for _ in test_cases: + if test_instance._totalInputs != None: + self._totalInputs += test_instance._totalInputs + else: + self._totalInputs += 1 # Run the setupClass method yield defer.maybeDeferred( @@ -593,6 +633,7 @@ class NetTest(object): FIXME: If this generator throws exception TaskManager scheduler is irreversibly damaged. """ + self._startTime = time.time() for test_class, test_methods in self.testCases: # load a singular input processor for all instances @@ -730,6 +771,8 @@ class NetTestCase(object): localOptions = {} + _totalInputs = None + @classmethod def setUpClass(cls): """ @@ -853,9 +896,16 @@ class NetTestCase(object): inputProcessor. """ if self.inputFileSpecified: + if self._totalInputs is None: + self._totalInputs = 0 self.inputFilename = self.localOptions[self.inputFile[0]] + for _ in self.inputProcessor(self.inputFilename): + self._totalInputs += 1 return self.inputProcessor(self.inputFilename) + if isinstance(self.inputs, list): + self._totalInputs = len(self.inputs) + if self.inputs: return self.inputs diff --git a/ooni/ui/web/server.py b/ooni/ui/web/server.py index a79c1e19..37b93dba 100644 --- a/ooni/ui/web/server.py +++ b/ooni/ui/web/server.py @@ -472,7 +472,7 @@ class WebUIAPI(object): 400, 'Missing required option: "{}"'.format(option_name) ) - except usage.UsageError: + except usage.UsageError as ue: raise WebUIError( 400, 'Error in parsing options' ) @@ -528,6 +528,14 @@ class WebUIAPI(object): @requires_true(attrs=['_is_initialized']) def api_measurement_list(self, request): measurements = list_measurements(order='desc') + for measurement in measurements: + if measurement['running'] == False: + continue + try: + net_test = self.director.activeMeasurements[measurement['id']] + measurement['progress'] = net_test.completionPercentage * 100 + except KeyError: + log.err("Did not find measurement with ID %s" % measurement['id']) return self.render_json({"measurements": measurements}, request) @app.route('/api/measurement/<string:measurement_id>', methods=["GET"])

1 0

[ooni-probe/master] Add support for showing the test progress
by art＠torproject.org 22 Sep '17

22 Sep '17

commit da338188f3df1775131534fa70a7c7102dc46e3a Author: Arturo Filastò <arturo(a)filasto.net> Date: Thu Jan 19 16:31:17 2017 +0000 Add support for showing the test progress --- ooni/nettest.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ooni/nettest.py b/ooni/nettest.py index edba448c..e10aacab 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -615,6 +615,11 @@ class NetTest(object): for test_class, test_cases in self.testCases: # Initialize Input Processor test_instance = test_class() + inputs = yield defer.maybeDeferred( + test_class().getInputProcessor + ) + for _ in inputs: + self._totalInputs += 1 test_class.inputs = yield defer.maybeDeferred( test_instance.getInputProcessor )

1 0

[ooni-probe/master] Enable deck and nettest API also when director is not started
by art＠torproject.org 22 Sep '17

22 Sep '17

commit 657941f91970c91a257932993bcb3bd8670b1781 Author: Arturo Filastò <arturo(a)filasto.net> Date: Tue Jan 24 15:32:41 2017 +0000 Enable deck and nettest API also when director is not started --- ooni/ui/web/server.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ooni/ui/web/server.py b/ooni/ui/web/server.py index 58c77132..fc197a12 100644 --- a/ooni/ui/web/server.py +++ b/ooni/ui/web/server.py @@ -367,7 +367,7 @@ class WebUIAPI(object): @app.route('/api/deck', methods=["GET"]) @xsrf_protect(check=False) - @requires_true(attrs=['_director_started', '_is_initialized']) + @requires_true(attrs=['_is_initialized']) def api_deck_list(self, request): deck_list = {'decks': []} for deck_id, deck in self.director.deck_store.list(): @@ -492,7 +492,7 @@ class WebUIAPI(object): @app.route('/api/nettest', methods=["GET"]) @xsrf_protect(check=False) - @requires_true(attrs=['_director_started', '_is_initialized']) + @requires_true(attrs=['_is_initialized']) def api_nettest_list(self, request): return self.render_json(self.director.netTests, request)

1 0

[ooni-probe/master] Fix logic lost in rebase
by art＠torproject.org 22 Sep '17

22 Sep '17

commit 2b07d30725d8526fe002e6b5bdf3991411af22b7 Author: Arturo Filastò <arturo(a)filasto.net> Date: Fri Jan 27 11:40:23 2017 +0000 Fix logic lost in rebase --- ooni/nettest.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ooni/nettest.py b/ooni/nettest.py index e10aacab..edba448c 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -615,11 +615,6 @@ class NetTest(object): for test_class, test_cases in self.testCases: # Initialize Input Processor test_instance = test_class() - inputs = yield defer.maybeDeferred( - test_class().getInputProcessor - ) - for _ in inputs: - self._totalInputs += 1 test_class.inputs = yield defer.maybeDeferred( test_instance.getInputProcessor )

1 0

[ooni-probe/master] Include icon in initialize API
by art＠torproject.org 22 Sep '17

22 Sep '17

commit dba7494c4adaa4efed5c34cf666f1f0c5b6d3d94 Author: Arturo Filastò <arturo(a)filasto.net> Date: Tue Jan 24 14:22:40 2017 +0000 Include icon in initialize API --- ooni/ui/web/server.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ooni/ui/web/server.py b/ooni/ui/web/server.py index 37b93dba..58c77132 100644 --- a/ooni/ui/web/server.py +++ b/ooni/ui/web/server.py @@ -297,7 +297,8 @@ class WebUIAPI(object): 'description': deck.description, 'schedule': deck.schedule, 'enabled': self.director.deck_store.is_enabled(deck_id), - 'id': deck_id + 'id': deck_id, + 'icon': deck.icon }) return self.render_json({"available_decks": available_decks}, request)

1 0

[ooni-probe/master] Fix the is_public_ipv4_address function
by art＠torproject.org 22 Sep '17

22 Sep '17

commit 0a28ada462c62fd3db4c2803036ab25cfdcb68b4 Author: Arturo Filastò <arturo(a)filasto.net> Date: Thu Jan 26 11:38:21 2017 +0000 Fix the is_public_ipv4_address function Fixes #727 in ooniprobe Bump web_connectivity version This bug was introduced in: 4f0c2af37093070e4cec0593a0f57568a4db231c --- ooni/common/ip_utils.py | 17 +++++++++++------ ooni/nettests/blocking/web_connectivity.py | 2 +- ooni/tests/test_common.py | 14 ++++++++++++++ 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/ooni/common/ip_utils.py b/ooni/common/ip_utils.py index afc5bf43..370670b5 100644 --- a/ooni/common/ip_utils.py +++ b/ooni/common/ip_utils.py @@ -2,16 +2,21 @@ from ipaddr import IPv4Address, IPv6Address from ipaddr import AddressValueError -def is_public_ipv4_address(address): - return not is_private_ipv4_address(address) +def in_private_ip_space(address): + ip_address = IPv4Address(address) + return any( + [ip_address.is_private, ip_address.is_loopback] + ) +def is_public_ipv4_address(address): + try: + return not in_private_ip_space(address) + except AddressValueError: + return False def is_private_ipv4_address(address): try: - ip_address = IPv4Address(address) - return any( - [ip_address.is_private, ip_address.is_loopback] - ) + return in_private_ip_space(address) except AddressValueError: return False diff --git a/ooni/nettests/blocking/web_connectivity.py b/ooni/nettests/blocking/web_connectivity.py index 629ef1c9..c3877d4a 100644 --- a/ooni/nettests/blocking/web_connectivity.py +++ b/ooni/nettests/blocking/web_connectivity.py @@ -48,7 +48,7 @@ class WebConnectivityTest(httpt.HTTPTest, dnst.DNSTest): "connect to the resolved IPs and then fetching the page " "and comparing all these results with those of a control.") author = "Arturo Filastò" - version = "0.1.0" + version = "0.2.0" contentDecoders = [('gzip', GzipDecoder)] diff --git a/ooni/tests/test_common.py b/ooni/tests/test_common.py index 1cd77cf4..eb8e2432 100644 --- a/ooni/tests/test_common.py +++ b/ooni/tests/test_common.py @@ -1,5 +1,6 @@ from twisted.trial import unittest from ooni.common.http_utils import META_CHARSET_REGEXP +from ooni.common.ip_utils import is_public_ipv4_address, is_private_ipv4_address class TestHTTPUtils(unittest.TestCase): def test_charset_detection(self): @@ -17,3 +18,16 @@ class TestHTTPUtils(unittest.TestCase): self.assertEqual(META_CHARSET_REGEXP.search( with_two_charsets).group(1), 'UTF-8') self.assertEqual(META_CHARSET_REGEXP.search(with_empty_charset), None) + +class TestIPUtils(unittest.TestCase): + def test_is_public_ipv4(self): + self.assertTrue(is_public_ipv4_address('8.8.8.8')) + self.assertFalse(is_public_ipv4_address('example.com')) + self.assertFalse(is_public_ipv4_address('127.0.0.1')) + self.assertFalse(is_public_ipv4_address('192.168.1.1')) + + def test_is_private_ipv4(self): + self.assertFalse(is_private_ipv4_address('8.8.8.8')) + self.assertFalse(is_private_ipv4_address('example.com')) + self.assertTrue(is_private_ipv4_address('127.0.0.1')) + self.assertTrue(is_private_ipv4_address('192.168.2.2'))

1 0

[ooni-probe/master] Update http-invalid.yaml
by art＠torproject.org 22 Sep '17

22 Sep '17

commit 462457d264f263c97b29ccc3af688ec0ea2f1a5f Author: Maria Xynou <maria.x(a)espiv.net> Date: Wed Jan 25 19:28:26 2017 +0100 Update http-invalid.yaml --- data/decks/http-invalid.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/decks/http-invalid.yaml b/data/decks/http-invalid.yaml index c37a8075..7b7f6575 100644 --- a/data/decks/http-invalid.yaml +++ b/data/decks/http-invalid.yaml @@ -1,5 +1,5 @@ --- -name: Test for Surveillance +name: Test for Middle Boxes description: "This deck runs the HTTP Invalid Request Line test which tries to detect censorship and/or surveillance systems in your network by sending an HTTP invalid request line to an echo server."

1 0

[ooni-probe/master] Edits to the deck descriptions included in OONI web UI
by art＠torproject.org 22 Sep '17

22 Sep '17

commit 7fb350b4c0b65ca0e46c70a06467942035c3f096 Author: Maria <maria.x(a)espiv.net> Date: Wed Jan 25 17:43:17 2017 +0100 Edits to the deck descriptions included in OONI web UI --- data/decks/http-invalid.yaml | 6 ++++-- data/decks/im.yaml | 10 ++++++---- data/decks/tor.yaml | 9 ++++++--- data/decks/web.yaml | 4 ++-- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/data/decks/http-invalid.yaml b/data/decks/http-invalid.yaml index 405ec5da..c37a8075 100644 --- a/data/decks/http-invalid.yaml +++ b/data/decks/http-invalid.yaml @@ -1,6 +1,8 @@ --- -name: HTTP Invalid Request Line -description: This deck runs HTTP Invalid Request Line test +name: Test for Surveillance +description: "This deck runs the HTTP Invalid +Request Line test which tries to detect censorship and/or surveillance systems +in your network by sending an HTTP invalid request line to an echo server." schedule: "@daily" icon: "fa-gears" tasks: diff --git a/data/decks/im.yaml b/data/decks/im.yaml index 31c88d3d..92984cf5 100644 --- a/data/decks/im.yaml +++ b/data/decks/im.yaml @@ -1,13 +1,15 @@ --- -name: Instant Messaging deck -description: This test deck will check to see if instant messaging applications are working +name: Test Instant Messaging Apps +description: "This test deck will check to see if instant messaging applications are working. + The WhatsApp test examines the reachability of both WhatsApp and WhatsApp's web interface (web.whatsapp.com) in your network. + The Facebook Messenger test examines the reachability of Facebook Messenger in your network." schedule: "@daily" icon: "fa-comment-o" tasks: -- name: Checks to see if WhatsApp is working +- name: Checks to see if WhatsApp is working. ooni: test_name: whatsapp -- name: Checks to see if Facebook Messenger is working +- name: Checks to see if Facebook Messenger is working. ooni: test_name: facebook_messenger diff --git a/data/decks/tor.yaml b/data/decks/tor.yaml index d732f345..a26364cc 100644 --- a/data/decks/tor.yaml +++ b/data/decks/tor.yaml @@ -1,6 +1,9 @@ --- -name: Tor test deck -description: This deck runs test related to testing the reachability of the Tor network +name: Test Tor +description: "This deck includes tests designed to examine the reachability of the Tor network and Tor bridges. + The Vanilla Tor test examines the reachability of the Tor network. + The Tor Bridges test examines the reachability of Tor bridges in your network. + The Meek Fronted Requests test examines whether the domains used by Meek (a type of Tor bridge) work in your network." schedule: "@daily" icon: "fa-wrench" tasks: @@ -8,7 +11,7 @@ tasks: ooni: test_name: vanilla_tor -- name: Runs the Meek fronted request test +- name: Runs the Meek Fronted Requests test ooni: test_name: meek_fronted_requests diff --git a/data/decks/web.yaml b/data/decks/web.yaml index 7e9b9c8f..bd9dfd51 100644 --- a/data/decks/web.yaml +++ b/data/decks/web.yaml @@ -1,6 +1,6 @@ --- -name: Web test deck -description: This deck runs HTTP Header Field Manipulation and the Web Connectivity test +name: Test URLs +description: "This deck examines whether (and how) websites are blocked and tries to detect censorship and/or surveillance systems in your network. The Web Connectivity test examines whether access to websites is blocked through DNS tampering, TCP connection RST/IP blocking, or by a transparent HTTP proxy. The HTTP Header Field Manipulation test tries to detect censorship and/or surveillance systems in your network by sending HTTP headers to an echo server that have variations in capitalization." schedule: "@daily" icon: "fa-unlink" tasks:

1 0

[ooni-probe/master] Fix formatting in decks
by art＠torproject.org 22 Sep '17

22 Sep '17

commit f5fa0dfe2981a05b1ee7958bced970a578c9929d Author: Arturo Filastò <arturo(a)filasto.net> Date: Fri Jan 27 11:51:33 2017 +0000 Fix formatting in decks --- data/decks/http-invalid.yaml | 6 +++--- data/decks/tor.yaml | 10 ++++++---- data/decks/web.yaml | 8 +++++++- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/data/decks/http-invalid.yaml b/data/decks/http-invalid.yaml index 7b7f6575..cda31e91 100644 --- a/data/decks/http-invalid.yaml +++ b/data/decks/http-invalid.yaml @@ -1,8 +1,8 @@ --- name: Test for Middle Boxes -description: "This deck runs the HTTP Invalid -Request Line test which tries to detect censorship and/or surveillance systems -in your network by sending an HTTP invalid request line to an echo server." +description: "This deck runs the HTTP Invalid Request Line test which tries to +detect censorship and/or surveillance systems in your network by sending an +HTTP invalid request line to an echo server." schedule: "@daily" icon: "fa-gears" tasks: diff --git a/data/decks/tor.yaml b/data/decks/tor.yaml index a26364cc..f8bff6ba 100644 --- a/data/decks/tor.yaml +++ b/data/decks/tor.yaml @@ -1,9 +1,11 @@ --- name: Test Tor -description: "This deck includes tests designed to examine the reachability of the Tor network and Tor bridges. - The Vanilla Tor test examines the reachability of the Tor network. - The Tor Bridges test examines the reachability of Tor bridges in your network. - The Meek Fronted Requests test examines whether the domains used by Meek (a type of Tor bridge) work in your network." +description: "This deck includes tests designed to examine the reachability of +the Tor network and Tor bridges. The Vanilla Tor test examines the +reachability of the Tor network. The Tor Bridges test examines the +reachability of Tor bridges in your network. The Meek Fronted Requests test +examines whether the domains used by Meek (a type of Tor bridge) work in your +network." schedule: "@daily" icon: "fa-wrench" tasks: diff --git a/data/decks/web.yaml b/data/decks/web.yaml index bd9dfd51..ad6792a7 100644 --- a/data/decks/web.yaml +++ b/data/decks/web.yaml @@ -1,6 +1,12 @@ --- name: Test URLs -description: "This deck examines whether (and how) websites are blocked and tries to detect censorship and/or surveillance systems in your network. The Web Connectivity test examines whether access to websites is blocked through DNS tampering, TCP connection RST/IP blocking, or by a transparent HTTP proxy. The HTTP Header Field Manipulation test tries to detect censorship and/or surveillance systems in your network by sending HTTP headers to an echo server that have variations in capitalization." +description: "This deck examines whether (and how) websites are blocked and +tries to detect censorship and/or surveillance systems in your network. The Web +Connectivity test examines whether access to websites is blocked through DNS +tampering, TCP connection RST/IP blocking, or by a transparent HTTP proxy. The +HTTP Header Field Manipulation test tries to detect censorship and/or +surveillance systems in your network by sending HTTP headers to an echo server +that have variations in capitalization." schedule: "@daily" icon: "fa-unlink" tasks:

1 0