tor-commits January 2018

tor-commits@lists.torproject.org

18 participants
1738 discussions

[stem/master] Move Pack table into Size docs
by atagar＠torproject.org 21 Jan '18

21 Jan '18

commit b65cf1c91597419d5c50ef50a428daf691552219 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jan 11 17:56:45 2018 -0800 Move Pack table into Size docs We no longer have a Pack enum, so moving the table to the right spot. --- stem/client/__init__.py | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/stem/client/__init__.py b/stem/client/__init__.py index d0920778..c3b18c6c 100644 --- a/stem/client/__init__.py +++ b/stem/client/__init__.py @@ -9,23 +9,6 @@ a wrapper for :class:`~stem.socket.RelaySocket`, much the same way as .. versionadded:: 1.7.0 -.. data:: Pack (enum) - - Unsigned `struct.pack format - <https://docs.python.org/2/library/struct.html#format-characters>` for - network-order fields. - - ==================== =========== - Pack Description - ==================== =========== - CHAR Unsigned char (1 byte) - SHORT Unsigned short (2 bytes) - LONG Unsigned long (4 bytes) - LONG_LONG Unsigned long long (8 bytes) - ==================== =========== - -**Module Overview:** - :: Size - Packable and unpackable field size. @@ -48,6 +31,15 @@ class Size(object): Unsigned `struct.pack format <https://docs.python.org/2/library/struct.html#format-characters>` for network-order fields. + + ==================== =========== + Pack Description + ==================== =========== + CHAR Unsigned char (1 byte) + SHORT Unsigned short (2 bytes) + LONG Unsigned long (4 bytes) + LONG_LONG Unsigned long long (8 bytes) + ==================== =========== """ def __init__(self, name, size, pack_format):

1 0

[stem/master] Have Cell.unpack() provide a list of cells
by atagar＠torproject.org 21 Jan '18

21 Jan '18

commit 3db7fab9c3ea84a68c154a0a33829bbcf5da8cdf Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 13 12:07:18 2018 -0800 Have Cell.unpack() provide a list of cells On reflection ORPort socket responses contain a series of cells, not just one. Changing our unpack function to parse a series. We'll need CERTS, AUTH_CHALLENGE, and NETINFO cell support before we can open links. --- stem/client/cell.py | 33 ++++++++++++++++++++++----------- test/unit/client/__init__.py | 17 +++++++++++++++++ test/unit/client/cell.py | 11 ++++++++--- test/unit/client/data/new_link_cells | Bin 0 -> 2043 bytes 4 files changed, 47 insertions(+), 14 deletions(-) diff --git a/stem/client/cell.py b/stem/client/cell.py index e29e404f..4d4667d0 100644 --- a/stem/client/cell.py +++ b/stem/client/cell.py @@ -42,7 +42,7 @@ import sys from stem import UNDEFINED from stem.client import ZERO, Size -MAX_FIXED_PAYLOAD_LEN = 509 +FIXED_PAYLOAD_LEN = 509 class Cell(object): @@ -96,28 +96,39 @@ class Cell(object): @staticmethod def unpack(content, link_version): """ - Unpacks encoded bytes into a Cell subclass. + Unpacks encoded bytes into a series of cells. :param bytes content: payload to decode :param int link_version: link protocol version - :returns: :class:`~stem.client.cell.Cell` subclass + :returns: **list** of :class:`~stem.client.cell.Cell` subclasses :raises: * ValueError if content is malformed * NotImplementedError if unable to unpack this cell type """ - circ_id, content = Size.LONG.pop(content) if link_version > 3 else Size.SHORT.pop(content) - command, content = Size.CHAR.pop(content) - cls = Cell.by_value(command) + cells = [] - if cls.IS_FIXED_SIZE: - payload_len = MAX_FIXED_PAYLOAD_LEN - else: - payload_len, content = Size.SHORT.pop(content) + while content: + circ_id, content = Size.SHORT.pop(content) if link_version < 4 else Size.LONG.pop(content) + command, content = Size.CHAR.pop(content) + cls = Cell.by_value(command) + + if cls.IS_FIXED_SIZE: + payload_len = FIXED_PAYLOAD_LEN + else: + payload_len, content = Size.SHORT.pop(content) + + if len(content) < payload_len: + raise ValueError('%s cell should have a payload of %i bytes, but only had %i' % (cls.NAME, payload_len, len(content))) + + payload = content[:payload_len].rstrip(ZERO) # strip padding + content = content[payload_len:] + + cells.append(cls._unpack(payload, link_version, circ_id)) - return cls._unpack(content, link_version, circ_id) + return cells @classmethod def _pack(cls, link_version, payload, circ_id = 0): diff --git a/test/unit/client/__init__.py b/test/unit/client/__init__.py index e35416a8..f5b82e7e 100644 --- a/test/unit/client/__init__.py +++ b/test/unit/client/__init__.py @@ -5,3 +5,20 @@ Unit tests for stem.client.* contents. __all__ = [ 'cell', ] + +import os + +TEST_DATA = os.path.join(os.path.dirname(__file__), 'data') + + +def test_data(filename): + """ + Provides test data in the given file. + + :param str filename: test data to provide + + :returns: **bytes** with the data + """ + + with open(os.path.join(TEST_DATA, filename), 'rb') as data_file: + return data_file.read() diff --git a/test/unit/client/cell.py b/test/unit/client/cell.py index 9502975e..3a2a55f2 100644 --- a/test/unit/client/cell.py +++ b/test/unit/client/cell.py @@ -5,6 +5,7 @@ Unit tests for the stem.client.cell. import unittest from stem.client.cell import Cell, VersionsCell +from test.unit.client import test_data class TestCell(unittest.TestCase): @@ -31,12 +32,16 @@ class TestCell(unittest.TestCase): def test_unpack_not_implemented(self): self.assertRaisesRegexp(NotImplementedError, 'Unpacking not yet implemented for AUTHORIZE cells', Cell.unpack, '\x00\x00\x84\x00\x06\x00\x01\x00\x02\x00\x03', 2) + def test_unpack_for_new_link(self): + # TODO: we need to support more cell types before we can test this + self.assertRaisesRegexp(NotImplementedError, 'Unpacking not yet implemented for CERTS cells', Cell.unpack, test_data('new_link_cells'), 2) + def test_versions_pack(self): self.assertEqual('\x00\x00\x07\x00\x00', VersionsCell.pack([])) self.assertEqual('\x00\x00\x07\x00\x02\x00\x01', VersionsCell.pack([1])) self.assertEqual('\x00\x00\x07\x00\x06\x00\x01\x00\x02\x00\x03', VersionsCell.pack([1, 2, 3])) def test_versions_unpack(self): - self.assertEqual([], Cell.unpack('\x00\x00\x07\x00\x00', 2).versions) - self.assertEqual([1], Cell.unpack('\x00\x00\x07\x00\x02\x00\x01', 2).versions) - self.assertEqual([1, 2, 3], Cell.unpack('\x00\x00\x07\x00\x06\x00\x01\x00\x02\x00\x03', 2).versions) + self.assertEqual([], Cell.unpack('\x00\x00\x07\x00\x00', 2)[0].versions) + self.assertEqual([1], Cell.unpack('\x00\x00\x07\x00\x02\x00\x01', 2)[0].versions) + self.assertEqual([1, 2, 3], Cell.unpack('\x00\x00\x07\x00\x06\x00\x01\x00\x02\x00\x03', 2)[0].versions) diff --git a/test/unit/client/data/new_link_cells b/test/unit/client/data/new_link_cells new file mode 100644 index 00000000..38e68613 Binary files /dev/null and b/test/unit/client/data/new_link_cells differ

1 0

[stem/master] Use BytesIO for cell packing
by atagar＠torproject.org 21 Jan '18

21 Jan '18

commit b7ae57c4bcface5314700b38781ae6fbac65ad25 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 14 11:19:25 2018 -0800 Use BytesIO for cell packing Not a terribly big whoop, but probably a tad more performant. --- stem/client/cell.py | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/stem/client/cell.py b/stem/client/cell.py index 73c1c8f2..4fe7952e 100644 --- a/stem/client/cell.py +++ b/stem/client/cell.py @@ -135,6 +135,13 @@ class Cell(object): def _pack(cls, link_version, payload, circ_id = 0): """ Provides bytes that can be used on the wire for these cell attributes. + Format of a properly packed cell depends on if it's fixed or variable + sized... + + :: + + Fixed: [ CircuitID ][ Command ][ Payload ][ Padding ] + Variable: [ CircuitID ][ Command ][ Size ][ Payload ] :param str name: cell command :param int link_version: link protocol version @@ -146,22 +153,24 @@ class Cell(object): :raise: **ValueError** if cell type invalid or payload is too large """ - packed_circ_id = Size.LONG.pack(circ_id) if link_version > 3 else Size.SHORT.pack(circ_id) - packed_command = Size.CHAR.pack(cls.VALUE) - packed_size = b'' if cls.IS_FIXED_SIZE else Size.SHORT.pack(len(payload)) - cell = b''.join((packed_circ_id, packed_command, packed_size, payload)) + cell = io.BytesIO() + cell.write(Size.LONG.pack(circ_id) if link_version > 3 else Size.SHORT.pack(circ_id)) + cell.write(Size.CHAR.pack(cls.VALUE)) + cell.write(b'' if cls.IS_FIXED_SIZE else Size.SHORT.pack(len(payload))) + cell.write(payload) # pad fixed sized cells to the required length if cls.IS_FIXED_SIZE: + cell_size = cell.seek(0, io.SEEK_END) fixed_cell_len = 514 if link_version > 3 else 512 - if len(cell) > fixed_cell_len: - raise ValueError('Payload of %s is too large (%i bytes), must be less than %i' % (cls.NAME, len(cell), fixed_cell_len)) + if cell_size > fixed_cell_len: + raise ValueError('Payload of %s is too large (%i bytes), must be less than %i' % (cls.NAME, cell_size, fixed_cell_len)) - cell += ZERO * (fixed_cell_len - len(cell)) + cell.write(ZERO * (fixed_cell_len - cell_size)) - return cell + return cell.getvalue() @classmethod def _unpack(cls, content, circ_id, link_version):

