tor-commits May 2017

tor-commits@lists.torproject.org

16 participants
1135 discussions

[stem/master] Move remaining run_tests.py helpers
by atagar＠torproject.org 22 May '17

22 May '17

commit bb7975928a07893699b26528989d39bac941b82d Author: Damian Johnson <atagar(a)torproject.org> Date: Sun May 21 18:57:00 2017 -0700 Move remaining run_tests.py helpers Most of the remaining helpers are solely used by run_tests.py. Might as well have them in there. I probably originally moved these out when run_tests.py was tiny but it's already a moderately sizable module so these don't account for much. --- run_tests.py | 85 +++++++++++++++++++++++++++++++++++++++++++++++--- test/settings.cfg | 2 +- test/util.py | 92 +------------------------------------------------------ 3 files changed, 83 insertions(+), 96 deletions(-) diff --git a/run_tests.py b/run_tests.py index f3eabf4..6beb659 100755 --- a/run_tests.py +++ b/run_tests.py @@ -37,8 +37,10 @@ from test.output import STATUS, SUCCESS, ERROR, NO_NL, STDERR, println from test.util import STEM_BASE CONFIG = stem.util.conf.config_dict('test', { - 'integ.test_directory': './test/data', + 'test.unit_tests': '', + 'test.integ_tests': '', 'target.prereq': {}, + 'target.torrc': {}, }) MOCK_UNAVAILABLE_MSG = """\ @@ -71,6 +73,81 @@ if stem.prereq._is_python_26(): unittest.TestCase.assertItemsEqual = assertItemsEqual +def get_unit_tests(module_prefix = None): + """ + Provides the classes for our unit tests. + + :param str module_prefix: only provide the test if the module starts with + this substring + + :returns: an **iterator** for our unit tests + """ + + if module_prefix and not module_prefix.startswith('test.unit.'): + module_prefix = 'test.unit.' + module_prefix + + return _get_tests(CONFIG['test.unit_tests'].splitlines(), module_prefix) + + +def get_integ_tests(module_prefix = None): + """ + Provides the classes for our integration tests. + + :param str module_prefix: only provide the test if the module starts with + this substring + + :returns: an **iterator** for our integration tests + """ + + if module_prefix and not module_prefix.startswith('test.integ.'): + module_prefix = 'test.integ.' + module_prefix + + return _get_tests(CONFIG['test.integ_tests'].splitlines(), module_prefix) + + +def _get_tests(modules, module_prefix): + for import_name in modules: + if import_name: + module, module_name = import_name.rsplit('.', 1) # example: util.conf.TestConf + + if not module_prefix or module.startswith(module_prefix): + yield import_name + elif module_prefix.startswith(module): + # single test for this module + + test_module = module_prefix.rsplit('.', 1)[1] + yield '%s.%s' % (import_name, test_module) + + +def get_torrc_entries(target): + """ + Provides the torrc entries used to run the given target. + + :param Target target: target to provide the custom torrc contents of + + :returns: list of :class:`~test.runner.Torrc` entries for the given target + + :raises: **ValueError** if the target.torrc config has entries that don't map + to test.runner.Torrc + """ + + # converts the 'target.torrc' csv into a list of test.runner.Torrc enums + + config_csv = CONFIG['target.torrc'].get(target) + torrc_opts = [] + + if config_csv: + for opt in config_csv.split(','): + opt = opt.strip() + + if opt in test.runner.Torrc.keys(): + torrc_opts.append(test.runner.Torrc[opt]) + else: + raise ValueError("'%s' isn't a test.runner.Torrc enumeration" % opt) + + return torrc_opts + + def main(): start_time = time.time() @@ -173,7 +250,7 @@ def main(): test.output.print_divider('UNIT TESTS', True) error_tracker.set_category('UNIT TEST') - for test_class in test.util.get_unit_tests(args.specific_test): + for test_class in get_unit_tests(args.specific_test): run_result = _run_test(args, test_class, output_filters, logging_buffer) skipped_tests += len(getattr(run_result, 'skipped', [])) @@ -205,7 +282,7 @@ def main(): error_tracker.set_category(target) try: - integ_runner.start(args.attribute_targets, args.tor_path, extra_torrc_opts = test.util.get_torrc_entries(target)) + integ_runner.start(args.attribute_targets, args.tor_path, extra_torrc_opts = get_torrc_entries(target)) println('Running tests...\n', STATUS) @@ -213,7 +290,7 @@ def main(): if integ_runner.is_accessible(): owner = integ_runner.get_tor_controller(True) # controller to own our main Tor process - for test_class in test.util.get_integ_tests(args.specific_test): + for test_class in get_integ_tests(args.specific_test): run_result = _run_test(args, test_class, output_filters, logging_buffer) skipped_tests += len(getattr(run_result, 'skipped', [])) diff --git a/test/settings.cfg b/test/settings.cfg index f11b1f5..2b5fafc 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -161,9 +161,9 @@ pyflakes.ignore stem/interpreter/__init__.py => undefined name 'raw_input' pyflakes.ignore stem/util/conf.py => undefined name 'unicode' pyflakes.ignore stem/util/test_tools.py => 'pyflakes' imported but unused pyflakes.ignore stem/util/test_tools.py => 'pycodestyle' imported but unused -pyflakes.ignore test/mocking.py => undefined name 'test' pyflakes.ignore test/unit/response/events.py => 'from stem import *' used; unable to detect undefined names pyflakes.ignore test/unit/response/events.py => *may be undefined, or defined from star imports: stem +pyflakes.ignore test/util.py => undefined name 'test' # Test modules we want to run. Modules are roughly ordered by the dependencies # so the lowest level tests come first. This is because a problem in say, diff --git a/test/util.py b/test/util.py index 2731f63..3decb89 100644 --- a/test/util.py +++ b/test/util.py @@ -6,10 +6,6 @@ Helper functions for our test framework. :: - get_unit_tests - provides our unit tests - get_integ_tests - provides our integration tests - - get_torrc_entries - provides the torrc entries for a given target get_all_combinations - provides all combinations of attributes tor_version - provides the version of tor we're testing against """ @@ -18,17 +14,9 @@ import itertools import os import stem -import stem.util.conf import stem.util.enum import stem.version -CONFIG = stem.util.conf.config_dict('test', { - 'target.torrc': {}, - 'integ.test_directory': './test/data', - 'test.unit_tests': '', - 'test.integ_tests': '', -}) - # Integration targets fall into two categories: # # * Run Targets (like RUN_COOKIE and RUN_PTRACE) which customize our torrc. @@ -75,81 +63,6 @@ with open(os.path.join(STEM_BASE, '.gitignore')) as ignore_file: IGNORED_FILE_TYPES.append(line[2:].strip()) -def get_unit_tests(module_prefix = None): - """ - Provides the classes for our unit tests. - - :param str module_prefix: only provide the test if the module starts with - this substring - - :returns: an **iterator** for our unit tests - """ - - if module_prefix and not module_prefix.startswith('test.unit.'): - module_prefix = 'test.unit.' + module_prefix - - return _get_tests(CONFIG['test.unit_tests'].splitlines(), module_prefix) - - -def get_integ_tests(module_prefix = None): - """ - Provides the classes for our integration tests. - - :param str module_prefix: only provide the test if the module starts with - this substring - - :returns: an **iterator** for our integration tests - """ - - if module_prefix and not module_prefix.startswith('test.integ.'): - module_prefix = 'test.integ.' + module_prefix - - return _get_tests(CONFIG['test.integ_tests'].splitlines(), module_prefix) - - -def _get_tests(modules, module_prefix): - for import_name in modules: - if import_name: - module, module_name = import_name.rsplit('.', 1) # example: util.conf.TestConf - - if not module_prefix or module.startswith(module_prefix): - yield import_name - elif module_prefix.startswith(module): - # single test for this module - - test_module = module_prefix.rsplit('.', 1)[1] - yield '%s.%s' % (import_name, test_module) - - -def get_torrc_entries(target): - """ - Provides the torrc entries used to run the given target. - - :param Target target: target to provide the custom torrc contents of - - :returns: list of :class:`~test.runner.Torrc` entries for the given target - - :raises: **ValueError** if the target.torrc config has entries that don't map - to test.runner.Torrc - """ - - # converts the 'target.torrc' csv into a list of test.runner.Torrc enums - - config_csv = CONFIG['target.torrc'].get(target) - torrc_opts = [] - - if config_csv: - for opt in config_csv.split(','): - opt = opt.strip() - - if opt in test.runner.Torrc.keys(): - torrc_opts.append(test.runner.Torrc[opt]) - else: - raise ValueError("'%s' isn't a test.runner.Torrc enumeration" % opt) - - return torrc_opts - - def get_new_capabilities(): """ Provides a list of capabilities tor supports but stem doesn't, as discovered @@ -185,7 +98,7 @@ def get_all_combinations(attr, include_empty = False): :: - >>> list(test.mocking.get_all_combinations(['a', 'b', 'c'])) + >>> list(test.util.get_all_combinations(['a', 'b', 'c'])) [('a',), ('b',), ('c',), ('a', 'b'), ('a', 'c'), ('b', 'c'), ('a', 'b', 'c')] :param list attr: attributes to provide combinations for @@ -231,6 +144,3 @@ def tor_version(tor_path = None): TOR_VERSION = stem.version.get_system_tor_version(tor_path) return TOR_VERSION - - -import test.runner # needs to be imported at the end to avoid a circular dependency

