December 2012 - tor-commits - lists.torproject.org

[stem/master] Support for consensus 'a' lines
by atagar＠torproject.org 31 Dec '12

31 Dec '12

commit 683b1ba479f2aff3c277e0ff53bdc8b1f81664af Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Dec 31 01:43:00 2012 -0800 Support for consensus 'a' lines Adding support for the 'a' lines in version 3 router status entries. These contain IPv6 addresses and port lists. The port lists will make this unweildy for users but that's out of our hands. --- stem/descriptor/router_status_entry.py | 46 ++++++++++++++++++++++--- test/unit/descriptor/router_status_entry.py | 49 +++++++++++++++++++++++++- 2 files changed, 87 insertions(+), 8 deletions(-) diff --git a/stem/descriptor/router_status_entry.py b/stem/descriptor/router_status_entry.py index 31458c1..ed01132 100644 --- a/stem/descriptor/router_status_entry.py +++ b/stem/descriptor/router_status_entry.py @@ -270,6 +270,8 @@ class RouterStatusEntryV3(RouterStatusEntry): Information about an individual router stored within a version 3 network status document. + :var dict addresses_v6: **\*** relay's IPv6 OR addresses, this is a mapping + of IPv6 addresses to a listing of [(min port, max port)...] it accepts :var str digest: **\*** router's digest :var int bandwidth: bandwidth claimed by the relay (in kb/s) @@ -279,14 +281,16 @@ class RouterStatusEntryV3(RouterStatusEntry): :var stem.exit_policy.MicrodescriptorExitPolicy exit_policy: router's exit policy - :var list microdescriptor_hashes: tuples of two values, the list of consensus - methods for generating a set of digests and the 'algorithm => digest' mappings + :var list microdescriptor_hashes: **\*** tuples of two values, the list of + consensus methods for generating a set of digests and the 'algorithm => + digest' mappings **\*** attribute is either required when we're parsed with validation or has a default value, others are left as **None** if undefined """ def __init__(self, content, validate = True, document = None): + self.addresses_v6 = {} self.digest = None self.bandwidth = None @@ -294,7 +298,7 @@ class RouterStatusEntryV3(RouterStatusEntry): self.unrecognized_bandwidth_entries = [] self.exit_policy = None - self.microdescriptor_hashes = None + self.microdescriptor_hashes = [] super(RouterStatusEntryV3, self).__init__(content, validate, document) @@ -305,6 +309,11 @@ class RouterStatusEntryV3(RouterStatusEntry): if keyword == 'r': _parse_r_line(self, value, validate, True) del entries['r'] + elif keyword == 'a': + for entry, _ in values: + _parse_a_line(self, entry, validate) + + del entries['a'] elif keyword == 'w': _parse_w_line(self, value, validate) del entries['w'] @@ -449,6 +458,34 @@ def _parse_r_line(desc, value, validate, include_digest = True): if validate: raise ValueError("Publication time time wasn't parsable: r %s" % value) +def _parse_a_line(desc, value, validate): + # "a" SP address ":" portlist + # example: a [2001:888:2133:0:82:94:251:204]:9001 + + if not ':' in value: + if not validate: return + raise ValueError("%s 'a' line must be of the form '[address]:[ports]': a %s" % (desc._name(), value)) + + address, ports = value.rsplit(':', 1) + + if validate and not stem.util.connection.is_valid_ipv6_address(address, allow_brackets = True): + raise ValueError("%s 'a' line must start with an IPv6 address: a %s" % (desc._name(), value)) + + address = address.lstrip('[').rstrip(']') + + for port_entry in ports.split(','): + if '-' in port_entry: + min_port, max_port = port_entry.split('-', 1) + else: + min_port = max_port = port_entry + + if not stem.util.connection.is_valid_port(min_port) or \ + not stem.util.connection.is_valid_port(max_port): + if not validate: continue + raise ValueError("%s 'a' line had an invalid port range (%s): a %s" % (desc._name(), port_entry, value)) + + desc.addresses_v6.setdefault(address, []).append((int(min_port), int(max_port))) + def _parse_s_line(desc, value, validate): # "s" Flags # example: s Named Running Stable Valid @@ -556,9 +593,6 @@ def _parse_m_line(desc, value, validate): hash_name, digest = entry.split('=', 1) hashes[hash_name] = digest - if desc.microdescriptor_hashes is None: - desc.microdescriptor_hashes = [] - desc.microdescriptor_hashes.append((methods, hashes)) def _decode_fingerprint(identity, validate): diff --git a/test/unit/descriptor/router_status_entry.py b/test/unit/descriptor/router_status_entry.py index b0cd3b8..ef03baa 100644 --- a/test/unit/descriptor/router_status_entry.py +++ b/test/unit/descriptor/router_status_entry.py @@ -82,7 +82,7 @@ class TestRouterStatusEntry(unittest.TestCase): self.assertEqual(None, entry.measured) self.assertEqual([], entry.unrecognized_bandwidth_entries) self.assertEqual(None, entry.exit_policy) - self.assertEqual(None, entry.microdescriptor_hashes) + self.assertEqual([], entry.microdescriptor_hashes) self.assertEqual([], entry.get_unrecognized_lines()) def test_minimal_micro_v3(self): @@ -304,6 +304,51 @@ class TestRouterStatusEntry(unittest.TestCase): content = get_router_status_entry_v3({'r': r_line}, content = True) self._expect_invalid_attr(content, attr, expected) + def test_ipv6_addresses(self): + """ + Handles a variety of 'a' lines. + """ + + test_values = { + "[2607:fcd0:daaa:101::602c:bd62]:443": { + '2607:fcd0:daaa:101::602c:bd62': [(443, 443)]}, + "[2607:fcd0:daaa:101::602c:bd62]:80,443": { + '2607:fcd0:daaa:101::602c:bd62': [(80, 80), (443, 443)]}, + "[2607:fcd0:daaa:101::602c:bd62]:443-512": { + '2607:fcd0:daaa:101::602c:bd62': [(443, 512)]}, + } + + for a_line, expected in test_values.items(): + entry = get_router_status_entry_v3({'a': a_line}) + self.assertEquals(expected, entry.addresses_v6) + + # includes multiple 'a' lines + + content = get_router_status_entry_v3(content = True) + content += "\na [2607:fcd0:daaa:101::602c:bd62]:80,443" + content += "\na [2607:fcd0:daaa:101::602c:bd62]:512-600" + content += "\na [1148:fcd0:daaa:101::602c:bd62]:80" + + expected = { + '2607:fcd0:daaa:101::602c:bd62': [(80, 80), (443, 443), (512, 600)], + '1148:fcd0:daaa:101::602c:bd62': [(80, 80)], + } + + entry = RouterStatusEntryV3(content) + self.assertEquals(expected, entry.addresses_v6) + + # tries some invalid inputs + + test_values = ( + "", + "127.0.0.1:80", + "[1148:fcd0:daaa:101::602c:bd62]:80000", + ) + + for a_line in test_values: + content = get_router_status_entry_v3({'a': a_line}, content = True) + self._expect_invalid_attr(content, expected_value = {}) + def test_flags(self): """ Handles a variety of flag inputs. @@ -454,7 +499,7 @@ class TestRouterStatusEntry(unittest.TestCase): # try without a document content = get_router_status_entry_v3({'m': "8,9,10,11,12"}, content = True) - self._expect_invalid_attr(content, "microdescriptor_hashes") + self._expect_invalid_attr(content, "microdescriptor_hashes", expected_value = []) # tries some invalid inputs test_values = (

