tor-commits July 2012

tor-commits@lists.torproject.org

14 participants
949 discussions

[tor/master] Detect bug 6252 (unexpected sendme cell)
by arma＠torproject.org 01 Jul '12

01 Jul '12

commit c32ec9c425e9539bcc8ede95612e2d331c2cc2dd Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Jun 28 14:00:01 2012 -0400 Detect bug 6252 (unexpected sendme cell) I only check on circuits, not streams, since bloating your stream window past the initial circuit window can't help you much. Also, I compare to CIRCWINDOW_START_MAX so we don't have surprising races if we lower CIRCWINDOW_START for an experiment. --- changes/bug6252 | 8 ++++++++ src/or/relay.c | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/changes/bug6252 b/changes/bug6252 new file mode 100644 index 0000000..0d29203 --- /dev/null +++ b/changes/bug6252 @@ -0,0 +1,8 @@ + o Security fixes: + - Tear down the circuit if we get an unexpected SENDME cell. Clients + could use this trick to make their circuits receive cells faster + than our flow control would have allowed, or to gum up the network, + or possibly to do targeted memory denial-of-service attacks on + entry nodes. Fixes bug 6252. Bugfix on the 54th commit on Tor -- + from July 2002, before the release of Tor 0.0.0. + diff --git a/src/or/relay.c b/src/or/relay.c index 3f894bf..4ab4403 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1265,11 +1265,25 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, case RELAY_COMMAND_SENDME: if (!conn) { if (layer_hint) { + if (layer_hint->package_window + CIRCWINDOW_INCREMENT > + CIRCWINDOW_START_MAX) { + log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, + "Bug/attack: unexpected sendme cell from exit relay. " + "Closing circ."); + return -END_CIRC_REASON_TORPROTOCOL; + } layer_hint->package_window += CIRCWINDOW_INCREMENT; log_debug(LD_APP,"circ-level sendme at origin, packagewindow %d.", layer_hint->package_window); circuit_resume_edge_reading(circ, layer_hint); } else { + if (circ->package_window + CIRCWINDOW_INCREMENT > + CIRCWINDOW_START_MAX) { + log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, + "Bug/attack: unexpected sendme cell from client. " + "Closing circ."); + return -END_CIRC_REASON_TORPROTOCOL; + } circ->package_window += CIRCWINDOW_INCREMENT; log_debug(LD_APP, "circ-level sendme at non-origin, packagewindow %d.",

1 0

[tor/master] Merge branch 'maint-0.2.3'
by arma＠torproject.org 01 Jul '12

01 Jul '12

commit 6061cd584c129eb8b5ed24fb5ce686a0236913e4 Merge: ed2601f c32ec9c Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Jul 1 05:32:37 2012 -0400 Merge branch 'maint-0.2.3' changes/bug6252 | 8 ++++++++ src/or/relay.c | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-)

1 0

[tor/maint-0.2.3] Detect bug 6252 (unexpected sendme cell)
by arma＠torproject.org 01 Jul '12

01 Jul '12

1 0

[stem/master] Minor formatting tweaks
by atagar＠torproject.org 01 Jul '12

01 Jul '12