1 0

[stem/master] Moving test tasks to its own module
by atagar＠torproject.org 22 May '17

22 May '17

commit f52141e1e0becb4b3899b7da8d62f1591b1b2a36 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 18 11:38:09 2017 -0700 Moving test tasks to its own module Everything is miscellaneous. Our test.util module does two distinct things: startup tasks and testing prerequisits. These are better as their own small dedicated modules. Moving the startup tasks out first. There's more tweaks I want to make here but starting with just the bulk move. --- run_tests.py | 29 ++++---- test/task.py | 228 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ test/util.py | 233 +++-------------------------------------------------------- 3 files changed, 252 insertions(+), 238 deletions(-) diff --git a/run_tests.py b/run_tests.py index f4f49c0..b64857c 100755 --- a/run_tests.py +++ b/run_tests.py @@ -29,10 +29,11 @@ import test.arguments import test.integ.installation import test.output import test.runner +import test.task import test.util from test.output import STATUS, SUCCESS, ERROR, NO_NL, STDERR, println -from test.util import STEM_BASE, Task +from test.util import STEM_BASE CONFIG = stem.util.conf.config_dict('test', { 'integ.test_directory': './test/data', @@ -72,7 +73,7 @@ If you're running the latest version of stem then please file a ticket on: New capabilities are: """ -PYFLAKES_TASK = Task( +PYFLAKES_TASK = test.task.Task( 'running pyflakes', stem.util.test_tools.pyflakes_issues, args = (SRC_PATHS,), @@ -81,7 +82,7 @@ PYFLAKES_TASK = Task( print_runtime = True, ) -PYCODESTYLE_TASK = Task( +PYCODESTYLE_TASK = test.task.Task( 'running pycodestyle', stem.util.test_tools.stylistic_issues, args = (SRC_PATHS, True, True, True), @@ -153,20 +154,20 @@ def main(): pycodestyle_task = PYCODESTYLE_TASK if args.run_integ: - tor_version_check = Task('checking tor version', test.util.check_tor_version, (args.tor_path,)) + tor_version_check = test.task.Task('checking tor version', test.task.check_tor_version, (args.tor_path,)) - test.util.run_tasks( + test.task.run_tasks( 'INITIALISING', - Task('checking stem version', test.util.check_stem_version), + test.task.Task('checking stem version', test.task.check_stem_version), tor_version_check, - Task('checking python version', test.util.check_python_version), - Task('checking cryptography version', test.util.check_cryptography_version), - Task('checking pynacl version', test.util.check_pynacl_version), - Task('checking mock version', test.util.check_mock_version), - Task('checking pyflakes version', test.util.check_pyflakes_version), - Task('checking pycodestyle version', test.util.check_pycodestyle_version), - Task('checking for orphaned .pyc files', test.util.clean_orphaned_pyc, (SRC_PATHS,)), - Task('checking for unused tests', test.util.check_for_unused_tests, [( + test.task.Task('checking python version', test.task.check_python_version), + test.task.Task('checking cryptography version', test.task.check_cryptography_version), + test.task.Task('checking pynacl version', test.task.check_pynacl_version), + test.task.Task('checking mock version', test.task.check_mock_version), + test.task.Task('checking pyflakes version', test.task.check_pyflakes_version), + test.task.Task('checking pycodestyle version', test.task.check_pycodestyle_version), + test.task.Task('checking for orphaned .pyc files', test.task.clean_orphaned_pyc, (SRC_PATHS,)), + test.task.Task('checking for unused tests', test.task.check_for_unused_tests, [( os.path.join(STEM_BASE, 'test', 'unit'), os.path.join(STEM_BASE, 'test', 'integ'), )]), diff --git a/test/task.py b/test/task.py new file mode 100644 index 0000000..7827f59 --- /dev/null +++ b/test/task.py @@ -0,0 +1,228 @@ +# Copyright 2012-2017, Damian Johnson and The Tor Project +# See LICENSE for licensing information + +""" +:class:`~test.task.Task` that can be ran with :func:`~test.task.run_tasks` to initialize our tests. tasks are... + +:: + + Initialization Tasks + |- check_stem_version - checks our version of stem + |- check_tor_version - checks our version of tor + |- check_python_version - checks our version of python + |- check_cryptography_version - checks our version of cryptography + |- check_pynacl_version - checks our version of pynacl + |- check_pyflakes_version - checks our version of pyflakes + |- check_pycodestyle_version - checks our version of pycodestyle + |- clean_orphaned_pyc - removes any *.pyc without a corresponding *.py + +- check_for_unused_tests - checks to see if any tests are missing from our settings +""" + +import os +import re +import sys +import time + +import stem +import stem.prereq +import stem.util.conf +import stem.util.system +import stem.util.test_tools +import stem.version + +import test.output +import test.util + +from test.output import STATUS, ERROR, NO_NL, println + +CONFIG = stem.util.conf.config_dict('test', { + 'integ.test_directory': './test/data', + 'test.unit_tests': '', + 'test.integ_tests': '', +}) + + +def check_stem_version(): + return stem.__version__ + + +def check_tor_version(tor_path): + return str(test.util.tor_version(tor_path)).split()[0] + + +def check_python_version(): + return '.'.join(map(str, sys.version_info[:3])) + + +def check_cryptography_version(): + if stem.prereq.is_crypto_available(): + import cryptography + return cryptography.__version__ + else: + return 'missing' + + +def check_pynacl_version(): + if stem.prereq._is_pynacl_available(): + import nacl + return nacl.__version__ + else: + return 'missing' + + +def check_mock_version(): + if stem.prereq.is_mock_available(): + try: + import unittest.mock as mock + except ImportError: + import mock + + return mock.__version__ + else: + return 'missing' + + +def check_pyflakes_version(): + try: + import pyflakes + return pyflakes.__version__ + except ImportError: + return 'missing' + + +def check_pycodestyle_version(): + if stem.util.test_tools._module_exists('pycodestyle'): + import pycodestyle + elif stem.util.test_tools._module_exists('pep8'): + import pep8 as pycodestyle + else: + return 'missing' + + return pycodestyle.__version__ + + +def clean_orphaned_pyc(paths): + """ + Deletes any file with a *.pyc extention without a corresponding *.py. + + :param list paths: paths to search for orphaned pyc files + """ + + return ['removed %s' % path for path in stem.util.test_tools.clean_orphaned_pyc(paths)] + + +def check_for_unused_tests(paths): + """ + The 'test.unit_tests' and 'test.integ_tests' in our settings.cfg defines the + tests that we run. We do it this way so that we can control the order in + which our tests are run but there's a disadvantage: when we add new test + modules we can easily forget to add it there. + + Checking to see if we have any unittest.TestCase subclasses not covered by + our settings. + + :param list paths: paths to search for unused tests + """ + + unused_tests = [] + + for path in paths: + for py_path in stem.util.system.files_with_suffix(path, '.py'): + if os.path.normpath(CONFIG['integ.test_directory']) in py_path: + continue + + with open(py_path) as f: + file_contents = f.read() + + test_match = re.search('^class (\S*)$unittest.TestCase$:$', file_contents, re.MULTILINE) + + if test_match: + class_name = test_match.groups()[0] + module_name = py_path.replace(os.path.sep, '.')[len(test.util.STEM_BASE) + 1:-3] + '.' + class_name + + if not (module_name in CONFIG['test.unit_tests'] or module_name in CONFIG['test.integ_tests']): + unused_tests.append(module_name) + + if unused_tests: + raise ValueError('Test modules are missing from our test/settings.cfg:\n%s' % '\n'.join(unused_tests)) + + +def run_tasks(category, *tasks): + """ + Runs a series of :class:`test.util.Task` instances. This simply prints 'done' + or 'failed' for each unless we fail one that is marked as being required. If + that happens then we print its error message and call sys.exit(). + + :param str category: label for the series of tasks + :param list tasks: **Task** instances to be ran + """ + + test.output.print_divider(category, True) + + for task in tasks: + if task is None: + continue + + task.run() + + if task.is_required and task.error: + println('\n%s\n' % task.error, ERROR) + sys.exit(1) + + println() + + +class Task(object): + """ + Task we can process while running our tests. The runner can return either a + message or list of strings for its results. + """ + + def __init__(self, label, runner, args = None, is_required = True, print_result = True, print_runtime = False): + super(Task, self).__init__() + + self.label = label + self.runner = runner + self.args = args + self.is_required = is_required + self.print_result = print_result + self.print_runtime = print_runtime + self.error = None + + self.is_successful = False + self.result = None + + def run(self): + start_time = time.time() + println(' %s...' % self.label, STATUS, NO_NL) + + padding = 50 - len(self.label) + println(' ' * padding, NO_NL) + + try: + if self.args: + self.result = self.runner(*self.args) + else: + self.result = self.runner() + + self.is_successful = True + output_msg = 'done' + + if self.print_result and isinstance(self.result, str): + output_msg = self.result + elif self.print_runtime: + output_msg += ' (%0.1fs)' % (time.time() - start_time) + + println(output_msg, STATUS) + + if self.print_result and isinstance(self.result, (list, tuple)): + for line in self.result: + println(' %s' % line, STATUS) + except Exception as exc: + output_msg = str(exc) + + if not output_msg or self.is_required: + output_msg = 'failed' + + println(output_msg, ERROR) + self.error = exc diff --git a/test/util.py b/test/util.py index d19540c..e8af8e1 100644 --- a/test/util.py +++ b/test/util.py @@ -12,24 +12,7 @@ Helper functions for our test framework. get_prereq - provides the tor version required to run the given target get_torrc_entries - provides the torrc entries for a given target -Sets of :class:`~test.util.Task` instances can be ran with -:func:`~test.util.run_tasks`. Functions that are intended for easy use with -Tasks are... - -:: - - Initialization - |- check_stem_version - checks our version of stem - |- check_tor_version - checks our version of tor - |- check_python_version - checks our version of python - |- check_cryptography_version - checks our version of cryptography - |- check_pynacl_version - checks our version of pynacl - |- check_pyflakes_version - checks our version of pyflakes - |- check_pycodestyle_version - checks our version of pycodestyle - |- clean_orphaned_pyc - removes any *.pyc without a corresponding *.py - +- check_for_unused_tests - checks to see if any tests are missing from our settings - -Lastly, this module provides generally useful test helpers... +This module also provides generally useful test helpers... :: @@ -58,8 +41,6 @@ import hashlib import itertools import re import os -import sys -import time import stem import stem.prereq @@ -70,8 +51,6 @@ import stem.version import test.output -from test.output import STATUS, ERROR, NO_NL, println - CONFIG = stem.util.conf.config_dict('test', { 'target.prereq': {}, 'target.torrc': {}, @@ -104,8 +83,8 @@ Target = stem.util.enum.UppercaseEnum( 'RUN_ALL', ) -TOR_VERSION = None RAN_TESTS = [] +TOR_VERSION = None # We make some paths relative to stem's base directory (the one above us) # rather than the process' cwd. This doesn't end with a slash. @@ -308,116 +287,6 @@ def require_version(req_version): return require(lambda: tor_version() >= req_version, 'requires %s' % req_version) -def check_stem_version(): - return stem.__version__ - - -def check_tor_version(tor_path): - global TOR_VERSION - - if TOR_VERSION is None: - TOR_VERSION = stem.version.get_system_tor_version(tor_path) - - return str(TOR_VERSION).split()[0] - - -def check_python_version(): - return '.'.join(map(str, sys.version_info[:3])) - - -def check_cryptography_version(): - if stem.prereq.is_crypto_available(): - import cryptography - return cryptography.__version__ - else: - return 'missing' - - -def check_pynacl_version(): - if stem.prereq._is_pynacl_available(): - import nacl - return nacl.__version__ - else: - return 'missing' - - -def check_mock_version(): - if stem.prereq.is_mock_available(): - try: - import unittest.mock as mock - except ImportError: - import mock - - return mock.__version__ - else: - return 'missing' - - -def check_pyflakes_version(): - try: - import pyflakes - return pyflakes.__version__ - except ImportError: - return 'missing' - - -def check_pycodestyle_version(): - if stem.util.test_tools._module_exists('pycodestyle'): - import pycodestyle - elif stem.util.test_tools._module_exists('pep8'): - import pep8 as pycodestyle - else: - return 'missing' - - return pycodestyle.__version__ - - -def clean_orphaned_pyc(paths): - """ - Deletes any file with a *.pyc extention without a corresponding *.py. - - :param list paths: paths to search for orphaned pyc files - """ - - return ['removed %s' % path for path in stem.util.test_tools.clean_orphaned_pyc(paths)] - - -def check_for_unused_tests(paths): - """ - The 'test.unit_tests' and 'test.integ_tests' in our settings.cfg defines the - tests that we run. We do it this way so that we can control the order in - which our tests are run but there's a disadvantage: when we add new test - modules we can easily forget to add it there. - - Checking to see if we have any unittest.TestCase subclasses not covered by - our settings. - - :param list paths: paths to search for unused tests - """ - - unused_tests = [] - - for path in paths: - for py_path in stem.util.system.files_with_suffix(path, '.py'): - if _is_test_data(py_path): - continue - - with open(py_path) as f: - file_contents = f.read() - - test_match = re.search('^class (\S*)$unittest.TestCase$:$', file_contents, re.MULTILINE) - - if test_match: - class_name = test_match.groups()[0] - module_name = py_path.replace(os.path.sep, '.')[len(STEM_BASE) + 1:-3] + '.' + class_name - - if not (module_name in CONFIG['test.unit_tests'] or module_name in CONFIG['test.integ_tests']): - unused_tests.append(module_name) - - if unused_tests: - raise ValueError('Test modules are missing from our test/settings.cfg:\n%s' % '\n'.join(unused_tests)) - - def register_new_capability(capability_type, msg, suppression_token = None): """ Register new capability found during the tests. @@ -435,35 +304,6 @@ def register_new_capability(capability_type, msg, suppression_token = None): NEW_CAPABILITIES_SUPPRESSION_TOKENS.add(suppression_token) -def _is_test_data(path): - return os.path.normpath(CONFIG['integ.test_directory']) in path - - -def run_tasks(category, *tasks): - """ - Runs a series of :class:`test.util.Task` instances. This simply prints 'done' - or 'failed' for each unless we fail one that is marked as being required. If - that happens then we print its error message and call sys.exit(). - - :param str category: label for the series of tasks - :param list tasks: **Task** instances to be ran - """ - - test.output.print_divider(category, True) - - for task in tasks: - if task is None: - continue - - task.run() - - if task.is_required and task.error: - println('\n%s\n' % task.error, ERROR) - sys.exit(1) - - println() - - def get_all_combinations(attr, include_empty = False): """ Provides an iterator for all combinations of a set of attributes. For @@ -552,77 +392,22 @@ def get_protocolinfo_response(**attributes): return protocolinfo_response -def tor_version(): +def tor_version(tor_path = None): """ Provides the version of tor we're testing against. + :param str tor_path: location of tor executable to cehck the version of + :returns: :class:`~stem.version.Version` of tor invoked by our integration tests - - :raise: **ValueError** if :func:`~test.util.check_tor_version` isn't called - first """ - if TOR_VERSION is None: - raise ValueError('BUG: check_tor_version() must be called before tor_version()') - - return TOR_VERSION - - -class Task(object): - """ - Task we can process while running our tests. The runner can return either a - message or list of strings for its results. - """ - - def __init__(self, label, runner, args = None, is_required = True, print_result = True, print_runtime = False): - super(Task, self).__init__() - - self.label = label - self.runner = runner - self.args = args - self.is_required = is_required - self.print_result = print_result - self.print_runtime = print_runtime - self.error = None - - self.is_successful = False - self.result = None - - def run(self): - start_time = time.time() - println(' %s...' % self.label, STATUS, NO_NL) - - padding = 50 - len(self.label) - println(' ' * padding, NO_NL) - - try: - if self.args: - self.result = self.runner(*self.args) - else: - self.result = self.runner() - - self.is_successful = True - output_msg = 'done' - - if self.print_result and isinstance(self.result, str): - output_msg = self.result - elif self.print_runtime: - output_msg += ' (%0.1fs)' % (time.time() - start_time) - - println(output_msg, STATUS) - - if self.print_result and isinstance(self.result, (list, tuple)): - for line in self.result: - println(' %s' % line, STATUS) - except Exception as exc: - output_msg = str(exc) + global TOR_VERSION - if not output_msg or self.is_required: - output_msg = 'failed' + if TOR_VERSION is None or tor_path: + TOR_VERSION = stem.version.get_system_tor_version(tor_path) - println(output_msg, ERROR) - self.error = exc + return TOR_VERSION import test.runner # needs to be imported at the end to avoid a circular dependency