1 0

[stem/master] Duplicate network status 'm' lines were ignored
by atagar＠torproject.org 31 Dec '12

31 Dec '12

commit 7df236509dca6d32d5cebb8aa0b634d3b3d962b1 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Dec 31 00:47:58 2012 -0800 Duplicate network status 'm' lines were ignored The 'm' lines in version 3 router status entries can appear multiple times, but we were only parsing the first instance. --- stem/descriptor/router_status_entry.py | 4 +++- test/unit/descriptor/router_status_entry.py | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/stem/descriptor/router_status_entry.py b/stem/descriptor/router_status_entry.py index 2d02330..31458c1 100644 --- a/stem/descriptor/router_status_entry.py +++ b/stem/descriptor/router_status_entry.py @@ -312,7 +312,9 @@ class RouterStatusEntryV3(RouterStatusEntry): _parse_p_line(self, value, validate) del entries['p'] elif keyword == 'm': - _parse_m_line(self, value, validate) + for entry, _ in values: + _parse_m_line(self, entry, validate) + del entries['m'] RouterStatusEntry._parse(self, entries, validate) diff --git a/test/unit/descriptor/router_status_entry.py b/test/unit/descriptor/router_status_entry.py index 8a7e711..b0cd3b8 100644 --- a/test/unit/descriptor/router_status_entry.py +++ b/test/unit/descriptor/router_status_entry.py @@ -438,6 +438,20 @@ class TestRouterStatusEntry(unittest.TestCase): entry = RouterStatusEntryV3(content, document = mock_document) self.assertEquals(expected, entry.microdescriptor_hashes) + # try with multiple 'm' lines + + content = get_router_status_entry_v3(content = True) + content += "\nm 11,12 sha256=g1vx9si329muxV3tquWIXXySNOIwRGMeAESKs/v4DWs" + content += "\nm 31,32 sha512=g1vx9si329muxV3tquWIXXySNOIwRGMeAESKs/v4DWs" + + expected = [ + ([11, 12], {"sha256": "g1vx9si329muxV3tquWIXXySNOIwRGMeAESKs/v4DWs"}), + ([31, 32], {"sha512": "g1vx9si329muxV3tquWIXXySNOIwRGMeAESKs/v4DWs"}), + ] + + entry = RouterStatusEntryV3(content, document = mock_document) + self.assertEquals(expected, entry.microdescriptor_hashes) + # try without a document content = get_router_status_entry_v3({'m': "8,9,10,11,12"}, content = True) self._expect_invalid_attr(content, "microdescriptor_hashes")