commit c0434646354a6031fd8fb0750af4700f1a450f1a Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 30 15:50:14 2012 -0700 Minor formatting tweaks --- test/integ/util/system.py | 13 +++++++------ test/unit/util/system.py | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/test/integ/util/system.py b/test/integ/util/system.py index 8293120..968b920 100644 --- a/test/integ/util/system.py +++ b/test/integ/util/system.py @@ -4,7 +4,6 @@ that we're running. """ import os -import platform import getpass import unittest @@ -79,6 +78,7 @@ class TestSystem(unittest.TestCase): if not stem.util.system.is_available("ps"): test.runner.skip(self, "(ps unavailable)") return + self.assertTrue(stem.util.system.is_running("tor")) self.assertFalse(stem.util.system.is_running("blarg_and_stuff")) @@ -91,7 +91,7 @@ class TestSystem(unittest.TestCase): if stem.util.system.is_windows(): test.runner.skip(self, "(unavailable on windows)") return - if self.is_extra_tor_running: + elif self.is_extra_tor_running: test.runner.skip(self, "(multiple tor instances)") return @@ -203,11 +203,12 @@ class TestSystem(unittest.TestCase): """ Checks general usage of the stem.util.system.get_pid_by_port function. """ + + runner = test.runner.get_runner() if stem.util.system.is_windows(): test.runner.skip(self, "(unavailable on windows)") return - runner = test.runner.get_runner() - if not _has_port(): + elif not _has_port(): test.runner.skip(self, "(test instance has no port)") return elif stem.util.system.is_mac(): @@ -302,7 +303,7 @@ class TestSystem(unittest.TestCase): """ # on macs this test is unreliable because Quicklook sometimes claims '/tmp' - if platform.system() == "Darwin": + if stem.util.system.is_mac(): test.runner.skip(self, "(unreliable due to Quicklook)") return @@ -322,7 +323,7 @@ class TestSystem(unittest.TestCase): if stem.util.system.is_windows(): test.runner.skip(self, "(unavailable on windows)") return - if not runner.is_ptraceable(): + elif not runner.is_ptraceable(): test.runner.skip(self, "(DisableDebuggerAttachment is set)") return diff --git a/test/unit/util/system.py b/test/unit/util/system.py index 2fee30d..5609917 100644 --- a/test/unit/util/system.py +++ b/test/unit/util/system.py @@ -321,4 +321,4 @@ class TestSystem(unittest.TestCase): self.assertEquals("C:\\tmp", system.expand_path(".\\", "C:\\tmp")) self.assertEquals("C:\\tmp\\foo", system.expand_path("foo", "C:\\tmp")) self.assertEquals("C:\\tmp\\foo", system.expand_path(".\\foo", "C:\\tmp")) - \ No newline at end of file +

1 0

[stem/master] Testing fixes for Windows
by atagar＠torproject.org 01 Jul '12

01 Jul '12

commit af27984ffcaa418fb71e68992976967a06c4ba56 Merge: 2fe0f2c c043464 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 30 15:51:59 2012 -0700 Testing fixes for Windows stem/util/system.py | 2 +- test/integ/descriptor/reader.py | 6 +++--- test/integ/util/system.py | 25 +++++++++++++++++++------ test/unit/response/protocolinfo.py | 3 ++- test/unit/util/system.py | 23 ++++++++++++++++++++--- 5 files changed, 45 insertions(+), 14 deletions(-)

1 0

[stem/master] Created proc.py testing code and imported unit tests to run_tests.py.
by atagar＠torproject.org 01 Jul '12

01 Jul '12