1 0

[stem/master] Revise stem.client docs
by atagar＠torproject.org 21 Jan '18

21 Jan '18

commit 7d33345426b54f0a55eb47163d207d0ce1cb3697 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jan 18 09:58:11 2018 -0800 Revise stem.client docs Not yet accurate, but the direction we're going. --- stem/client/__init__.py | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/stem/client/__init__.py b/stem/client/__init__.py index 9ad790a8..d458e068 100644 --- a/stem/client/__init__.py +++ b/stem/client/__init__.py @@ -11,7 +11,13 @@ a wrapper for :class:`~stem.socket.RelaySocket`, much the same way as :: - Size - Packable and unpackable field size. + split - splits bytes into substrings + + Field - Packable and unpackable datatype. + |- Size - Field of a static size. + |- Address - Relay address. + |- Certificate - Relay certificate. + | |- pack - encodes content |- unpack - decodes content +- pop - decodes content with remainder @@ -30,6 +36,19 @@ a wrapper for :class:`~stem.socket.RelaySocket`, much the same way as **ERROR_PERMANENT** permanent error retrieving address **UNKNOWN** unrecognized address type ===================== =========== + +.. data:: CertType (enum) + + Relay certificate type. + + ===================== =========== + CertType Description + ===================== =========== + **LINK** link key certificate certified by RSA1024 identity + **IDENTITY** RSA1024 Identity certificate + **AUTHENTICATE** RSA1024 AUTHENTICATE cell link certificate + **UNKNOWN** unrecognized certificate type + ===================== =========== """ import collections

1 0

[stem/master] Flexable Address constructor
by atagar＠torproject.org 21 Jan '18

21 Jan '18