1 0

[stem/master] Lazily parsing ExitPolicy
by atagar＠torproject.org 31 Dec '12

31 Dec '12

commit da65f282699d3e8e763e1f3ba3c7612cc970178a Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 30 21:00:50 2012 -0800 Lazily parsing ExitPolicy Why parse exit policies that we never use? ExitPolicy instances exist numerous places, note notably in the descriptors. Users may never use or care about the exit policy, so there's no point in putting effort into parsing them until they're needed. The advantages is that this means faster untime and less memory usage if they go unused. Down side is that we won't pick up on malformed content until they're used (handy for tests, but not somethign that users care about). This dropped the runtime for the server descriptor integ tests on my system from 10.1 to 7.7 seconds. --- stem/exit_policy.py | 40 ++++++++++++++++++++++++++-------------- 1 files changed, 26 insertions(+), 14 deletions(-) diff --git a/stem/exit_policy.py b/stem/exit_policy.py index e1f68b7..462a0b5 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -86,16 +86,13 @@ class ExitPolicy(object): """ def __init__(self, *rules): - self._rules = [] - + # sanity check the types for rule in rules: - if isinstance(rule, str): - self._rules.append(ExitPolicyRule(rule.strip())) - elif isinstance(rule, ExitPolicyRule): - self._rules.append(rule) - else: + if not (isinstance(rule, str) or isinstance(rule, ExitPolicyRule)): raise TypeError("Exit policy rules can only contain strings or ExitPolicyRules, got a %s (%s)" % (type(rule), rules)) + self._rules = None # lazily loaded series of ExitPolicyRule + self._input_rules = rules # input rules, only kept until self._rules is set self._is_allowed_default = True self._summary_representation = None @@ -111,7 +108,7 @@ class ExitPolicy(object): :returns: **True** if exiting to this destination is allowed, **False** otherwise """ - for rule in self._rules: + for rule in self._get_rules(): if rule.is_match(address, port): return rule.is_accept @@ -124,7 +121,7 @@ class ExitPolicy(object): """ rejected_ports = set() - for rule in self._rules: + for rule in self._get_rules(): if rule.is_accept: for port in xrange(rule.min_port, rule.max_port + 1): if not port in rejected_ports: @@ -161,7 +158,7 @@ class ExitPolicy(object): # determines if we're a white-list or blacklist is_whitelist = not self._is_allowed_default - for rule in self._rules: + for rule in self._get_rules(): if rule.is_address_wildcard() and rule.is_port_wildcard(): is_whitelist = not rule.is_accept break @@ -173,7 +170,7 @@ class ExitPolicy(object): display_ports, skip_ports = [], set() - for rule in self._rules: + for rule in self._get_rules(): if not rule.is_address_wildcard(): continue elif rule.is_port_wildcard(): break @@ -231,16 +228,31 @@ class ExitPolicy(object): self._is_allowed_default = is_allowed_default + def _get_rules(self): + if self._rules is None: + rules = [] + + for rule in self._input_rules: + if isinstance(rule, str): + rules.append(ExitPolicyRule(rule.strip())) + elif isinstance(rule, ExitPolicyRule): + rules.append(rule) + + self._rules = rules + self._input_rules = None + + return self._rules + def __iter__(self): - for rule in self._rules: + for rule in self._get_rules(): yield rule def __str__(self): - return ', '.join([str(rule) for rule in self._rules]) + return ', '.join([str(rule) for rule in self._get_rules()]) def __eq__(self, other): if isinstance(other, ExitPolicy): - return self._rules == list(other) + return self._get_rules() == list(other) else: return False

1 0

[stem/master] Using a lightweight rule counterpart for microdescriptor policies
by atagar＠torproject.org 31 Dec '12

31 Dec '12

commit d35b9c737e320500fa6cfdfa874534cfbe6f1b3a Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 30 21:26:34 2012 -0800 Using a lightweight rule counterpart for microdescriptor policies The exit policies used in microdescriptors are wonderfully simple. There's no point in storing full ExitPolicyRule instances for them, so making an alternate lightweight subclass. Advantages are faster for parsing and less memory usage. Disadvantage is that this doesn't use the ExitPolicyRule constructor, so we'll need to take care that ExitPolicyRule changes are reflected in this subclass. This dropped the runtime of the network status integ tests on my system from 9.4 to 8.3 seconds. --- stem/exit_policy.py | 43 ++++++++++++++++++++++++++++++++++--------- 1 files changed, 34 insertions(+), 9 deletions(-) diff --git a/stem/exit_policy.py b/stem/exit_policy.py index 462a0b5..d7e091f 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -308,19 +308,20 @@ class MicrodescriptorExitPolicy(ExitPolicy): policy = policy[1:] - # convert our port list into ExitPolicyRules + # convert our port list into MicroExitPolicyRule rules = [] - rule_format = "accept *:%s" if self.is_accept else "reject *:%s" for port_entry in policy.split(","): - rule_str = rule_format % port_entry + if '-' in port_entry: + min_port, max_port = port_entry.split('-', 1) + else: + min_port = max_port = port_entry + + if not stem.util.connection.is_valid_port(min_port) or \ + not stem.util.connection.is_valid_port(max_port): + raise ValueError("'%s' is an invalid port range" % port_entry) - try: - rule = ExitPolicyRule(rule_str) - rules.append(rule) - except ValueError, exc: - exc_msg = "Policy '%s' is malformed. %s" % (self._policy, str(exc).replace(rule_str, port_entry)) - raise ValueError(exc_msg) + rules.append(MicroExitPolicyRule(self.is_accept, int(min_port), int(max_port))) super(MicrodescriptorExitPolicy, self).__init__(*rules) self._set_default_allowed(not self.is_accept) @@ -694,3 +695,27 @@ def _address_type_to_int(address_type): def _int_to_address_type(address_type_int): return AddressType[AddressType.keys()[address_type_int]] +class MicroExitPolicyRule(ExitPolicyRule): + """ + Lighter weight ExitPolicyRule derivative for microdescriptors. + """ + + def __init__(self, is_accept, min_port, max_port): + self.is_accept = is_accept + self.address = None # wildcard address + self.min_port = min_port + self.max_port = max_port + self._str_representation = None + + def is_address_wildcard(self): + return True + + def get_address_type(self): + return AddressType.WILDCARD + + def get_mask(self, cache = True): + return None + + def get_masked_bits(self): + return None +

1 0

[stem/master] Tor 0.2.2.9 required for tests with new/extend_circuit()
by atagar＠torproject.org 31 Dec '12

31 Dec '12

commit c34e90b55d744b0e19922d61b638c8987b089233 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 30 19:39:54 2012 -0800 Tor 0.2.2.9 required for tests with new/extend_circuit() Our tests utilizing new_circuit() and extend_circuit() do not provide an explicit path. This breaks the tests if tor isn't version 0.2.2.9 or later. https://trac.torproject.org/7833 --- test/integ/control/controller.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index c8055ab..534bba2 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -24,6 +24,7 @@ import test.runner import test.util from stem.control import EventType +from stem.version import Requirement class TestController(unittest.TestCase): def test_from_port(self): @@ -515,6 +516,7 @@ class TestController(unittest.TestCase): def test_extendcircuit(self): if test.runner.require_control(self): return elif test.runner.require_online(self): return + elif test.runner.require_version(self, Requirement.EXTENDCIRCUIT_PATH_OPTIONAL): return with test.runner.get_runner().get_tor_controller() as controller: circuit_id = controller.extend_circuit('0') @@ -535,6 +537,7 @@ class TestController(unittest.TestCase): if test.runner.require_control(self): return elif test.runner.require_online(self): return + elif test.runner.require_version(self, Requirement.EXTENDCIRCUIT_PATH_OPTIONAL): return runner = test.runner.get_runner() @@ -558,6 +561,7 @@ class TestController(unittest.TestCase): if test.runner.require_control(self): return elif test.runner.require_online(self): return + elif test.runner.require_version(self, Requirement.EXTENDCIRCUIT_PATH_OPTIONAL): return runner = test.runner.get_runner() @@ -722,6 +726,7 @@ class TestController(unittest.TestCase): def test_attachstream(self): if test.runner.require_control(self): return elif test.runner.require_online(self): return + elif test.runner.require_version(self, Requirement.EXTENDCIRCUIT_PATH_OPTIONAL): return circuit_id = None @@ -753,7 +758,8 @@ class TestController(unittest.TestCase): """ if test.runner.require_control(self): return - if test.runner.require_online(self): return + elif test.runner.require_online(self): return + elif test.runner.require_version(self, Requirement.EXTENDCIRCUIT_PATH_OPTIONAL): return runner = test.runner.get_runner() with runner.get_tor_controller() as controller:

1 0

[stem/master] Add a Controller.get_circuits method
by atagar＠torproject.org 31 Dec '12

31 Dec '12

commit 1b9ffa597408e9b7f0f8863e8c7a2f66d9922e1c Author: Ravi Chandra Padmala <neenaoffline(a)gmail.com> Date: Wed Dec 5 08:08:18 2012 +0530 Add a Controller.get_circuits method --- stem/control.py | 20 ++++++++++++++++++++ test/integ/control/controller.py | 15 +++++++++++++++ 2 files changed, 35 insertions(+), 0 deletions(-) diff --git a/stem/control.py b/stem/control.py index 704bb5e..fe45010 100644 --- a/stem/control.py +++ b/stem/control.py @@ -36,6 +36,7 @@ providing its own for interacting at a higher level. |- close_stream - close a stream |- repurpose_circuit - change a circuit's purpose |- map_address - maps one address to another such that connections to the original are replaced with the other + |- get_circuits - provides a list of active circuits |- get_version - convenience method to get tor version |- get_server_descriptor - querying the server descriptor for a relay |- get_server_descriptors - provides all presently available server descriptors @@ -1537,6 +1538,25 @@ class Controller(BaseController): raise stem.ProtocolError("EXTENDCIRCUIT returned unexpected response code: %s" % response.code) return new_circuit + + def get_circuits(self): + """ + Provides the list of circuits Tor is currently handling. + + :returns: **list** of :class:`stem.events.CircuitEvent` objects + + :raises: :class:`stem.ControllerError` if the call fails + """ + + circuits = [] + response = self.get_info("circuit-status") + + for circ in response.splitlines(): + circ_message = stem.socket.recv_message(StringIO.StringIO("650 CIRC " + circ + "\r\n")) + stem.response.convert("EVENT", circ_message, arrived_at = 0) + circuits.append(circ_message) + + return circuits def close_circuit(self, circuit_id, flag = ''): """ diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 86056aa..9b1f1c6 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -722,3 +722,18 @@ class TestController(unittest.TestCase): count += 1 if count > 10: break + def test_get_circuits(self): + """ + Fetches circuits via the get_circuits() method. + """ + + if test.runner.require_control(self): return + if test.runner.require_online(self): return + + runner = test.runner.get_runner() + with runner.get_tor_controller() as controller: + new_circ = controller.new_circuit() + circuits = controller.get_circuits() + self.assertTrue(new_circ in [int(circ.id) for circ in circuits]) + +

