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

[stem/master] Switch to 'import pycodestyle' and add fallback mechanism
by atagar＠torproject.org 29 Oct '16

29 Oct '16

commit 5d7f24c5dd6b34dfaccd534707d018e2889bb31e Author: Neel Chauhan <neel(a)neelc.org> Date: Wed Oct 26 20:35:15 2016 -0400 Switch to 'import pycodestyle' and add fallback mechanism --- stem/util/test_tools.py | 74 ++++++++++++++++++++++++++++++------------------- 1 file changed, 45 insertions(+), 29 deletions(-) diff --git a/stem/util/test_tools.py b/stem/util/test_tools.py index 9a9f7f6..450e18a 100644 --- a/stem/util/test_tools.py +++ b/stem/util/test_tools.py @@ -11,9 +11,9 @@ Helper functions for testing. clean_orphaned_pyc - delete *.pyc files without corresponding *.py is_pyflakes_available - checks if pyflakes is available - is_pep8_available - checks if pep8 is available + is_pycodestyle_available - checks if pycodestyle is available - stylistic_issues - checks for PEP8 and other stylistic issues + stylistic_issues - checks for pycodestyle and other stylistic issues pyflakes_issues - static checks for problems via pyflakes """ @@ -26,7 +26,7 @@ import stem.util.conf import stem.util.system CONFIG = stem.util.conf.config_dict('test', { - 'pep8.ignore': [], + 'pycodestyle.ignore': [], 'pyflakes.ignore': [], 'exclude_paths': [], }) @@ -34,7 +34,7 @@ CONFIG = stem.util.conf.config_dict('test', { class Issue(collections.namedtuple('Issue', ['line_number', 'message', 'line'])): """ - Issue encountered by pyflakes or pep8. + Issue encountered by pyflakes or pycodestyle. :var int line_number: line number the issue occured on :var str message: description of the issue @@ -86,6 +86,18 @@ def clean_orphaned_pyc(paths): return orphaned_pyc +def module_exists(module_name): + """ + Checks if a module exists + + :returns: **True** if module exists and **False** otherwise + """ + try: + mod = __import__(module_name) + except ImportError: + return False + else: + return True def is_pyflakes_available(): """ @@ -102,44 +114,45 @@ def is_pyflakes_available(): return False -def is_pep8_available(): +def is_pycodestyle_available(): """ - Checks if pep8 is availalbe. + Checks if pycodestyle is availalbe. - :returns: **True** if we can use pep8 and **False** otherwise + :returns: **True** if we can use pycodestyle and **False** otherwise """ - try: - import pep8 - - if not hasattr(pep8, 'BaseReport'): - raise ImportError() - - return True - except ImportError: + if module_exists('pycodestyle'): + import pycodestyle + elif module_exists('pep8'): + import pep8 as pycodestyle + else: return False + if not hasattr(pycodestyle, 'BaseReport'): + return False + else: + return True def stylistic_issues(paths, check_newlines = False, check_exception_keyword = False, prefer_single_quotes = False): """ - Checks for stylistic issues that are an issue according to the parts of PEP8 - we conform to. You can suppress PEP8 issues by making a 'test' configuration - that sets 'pep8.ignore'. + Checks for stylistic issues that are an issue according to the parts of + pycodestyle we conform to. You can suppress pycodestyle issues by making a + 'test' configuration that sets 'pycodestyle.ignore'. For example, with a 'test/settings.cfg' of... :: - # PEP8 compliance issues that we're ignoreing... + # pycodestyle compliance issues that we're ignoreing... # # * E111 and E121 four space indentations # * E501 line is over 79 characters - pep8.ignore E111 - pep8.ignore E121 - pep8.ignore E501 + pycodestyle.ignore E111 + pycodestyle.ignore E121 + pycodestyle.ignore E501 - pep8.ignore run_tests.py => E402: import stem.util.enum + pycodestyle.ignore run_tests.py => E402: import stem.util.enum ... you can then run tests with... @@ -182,7 +195,7 @@ def stylistic_issues(paths, check_newlines = False, check_exception_keyword = Fa ignore_rules = [] ignore_for_file = [] - for rule in CONFIG['pep8.ignore']: + for rule in CONFIG['pycodestyle.ignore']: if '=>' in rule: path, rule_entry = rule.split('=>', 1) @@ -199,10 +212,13 @@ def stylistic_issues(paths, check_newlines = False, check_exception_keyword = Fa return False - if is_pep8_available(): - import pep8 + if is_pycodestyle_available(): + if module_exists('pycodestyle'): + import pycodestyle + elif module_exists('pep8'): + import pep8 as pycodestyle - class StyleReport(pep8.BaseReport): + class StyleReport(pycodestyle.BaseReport): def __init__(self, options): super(StyleReport, self).__init__(options) @@ -215,7 +231,7 @@ def stylistic_issues(paths, check_newlines = False, check_exception_keyword = Fa if not is_ignored(self.filename, code, line): issues.setdefault(self.filename, []).append(Issue(line_number, text, line)) - style_checker = pep8.StyleGuide(ignore = ignore_rules, reporter = StyleReport) + style_checker = pycodestyle.StyleGuide(ignore = ignore_rules, reporter = StyleReport) style_checker.check_files(list(_python_files(paths))) if check_newlines or check_exception_keyword: @@ -269,7 +285,7 @@ def pyflakes_issues(paths): :: pyflakes.ignore stem/util/test_tools.py => 'pyflakes' imported but unused - pyflakes.ignore stem/util/test_tools.py => 'pep8' imported but unused + pyflakes.ignore stem/util/test_tools.py => 'pycodestyle' imported but unused If a 'exclude_paths' was set in our test config then we exclude any absolute paths matching those regexes.