commit 3fd005a27ca35bf802d3917c992d2626534e87c9 Author: Megan <mchang01(a)wesleyan.edu> Date: Thu Jun 14 16:17:32 2012 -0400 Created proc.py testing code and imported unit tests to run_tests.py. Wrote mock_get_lines to mock the proc module's _get_lines function. Completed unit testing code for proc utilities such as get_system_start_time, get_physical_memory, and get_memory_usage. The test_get_memory_usage function was written to test the functionality of mock_get_lines as it is the only function that takes in multiple line prefixes. --- run_tests.py | 2 + test/unit/util/proc.py | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 0 deletions(-) diff --git a/run_tests.py b/run_tests.py index bcd7e12..670947a 100755 --- a/run_tests.py +++ b/run_tests.py @@ -44,6 +44,7 @@ import test.integ.util.conf import test.integ.util.system import test.integ.process import test.integ.version +import test.unit.util.proc import stem.prereq import stem.util.conf @@ -110,6 +111,7 @@ UNIT_TESTS = ( test.unit.response.protocolinfo.TestProtocolInfoResponse, test.unit.response.authchallenge.TestAuthChallengeResponse, test.unit.connection.authentication.TestAuthenticate, + test.unit.util.proc.TestProc, ) INTEG_TESTS = ( diff --git a/test/unit/util/proc.py b/test/unit/util/proc.py new file mode 100644 index 0000000..a474800 --- /dev/null +++ b/test/unit/util/proc.py @@ -0,0 +1,70 @@ +""" +Unit testing code for proc utilities located in /stem/util/proc.py +""" +import os +import time +import unittest +import functools + +import test.mocking as mocking +import stem.util.proc as proc + +def mock_get_lines(file_path, line_prefixes, return_values): + """ + Provides mocking for the proc module's _get_line function. + """ + if isinstance(line_prefixes, tuple): + prefix_list = sorted(list(line_prefixes)) + else: + # Only one line prefix given. + prefix_list = line_prefixes + def _mock_get_lines(path, prefixes, return_values, caller_path, + caller_prefixes, caller_parameter): + if isinstance(caller_prefixes, tuple): + caller_prefix_list = sorted(list(caller_prefixes)) + else: + #Only one line prefix given. + caller_prefix_list = caller_prefixes + if path == caller_path and prefixes == caller_prefix_list: + return return_values + else: + return None + + return functools.partial(_mock_get_lines, file_path, prefix_list, + return_values) + +class TestProc(unittest.TestCase): + def tearDown(self): + mocking.revert_mocking() + + def test_get_system_start_time(self): + """ + Tests the get_system_start_time function. + """ + mocking.mock(proc._get_line, mock_get_lines("/proc/stat", "btime", + "btime 1001001")) + + self.assertEquals(1001001, proc.get_system_start_time()) + + def test_get_physical_memory(self): + """ + Tests the get_physical_memory function. + """ + mocking.mock(proc._get_line, mock_get_lines("/proc/meminfo", + "MemTotal:", "MemTotal: 12345 kB")) + + self.assertEquals((12345*1024), proc.get_physical_memory()) + + def test_get_memory_usage(self): + """ + Tests the get_memory_usage function. + + This is the only function in proc.py that utilizes + _get_lines explicitly. + """ + + mocking.mock(proc._get_lines, mock_get_lines("/proc/1111/status", + ("VmRSS:", "VmSize:"), {"VmRSS:": "VmRSS: 100 kB", + "VmSize:":"VmSize: 1800 kB"})) + + self.assertEqual((100*1024, 1800*1024), proc.get_memory_usage(1111))

1 0

[stem/master] Made additional changes regarding sphinx documentation. This completes Code Review 1.
by atagar＠torproject.org 01 Jul '12

01 Jul '12

commit 10ae1304d02c390237d865c5fc439992249bc9d0 Author: Megan <mchang01(a)wesleyan.edu> Date: Tue Jun 26 17:20:37 2012 -0400 Made additional changes regarding sphinx documentation. This completes Code Review 1. --- test/unit/util/proc.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/unit/util/proc.py b/test/unit/util/proc.py index 7ea119b..2d90267 100644 --- a/test/unit/util/proc.py +++ b/test/unit/util/proc.py @@ -28,12 +28,12 @@ class TargetError(Exception): def mock_fn(arguments_returns, target=None): """ Provides a lambda function that may be used to mock another function. + + This function operates under the precondition that len(exp_args) = len(return_vals) :param dict args_rets: expected input value(s) as tuples are the key and return values are the values of the dictionary. :param function target: target function to be called if mocking doesn't cover this input - :precondition: len(exp_args) = len(return_vals) - :returns: function _mocker such that... *return_vals[i] a = exp_args[i] *target(*a) a != exp_args[i] and target != None

1 0

[stem/master] First code review changes.
by atagar＠torproject.org 01 Jul '12

01 Jul '12