1 0

[stem/master] Implement Controller.attach_stream
by atagar＠torproject.org 31 Dec '12

31 Dec '12

commit 32a54a71f8391b5300e6cae5a3f558f190160995 Author: Ravi Chandra Padmala <neenaoffline(a)gmail.com> Date: Tue Jul 3 10:35:52 2012 +0530 Implement Controller.attach_stream --- stem/control.py | 38 ++++++++++++++++++++++++++++++++++---- test/integ/control/controller.py | 34 ++++++++++++++++++++++++++++++++-- test/util.py | 23 +++++++++++++++++------ 3 files changed, 83 insertions(+), 12 deletions(-) diff --git a/stem/control.py b/stem/control.py index fe45010..4cb55e0 100644 --- a/stem/control.py +++ b/stem/control.py @@ -37,6 +37,7 @@ providing its own for interacting at a higher level. |- repurpose_circuit - change a circuit's purpose |- map_address - maps one address to another such that connections to the original are replaced with the other |- get_circuits - provides a list of active circuits + |- attach_stream - attach a stream to a circuit |- get_version - convenience method to get tor version |- get_server_descriptor - querying the server descriptor for a relay |- get_server_descriptors - provides all presently available server descriptors @@ -129,6 +130,7 @@ import stem.util.enum import stem.version from stem.util import log +import stem.util.tor_tools # state changes a control socket can have @@ -1538,16 +1540,16 @@ class Controller(BaseController): raise stem.ProtocolError("EXTENDCIRCUIT returned unexpected response code: %s" % response.code) return new_circuit - + def get_circuits(self): """ Provides the list of circuits Tor is currently handling. - + :returns: **list** of :class:`stem.events.CircuitEvent` objects :raises: :class:`stem.ControllerError` if the call fails """ - + circuits = [] response = self.get_info("circuit-status") @@ -1555,9 +1557,37 @@ class Controller(BaseController): circ_message = stem.socket.recv_message(StringIO.StringIO("650 CIRC " + circ + "\r\n")) stem.response.convert("EVENT", circ_message, arrived_at = 0) circuits.append(circ_message) - + return circuits + def attach_stream(self, stream, circuit, hop = None): + """ + Attaches a stream to a circuit. + + Note: Tor attaches streams to circuits automatically unless the + __LeaveStreamsUnattached configuration variable is set to "1" + + :param int stream: id of the stream that must be attached + :param int circuit: id of the circuit to which it must be attached + :param int hop: hop in the circuit that must be used as an exit node + + :raises: + * :class:`stem.InvalidRequest` if the stream or circuit id were unrecognized + * :class:`stem.OperationFailed` if the stream couldn't be attached for any other reason + """ + + hop_str = " HOP=" + str(hop) if hop else "" + response = self.msg("ATTACHSTREAM %i %i%s" % (stream, circuit, hop_str)) + stem.response.convert("SINGLELINE", response) + + if not response.is_ok(): + if response.code == '552': + raise stem.InvalidRequest(response.code, response.message) + elif response.code == '551': + raise stem.OperationFailed(response.code, response.message) + else: + raise stem.ProtocolError("ATTACHSTREAM returned unexpected response code: %s" % response.code) + def close_circuit(self, circuit_id, flag = ''): """ Closes the specified circuit. diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 9b1f1c6..bced64a 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -13,6 +13,8 @@ import threading import time import unittest +from Queue import Queue + import stem.connection import stem.control import stem.descriptor.reader @@ -721,7 +723,36 @@ class TestController(unittest.TestCase): count += 1 if count > 10: break - + + def test_attachstream(self): + + if test.runner.require_control(self): return + elif test.runner.require_online(self): return + + runner = test.runner.get_runner() + + with runner.get_tor_controller() as controller: + controller.set_conf("__LeaveStreamsUnattached", "1") + socksport = controller.get_conf("SocksPort") + circuits_3hop = [c.id for c in controller.get_circuits() if len(c.path) == 3] + self.assertTrue(len(circuits_3hop) > 0) + circuit_id = circuits_3hop[0] + + def handle_streamcreated(stream): + if stream.status == "NEW": + controller.attach_stream(int(stream.id), int(circuit_id)) + + controller.add_event_listener(handle_streamcreated, stem.control.EventType.STREAM) + ip = test.util.external_ip('127.0.0.1', socksport) + exit_circuit = [c for c in controller.get_circuits() if c.id == circuit_id] + self.assertTrue(exit_circuit) + exit_ip = controller.get_network_status(exit_circuit[0].path[2][0]).address + + self.assertEquals(exit_ip, ip) + + controller.remove_event_listener(handle_streamcreated) + controller.reset_conf("__LeaveStreamsUnattached") + def test_get_circuits(self): """ Fetches circuits via the get_circuits() method. @@ -735,5 +766,4 @@ class TestController(unittest.TestCase): new_circ = controller.new_circuit() circuits = controller.get_circuits() self.assertTrue(new_circ in [int(circ.id) for circ in circuits]) - diff --git a/test/util.py b/test/util.py index 74b494d..b89e48f 100644 --- a/test/util.py +++ b/test/util.py @@ -18,26 +18,37 @@ Accept-Encoding: identity """ -def external_ip(sock): +def external_ip(host, port): """ Returns the externally visible IP address when using a SOCKS4a proxy. Negotiates the socks connection, connects to ipconfig.me and requests http://ifconfig.me/ip to find out the externally visible IP. - :param socket sock: socket connected to a SOCKS4a proxy server + Supports only SOCKS4a proxies. + + :param str host: hostname/IP of the proxy server + :param int port: port on which the proxy server is listening :returns: externally visible IP address, or None if it isn't able to + + :raises: :class:`stem.socket.SocketError`: unable to connect a socket to the socks server """ try: + sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + sock.connect((host, int(port))) + except Exception, exc: + raise SocketError("Failed to connect to the socks server: " + str(exc)) + + try: negotiate_socks(sock, "ifconfig.me", 80) - s.sendall(req) - response = s.recv(1000) + sock.sendall(ip_request) + response = sock.recv(1000) # everything after the blank line is the 'data' in a HTTP response # The response data for our request for request should be an IP address + '\n' return response[response.find("\r\n\r\n"):].strip() - except: + except Exception, exc: return None def negotiate_socks(sock, host, port): @@ -46,7 +57,7 @@ def negotiate_socks(sock, host, port): failure. :param socket sock: socket connected to socks4a server - :param str host: host to connect to + :param str host: hostname/IP to connect to :param int port: port to connect to :raises: :class:`stem.ProtocolError` if the socks server doesn't grant our request