1 0

[stem/master] Provide backward compatability
by atagar＠torproject.org 29 Oct '16

29 Oct '16

commit 0a59e52d1f40f8889095fab332db34a83de50bf5 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Oct 29 15:17:03 2016 -0700 Provide backward compatability Supporting the old pep8 function and config as an alias. Minor version bumps shouldn't break users. ;) --- stem/util/test_tools.py | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/stem/util/test_tools.py b/stem/util/test_tools.py index 82c0d0b..a09f735 100644 --- a/stem/util/test_tools.py +++ b/stem/util/test_tools.py @@ -13,7 +13,7 @@ Helper functions for testing. is_pyflakes_available - checks if pyflakes is available is_pycodestyle_available - checks if pycodestyle is available - stylistic_issues - checks for pycodestyle and other stylistic issues + stylistic_issues - checks for PEP8 and other stylistic issues pyflakes_issues - static checks for problems via pyflakes """ @@ -26,6 +26,7 @@ import stem.util.conf import stem.util.system CONFIG = stem.util.conf.config_dict('test', { + 'pep8.ignore': [], # TODO: drop with stem 2.x, legacy alias for pycodestyle.ignore 'pycodestyle.ignore': [], 'pyflakes.ignore': [], 'exclude_paths': [], @@ -119,9 +120,9 @@ def is_pycodestyle_available(): def stylistic_issues(paths, check_newlines = False, check_exception_keyword = False, prefer_single_quotes = False): """ - Checks for stylistic issues that are an issue according to the parts of - pycodestyle we conform to. You can suppress pycodestyle issues by making a - 'test' configuration that sets 'pycodestyle.ignore'. + Checks for stylistic issues that are an issue according to the parts of PEP8 + we conform to. You can suppress pycodestyle issues by making a 'test' + configuration that sets 'pycodestyle.ignore'. For example, with a 'test/settings.cfg' of... @@ -179,7 +180,7 @@ def stylistic_issues(paths, check_newlines = False, check_exception_keyword = Fa ignore_rules = [] ignore_for_file = [] - for rule in CONFIG['pycodestyle.ignore']: + for rule in CONFIG['pycodestyle.ignore'] + CONFIG['pep8.ignore']: if '=>' in rule: path, rule_entry = rule.split('=>', 1) @@ -197,10 +198,10 @@ def stylistic_issues(paths, check_newlines = False, check_exception_keyword = Fa return False if is_pycodestyle_available(): - if _module_exists('pycodestyle'): - import pycodestyle - elif _module_exists('pep8'): + if _module_exists('pep8'): import pep8 as pycodestyle + else: + import pycodestyle class StyleReport(pycodestyle.BaseReport): def __init__(self, options): @@ -346,10 +347,9 @@ def _module_exists(module_name): try: __import__(module_name) + return True except ImportError: return False - else: - return True def _python_files(paths): @@ -367,7 +367,9 @@ def _python_files(paths): # TODO: drop with stem 2.x # We renamed our methods to drop a redundant 'get_*' prefix, so alias the old -# names for backward compatability. +# names for backward compatability, and account for pep8 being renamed to +# pycodestyle. get_stylistic_issues = stylistic_issues get_pyflakes_issues = pyflakes_issues +is_pep8_available = is_pycodestyle_available