commit 48fcbc69e4ed13a44ff160ba35997a46487f997f Author: Megan <mchang01(a)wesleyan.edu> Date: Tue Jun 26 17:05:35 2012 -0400 First code review changes. --- test/unit/util/proc.py | 86 +++++++++++++++++++++++++---------------------- 1 files changed, 46 insertions(+), 40 deletions(-) diff --git a/test/unit/util/proc.py b/test/unit/util/proc.py index 2e3dd67..7ea119b 100644 --- a/test/unit/util/proc.py +++ b/test/unit/util/proc.py @@ -7,6 +7,7 @@ import time import unittest import operator import functools +import itertools import cStringIO import test.mocking as mocking @@ -24,25 +25,34 @@ class TargetError(Exception): def __str__(self): return repr(self.value) -def mock_fn(exp_args, return_vals, target=None): +def mock_fn(arguments_returns, target=None): """ Provides a lambda function that may be used to mock another function. - :param list of tuples exp_args: expected input value(s) to be used for comparison - :param list return_vals: value(s) to be returned if expected input matches given input + :param dict args_rets: expected input value(s) as tuples are the key and return values are the values of the dictionary. :param function target: target function to be called if mocking doesn't cover this input :precondition: len(exp_args) = len(return_vals) - return_vals[i] a=exp_args[i] - :returns: function _mocker such that: f(*a) = target(*a) a != exp_args[i] and target != None - raise TargetError a != exp_args[i] and target = None + :returns: function _mocker such that... + *return_vals[i] a = exp_args[i] + *target(*a) a != exp_args[i] and target != None + *raise TargetError a != exp_args[i] and target = None """ - def _mocked(tgt, exp_args, return_vals, *arg): + def _mocked(args_rets, tgt, *arg): try: - # - i = operator.indexOf(exp_args, arg) + # First check if given input matches one of the inputs to be mocked. + return args_rets[arg] + except KeyError: + if tgt: + return tgt(*arg) + else: + raise TargetError("A relevant function could not be applied") + ''' + try: + # First check if given input matches one of the inputs to be mocked. + i = operator.indexOf(args_rets, arg) except ValueError: i = -1 if i == -1: @@ -52,17 +62,19 @@ def mock_fn(exp_args, return_vals, target=None): raise TargetError("A relevant function could not be applied") else: return return_vals[i] - - return functools.partial(_mocked, target, exp_args, return_vals) + ''' + return functools.partial(_mocked, arguments_returns, target) def find_subsets(xs): """ Used with the builtin zip function to create all possible combinations - of two lists. Called in test_get_stats(). + of the elements of two lists. + + Called in test_get_stats(). :param xs: list of tuples given by calling zip on two lists - :returns: a list of lists of tuples + :returns: a list of lists of tuples containing all possible combinations of arguments. Will be of the form [[(arg1, resp1),(arg2, resp2),...], [(arg1, resp1),(arg3, resp3),...],...] """ # Base case is the empty list. @@ -88,8 +100,7 @@ class TestProc(unittest.TestCase): Tests the get_system_start_time function. """ - mocking.mock(proc._get_line, mock_fn([("/proc/stat", "btime", 'system start time')], - ["btime 1001001"])) + mocking.mock(proc._get_line, mock_fn({('/proc/stat', 'btime', 'system start time'):'btime 1001001'})) # Single test as get_system_start_time takes no arguments self.assertEquals(1001001, proc.get_system_start_time()) @@ -99,8 +110,7 @@ class TestProc(unittest.TestCase): Tests the get_physical_memory function. """ - mocking.mock(proc._get_line, mock_fn([("/proc/meminfo", - "MemTotal:", 'system physical memory')], ["MemTotal: 12345 kB"])) + mocking.mock(proc._get_line, mock_fn({('/proc/meminfo', 'MemTotal:', 'system physical memory'):'MemTotal: 12345 kB'})) self.assertEquals((12345*1024), proc.get_physical_memory()) @@ -109,8 +119,7 @@ class TestProc(unittest.TestCase): Tests the get_cwd function with a given pid. """ - mocking.mock(os.readlink, mock_fn([('/proc/24019/cwd',)], - ['/home/directory/TEST'], os.listdir), os) + mocking.mock(os.readlink, mock_fn({('/proc/24019/cwd',):'/home/directory/TEST'}, os.listdir), os) # Test edge case of pid = 0 and a standard pid. self.assertEquals('', proc.get_cwd(0)) @@ -127,8 +136,8 @@ class TestProc(unittest.TestCase): for pid in pid_list: pid_id, user_id = pid status_path = "/proc/%s/status" % pid_id - mocking.mock(proc._get_line, mock_fn([(status_path, "Uid:", "uid")], - ["Uid: %s" % user_id])) + mocking.mock(proc._get_line, mock_fn({(status_path, 'Uid:', 'uid'):'Uid: %s' % user_id})) + self.assertEquals(user_id, proc.get_uid(pid_id)) def test_get_memory_usage(self): @@ -138,9 +147,7 @@ class TestProc(unittest.TestCase): This is the only function in proc.py that calls _get_lines explicitly. """ - mocking.mock(proc._get_lines, mock_fn([("/proc/1111/status", - ("VmRSS:", "VmSize:"), 'memory usage')], [{"VmRSS:": "VmRSS: 100 kB", - "VmSize:":"VmSize: 1800 kB"}])) + mocking.mock(proc._get_lines, mock_fn({('/proc/1111/status', ('VmRSS:', 'VmSize:'), 'memory usage'):{'VmRSS:':'VmRSS: 100 kB', 'VmSize:':'VmSize: 1800 kB'}})) # Test edge case of pid = 0 and a standard pid self.assertEqual((0,0), proc.get_memory_usage(0)) @@ -165,8 +172,7 @@ class TestProc(unittest.TestCase): # Tests the case where no stat_types are specified. - mocking.mock(proc._get_line, mock_fn( - [(stat_path, str(24062), 'process ')], [stat])) + mocking.mock(proc._get_line, mock_fn({(stat_path, str(24062), 'process '):stat})) self.assertEquals((), proc.get_stats(24062)) # Don't handle empty set of commands here. (just did above) @@ -177,8 +183,8 @@ class TestProc(unittest.TestCase): # and (resp1,resp2,...). arg, response = zip(*sub) - mocking.mock(proc._get_line, mock_fn( - [(stat_path, str(24062), 'process %s' % ", ".join(arg))], [stat])) + mocking.mock(proc._get_line, mock_fn({(stat_path, str(24062), 'process %s' % ', '.join(arg)):stat})) + # Iterates through each combination of commands. self.assertEquals(response, proc.get_stats(24062, *arg)) @@ -197,9 +203,7 @@ class TestProc(unittest.TestCase): elif a == 'stime': response += ('0',) - mocking.mock(proc._get_line, mock_fn( - [('/proc/0/stat', str(0), 'process %s' % ", ".join(arg))], [stat])) - + mocking.mock(proc._get_line, mock_fn({('/proc/0/stat', str(0), 'process %s' % ', '.join(arg)):stat})) self.assertEquals(response, proc.get_stats(0, *arg)) def test_get_connections(self): @@ -209,23 +213,25 @@ class TestProc(unittest.TestCase): pid = 1111 fd_list = ['1', '2', '3', '4'] - fd_paths = [] + ''' for fd in fd_list: fd_paths.append(('/proc/%s/fd/%s' % (str(pid), fd),)) + ''' readlink_results = ['socket:[99999999]', 'socket:[IIIIIIII]', 'pipe:[30303]', 'pipe:[40404]'] + input_vals = {} + for i in range(len(fd_list)): + input_vals[('/proc/%s/fd/%s' % (str(pid), fd_list[i]),)] = readlink_results[i] # Will be put in cStringIO wrappers and treated as files. tcp = '\n 0: 11111111:1111 22222222:2222 01 44444444:44444444 55:55555555 66666666 1111 8 99999999' udp = '\n A: BBBBBBBB:BBBB CCCCCCCC:CCCC DD EEEEEEEE:EEEEEEEE FF:FFFFFFFF GGGGGGGG 1111 H IIIIIIII' - file_list = [cStringIO.StringIO(tcp), cStringIO.StringIO(udp)] - contents_list = [tcp, udp] - - # Mock os.listdir, os.readlink, and open. - mocking.mock(os.listdir, mock_fn([('/proc/%s/fd' % str(pid),)], [fd_list], os.listdir), os) - mocking.mock(os.readlink, mock_fn(fd_paths, readlink_results, os.readlink), os) + file_vals = {('/proc/net/tcp',):cStringIO.StringIO(tcp), ('/proc/net/udp',):cStringIO.StringIO(udp)} - mocking.mock(open, mock_fn([('/proc/net/tcp',), ('/proc/net/udp',)], file_list, open)) + # Mock os.listdir, os.readlink, and open with mock_fn. + mocking.mock(os.listdir, mock_fn({('/proc/%s/fd' % str(pid),):fd_list}, os.listdir), os) + mocking.mock(os.readlink, mock_fn(input_vals, os.readlink), os) + mocking.mock(open, mock_fn(file_vals, open)) # Tests the edge case of pid = 0. self.assertEquals([], proc.get_connections(0)) @@ -240,5 +246,5 @@ class TestProc(unittest.TestCase): local_ip, local_port = proc._decode_proc_address_encoding(l_addr) foreign_ip, foreign_port = proc._decode_proc_address_encoding(f_addr) results.append((local_ip, local_port, foreign_ip, foreign_port)) - + print "results: %s" % results self.assertEquals(results, proc.get_connections(1111))