1 0

[stem/master] Variable naming consistency
by atagar＠torproject.org 31 Dec '12

31 Dec '12

commit e0929d2cde0b57232dea966192dd4fe954667d93 Author: Ravi Chandra Padmala <neenaoffline(a)gmail.com> Date: Mon Dec 17 08:09:18 2012 +0530 Variable naming consistency --- stem/control.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stem/control.py b/stem/control.py index 4cb55e0..3c5f8bf 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1560,15 +1560,15 @@ class Controller(BaseController): return circuits - def attach_stream(self, stream, circuit, hop = None): + def attach_stream(self, stream_id, circuit_id, hop = None): """ Attaches a stream to a circuit. Note: Tor attaches streams to circuits automatically unless the __LeaveStreamsUnattached configuration variable is set to "1" - :param int stream: id of the stream that must be attached - :param int circuit: id of the circuit to which it must be attached + :param int stream_id: id of the stream that must be attached + :param int circuit_id: id of the circuit to which it must be attached :param int hop: hop in the circuit that must be used as an exit node :raises: @@ -1577,7 +1577,7 @@ class Controller(BaseController): """ hop_str = " HOP=" + str(hop) if hop else "" - response = self.msg("ATTACHSTREAM %i %i%s" % (stream, circuit, hop_str)) + response = self.msg("ATTACHSTREAM %i %i%s" % (stream_id, circuit_id, hop_str)) stem.response.convert("SINGLELINE", response) if not response.is_ok():