commit 13a819231b0aab7aa715d14059ab92ded7d79e1a Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 19 02:53:47 2018 -0800 Flexable Address constructor Callers will need to make addresses themselves, so expanding our Address constructor to be more flexable. It now does the types and value conversion so you can construct Address instances with either packed or unpacked data. --- stem/client/__init__.py | 75 +++++++++++++++++++++++++++++--------------- test/unit/client/__init__.py | 3 +- test/unit/client/address.py | 24 ++++++++++++-- test/unit/client/cell.py | 10 +++--- 4 files changed, 78 insertions(+), 34 deletions(-) diff --git a/stem/client/__init__.py b/stem/client/__init__.py index 223956f5..217e32af 100644 --- a/stem/client/__init__.py +++ b/stem/client/__init__.py @@ -54,8 +54,11 @@ a wrapper for :class:`~stem.socket.RelaySocket`, much the same way as import collections import struct +import stem.util.connection import stem.util.enum +from stem.util import _hash_attr + ZERO = '\x00' __all__ = [ @@ -78,14 +81,6 @@ CertType = stem.util.enum.UppercaseEnum( 'UNKNOWN', ) -ADDR_INT = { - 0: AddrType.HOSTNAME, - 4: AddrType.IPv4, - 6: AddrType.IPv6, - 16: AddrType.ERROR_TRANSIENT, - 17: AddrType.ERROR_PERMANENT, -} - def split(content, size): """ @@ -149,6 +144,12 @@ class Field(object): raise NotImplementedError('Not yet available') + def __eq__(self, other): + return hash(self) == hash(other) if isinstance(other, Field) else False + + def __ne__(self, other): + return not self == other + class Size(Field): """ @@ -214,7 +215,7 @@ class Certificate(collections.namedtuple('Certificate', ['type', 'value'])): """ -class Address(collections.namedtuple('Address', ['type', 'type_int', 'value', 'value_bin'])): +class Address(Field): """ Relay address. @@ -224,13 +225,40 @@ class Address(collections.namedtuple('Address', ['type', 'type_int', 'value', 'v :var bytes value_bin: encoded address value """ - @staticmethod - def pack(addr): - """ - Bytes payload for an address. - """ - - raise NotImplementedError('Not yet available') + TYPE_FOR_INT = { + 0: AddrType.HOSTNAME, + 4: AddrType.IPv4, + 6: AddrType.IPv6, + 16: AddrType.ERROR_TRANSIENT, + 17: AddrType.ERROR_PERMANENT, + } + + INT_FOR_TYPE = dict((v, k) for k, v in TYPE_FOR_INT.items()) + + def __init__(self, addr_type, value): + if isinstance(addr_type, int): + self.type = Address.TYPE_FOR_INT.get(addr_type, AddrType.UNKNOWN) + self.type_int = addr_type + elif addr_type in AddrType: + self.type = addr_type + self.type_int = Address.INT_FOR_TYPE.get(addr_type, -1) + else: + raise ValueError('Invalid address type: %s' % addr_type) + + if self.type == AddrType.IPv4: + if stem.util.connection.is_valid_ipv4_address(value): + self.value = value + self.value_bin = ''.join([Size.CHAR.pack(int(v)) for v in value.split('.')]) + else: + if len(value) != 4: + raise ValueError('Packed IPv4 addresses should be four bytes, but was: %s' % repr(value)) + + self.value = '.'.join([str(Size.CHAR.unpack(value[i])) for i in range(4)]) + self.value_bin = value + elif self.type == AddrType.IPv6: + self.value, self.value_bin = None, None # TODO: implement + else: + self.value, self.value_bin = None, None # TODO: implement @staticmethod def pop(content): @@ -239,22 +267,19 @@ class Address(collections.namedtuple('Address', ['type', 'type_int', 'value', 'v elif len(content) < 2: raise ValueError('Insuffient data for address headers') - addr_type_int, content = Size.CHAR.pop(content) - addr_type = ADDR_INT.get(addr_type_int, AddrType.UNKNOWN) + addr_type, content = Size.CHAR.pop(content) addr_length, content = Size.CHAR.pop(content) if len(content) < addr_length: raise ValueError('Address specified a payload of %i bytes, but only had %i' % (addr_length, len(content))) - # TODO: add support for other address types - - address_bin, content = split(content, addr_length) - address = None + addr_value, content = split(content, addr_length) - if addr_type == AddrType.IPv4 and len(address_bin) == 4: - address = '.'.join([str(Size.CHAR.unpack(address_bin[i])) for i in range(4)]) + return Address(addr_type, addr_value), content - return Address(addr_type, addr_type_int, address, address_bin), content + def __hash__(self): + # no need to include value or type since they're derived from these + return _hash_attr(self, 'type_int', 'value_bin') setattr(Size, 'CHAR', Size('CHAR', 1, '!B')) diff --git a/test/unit/client/__init__.py b/test/unit/client/__init__.py index fdc7a0c6..b36b72af 100644 --- a/test/unit/client/__init__.py +++ b/test/unit/client/__init__.py @@ -3,8 +3,9 @@ Unit tests for stem.client.* contents. """ __all__ = [ + 'address', 'cell', - 'types', + 'size', ] import os diff --git a/test/unit/client/address.py b/test/unit/client/address.py index bb844264..9e6430ff 100644 --- a/test/unit/client/address.py +++ b/test/unit/client/address.py @@ -2,17 +2,35 @@ Unit tests for stem.client.Address. """ +import collections import unittest -from stem.client import Address +from stem.client import AddrType, Address + +ExpectedAddress = collections.namedtuple('ExpectedAddress', ['type', 'type_int', 'value', 'value_bin']) class TestAddress(unittest.TestCase): - def test_ipv4(self): + def test_constructor(self): + test_data = ( + ((4, '\x7f\x00\x00\x01'), ExpectedAddress(AddrType.IPv4, 4, '127.0.0.1', '\x7f\x00\x00\x01')), + ((4, 'aq\x0f\x02'), ExpectedAddress(AddrType.IPv4, 4, '97.113.15.2', 'aq\x0f\x02')), + ((AddrType.IPv4, '127.0.0.1'), ExpectedAddress(AddrType.IPv4, 4, '127.0.0.1', '\x7f\x00\x00\x01')), + ((AddrType.IPv4, '97.113.15.2'), ExpectedAddress(AddrType.IPv4, 4, '97.113.15.2', 'aq\x0f\x02')), + ) + + for (addr_type, addr_value), expected in test_data: + addr = Address(addr_type, addr_value) + self.assertEqual(expected.type, addr.type) + self.assertEqual(expected.type_int, addr.type_int) + self.assertEqual(expected.value, addr.value) + self.assertEqual(expected.value_bin, addr.value_bin) + + def test_pop_ipv4(self): addr, content = Address.pop('\x04\x04\x7f\x00\x00\x01\x01\x04\x04aq\x0f\x02\x00\x00\x00\x00') self.assertEqual('\x01\x04\x04aq\x0f\x02\x00\x00\x00\x00', content) - self.assertEqual('IPv4', addr.type) + self.assertEqual(AddrType.IPv4, addr.type) self.assertEqual(4, addr.type_int) self.assertEqual('127.0.0.1', addr.value) self.assertEqual('\x7f\x00\x00\x01', addr.value_bin) diff --git a/test/unit/client/cell.py b/test/unit/client/cell.py index a0eab2e5..c9aea5bc 100644 --- a/test/unit/client/cell.py +++ b/test/unit/client/cell.py @@ -6,7 +6,7 @@ import datetime import os import unittest -from stem.client import ZERO, Address, Certificate +from stem.client import ZERO, AddrType, Address, Certificate from test.unit.client import test_data from stem.client.cell import ( @@ -105,8 +105,8 @@ class TestCell(unittest.TestCase): netinfo_cell, content = Cell.unpack(content, 2) self.assertEqual(NetinfoCell, type(netinfo_cell)) self.assertEqual(datetime.datetime(2018, 1, 14, 1, 46, 56), netinfo_cell.timestamp) - self.assertEqual(Address(type='IPv4', type_int=4, value='127.0.0.1', value_bin='\x7f\x00\x00\x01'), netinfo_cell.receiver_address) - self.assertEqual([Address(type='IPv4', type_int=4, value='97.113.15.2', value_bin='aq\x0f\x02')], netinfo_cell.sender_addresses) + self.assertEqual(Address(AddrType.IPv4, '127.0.0.1'), netinfo_cell.receiver_address) + self.assertEqual([Address(AddrType.IPv4, '97.113.15.2')], netinfo_cell.sender_addresses) self.assertEqual('', content) # check that we've consumed all of the bytes @@ -124,8 +124,8 @@ class TestCell(unittest.TestCase): cell = Cell.unpack(NETINFO_CELL, 2)[0] self.assertEqual(datetime.datetime(2018, 1, 14, 1, 46, 56), cell.timestamp) - self.assertEqual(Address(type='IPv4', type_int=4, value='127.0.0.1', value_bin='\x7f\x00\x00\x01'), cell.receiver_address) - self.assertEqual([Address(type='IPv4', type_int=4, value='97.113.15.2', value_bin='aq\x0f\x02')], cell.sender_addresses) + self.assertEqual(Address(AddrType.IPv4, '127.0.0.1'), cell.receiver_address) + self.assertEqual([Address(AddrType.IPv4, '97.113.15.2')], cell.sender_addresses) def test_vpadding_packing(self): for cell_bytes, payload in VPADDING_CELLS.items():

1 0

[stem/master] Split size tests into their own module
by atagar＠torproject.org 21 Jan '18

21 Jan '18

commit 895cd3a3e3c9e453ee2a1e494f486dd5df3326e7 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jan 16 12:00:31 2018 -0800 Split size tests into their own module --- stem/client/__init__.py | 122 +++++++++++++++++++++++----------------------- test/settings.cfg | 1 + test/unit/client/size.py | 50 +++++++++++++++++++ test/unit/client/types.py | 43 +--------------- 4 files changed, 113 insertions(+), 103 deletions(-) diff --git a/stem/client/__init__.py b/stem/client/__init__.py index defa09fa..3b38f8bb 100644 --- a/stem/client/__init__.py +++ b/stem/client/__init__.py @@ -61,67 +61,6 @@ ADDR_INT = { } -class Certificate(collections.namedtuple('Certificate', ['type', 'value'])): - """ - Relay certificate as defined in tor-spec section 4.2. Certificate types - are... - - ==================== =========== - Type Value Description - ==================== =========== - 1 Link key certificate certified by RSA1024 identity - 2 RSA1024 Identity certificate - 3 RSA1024 AUTHENTICATE cell link certificate - ==================== =========== - - :var int type: certificate type - :var bytes value: certificate value - """ - - -class Address(collections.namedtuple('Address', ['type', 'type_int', 'value', 'value_bin'])): - """ - Relay address. - - :var stem.client.AddrType type: address type - :var int type_int: integer value of the address type - :var unicode value: address value - :var bytes value_bin: encoded address value - """ - - @staticmethod - def pack(addr): - """ - Bytes payload for an address. - """ - - raise NotImplementedError('Not yet available') - - @staticmethod - def pop(content): - if not content: - raise ValueError('Payload empty where an address was expected') - elif len(content) < 2: - raise ValueError('Insuffient data for address headers') - - addr_type_int, content = Size.CHAR.pop(content) - addr_type = ADDR_INT.get(addr_type_int, AddrType.UNKNOWN) - addr_length, content = Size.CHAR.pop(content) - - if len(content) < addr_length: - raise ValueError('Address specified a payload of %i bytes, but only had %i' % (addr_length, len(content))) - - # TODO: add support for other address types - - address_bin, content = content[:addr_length], content[addr_length:] - address = None - - if addr_type == AddrType.IPv4 and len(address_bin) == 4: - address = '.'.join([str(Size.CHAR.unpack(address_bin[i])) for i in range(4)]) - - return Address(addr_type, addr_type_int, address, address_bin), content - - class Size(object): """ Unsigned `struct.pack format @@ -189,6 +128,67 @@ class Size(object): return self.unpack(content[:self.size]), content[self.size:] +class Certificate(collections.namedtuple('Certificate', ['type', 'value'])): + """ + Relay certificate as defined in tor-spec section 4.2. Certificate types + are... + + ==================== =========== + Type Value Description + ==================== =========== + 1 Link key certificate certified by RSA1024 identity + 2 RSA1024 Identity certificate + 3 RSA1024 AUTHENTICATE cell link certificate + ==================== =========== + + :var int type: certificate type + :var bytes value: certificate value + """ + + +class Address(collections.namedtuple('Address', ['type', 'type_int', 'value', 'value_bin'])): + """ + Relay address. + + :var stem.client.AddrType type: address type + :var int type_int: integer value of the address type + :var unicode value: address value + :var bytes value_bin: encoded address value + """ + + @staticmethod + def pack(addr): + """ + Bytes payload for an address. + """ + + raise NotImplementedError('Not yet available') + + @staticmethod + def pop(content): + if not content: + raise ValueError('Payload empty where an address was expected') + elif len(content) < 2: + raise ValueError('Insuffient data for address headers') + + addr_type_int, content = Size.CHAR.pop(content) + addr_type = ADDR_INT.get(addr_type_int, AddrType.UNKNOWN) + addr_length, content = Size.CHAR.pop(content) + + if len(content) < addr_length: + raise ValueError('Address specified a payload of %i bytes, but only had %i' % (addr_length, len(content))) + + # TODO: add support for other address types + + address_bin, content = content[:addr_length], content[addr_length:] + address = None + + if addr_type == AddrType.IPv4 and len(address_bin) == 4: + address = '.'.join([str(Size.CHAR.unpack(address_bin[i])) for i in range(4)]) + + return Address(addr_type, addr_type_int, address, address_bin), content + + setattr(Size, 'CHAR', Size('CHAR', 1, '!B')) setattr(Size, 'SHORT', Size('SHORT', 2, '!H')) setattr(Size, 'LONG', Size('LONG', 4, '!L')) diff --git a/test/settings.cfg b/test/settings.cfg index d4e1a6c3..96e2d302 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -230,6 +230,7 @@ test.unit_tests |test.unit.response.protocolinfo.TestProtocolInfoResponse |test.unit.response.mapaddress.TestMapAddressResponse |test.unit.client.types.TestClientTypes +|test.unit.client.size.TestSize |test.unit.client.cell.TestCell |test.unit.connection.authentication.TestAuthenticate |test.unit.connection.connect.TestConnect diff --git a/test/unit/client/size.py b/test/unit/client/size.py new file mode 100644 index 00000000..6078139c --- /dev/null +++ b/test/unit/client/size.py @@ -0,0 +1,50 @@ +""" +Unit tests for stem.client.Size. +""" + +import re +import unittest + +from stem.client import Size + + +class TestSize(unittest.TestCase): + def test_attributes(self): + self.assertEqual('CHAR', Size.CHAR.name) + self.assertEqual('!B', Size.CHAR.format) + + self.assertEqual(1, Size.CHAR.size) + self.assertEqual(2, Size.SHORT.size) + self.assertEqual(4, Size.LONG.size) + self.assertEqual(8, Size.LONG_LONG.size) + + def test_pack(self): + self.assertEqual('\x12', Size.CHAR.pack(18)) + self.assertEqual('\x00\x12', Size.SHORT.pack(18)) + self.assertEqual('\x00\x00\x00\x12', Size.LONG.pack(18)) + self.assertEqual('\x00\x00\x00\x00\x00\x00\x00\x12', Size.LONG_LONG.pack(18)) + + self.assertRaisesRegexp(ValueError, 'Size.pack encodes an integer, but was a str', Size.CHAR.pack, 'hi') + + bad_size = Size('BAD_SIZE', 1, '!H') + self.assertRaisesRegexp(ValueError, re.escape("'\\x00\\x12' is the wrong size for a BAD_SIZE field"), bad_size.pack, 18) + + def test_unpack(self): + self.assertEqual(18, Size.CHAR.unpack('\x12')) + self.assertEqual(18, Size.SHORT.unpack('\x00\x12')) + self.assertEqual(18, Size.LONG.unpack('\x00\x00\x00\x12')) + self.assertEqual(18, Size.LONG_LONG.unpack('\x00\x00\x00\x00\x00\x00\x00\x12')) + + self.assertEqual(ord('a'), Size.CHAR.unpack('a')) + self.assertEqual(24930, Size.SHORT.unpack('ab')) + + self.assertRaisesRegexp(ValueError, re.escape("'\\x00\\x12' is the wrong size for a CHAR field"), Size.CHAR.unpack, '\x00\x12') + + def test_pop(self): + self.assertEqual((18, ''), Size.CHAR.pop('\x12')) + + self.assertEqual((0, '\x12'), Size.CHAR.pop('\x00\x12')) + self.assertEqual((18, ''), Size.SHORT.pop('\x00\x12')) + + self.assertRaisesRegexp(ValueError, "'' is the wrong size for a CHAR field", Size.CHAR.pop, '') + self.assertRaisesRegexp(ValueError, re.escape("'\\x12' is the wrong size for a SHORT field"), Size.SHORT.pop, '\x12') diff --git a/test/unit/client/types.py b/test/unit/client/types.py index a4d69a19..a85a0b8d 100644 --- a/test/unit/client/types.py +++ b/test/unit/client/types.py @@ -2,10 +2,9 @@ Unit tests for the types in stem.client. """ -import re import unittest -from stem.client import Address, Size +from stem.client import Address class TestClientTypes(unittest.TestCase): @@ -17,43 +16,3 @@ class TestClientTypes(unittest.TestCase): self.assertEqual(4, addr.type_int) self.assertEqual('127.0.0.1', addr.value) self.assertEqual('\x7f\x00\x00\x01', addr.value_bin) - - def test_size_attributes(self): - self.assertEqual('CHAR', Size.CHAR.name) - self.assertEqual('!B', Size.CHAR.format) - - self.assertEqual(1, Size.CHAR.size) - self.assertEqual(2, Size.SHORT.size) - self.assertEqual(4, Size.LONG.size) - self.assertEqual(8, Size.LONG_LONG.size) - - def test_size_pack(self): - self.assertEqual('\x12', Size.CHAR.pack(18)) - self.assertEqual('\x00\x12', Size.SHORT.pack(18)) - self.assertEqual('\x00\x00\x00\x12', Size.LONG.pack(18)) - self.assertEqual('\x00\x00\x00\x00\x00\x00\x00\x12', Size.LONG_LONG.pack(18)) - - self.assertRaisesRegexp(ValueError, 'Size.pack encodes an integer, but was a str', Size.CHAR.pack, 'hi') - - bad_size = Size('BAD_SIZE', 1, '!H') - self.assertRaisesRegexp(ValueError, re.escape("'\\x00\\x12' is the wrong size for a BAD_SIZE field"), bad_size.pack, 18) - - def test_size_unpack(self): - self.assertEqual(18, Size.CHAR.unpack('\x12')) - self.assertEqual(18, Size.SHORT.unpack('\x00\x12')) - self.assertEqual(18, Size.LONG.unpack('\x00\x00\x00\x12')) - self.assertEqual(18, Size.LONG_LONG.unpack('\x00\x00\x00\x00\x00\x00\x00\x12')) - - self.assertEqual(ord('a'), Size.CHAR.unpack('a')) - self.assertEqual(24930, Size.SHORT.unpack('ab')) - - self.assertRaisesRegexp(ValueError, re.escape("'\\x00\\x12' is the wrong size for a CHAR field"), Size.CHAR.unpack, '\x00\x12') - - def test_size_pop(self): - self.assertEqual((18, ''), Size.CHAR.pop('\x12')) - - self.assertEqual((0, '\x12'), Size.CHAR.pop('\x00\x12')) - self.assertEqual((18, ''), Size.SHORT.pop('\x00\x12')) - - self.assertRaisesRegexp(ValueError, "'' is the wrong size for a CHAR field", Size.CHAR.pop, '') - self.assertRaisesRegexp(ValueError, re.escape("'\\x12' is the wrong size for a SHORT field"), Size.SHORT.pop, '\x12')

1 0

[stem/master] Parse address payloads
by atagar＠torproject.org 21 Jan '18

21 Jan '18

commit 954269505c8d0656b69849de8121195c42aeee5b Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jan 15 09:29:45 2018 -0800 Parse address payloads Add support for addresses in Netinfo cells. Presently this only decodes IPv4 addresses since that's what I have an example for. --- stem/client/__init__.py | 74 ++++++++++++++++++++++++++++++++++++++++++++ test/settings.cfg | 1 + test/unit/client/__init__.py | 1 + test/unit/client/types.py | 19 ++++++++++++ 4 files changed, 95 insertions(+) diff --git a/stem/client/__init__.py b/stem/client/__init__.py index 6909c1a7..931dbab1 100644 --- a/stem/client/__init__.py +++ b/stem/client/__init__.py @@ -15,17 +15,51 @@ a wrapper for :class:`~stem.socket.RelaySocket`, much the same way as |- pack - encodes content |- unpack - decodes content +- pop - decodes content with remainder + +.. data:: AddrType (enum) + + Form an address takes. + + ===================== =========== + AddressType Description + ===================== =========== + **HOSTNAME** relay hostname + **IPv4** IPv4 address + **IPv6** IPv6 address + **ERROR_TRANSIENT** temporarily error retrieving address + **ERROR_PERMANENT** permanent error retrieving address + **UNKNOWN** unrecognized address type + ===================== =========== """ import collections import struct +import stem.util.enum + ZERO = '\x00' __all__ = [ 'cell', ] +AddrType = stem.util.enum.UppercaseEnum( + 'HOSTNAME', + 'IPv4', + 'IPv6', + 'ERROR_TRANSIENT', + 'ERROR_PERMANENT', + 'UNKNOWN', +) + +ADDR_INT = { + 0: AddrType.HOSTNAME, + 4: AddrType.IPv4, + 6: AddrType.IPv6, + 16: AddrType.ERROR_TRANSIENT, + 17: AddrType.ERROR_PERMANENT, +} + class Certificate(collections.namedtuple('Certificate', ['type', 'value'])): """ @@ -45,6 +79,46 @@ class Certificate(collections.namedtuple('Certificate', ['type', 'value'])): """ +class Address(collections.namedtuple('Address', ['type', 'type_int', 'value', 'value_bin', 'ttl'])): + """ + Relay address. + + :var stem.client.AddrType type: address type + :var int type_int: integer value of the address type + :var unicode value: address value + :var bytes value_bin: encoded address value + :var int ttl: seconds the record can be validly cached for + """ + + @staticmethod + def pop(content): + if not content: + raise ValueError('Payload empty where an address was expected') + elif len(content) < 2: + raise ValueError('Insuffient data for address headers') + + addr_type_int, content = Size.CHAR.pop(content) + addr_type = ADDR_INT.get(addr_type_int, AddrType.UNKNOWN) + addr_length, content = Size.CHAR.pop(content) + + if len(content) < addr_length: + raise ValueError('Address specified a payload of %i bytes, but only had %i' % (addr_length, len(content))) + elif len(content) < addr_length + 4: + raise ValueError('Address missing a TTL at its end') + + address_bin, content = content[:addr_length], content[addr_length:] + ttl, content = Size.LONG.pop(content) + + # TODO: add support for other address types + + address = None + + if addr_type == AddrType.IPv4 and len(address_bin) == 4: + address = '.'.join([str(Size.CHAR.unpack(address_bin[i])) for i in range(4)]) + + return Address(addr_type, addr_type_int, address, address_bin, ttl), content + + class Size(object): """ Unsigned `struct.pack format diff --git a/test/settings.cfg b/test/settings.cfg index b4b125a8..d4e1a6c3 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -229,6 +229,7 @@ test.unit_tests |test.unit.response.authchallenge.TestAuthChallengeResponse |test.unit.response.protocolinfo.TestProtocolInfoResponse |test.unit.response.mapaddress.TestMapAddressResponse +|test.unit.client.types.TestClientTypes |test.unit.client.cell.TestCell |test.unit.connection.authentication.TestAuthenticate |test.unit.connection.connect.TestConnect diff --git a/test/unit/client/__init__.py b/test/unit/client/__init__.py index f5b82e7e..fdc7a0c6 100644 --- a/test/unit/client/__init__.py +++ b/test/unit/client/__init__.py @@ -4,6 +4,7 @@ Unit tests for stem.client.* contents. __all__ = [ 'cell', + 'types', ] import os diff --git a/test/unit/client/types.py b/test/unit/client/types.py new file mode 100644 index 00000000..fdf4e085 --- /dev/null +++ b/test/unit/client/types.py @@ -0,0 +1,19 @@ +""" +Unit tests for the types in stem.client. +""" + +import unittest + +from stem.client import Address + + +class TestClientTypes(unittest.TestCase): + def test_address_ipv4(self): + addr, content = Address.pop('\x04\x04\x7f\x00\x00\x01\x01\x04\x04aq\x0f\x02\x00\x00\x00\x00') + self.assertEqual('q\x0f\x02\x00\x00\x00\x00', content) + + self.assertEqual('IPv4', addr.type) + self.assertEqual(4, addr.type_int) + self.assertEqual('127.0.0.1', addr.value) + self.assertEqual('\x7f\x00\x00\x01', addr.value_bin) + self.assertEqual(17040481, addr.ttl)

1 0

[stem/master] Size unit tests
by atagar＠torproject.org 21 Jan '18

21 Jan '18

commit 6a0789d367283ed5e64ab7082e76c9b9d811838b Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jan 16 11:49:04 2018 -0800 Size unit tests Adding unit test coverage for our Size class. This has been exercised transitively by our other tests, but direct tests of our lower level types still help. These actually caught a surprising number of issues with regard to the exceptions we raise. --- stem/client/__init__.py | 17 ++++++++++------- test/unit/client/types.py | 43 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 52 insertions(+), 8 deletions(-) diff --git a/stem/client/__init__.py b/stem/client/__init__.py index d15f0aa4..defa09fa 100644 --- a/stem/client/__init__.py +++ b/stem/client/__init__.py @@ -147,17 +147,20 @@ class Size(object): """ Encodes bytes into a packed field. - :param bytes content: content to encode + :param int content: content to encode - :raises: **ValueError** if content isn't of the right size + :raises: **ValueError** if incorrect type or size """ - unpacked = struct.pack(self.format, content) + if not isinstance(content, int): + raise ValueError('Size.pack encodes an integer, but was a %s' % type(content).__name__) + + packed = struct.pack(self.format, content) - if self.size != len(unpacked): - raise ValueError("'%s' is the wrong size for a %s field" % (unpacked, self.name)) + if self.size != len(packed): + raise ValueError('%s is the wrong size for a %s field' % (repr(packed), self.name)) - return unpacked + return packed def unpack(self, content): """ @@ -169,7 +172,7 @@ class Size(object): """ if self.size != len(content): - raise ValueError("'%s' is the wrong size for a %s field" % (content, self.name)) + raise ValueError('%s is the wrong size for a %s field' % (repr(content), self.name)) return struct.unpack(self.format, content)[0] diff --git a/test/unit/client/types.py b/test/unit/client/types.py index a85a0b8d..a4d69a19 100644 --- a/test/unit/client/types.py +++ b/test/unit/client/types.py @@ -2,9 +2,10 @@ Unit tests for the types in stem.client. """ +import re import unittest -from stem.client import Address +from stem.client import Address, Size class TestClientTypes(unittest.TestCase): @@ -16,3 +17,43 @@ class TestClientTypes(unittest.TestCase): self.assertEqual(4, addr.type_int) self.assertEqual('127.0.0.1', addr.value) self.assertEqual('\x7f\x00\x00\x01', addr.value_bin) + + def test_size_attributes(self): + self.assertEqual('CHAR', Size.CHAR.name) + self.assertEqual('!B', Size.CHAR.format) + + self.assertEqual(1, Size.CHAR.size) + self.assertEqual(2, Size.SHORT.size) + self.assertEqual(4, Size.LONG.size) + self.assertEqual(8, Size.LONG_LONG.size) + + def test_size_pack(self): + self.assertEqual('\x12', Size.CHAR.pack(18)) + self.assertEqual('\x00\x12', Size.SHORT.pack(18)) + self.assertEqual('\x00\x00\x00\x12', Size.LONG.pack(18)) + self.assertEqual('\x00\x00\x00\x00\x00\x00\x00\x12', Size.LONG_LONG.pack(18)) + + self.assertRaisesRegexp(ValueError, 'Size.pack encodes an integer, but was a str', Size.CHAR.pack, 'hi') + + bad_size = Size('BAD_SIZE', 1, '!H') + self.assertRaisesRegexp(ValueError, re.escape("'\\x00\\x12' is the wrong size for a BAD_SIZE field"), bad_size.pack, 18) + + def test_size_unpack(self): + self.assertEqual(18, Size.CHAR.unpack('\x12')) + self.assertEqual(18, Size.SHORT.unpack('\x00\x12')) + self.assertEqual(18, Size.LONG.unpack('\x00\x00\x00\x12')) + self.assertEqual(18, Size.LONG_LONG.unpack('\x00\x00\x00\x00\x00\x00\x00\x12')) + + self.assertEqual(ord('a'), Size.CHAR.unpack('a')) + self.assertEqual(24930, Size.SHORT.unpack('ab')) + + self.assertRaisesRegexp(ValueError, re.escape("'\\x00\\x12' is the wrong size for a CHAR field"), Size.CHAR.unpack, '\x00\x12') + + def test_size_pop(self): + self.assertEqual((18, ''), Size.CHAR.pop('\x12')) + + self.assertEqual((0, '\x12'), Size.CHAR.pop('\x00\x12')) + self.assertEqual((18, ''), Size.SHORT.pop('\x00\x12')) + + self.assertRaisesRegexp(ValueError, "'' is the wrong size for a CHAR field", Size.CHAR.pop, '') + self.assertRaisesRegexp(ValueError, re.escape("'\\x12' is the wrong size for a SHORT field"), Size.SHORT.pop, '\x12')

1 0

[stem/master] Alias for splitting bytes
by atagar＠torproject.org 21 Jan '18

21 Jan '18

commit 4d5fe240b2db05ba8b640183bd85ff122fde3e8c Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jan 17 08:15:47 2018 -0800 Alias for splitting bytes We do quite a bit of splitting bytes into substrings. Adding a little alias for it. --- stem/client/__init__.py | 19 ++++++++++++++++++- stem/client/cell.py | 10 ++++------ 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/stem/client/__init__.py b/stem/client/__init__.py index 3b38f8bb..9ad790a8 100644 --- a/stem/client/__init__.py +++ b/stem/client/__init__.py @@ -61,6 +61,19 @@ ADDR_INT = { } +def split(content, size): + """ + Simple split of bytes into two substrings. + + :param bytes content: string to split + :param int size: index to split the string on + + :returns: two value tuple with the split bytes + """ + + return content[:size], content[size:] + + class Size(object): """ Unsigned `struct.pack format @@ -107,6 +120,8 @@ class Size(object): :param bytes content: content to encode + :returns: **int** with the unpacked value + :raises: **ValueError** if packed data isn't of the right size """ @@ -122,6 +137,8 @@ class Size(object): :param bytes content: content to encode + :returns: tuple of the form (unpacked, remainder) + :raises: **ValueError** if packed data isn't of the right size """ @@ -180,7 +197,7 @@ class Address(collections.namedtuple('Address', ['type', 'type_int', 'value', 'v # TODO: add support for other address types - address_bin, content = content[:addr_length], content[addr_length:] + address_bin, content = split(content, addr_length) address = None if addr_type == AddrType.IPv4 and len(address_bin) == 4: diff --git a/stem/client/cell.py b/stem/client/cell.py index bc44298f..332e3f16 100644 --- a/stem/client/cell.py +++ b/stem/client/cell.py @@ -44,7 +44,7 @@ import random import sys from stem import UNDEFINED -from stem.client import ZERO, Address, Certificate, Size +from stem.client import ZERO, Address, Certificate, Size, split from stem.util import _hash_attr, datetime_to_unix FIXED_PAYLOAD_LEN = 509 @@ -119,9 +119,7 @@ class Cell(object): if len(content) < payload_len: raise ValueError('%s cell should have a payload of %i bytes, but only had %i' % (cls.NAME, payload_len, len(content))) - payload = content[:payload_len] - content = content[payload_len:] - + payload, content = split(content, payload_len) return cls._unpack(payload, link_version, circ_id), content @classmethod @@ -516,7 +514,7 @@ class CertsCell(Cell): if cert_size > len(content): raise ValueError('CERTS cell should have a certificate with %i bytes, but only had %i remaining' % (cert_size, len(content))) - cert_bytes, content = content[:cert_size], content[cert_size:] + cert_bytes, content = split(content, cert_size) certs.append(Certificate(cert_type, cert_bytes)) return CertsCell(certs) @@ -573,7 +571,7 @@ class AuthChallengeCell(Cell): if len(content) < AUTH_CHALLENGE_SIZE + 2: raise ValueError('AUTH_CHALLENGE payload should be at least 34 bytes, but was %i' % len(content)) - challenge, content = content[:AUTH_CHALLENGE_SIZE], content[AUTH_CHALLENGE_SIZE:] + challenge, content = split(content, AUTH_CHALLENGE_SIZE) method_count, content = Size.SHORT.pop(content) if len(content) < method_count * 2:

1 0

[stem/master] Add IPv6 address support
by atagar＠torproject.org 21 Jan '18

21 Jan '18

commit 94a86b974e2d7fe4728675ee94d43bded78e4706 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 20 12:05:13 2018 -0800 Add IPv6 address support I'm a tad uncomfortable since I lack actual tor data to exercise this on, but taking my best stab. --- stem/client/__init__.py | 10 +++++++++- test/unit/client/address.py | 7 +++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/stem/client/__init__.py b/stem/client/__init__.py index 217e32af..b0da7aae 100644 --- a/stem/client/__init__.py +++ b/stem/client/__init__.py @@ -256,7 +256,15 @@ class Address(Field): self.value = '.'.join([str(Size.CHAR.unpack(value[i])) for i in range(4)]) self.value_bin = value elif self.type == AddrType.IPv6: - self.value, self.value_bin = None, None # TODO: implement + if stem.util.connection.is_valid_ipv6_address(value): + self.value = stem.util.connection.expand_ipv6_address(value).lower() + self.value_bin = ''.join([Size.SHORT.pack(int(v, 16)) for v in self.value.split(':')]) + else: + if len(value) != 16: + raise ValueError('Packed IPv6 addresses should be sixteen bytes, but was: %s' % repr(value)) + + self.value = ':'.join(['%04x' % Size.SHORT.unpack(value[i * 2:(i + 1) * 2]) for i in range(8)]) + self.value_bin = value else: self.value, self.value_bin = None, None # TODO: implement diff --git a/test/unit/client/address.py b/test/unit/client/address.py index 9e6430ff..689b77a0 100644 --- a/test/unit/client/address.py +++ b/test/unit/client/address.py @@ -3,6 +3,7 @@ Unit tests for stem.client.Address. """ import collections +import re import unittest from stem.client import AddrType, Address @@ -15,8 +16,11 @@ class TestAddress(unittest.TestCase): test_data = ( ((4, '\x7f\x00\x00\x01'), ExpectedAddress(AddrType.IPv4, 4, '127.0.0.1', '\x7f\x00\x00\x01')), ((4, 'aq\x0f\x02'), ExpectedAddress(AddrType.IPv4, 4, '97.113.15.2', 'aq\x0f\x02')), + ((6, ' \x01\r\xb8\x00\x00\x00\x00\x00\x00\xff\x00\x00B\x83)'), ExpectedAddress(AddrType.IPv6, 6, '2001:0db8:0000:0000:0000:ff00:0042:8329', ' \x01\r\xb8\x00\x00\x00\x00\x00\x00\xff\x00\x00B\x83)')), ((AddrType.IPv4, '127.0.0.1'), ExpectedAddress(AddrType.IPv4, 4, '127.0.0.1', '\x7f\x00\x00\x01')), ((AddrType.IPv4, '97.113.15.2'), ExpectedAddress(AddrType.IPv4, 4, '97.113.15.2', 'aq\x0f\x02')), + ((AddrType.IPv6, '2001:0db8:0000:0000:0000:ff00:0042:8329'), ExpectedAddress(AddrType.IPv6, 6, '2001:0db8:0000:0000:0000:ff00:0042:8329', ' \x01\r\xb8\x00\x00\x00\x00\x00\x00\xff\x00\x00B\x83)')), + ((AddrType.IPv6, '2001:0DB8:AC10:FE01::'), ExpectedAddress(AddrType.IPv6, 6, '2001:0db8:ac10:fe01:0000:0000:0000:0000', ' \x01\r\xb8\xac\x10\xfe\x01\x00\x00\x00\x00\x00\x00\x00\x00')), # collaped and different case ) for (addr_type, addr_value), expected in test_data: @@ -26,6 +30,9 @@ class TestAddress(unittest.TestCase): self.assertEqual(expected.value, addr.value) self.assertEqual(expected.value_bin, addr.value_bin) + self.assertRaisesRegexp(ValueError, re.escape("Packed IPv4 addresses should be four bytes, but was: '\\x7f\\x00'"), Address, 4, '\x7f\x00') + self.assertRaisesRegexp(ValueError, re.escape("Packed IPv6 addresses should be sixteen bytes, but was: '\\x7f\\x00'"), Address, 6, '\x7f\x00') + def test_pop_ipv4(self): addr, content = Address.pop('\x04\x04\x7f\x00\x00\x01\x01\x04\x04aq\x0f\x02\x00\x00\x00\x00') self.assertEqual('\x01\x04\x04aq\x0f\x02\x00\x00\x00\x00', content)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits January 2018