1 0

[stem/master] Removed commented out code that was forgotten.
by atagar＠torproject.org 01 Jul '12

01 Jul '12

commit af9d226e851b3ca1ab552a3fbd249a61602b8fd3 Author: Megan <mchang01(a)wesleyan.edu> Date: Thu Jun 28 16:51:48 2012 -0400 Removed commented out code that was forgotten. --- test/unit/util/proc.py | 25 ++++--------------------- 1 files changed, 4 insertions(+), 21 deletions(-) diff --git a/test/unit/util/proc.py b/test/unit/util/proc.py index 2d90267..7ae3865 100644 --- a/test/unit/util/proc.py +++ b/test/unit/util/proc.py @@ -28,7 +28,7 @@ class TargetError(Exception): def mock_fn(arguments_returns, target=None): """ Provides a lambda function that may be used to mock another function. - + This function operates under the precondition that len(exp_args) = len(return_vals) :param dict args_rets: expected input value(s) as tuples are the key and return values are the values of the dictionary. @@ -49,20 +49,6 @@ def mock_fn(arguments_returns, target=None): return tgt(*arg) else: raise TargetError("A relevant function could not be applied") - ''' - try: - # First check if given input matches one of the inputs to be mocked. - i = operator.indexOf(args_rets, arg) - except ValueError: - i = -1 - if i == -1: - if tgt: - return tgt(*arg) - else: - raise TargetError("A relevant function could not be applied") - else: - return return_vals[i] - ''' return functools.partial(_mocked, arguments_returns, target) def find_subsets(xs): @@ -213,10 +199,7 @@ class TestProc(unittest.TestCase): pid = 1111 fd_list = ['1', '2', '3', '4'] - ''' - for fd in fd_list: - fd_paths.append(('/proc/%s/fd/%s' % (str(pid), fd),)) - ''' + readlink_results = ['socket:[99999999]', 'socket:[IIIIIIII]', 'pipe:[30303]', 'pipe:[40404]'] input_vals = {} for i in range(len(fd_list)): @@ -238,8 +221,8 @@ class TestProc(unittest.TestCase): # First build expected responses, then call the function to be tested. results = [] - for proc_file in file_list: - contents = proc_file.getvalue() + for keys, files in file_vals.iteritems(): + contents = files.getvalue() _, l_addr, f_addr, status, _, _, _, _, _, inode = contents.split()[:10]

1 0

[stem/master] Unit and integration tests for stem.util.proc
by atagar＠torproject.org 01 Jul '12

01 Jul '12

commit 2fe0f2c84f0d41111571f2ae02575124da008743 Merge: c35c8a6 14087a7 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 30 15:41:40 2012 -0700 Unit and integration tests for stem.util.proc run_tests.py | 4 + test/integ/util/proc.py | 97 ++++++++++++++++++ test/mocking.py | 58 +++++++++++ test/unit/connection/authentication.py | 31 ++---- test/unit/util/proc.py | 171 ++++++++++++++++++++++++++++++++ 5 files changed, 339 insertions(+), 22 deletions(-)

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits July 2012