1 0

[stem/master] Fix test_get_circuits to work with string ids
by atagar＠torproject.org 31 Dec '12

31 Dec '12

commit 631b210c59fcbeadd3e75a1b1ac9e9f9a635d142 Author: Ravi Chandra Padmala <neenaoffline(a)gmail.com> Date: Sat Dec 22 14:33:26 2012 +0530 Fix test_get_circuits to work with string ids --- test/integ/control/controller.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index bced64a..32cc3a2 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -765,5 +765,5 @@ class TestController(unittest.TestCase): with runner.get_tor_controller() as controller: new_circ = controller.new_circuit() circuits = controller.get_circuits() - self.assertTrue(new_circ in [int(circ.id) for circ in circuits]) + self.assertTrue(new_circ in [circ.id for circ in circuits])

1 0

[stem/master] Fix test_repurpose_circuits to work with string ids
by atagar＠torproject.org 31 Dec '12

31 Dec '12

commit 299a872c0b7ba26babec3febf8c0a8adad09f4c7 Author: Ravi Chandra Padmala <neenaoffline(a)gmail.com> Date: Sat Dec 22 17:17:47 2012 +0530 Fix test_repurpose_circuits to work with string ids --- test/integ/control/controller.py | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 32cc3a2..1b2c146 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -540,16 +540,16 @@ class TestController(unittest.TestCase): runner = test.runner.get_runner() with runner.get_tor_controller() as controller: - circuit_id = controller.new_circuit() - controller.repurpose_circuit(circuit_id, "CONTROLLER") - circuit_output = controller.get_info("circuit-status") - circ = filter(re.compile("^%s " % circuit_id).match, circuit_output.splitlines())[0] - self.assertTrue("PURPOSE=CONTROLLER" in circ) + circ_id = controller.new_circuit() + controller.repurpose_circuit(circ_id, "CONTROLLER") + circuits = controller.get_circuits() + circuit = filter(lambda circ: circ.id == circ_id, circuits)[0] + self.assertTrue(circuit.purpose == "CONTROLLER") - controller.repurpose_circuit(circuit_id, "GENERAL") - circuit_output = controller.get_info("circuit-status") - circ = filter(re.compile("^%s " % circuit_id).match, circuit_output.splitlines())[0] - self.assertTrue("PURPOSE=GENERAL" in circ) + controller.repurpose_circuit(circ_id, "GENERAL") + circuits = controller.get_circuits() + circuit = filter(lambda circ: circ.id == circ_id, circuits)[0] + self.assertTrue(circuit.purpose == "GENERAL") self.assertRaises(stem.InvalidRequest, controller.repurpose_circuit, 'f934h9f3h4', "fooo") self.assertRaises(stem.InvalidRequest, controller.repurpose_circuit, '4', "fooo")

1 0