1 0

[stem/master] Simplify startup tasks
by atagar＠torproject.org 22 May '17

22 May '17

commit 22cde36e3b912e8a4c2ae30d5ba170246212ee89 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 18 13:12:08 2017 -0700 Simplify startup tasks Moving more into our new task module and simplifying it. --- run_tests.py | 59 ++++++------------------ test/task.py | 144 ++++++++++++++++++++++++++++++++--------------------------- 2 files changed, 91 insertions(+), 112 deletions(-) diff --git a/run_tests.py b/run_tests.py index b64857c..026e09c 100755 --- a/run_tests.py +++ b/run_tests.py @@ -39,18 +39,6 @@ CONFIG = stem.util.conf.config_dict('test', { 'integ.test_directory': './test/data', }) -SRC_PATHS = [os.path.join(STEM_BASE, path) for path in ( - 'stem', - 'test', - 'run_tests.py', - 'cache_manual.py', - 'cache_fallback_directories.py', - 'setup.py', - 'tor-prompt', - os.path.join('docs', 'republish.py'), - os.path.join('docs', 'roles.py'), -)] - MOCK_UNAVAILABLE_MSG = """\ To run stem's tests you'll need mock... @@ -73,23 +61,6 @@ If you're running the latest version of stem then please file a ticket on: New capabilities are: """ -PYFLAKES_TASK = test.task.Task( - 'running pyflakes', - stem.util.test_tools.pyflakes_issues, - args = (SRC_PATHS,), - is_required = False, - print_result = False, - print_runtime = True, -) - -PYCODESTYLE_TASK = test.task.Task( - 'running pycodestyle', - stem.util.test_tools.stylistic_issues, - args = (SRC_PATHS, True, True, True), - is_required = False, - print_result = False, - print_runtime = True, -) if stem.prereq._is_python_26(): def assertItemsEqual(self, expected, actual): @@ -148,29 +119,27 @@ def main(): if not args.specific_test: if stem.util.test_tools.is_pyflakes_available(): - pyflakes_task = PYFLAKES_TASK + pyflakes_task = test.task.PYFLAKES_TASK if stem.util.test_tools.is_pycodestyle_available(): - pycodestyle_task = PYCODESTYLE_TASK + pycodestyle_task = test.task.PYCODESTYLE_TASK if args.run_integ: - tor_version_check = test.task.Task('checking tor version', test.task.check_tor_version, (args.tor_path,)) + tor_version_check = test.task.TOR_VERSION + tor_version_check.args = (args.tor_path,) - test.task.run_tasks( + test.task.run( 'INITIALISING', - test.task.Task('checking stem version', test.task.check_stem_version), + test.task.STEM_VERSION, tor_version_check, - test.task.Task('checking python version', test.task.check_python_version), - test.task.Task('checking cryptography version', test.task.check_cryptography_version), - test.task.Task('checking pynacl version', test.task.check_pynacl_version), - test.task.Task('checking mock version', test.task.check_mock_version), - test.task.Task('checking pyflakes version', test.task.check_pyflakes_version), - test.task.Task('checking pycodestyle version', test.task.check_pycodestyle_version), - test.task.Task('checking for orphaned .pyc files', test.task.clean_orphaned_pyc, (SRC_PATHS,)), - test.task.Task('checking for unused tests', test.task.check_for_unused_tests, [( - os.path.join(STEM_BASE, 'test', 'unit'), - os.path.join(STEM_BASE, 'test', 'integ'), - )]), + test.task.PYTHON_VERSION, + test.task.CRYPTO_VERSION, + test.task.PYNACL_VERSION, + test.task.MOCK_VERSION, + test.task.PYFLAKES_VERSION, + test.task.PYCODESTYLE_VERSION, + test.task.CLEAN_PYC, + test.task.UNUSED_TESTS, pyflakes_task, pycodestyle_task, ) diff --git a/test/task.py b/test/task.py index 7827f59..b2c8ba8 100644 --- a/test/task.py +++ b/test/task.py @@ -7,15 +7,18 @@ :: Initialization Tasks - |- check_stem_version - checks our version of stem - |- check_tor_version - checks our version of tor - |- check_python_version - checks our version of python - |- check_cryptography_version - checks our version of cryptography - |- check_pynacl_version - checks our version of pynacl - |- check_pyflakes_version - checks our version of pyflakes - |- check_pycodestyle_version - checks our version of pycodestyle - |- clean_orphaned_pyc - removes any *.pyc without a corresponding *.py - +- check_for_unused_tests - checks to see if any tests are missing from our settings + |- STEM_VERSION - checks our version of stem + |- TOR_VERSION - checks our version of tor + |- PYTHON_VERSION - checks our version of python + |- CRYPTO_VERSION - checks our version of cryptography + |- PYNACL_VERSION - checks our version of pynacl + |- MOCK_VERSION - checks our version of mock + |- PYFLAKES_VERSION - checks our version of pyflakes + |- PYCODESTYLE_VERSION - checks our version of pycodestyle + |- CLEAN_PYC - removes any *.pyc without a corresponding *.py + |- UNUSED_TESTS - checks to see if any tests are missing from our settings + |- PYFLAKES_TASK - static checks + +- PYCODESTYLE_TASK - style checks """ import os @@ -41,67 +44,24 @@ CONFIG = stem.util.conf.config_dict('test', { 'test.integ_tests': '', }) +SRC_PATHS = [os.path.join(test.util.STEM_BASE, path) for path in ( + 'stem', + 'test', + 'run_tests.py', + 'cache_manual.py', + 'cache_fallback_directories.py', + 'setup.py', + 'tor-prompt', + os.path.join('docs', 'republish.py'), + os.path.join('docs', 'roles.py'), +)] -def check_stem_version(): - return stem.__version__ - -def check_tor_version(tor_path): +def _check_tor_version(tor_path): return str(test.util.tor_version(tor_path)).split()[0] -def check_python_version(): - return '.'.join(map(str, sys.version_info[:3])) - - -def check_cryptography_version(): - if stem.prereq.is_crypto_available(): - import cryptography - return cryptography.__version__ - else: - return 'missing' - - -def check_pynacl_version(): - if stem.prereq._is_pynacl_available(): - import nacl - return nacl.__version__ - else: - return 'missing' - - -def check_mock_version(): - if stem.prereq.is_mock_available(): - try: - import unittest.mock as mock - except ImportError: - import mock - - return mock.__version__ - else: - return 'missing' - - -def check_pyflakes_version(): - try: - import pyflakes - return pyflakes.__version__ - except ImportError: - return 'missing' - - -def check_pycodestyle_version(): - if stem.util.test_tools._module_exists('pycodestyle'): - import pycodestyle - elif stem.util.test_tools._module_exists('pep8'): - import pep8 as pycodestyle - else: - return 'missing' - - return pycodestyle.__version__ - - -def clean_orphaned_pyc(paths): +def _clean_orphaned_pyc(paths): """ Deletes any file with a *.pyc extention without a corresponding *.py. @@ -111,7 +71,7 @@ def clean_orphaned_pyc(paths): return ['removed %s' % path for path in stem.util.test_tools.clean_orphaned_pyc(paths)] -def check_for_unused_tests(paths): +def _check_for_unused_tests(paths): """ The 'test.unit_tests' and 'test.integ_tests' in our settings.cfg defines the tests that we run. We do it this way so that we can control the order in @@ -147,7 +107,7 @@ def check_for_unused_tests(paths): raise ValueError('Test modules are missing from our test/settings.cfg:\n%s' % '\n'.join(unused_tests)) -def run_tasks(category, *tasks): +def run(category, *tasks): """ Runs a series of :class:`test.util.Task` instances. This simply prints 'done' or 'failed' for each unless we fail one that is marked as being required. If @@ -226,3 +186,53 @@ class Task(object): println(output_msg, ERROR) self.error = exc + + +class ModuleVersion(Task): + def __init__(self, label, modules, prereq_check = None): + if isinstance(modules, str): + modules = [modules] # normalize to a list + + def version_check(): + if prereq_check is None or prereq_check(): + for module in modules: + if stem.util.test_tools._module_exists(module): + return __import__(module).__version__ + + return 'missing' + + super(ModuleVersion, self).__init__(label, version_check) + + +STEM_VERSION = Task('checking stem version', lambda: stem.__version__) +TOR_VERSION = Task('checking tor version', _check_tor_version) +PYTHON_VERSION = Task('checking python version', lambda: '.'.join(map(str, sys.version_info[:3]))) +CRYPTO_VERSION = ModuleVersion('checking cryptography version', 'cryptography', stem.prereq.is_crypto_available) +PYNACL_VERSION = ModuleVersion('checking pynacl version', 'nacl', stem.prereq._is_pynacl_available) +MOCK_VERSION = ModuleVersion('checking mock version', ['unittest.mock', 'mock'], stem.prereq.is_mock_available) +PYFLAKES_VERSION = ModuleVersion('checking pyflakes version', 'pyflakes') +PYCODESTYLE_VERSION = ModuleVersion('checking pycodestyle version', ['pycodestyle', 'pep8']) +CLEAN_PYC = Task('checking for orphaned .pyc files', _clean_orphaned_pyc, (SRC_PATHS,)) + +UNUSED_TESTS = Task('checking for unused tests', _check_for_unused_tests, [( + os.path.join(test.util.STEM_BASE, 'test', 'unit'), + os.path.join(test.util.STEM_BASE, 'test', 'integ'), +)]) + +PYFLAKES_TASK = Task( + 'running pyflakes', + stem.util.test_tools.pyflakes_issues, + args = (SRC_PATHS,), + is_required = False, + print_result = False, + print_runtime = True, +) + +PYCODESTYLE_TASK = Task( + 'running pycodestyle', + stem.util.test_tools.stylistic_issues, + args = (SRC_PATHS, True, True, True), + is_required = False, + print_result = False, + print_runtime = True, +)

1 0

[stem/master] Drop get_protocolinfo_response() helper
by atagar＠torproject.org 22 May '17

22 May '17

commit 7087dad486dc5d3cfb2eb75da83750d61ce40ef6 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun May 21 18:27:04 2017 -0700 Drop get_protocolinfo_response() helper Replace the little usage of get_protocolinfo_response() we had. --- test/unit/connection/authentication.py | 11 ++++++----- test/unit/control/controller.py | 8 ++++---- test/util.py | 21 --------------------- 3 files changed, 10 insertions(+), 30 deletions(-) diff --git a/test/unit/connection/authentication.py b/test/unit/connection/authentication.py index 044f163..b50f97b 100644 --- a/test/unit/connection/authentication.py +++ b/test/unit/connection/authentication.py @@ -12,9 +12,9 @@ various error conditions, and make sure that the right exception is raised. import unittest import stem.connection - import test.util +from stem.response import ControlMessage from stem.util import log try: @@ -34,9 +34,9 @@ class TestAuthenticate(unittest.TestCase): # tests where get_protocolinfo succeeds - get_protocolinfo_mock.return_value = test.util.get_protocolinfo_response( - auth_methods = (stem.connection.AuthMethod.NONE, ), - ) + protocolinfo_message = ControlMessage.from_str('250-PROTOCOLINFO 1\r\n250 OK\r\n', 'PROTOCOLINFO') + protocolinfo_message.auth_methods = (stem.connection.AuthMethod.NONE, ) + get_protocolinfo_mock.return_value = protocolinfo_message stem.connection.authenticate(None) @@ -94,7 +94,8 @@ class TestAuthenticate(unittest.TestCase): stem.connection.AuthMethod.UNKNOWN, ], include_empty = True) - protocolinfo = test.util.get_protocolinfo_response(cookie_path = '/tmp/blah') + protocolinfo = ControlMessage.from_str('250-PROTOCOLINFO 1\r\n250 OK\r\n', 'PROTOCOLINFO') + protocolinfo.cookie_path = '/tmp/blah' for auth_methods in auth_method_combinations: for auth_none_exc in all_auth_none_exc: diff --git a/test/unit/control/controller.py b/test/unit/control/controller.py index 2cf8b7e..124c115 100644 --- a/test/unit/control/controller.py +++ b/test/unit/control/controller.py @@ -13,10 +13,9 @@ import stem.socket import stem.util.system import stem.version -import test.util - from stem import ControllerError, DescriptorUnavailable, InvalidArguments, InvalidRequest, ProtocolError, UnsatisfiableRequest from stem.control import _parse_circ_path, Listener, Controller, EventType +from stem.response import ControlMessage from stem.exit_policy import ExitPolicy try: @@ -339,13 +338,14 @@ class TestControl(unittest.TestCase): # use the handy mocked protocolinfo response - get_protocolinfo_mock.return_value = test.util.get_protocolinfo_response() + protocolinfo_msg = ControlMessage.from_str('250-PROTOCOLINFO 1\r\n250 OK\r\n', 'PROTOCOLINFO') + get_protocolinfo_mock.return_value = protocolinfo_msg # compare the str representation of these object, because the class # does not have, nor need, a direct comparison operator self.assertEqual( - str(test.util.get_protocolinfo_response()), + str(protocolinfo_msg), str(self.controller.get_protocolinfo()) ) diff --git a/test/util.py b/test/util.py index 7ad309d..adadfe4 100644 --- a/test/util.py +++ b/test/util.py @@ -12,7 +12,6 @@ Helper functions for our test framework. get_prereq - provides the tor version required to run the given target get_torrc_entries - provides the torrc entries for a given target - get_protocolinfo_response - provides a ProtocolInfoResponse instance get_all_combinations - provides all combinations of attributes random_fingerprint - provides a random relay fingerprint tor_version - provides the version of tor we're testing against @@ -248,26 +247,6 @@ def random_fingerprint(): return hashlib.sha1(os.urandom(20)).hexdigest().upper() -def get_protocolinfo_response(**attributes): - """ - Provides a ProtocolInfoResponse, customized with the given attributes. The - base instance is minimal, with its version set to one and everything else - left with the default. - - :param dict attributes: attributes to customize the response with - - :returns: stem.response.protocolinfo.ProtocolInfoResponse instance - """ - - protocolinfo_response = stem.response.ControlMessage.from_str('250-PROTOCOLINFO 1\r\n250 OK\r\n', 'PROTOCOLINFO') - stem.response.convert('PROTOCOLINFO', protocolinfo_response) - - for attr in attributes: - setattr(protocolinfo_response, attr, attributes[attr]) - - return protocolinfo_response - - def tor_version(tor_path = None): """ Provides the version of tor we're testing against.

1 0

[stem/master] Simplify requirement helpers
by atagar＠torproject.org 22 May '17

22 May '17

commit f72fa77b79afea50a2ca6deb8cad7b19c3f897fa Author: Damian Johnson <atagar(a)torproject.org> Date: Fri May 12 17:47:05 2017 -0700 Simplify requirement helpers Decorators that don't need a constructor arg can be simplified. All we need is a helper to do the required check. --- test/util.py | 66 +++++++++++++++++------------------------------------------- 1 file changed, 18 insertions(+), 48 deletions(-) diff --git a/test/util.py b/test/util.py index 99de3a6..d19540c 100644 --- a/test/util.py +++ b/test/util.py @@ -266,23 +266,28 @@ def require(condition, message): return decorator -require_cryptography = require(stem.prereq.is_crypto_available, 'requires cryptography') -require_pynacl = require(stem.prereq._is_pynacl_available, 'requires pynacl module') -require_proc = require(stem.util.proc.is_available, 'proc unavailable') +def _can_access_controller(): + return test.runner.get_runner().is_accessible() -def require_controller(func): - """ - Skips the test unless tor provides an endpoint for controllers to attach to. - """ +def _can_ptrace(): + # If we're running a tor version where ptrace is disabled and we didn't + # set 'DisableDebuggerAttachment=1' then we can infer that it's disabled. - def wrapped(self, *args, **kwargs): - if test.runner.get_runner().is_accessible(): - return func(self, *args, **kwargs) - else: - self.skipTest('(no connection)') + has_option = tor_version() >= stem.version.Requirement.TORRC_DISABLE_DEBUGGER_ATTACHMENT + return not has_option or test.runner.Torrc.PTRACE in test.runner.get_runner().get_options() - return wrapped + +def _is_online(): + return Target.ONLINE in test.runner.get_runner().attribute_targets + + +require_cryptography = require(stem.prereq.is_crypto_available, 'requires cryptography') +require_pynacl = require(stem.prereq._is_pynacl_available, 'requires pynacl module') +require_proc = require(stem.util.proc.is_available, 'proc unavailable') +require_controller = require(_can_access_controller, 'no connection') +require_ptrace = require(_can_ptrace, 'DisableDebuggerAttachment is set') +require_online = require(_is_online, 'requires online target') def require_command(cmd): @@ -303,41 +308,6 @@ def require_version(req_version): return require(lambda: tor_version() >= req_version, 'requires %s' % req_version) -def require_ptrace(func): - """ - Skips the test unless 'DisableDebuggerAttachment' is set. This feature has a - lot of adverse side effects (:trac:`3313`). - """ - - def wrapped(self, *args, **kwargs): - # If we're running a tor version where ptrace is disabled and we didn't - # set 'DisableDebuggerAttachment=1' then we can infer that it's disabled. - - has_option = tor_version() >= stem.version.Requirement.TORRC_DISABLE_DEBUGGER_ATTACHMENT - - if not has_option or test.runner.Torrc.PTRACE in test.runner.get_runner().get_options(): - return func(self, *args, **kwargs) - else: - self.skipTest('(DisableDebuggerAttachment is set)') - - return wrapped - - -def require_online(func): - """ - Skips the test if we weren't started with the ONLINE target, which indicates - that tests requiring network connectivity should run. - """ - - def wrapped(self, *args, **kwargs): - if Target.ONLINE in test.runner.get_runner().attribute_targets: - return func(self, *args, **kwargs) - else: - self.skipTest('(requires online target)') - - return wrapped - - def check_stem_version(): return stem.__version__

1 0

[webwml/master] 0.3.1.1-alpha is tagged
by nickm＠torproject.org 22 May '17

22 May '17

commit ffea450359526e3d6ceb0912ba3f6f9ea84657a3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 22 14:23:58 2017 -0400 0.3.1.1-alpha is tagged --- Makefile | 2 +- include/versions.wmi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0b5fcb0..e708f80 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ # website component, and set it to needs_review. export STABLETAG=tor-0.3.0.7 -export DEVTAG=tor-0.3.0.7 +export DEVTAG=tor-0.3.1.1-alpha WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate docs/torbutton diff --git a/include/versions.wmi b/include/versions.wmi index 1d35807..851cdfd 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -1,5 +1,5 @@ <define-tag version-stable whitespace=delete>0.3.0.7</define-tag> - +<define-tag version-alpha whitespace=delete>0.3.1.1-alpha</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.9.10</define-tag>

1 0

[tor-browser-bundle/master] Bug 22324: Fix broken tab crash pages on higher security levels
by gk＠torproject.org 22 May '17

22 May '17

commit 78de9734135f21077410d295b689751d60727592 Author: Georg Koppen <gk(a)torproject.org> Date: Mon May 22 09:30:33 2017 +0000 Bug 22324: Fix broken tab crash pages on higher security levels We need to allow JavaScript on `about:tabcrashed` pages explicitly. Otherwise are those pages broken on higher security levels. --- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js index 53c1a25..1465e29 100644 --- a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed"); +pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed"); +pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); diff --git a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js index 53c1a25..1465e29 100644 --- a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed"); +pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed"); +pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); diff --git a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js index 53c1a25..1465e29 100644 --- a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed"); +pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed"); +pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false);