1 0

[stem/master] Finish renaming pep8 to pycodestyle
by atagar＠torproject.org 29 Oct '16

29 Oct '16

commit b6b79867e2b4f1f9d4195e252a42fcf4cdef2782 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Oct 29 15:10:11 2016 -0700 Finish renaming pep8 to pycodestyle Just a couple missed spots. --- run_tests.py | 4 ++-- test/util.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/run_tests.py b/run_tests.py index 0f98db7..abe77e4 100755 --- a/run_tests.py +++ b/run_tests.py @@ -79,7 +79,7 @@ PYFLAKES_TASK = Task( print_result = False, ) -PEP8_TASK = Task( +PYCODESTYLE_TASK = Task( 'running pycodestyle', stem.util.test_tools.stylistic_issues, args = (SRC_PATHS, True, True, True), @@ -147,7 +147,7 @@ def main(): pyflakes_task = PYFLAKES_TASK if stem.util.test_tools.is_pycodestyle_available(): - pycodestyle_task = PEP8_TASK + pycodestyle_task = PYCODESTYLE_TASK test.util.run_tasks( 'INITIALISING', diff --git a/test/util.py b/test/util.py index 1cb59eb..7e94ab3 100644 --- a/test/util.py +++ b/test/util.py @@ -23,7 +23,7 @@ Tasks are... |- check_python_version - checks our version of python |- check_pycrypto_version - checks our version of pycrypto |- check_pyflakes_version - checks our version of pyflakes - |- check_pycodestyle_version - checks our version of pep8 + |- 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 """

1 0

[stem/master] Finish modifying tests to reference pycodestyle as well as pep8
by atagar＠torproject.org 29 Oct '16

29 Oct '16

commit 198af3f380d8c51dddc00e7b23fce1c70da9243f Author: Neel Chauhan <neel(a)neelc.org> Date: Thu Oct 27 09:49:48 2016 -0400 Finish modifying tests to reference pycodestyle as well as pep8 --- run_tests.py | 20 ++++++++++---------- test/util.py | 27 +++++++++++++++++++++------ 2 files changed, 31 insertions(+), 16 deletions(-) diff --git a/run_tests.py b/run_tests.py index 2fb93bf..0f98db7 100755 --- a/run_tests.py +++ b/run_tests.py @@ -80,7 +80,7 @@ PYFLAKES_TASK = Task( ) PEP8_TASK = Task( - 'running pep8', + 'running pycodestyle', stem.util.test_tools.stylistic_issues, args = (SRC_PATHS, True, True, True), is_required = False, @@ -140,14 +140,14 @@ def main(): sys.exit(1) - pyflakes_task, pep8_task = None, None + pyflakes_task, pycodestyle_task = None, None if not args.specific_test: if stem.util.test_tools.is_pyflakes_available(): pyflakes_task = PYFLAKES_TASK - if stem.util.test_tools.is_pep8_available(): - pep8_task = PEP8_TASK + if stem.util.test_tools.is_pycodestyle_available(): + pycodestyle_task = PEP8_TASK test.util.run_tasks( 'INITIALISING', @@ -156,11 +156,11 @@ def main(): Task('checking pycrypto version', test.util.check_pycrypto_version), Task('checking mock version', test.util.check_mock_version), Task('checking pyflakes version', test.util.check_pyflakes_version), - Task('checking pep8 version', test.util.check_pep8_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, ((os.path.join(STEM_BASE, 'test'),),)), pyflakes_task, - pep8_task, + pycodestyle_task, ) # buffer that we log messages into so they can be printed after a test has finished @@ -277,12 +277,12 @@ def main(): elif not stem.util.test_tools.is_pyflakes_available(): println('Static error checking requires pyflakes version 0.7.3 or later. Please install it from ...\n http://pypi.python.org/pypi/pyflakes\n', ERROR) - if pep8_task and pep8_task.is_successful: - for path, issues in pep8_task.result.items(): + if pycodestyle_task and pycodestyle_task.is_successful: + for path, issues in pycodestyle_task.result.items(): for issue in issues: static_check_issues.setdefault(path, []).append(issue) - elif not stem.util.test_tools.is_pep8_available(): - println('Style checks require pep8 version 1.4.2 or later. Please install it from...\n http://pypi.python.org/pypi/pep8\n', ERROR) + elif not stem.util.test_tools.is_pycodestyle_available(): + println('Style checks require pycodestyle version 1.4.2 or later. Please install it from...\n http://pypi.python.org/pypi/pycodestyle\n', ERROR) _print_static_issues(static_check_issues) diff --git a/test/util.py b/test/util.py index ef0e377..6812898 100644 --- a/test/util.py +++ b/test/util.py @@ -23,7 +23,7 @@ Tasks are... |- check_python_version - checks our version of python |- check_pycrypto_version - checks our version of pycrypto |- check_pyflakes_version - checks our version of pyflakes - |- check_pep8_version - checks our version of pep8 + |- check_pycodestyle_version - checks our version of pep8 |- 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 """ @@ -84,6 +84,18 @@ STEM_BASE = os.path.sep.join(__file__.split(os.path.sep)[:-2]) NEW_CAPABILITIES = [] +def module_exists(module_name): + """ + Checks if a module exists + + :returns: **True** if module exists and **False** otherwise + """ + try: + mod = __import__(module_name) + except ImportError: + return False + else: + return True def get_unit_tests(module_prefix = None): """ @@ -226,13 +238,16 @@ def check_pyflakes_version(): return 'missing' -def check_pep8_version(): - try: - import pep8 - return pep8.__version__ - except ImportError: +def check_pycodestyle_version(): + if module_exists('pycodestyle'): + import pycodestyle + elif module_exists('pep8'): + import pep8 as pycodestyle + else: return 'missing' + return pycodestyle.__version__ + def clean_orphaned_pyc(paths): """

1 0

[stem/master] Fix pycodestyle testing configuration
by atagar＠torproject.org 29 Oct '16

29 Oct '16

commit e60efc833492dfe95684d8875833894d1997fa97 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Oct 29 14:58:11 2016 -0700 Fix pycodestyle testing configuration Reasserting our testing configuration of pycodestyle issues to ignore. --- test/settings.cfg | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/test/settings.cfg b/test/settings.cfg index b7323ac..4579f09 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -92,13 +92,13 @@ target.torrc RUN_SOCKET => SOCKET target.torrc RUN_SCOOKIE => SOCKET, COOKIE target.torrc RUN_PTRACE => PORT, PTRACE -# PEP8 compliance issues that we're ignoreing... +# Pycodestyle compliance issues that we're ignoreing... # # * E251 no spaces around keyword / parameter equals # # This one I dislike a great deal. It makes keyword arguments different -# from assignments which looks... aweful. I'm not sure what PEP8's author -# was on when he wrote this one but it's stupid. +# from assignments which looks... aweful. I'm not sure what Pycodestyle's +# author was on when he wrote this one but it's stupid. # # Someone else can change this if they really care. # @@ -117,24 +117,24 @@ target.torrc RUN_PTRACE => PORT, PTRACE # # * E127 and E131 continuation line over-indented for visual indent # -# Pep8 only works with this one if we have four space indents (its +# Pycodestyle only works with this one if we have four space indents (its # detection is based on multiples of four). -pep8.ignore E111 -pep8.ignore E114 -pep8.ignore E121 -pep8.ignore E501 -pep8.ignore E251 -pep8.ignore E127 -pep8.ignore E131 - -pep8.ignore stem/__init__.py => E402: import stem.util.enum -pep8.ignore stem/descriptor/__init__.py => E402: import stem.descriptor.server_descriptor -pep8.ignore stem/descriptor/__init__.py => E402: import stem.descriptor.extrainfo_descriptor -pep8.ignore stem/descriptor/__init__.py => E402: import stem.descriptor.networkstatus -pep8.ignore stem/descriptor/__init__.py => E402: import stem.descriptor.microdescriptor -pep8.ignore stem/descriptor/__init__.py => E402: import stem.descriptor.tordnsel -pep8.ignore stem/descriptor/__init__.py => E402: import stem.descriptor.hidden_service_descriptor +pycodestyle.ignore E111 +pycodestyle.ignore E114 +pycodestyle.ignore E121 +pycodestyle.ignore E501 +pycodestyle.ignore E251 +pycodestyle.ignore E127 +pycodestyle.ignore E131 + +pycodestyle.ignore stem/__init__.py => E402: import stem.util.enum +pycodestyle.ignore stem/descriptor/__init__.py => E402: import stem.descriptor.server_descriptor +pycodestyle.ignore stem/descriptor/__init__.py => E402: import stem.descriptor.extrainfo_descriptor +pycodestyle.ignore stem/descriptor/__init__.py => E402: import stem.descriptor.networkstatus +pycodestyle.ignore stem/descriptor/__init__.py => E402: import stem.descriptor.microdescriptor +pycodestyle.ignore stem/descriptor/__init__.py => E402: import stem.descriptor.tordnsel +pycodestyle.ignore stem/descriptor/__init__.py => E402: import stem.descriptor.hidden_service_descriptor # False positives from pyflakes. These are mappings between the path and the # issue. @@ -151,7 +151,7 @@ pyflakes.ignore stem/prereq.py => 'long_to_bytes' imported but unused 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 => 'pep8' 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

1 0

[stem/master] Rename pep8 to pycodestyle
by atagar＠torproject.org 29 Oct '16

29 Oct '16

commit 8ce3fc16bb108208e57ffad9d723f9b2bf9e1cab Merge: 3cf6949 0a59e52 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Oct 29 15:24:56 2016 -0700 Rename pep8 to pycodestyle The pep8 project renamed itself to pycodestyle at Guido's request... https://pypi.python.org/pypi/pycodestyle Supporting both the old and new name. run_tests.py | 22 ++++++------- stem/util/test_tools.py | 85 ++++++++++++++++++++++++++++++------------------- test/settings.cfg | 40 +++++++++++------------ test/util.py | 15 +++++---- 4 files changed, 92 insertions(+), 70 deletions(-)

1 0

[stem/master] Unit tests fail when no address is available
by atagar＠torproject.org 29 Oct '16

29 Oct '16

commit 3cf69496466a46af56bf7b9bc789003ead7d1118 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Oct 28 09:45:42 2016 -0700 Unit tests fail when no address is available When expanding the 'private' alias for exit policies the last entry is for our pubic address. When python is unable to determine one get_config_policy() excludes this last entry, in turn causing our unit tests to fail... https://trac.torproject.org/projects/tor/ticket/20476 Being more careful to treat this part of the policy as being optional. --- stem/exit_policy.py | 26 ++++++++++++++------------ test/unit/exit_policy/policy.py | 14 +++++++++++++- 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/stem/exit_policy.py b/stem/exit_policy.py index 1aa2537..2e2b459 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -165,10 +165,10 @@ def _flag_private_rules(rules): series of rules exactly matching it. """ - matches = [] + matches = [] # find all possible starting indexes for i, rule in enumerate(rules): - if i + len(PRIVATE_ADDRESSES) + 1 > len(rules): + if i + len(PRIVATE_ADDRESSES) > len(rules): break rule_str = '%s/%s' % (rule.address, rule.get_masked_bits()) @@ -180,33 +180,35 @@ def _flag_private_rules(rules): # To match the private policy the following must all be true... # # * series of addresses and bit masks match PRIVATE_ADDRESSES - # * all rules have the same port range and acceptance + # * all rules have the same port range # * all rules have the same acceptance (all accept or reject entries) + # + # The last rule is dynamically based on the relay's public address. It may + # not be present if get_config_policy() created this policy and we couldn't + # resolve our address. - rule_set = rules[start_index:start_index + len(PRIVATE_ADDRESSES) + 1] + last_index = start_index + len(PRIVATE_ADDRESSES) + rule_set = rules[start_index:last_index] + last_rule = rules[last_index] if len(rules) > last_index else None is_match = True min_port, max_port = rule_set[0].min_port, rule_set[0].max_port is_accept = rule_set[0].is_accept - for i, rule in enumerate(rule_set[:-1]): + for i, rule in enumerate(rule_set): rule_str = '%s/%s' % (rule.address, rule.get_masked_bits()) if rule_str != PRIVATE_ADDRESSES[i] or rule.min_port != min_port or rule.max_port != max_port or rule.is_accept != is_accept: is_match = False break - # The last rule is for the relay's public address, so it's dynamic. - - last_rule = rule_set[-1] - - if last_rule.is_address_wildcard() or last_rule.min_port != min_port or last_rule.max_port != max_port or last_rule.is_accept != is_accept: - is_match = False - if is_match: for rule in rule_set: rule._is_private = True + if last_rule and not last_rule.is_address_wildcard() and last_rule.min_port == min_port and last_rule.max_port == max_port and last_rule.is_accept == is_accept: + last_rule._is_private = True + def _flag_default_rules(rules): """ diff --git a/test/unit/exit_policy/policy.py b/test/unit/exit_policy/policy.py index 5c20d0d..b1187ac 100644 --- a/test/unit/exit_policy/policy.py +++ b/test/unit/exit_policy/policy.py @@ -5,6 +5,12 @@ Unit tests for the stem.exit_policy.ExitPolicy class. import pickle import unittest +try: + # added in python 3.3 + from unittest.mock import Mock, patch +except ImportError: + from mock import Mock, patch + from stem.exit_policy import ( DEFAULT_POLICY_RULES, get_config_policy, @@ -123,7 +129,7 @@ class TestExitPolicy(unittest.TestCase): def test_all_private_policy(self): for port in ('*', '80', '1-1024'): - private_policy = get_config_policy('reject private:%s' % port) + private_policy = get_config_policy('reject private:%s' % port, '12.34.56.78') for rule in private_policy: self.assertTrue(rule.is_private()) @@ -135,6 +141,12 @@ class TestExitPolicy(unittest.TestCase): private_policy = get_config_policy('accept private:*') self.assertEqual(ExitPolicy(), private_policy.strip_private()) + @patch('socket.gethostname', Mock(side_effect = IOError('no address'))) + def test_all_private_policy_without_network(self): + for rule in get_config_policy('reject private:80, accept *:80'): + # all rules except the ending accept are part of the private policy + self.assertEqual(str(rule) != 'accept *:80', rule.is_private()) + def test_all_default_policy(self): policy = ExitPolicy(*DEFAULT_POLICY_RULES)

1 0

[stem/master] Fix passing IPv6 addresses to get_config_policy()
by atagar＠torproject.org 29 Oct '16

29 Oct '16

commit ebfd8bb67b681527089249c747844cf07fba8adf Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Oct 27 09:50:36 2016 -0700 Fix passing IPv6 addresses to get_config_policy() get_config_policy() accepts an optional address for expanding the 'private' alias. Trouble was that with IPv6 addresses it wouldn't accept an address with brackets, but providing an address without brackets in turn was rejected by ExitPolicy class validation. Accepting both. --- stem/exit_policy.py | 5 ++++- test/unit/exit_policy/policy.py | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/stem/exit_policy.py b/stem/exit_policy.py index df6809f..1aa2537 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -118,8 +118,10 @@ def get_config_policy(rules, ip_address = None): :raises: **ValueError** if input isn't a valid tor exit policy """ - if ip_address and not (stem.util.connection.is_valid_ipv4_address(ip_address) or stem.util.connection.is_valid_ipv6_address(ip_address)): + if ip_address and not (stem.util.connection.is_valid_ipv4_address(ip_address) or stem.util.connection.is_valid_ipv6_address(ip_address, allow_brackets = True)): raise ValueError("%s isn't a valid IP address" % ip_address) + elif ip_address and stem.util.connection.is_valid_ipv6_address(ip_address, allow_brackets = True) and not (ip_address[0] == '[' and ip_address[-1] == ']'): + ip_address = '[%s]' % ip_address # ExitPolicy validation expects IPv6 addresses to be bracketed if isinstance(rules, (bytes, str_type)): rules = rules.split(',') @@ -200,6 +202,7 @@ def _flag_private_rules(rules): if last_rule.is_address_wildcard() or last_rule.min_port != min_port or last_rule.max_port != max_port or last_rule.is_accept != is_accept: is_match = False + if is_match: for rule in rule_set: rule._is_private = True diff --git a/test/unit/exit_policy/policy.py b/test/unit/exit_policy/policy.py index 79f99e1..5c20d0d 100644 --- a/test/unit/exit_policy/policy.py +++ b/test/unit/exit_policy/policy.py @@ -161,6 +161,11 @@ class TestExitPolicy(unittest.TestCase): self.assertEqual(get_config_policy('accept *:80, accept 127.0.0.1:1-65533'), policy.strip_default()) + def test_get_config_policy_with_ipv6(self): + # ensure our constructor accepts addresses both with and without brackets + self.assertTrue(get_config_policy('reject private:80', 'fe80:0000:0000:0000:0202:b3ff:fe1e:8329').is_exiting_allowed()) + self.assertTrue(get_config_policy('reject private:80', '[fe80:0000:0000:0000:0202:b3ff:fe1e:8329]').is_exiting_allowed()) + def test_str(self): # sanity test for our __str__ method

1 0

[tor/master] Merge branch 'bug20494'
by nickm＠torproject.org 29 Oct '16

29 Oct '16

commit cac495f0ffdb9d6261c0329c41c4e1ceee127cf7 Merge: 183fbc4 ada75d5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 28 22:55:08 2016 -0400 Merge branch 'bug20494' src/or/connection_edge.c | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-)

1 0

[tor/master] Fix bad warning when checking IP policies.
by nickm＠torproject.org 29 Oct '16

29 Oct '16

commit ada75d5567783d7326b3a91263a5630abaf0684e Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 28 15:33:12 2016 -0400 Fix bad warning when checking IP policies. I had replaced a comment implying that a set of ifs was meant to be exhaustive with an actual check for exhaustiveness. It turns out, they were exhaustive, but not in the way I had assumed. :( Bug introduced in f3e158edf7d8128, not in any released Tor. --- src/or/connection_edge.c | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 6b68a19..27a0251 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1571,24 +1571,30 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, tor_addr_t dummy_addr; int socks_family = tor_addr_parse(&dummy_addr, socks->address); /* family will be -1 for a non-onion hostname that's not an IP */ - if (socks_family == -1 && !conn->entry_cfg.dns_request) { - log_warn(LD_APP, "Refusing to connect to hostname %s " - "because Port has NoDNSRequest set.", - safe_str_client(socks->address)); - connection_mark_unattached_ap(conn, END_STREAM_REASON_ENTRYPOLICY); - return -1; - } else if (socks_family == AF_INET && !conn->entry_cfg.ipv4_traffic) { - log_warn(LD_APP, "Refusing to connect to IPv4 address %s because " - "Port has NoIPv4Traffic set.", - safe_str_client(socks->address)); - connection_mark_unattached_ap(conn, END_STREAM_REASON_ENTRYPOLICY); - return -1; - } else if (socks_family == AF_INET6 && !conn->entry_cfg.ipv6_traffic) { - log_warn(LD_APP, "Refusing to connect to IPv6 address %s because " - "Port has NoIPv6Traffic set.", - safe_str_client(socks->address)); - connection_mark_unattached_ap(conn, END_STREAM_REASON_ENTRYPOLICY); - return -1; + if (socks_family == -1) { + if (!conn->entry_cfg.dns_request) { + log_warn(LD_APP, "Refusing to connect to hostname %s " + "because Port has NoDNSRequest set.", + safe_str_client(socks->address)); + connection_mark_unattached_ap(conn, END_STREAM_REASON_ENTRYPOLICY); + return -1; + } + } else if (socks_family == AF_INET) { + if (!conn->entry_cfg.ipv4_traffic) { + log_warn(LD_APP, "Refusing to connect to IPv4 address %s because " + "Port has NoIPv4Traffic set.", + safe_str_client(socks->address)); + connection_mark_unattached_ap(conn, END_STREAM_REASON_ENTRYPOLICY); + return -1; + } + } else if (socks_family == AF_INET6) { + if (!conn->entry_cfg.ipv6_traffic) { + log_warn(LD_APP, "Refusing to connect to IPv6 address %s because " + "Port has NoIPv6Traffic set.", + safe_str_client(socks->address)); + connection_mark_unattached_ap(conn, END_STREAM_REASON_ENTRYPOLICY); + return -1; + } } else { tor_assert_nonfatal_unreached_once(); }

1 0