1 0

[tor/master] pick a date
by nickm＠torproject.org 22 May '17

22 May '17

commit 615dbdb0e094d4ef0b1982d06e62a8058463a28a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 22 12:03:45 2017 -0400 pick a date --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index abc6db4..9617af9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in version 0.3.1.1-alpha - 2017-05-?? +Changes in version 0.3.1.1-alpha - 2017-05-22 Tor 0.3.1.1-alpha is the first release in the 0.3.1.x series. It reduces the bandwidth usage for Tor's directory protocol, adds some basic padding to resist netflow-based traffic analysis and to serve as

1 0

[tor/master] Log a warning if we receive a disallowed compression method for an anonymous connection.
by nickm＠torproject.org 22 May '17

22 May '17

commit 9604980733c30cabbdeee818e82ea647ace5b0c0 Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon May 22 15:52:41 2017 +0000 Log a warning if we receive a disallowed compression method for an anonymous connection. See: https://bugs.torproject.org/22305 --- src/or/directory.c | 13 +++++++++++++ src/or/directory.h | 1 + 2 files changed, 14 insertions(+) diff --git a/src/or/directory.c b/src/or/directory.c index e75c501..6d66ac1 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2356,6 +2356,7 @@ connection_dir_client_reached_eof(dir_connection_t *conn) * compression method that is not allowed for anonymous connections. */ if (anonymized_connection && ! allowed_anonymous_connection_compression_method(compression)) { + warn_disallowed_anonymous_compression_method(compression); rv = -1; goto done; } @@ -2368,6 +2369,7 @@ connection_dir_client_reached_eof(dir_connection_t *conn) * differently, try that. */ if (anonymized_connection && ! allowed_anonymous_connection_compression_method(guessed)) { + warn_disallowed_anonymous_compression_method(guessed); rv = -1; goto done; } @@ -3887,6 +3889,17 @@ allowed_anonymous_connection_compression_method(compress_method_t method) return 0; } +/** Log a warning when a remote server have send us a document using a + * compression method that is not allowed for anonymous directory requests. */ +STATIC void +warn_disallowed_anonymous_compression_method(compress_method_t method) +{ + log_fn(LOG_PROTOCOL_WARN, LD_HTTP, + "Received a %s HTTP response, which is not " + "allowed for anonymous directory requests.", + compression_method_get_human_name(method)); +} + /** Encodes the results of parsing a consensus request to figure out what * consensus, and possibly what diffs, the user asked for. */ typedef struct { diff --git a/src/or/directory.h b/src/or/directory.h index fecc8bd..14d5ae9 100644 --- a/src/or/directory.h +++ b/src/or/directory.h @@ -164,6 +164,7 @@ STATIC int handle_get_hs_descriptor_v3(dir_connection_t *conn, STATIC int directory_handle_command(dir_connection_t *conn); STATIC char *accept_encoding_header(void); STATIC int allowed_anonymous_connection_compression_method(compress_method_t); +STATIC void warn_disallowed_anonymous_compression_method(compress_method_t); #endif

1 0

[tor/master] Merge remote-tracking branch 'ahf/bugs/22305'
by nickm＠torproject.org 22 May '17

22 May '17

commit d9b14713033e263a8ae008eb6fad580f959bcce3 Merge: 281f06a 9604980 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 22 11:57:03 2017 -0400 Merge remote-tracking branch 'ahf/bugs/22305' src/or/directory.c | 13 +++++++++++++ src/or/directory.h | 1 + 2 files changed, 14 insertions(+)

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits May 2017