January 2018 - tor-commits - lists.torproject.org

[stem/master] Replace Pack enum with a Size class
by atagar＠torproject.org 21 Jan '18

21 Jan '18

commit a615cf7bc392337cc4353885ab64530abeae3dcc Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jan 11 11:56:32 2018 -0800 Replace Pack enum with a Size class Swapping our enum with the class so it can both pack and unpack. --- stem/client/__init__.py | 72 ++++++++++++++++++++++++++++++++++++++++--------- stem/client/cell.py | 11 ++++---- 2 files changed, 65 insertions(+), 18 deletions(-) diff --git a/stem/client/__init__.py b/stem/client/__init__.py … [View More]index 21786835..d0920778 100644 --- a/stem/client/__init__.py +++ b/stem/client/__init__.py @@ -28,29 +28,77 @@ a wrapper for :class:`~stem.socket.RelaySocket`, much the same way as :: - Relay - Connection with a relay's ORPort. + Size - Packable and unpackable field size. + |- pack - encodes content + |- unpack - decodes content + +- pop - decodes content with remainder """ -from stem.util import enum +import struct ZERO = '\x00' - __all__ = [ 'cell', ] -class Relay(object): +class Size(object): """ - Connection with a `Tor relay's ORPort - <https://gitweb.torproject.org/torspec.git/tree/tor-spec.txt>`_. + Unsigned `struct.pack format + <https://docs.python.org/2/library/struct.html#format-characters>` for + network-order fields. """ + def __init__(self, name, size, pack_format): + self.name = name + self.size = size + self.format = pack_format + + def pack(self, content): + """ + Encodes bytes into a packed field. + + :param bytes content: content to encode + + :raises: **ValueError** if content isn't of the right size + """ + + unpacked = struct.pack(self.format, content) + + if self.size != len(unpacked): + raise ValueError("'%s' is the wrong size for a %s field" % (unpacked, self.name)) + + return unpacked + + def unpack(self, content): + """ + Decodes packed data into bytes. + + :param bytes content: content to encode + + :raises: **ValueError** if packed data isn't of the right size + """ + + if self.size != len(content): + raise ValueError("'%s' is the wrong size for a %s field" % (content, self.name)) + + return struct.unpack(self.format, content)[0] + + def pop(self, content): + """ + Decodes the first characters as this data type, providing it and the + remainder. + + :param bytes content: content to encode + + :raises: **ValueError** if packed data isn't of the right size + """ + + return self.unpack(content[:self.size]), content[self.size:] + -Pack = enum.Enum( - ('CHAR', '!B'), # 1 byte - ('SHORT', '!H'), # 2 bytes - ('LONG', '!L'), # 4 bytes - ('LONG_LONG', '!Q'), # 8 bytes -) +setattr(Size, 'CHAR', Size('CHAR', 1, '!B')) +setattr(Size, 'SHORT', Size('SHORT', 2, '!H')) +setattr(Size, 'LONG', Size('LONG', 4, '!L')) +setattr(Size, 'LONG_LONG', Size('LONG_LONG', 8, '!Q')) diff --git a/stem/client/cell.py b/stem/client/cell.py index 7c680c4e..42fe87e1 100644 --- a/stem/client/cell.py +++ b/stem/client/cell.py @@ -38,11 +38,10 @@ Messages communicated over a Tor relay's ORPort. import collections import inspect -import struct import sys from stem import UNDEFINED -from stem.client import ZERO, Pack +from stem.client import ZERO, Size class Cell(collections.namedtuple('Cell', ['name', 'value', 'fixed_size', 'for_circuit'])): @@ -124,9 +123,9 @@ class Cell(collections.namedtuple('Cell', ['name', 'value', 'fixed_size', 'for_c :raise: **ValueError** if cell type invalid or payload is too large """ - packed_circ_id = struct.pack(Pack.LONG if link_version > 3 else Pack.SHORT, circ_id) - packed_command = struct.pack(Pack.CHAR, cls.VALUE) - packed_size = b'' if cls.IS_FIXED_SIZE else struct.pack(Pack.SHORT, len(payload)) + 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)) # pad fixed sized cells to the required length @@ -249,7 +248,7 @@ class VersionsCell(Cell): # Used for link version negotiation so we don't have that yet. This is fine # since VERSION cells avoid most version dependent attributes. - payload = b''.join([struct.pack(Pack.SHORT, v) for v in versions]) + payload = b''.join([Size.SHORT.pack(v) for v in versions]) return cls._pack(3, payload) [View Less]

1 0

[stem/master] Stub an unpack function
by atagar＠torproject.org 21 Jan '18

21 Jan '18

commit e6afab70873d58aea34944f5180940b82fb37c7c Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jan 10 11:46:08 2018 -0800 Stub an unpack function --- stem/client/cell.py | 56 +++++++++++++++++++++++++++++++++++++----------- test/unit/client/cell.py | 3 +++ 2 files changed, 46 insertions(+), 13 deletions(-) diff --git a/stem/client/cell.py b/stem/client/cell.py index 15adceae..7c680c4e 100644 --- a/stem/client/cell.py +++ b/stem/client/cell.py @@ -22,15 +22,15 @… [View More]@ Messages communicated over a Tor relay's ORPort. | |- Create2Cell - Extended CREATE cell. (section 5.1) | +- Created2Cell - Extended CREATED cell. (section 5.1) | - |- PaddingCell - Padding negotiation. (section 7.2) - |- VersionsCell - Negotiate proto version. (section 4) - |- NetinfoCell - Time and address info. (section 4.5) - |- PaddingNegotiateCell - Padding negotiation. (section 7.2) - |- VPaddingCell - Variable-length padding. (section 7.2) - |- CertsCell - Relay certificates. (section 4.2) - |- AuthChallengeCell - Challenge value. (section 4.3) - |- AuthenticateCell - Client authentication. (section 4.5) - |- AuthorizeCell - Client authorization. (not yet used) + |- PaddingCell - Padding negotiation. (section 7.2) + |- VersionsCell - Negotiate proto version. (section 4) + |- NetinfoCell - Time and address info. (section 4.5) + |- PaddingNegotiateCell - Padding negotiation. (section 7.2) + |- VPaddingCell - Variable-length padding. (section 7.2) + |- CertsCell - Relay certificates. (section 4.2) + |- AuthChallengeCell - Challenge value. (section 4.3) + |- AuthenticateCell - Client authentication. (section 4.5) + |- AuthorizeCell - Client authorization. (not yet used) | |- pack - Provides encoded bytes for this cell class. +- unpack - Decodes bytes for this cell class. @@ -93,6 +93,22 @@ class Cell(collections.namedtuple('Cell', ['name', 'value', 'fixed_size', 'for_c raise ValueError("'%s' isn't a valid cell value" % value) + @staticmethod + def unpack(content): + """ + Unpacks encoded bytes into a Cell subclass. + + :param bytes content: payload to decode + + :returns: :class:`~stem.client.cell.Cell` subclass + + :raises: + * ValueError if content is malformed + * NotImplementedError if unable to unpack this cell type + """ + + return AuthorizeCell._unpack(content) + @classmethod def _pack(cls, link_version, payload, circ_id = 0): """ @@ -103,9 +119,9 @@ class Cell(collections.namedtuple('Cell', ['name', 'value', 'fixed_size', 'for_c :param bytes payload: cell payload :param int circ_id: circuit id, if a CircuitCell - :raise: **ValueError** if... - * cell type or circuit id is invalid - * payload is too large + :return: **bytes** with the encoded payload + + :raise: **ValueError** if cell type invalid or payload is too large """ packed_circ_id = struct.pack(Pack.LONG if link_version > 3 else Pack.SHORT, circ_id) @@ -125,6 +141,20 @@ class Cell(collections.namedtuple('Cell', ['name', 'value', 'fixed_size', 'for_c return cell + @classmethod + def _unpack(cls, content): + """ + Subclass implementation for unpacking cell content. + + :param bytes content: payload to decode + + :returns: instance of this cell type + + :raises: **ValueError** if content is malformed + """ + + raise NotImplementedError('Unpacking not yet implemented for %s cells' % cls.NAME) + class CircuitCell(Cell): """ @@ -141,7 +171,7 @@ class CircuitCell(Cell): :param bytes payload: cell payload :param int circ_id: circuit id - :raise: **ValueError** if cell type is invalid or payload is too large + :raise: **ValueError** if cell type invalid or payload is too large """ if circ_id is None and cls.NAME.startswith('CREATE'): diff --git a/test/unit/client/cell.py b/test/unit/client/cell.py index b688d9e5..1335a77c 100644 --- a/test/unit/client/cell.py +++ b/test/unit/client/cell.py @@ -28,6 +28,9 @@ class TestCell(unittest.TestCase): self.assertRaises(ValueError, Cell.by_value, 85) self.assertRaises(ValueError, Cell.by_value, None) + def test_unpack_not_implemented(self): + self.assertRaisesRegexp(NotImplementedError, 'Unpacking not yet implemented for AUTHORIZE cells', Cell.unpack, 'boom') + 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])) [View Less]

1 0

[stem/master] Provide classes from by_name and by_value
by atagar＠torproject.org 21 Jan '18

21 Jan '18

commit 53fd66a3fb21f5dcf946da3264ac0b206f2c0bbc Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jan 9 12:09:41 2018 -0800 Provide classes from by_name and by_value Now that attributes are included as class constants we can swap these functions to provide them. This drops our pack unit test since you can no longer call it on the base Pack class. We'll add a test for the VersionCell pack method instead. --- stem/client/cell.py | 80 +++++++++++++++… [View More]++++++++------------------------- test/unit/client/cell.py | 34 ++++++-------------- 2 files changed, 48 insertions(+), 66 deletions(-) diff --git a/stem/client/cell.py b/stem/client/cell.py index f1917805..9a6e6788 100644 --- a/stem/client/cell.py +++ b/stem/client/cell.py @@ -40,12 +40,9 @@ class Cell(collections.namedtuple('Cell', ['name', 'value', 'fixed_size', 'for_c :raise: **ValueError** if cell type is invalid """ - if name == 'NETINFO': - return NetinfoCell - - for cell_type in CELL_TYPES: - if name == cell_type.name: - return cell_type + for cls in CELL_TYPES: + if name == cls.NAME: + return cls raise ValueError("'%s' isn't a valid cell type" % name) @@ -59,14 +56,14 @@ class Cell(collections.namedtuple('Cell', ['name', 'value', 'fixed_size', 'for_c :raise: **ValueError** if cell type is invalid """ - for cell_type in CELL_TYPES: - if value == cell_type.value: - return cell_type + for cls in CELL_TYPES: + if value == cls.VALUE: + return cls raise ValueError("'%s' isn't a valid cell value" % value) - @staticmethod - def pack(name, link_version, payload, circ_id = None): + @classmethod + def _pack(cls, link_version, payload, circ_id = None): """ Provides bytes that can be used on the wire for these cell attributes. @@ -80,35 +77,34 @@ class Cell(collections.namedtuple('Cell', ['name', 'value', 'fixed_size', 'for_c * payload is too large """ - attr = Cell.by_name(name) circ_id_len = Pack.LONG if link_version > 3 else Pack.SHORT - if attr.for_circuit and circ_id is None: - if name.startswith('CREATE'): + if cls.IS_FOR_CIRCUIT and circ_id is None: + if cls.NAME.startswith('CREATE'): # Since we're initiating the circuit we pick any value from a range # that's determined by our link version. circ_id = 0x80000000 if link_version > 3 else 0x01 else: - raise ValueError('%s cells require a circ_id' % name) - elif not attr.for_circuit: + raise ValueError('%s cells require a circ_id' % cls.NAME) + elif not cls.IS_FOR_CIRCUIT: if circ_id: - raise ValueError("%s cells don't concern circuits, circ_id is unused" % name) + raise ValueError("%s cells don't concern circuits, circ_id is unused" % cls.NAME) circ_id = 0 # field is still mandatory for all cells packed_circ_id = struct.pack(circ_id_len, circ_id) - packed_command = struct.pack(Pack.CHAR, attr.value) - packed_size = b'' if attr.fixed_size else struct.pack(Pack.SHORT, len(payload)) + packed_command = struct.pack(Pack.CHAR, cls.VALUE) + packed_size = b'' if cls.IS_FIXED_SIZE else struct.pack(Pack.SHORT, len(payload)) cell = b''.join((packed_circ_id, packed_command, packed_size, payload)) # pad fixed sized cells to the required length - if attr.fixed_size: + if cls.IS_FIXED_SIZE: 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' % (name, 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)) cell += ZERO * (fixed_cell_len - len(cell)) @@ -174,8 +170,8 @@ class VersionsCell(Cell): IS_FIXED_SIZE = False IS_FOR_CIRCUIT = False - @staticmethod - def pack(versions): + @classmethod + def pack(cls, versions): """ Provides the payload for a series of link versions. @@ -188,7 +184,7 @@ class VersionsCell(Cell): # since VERSION cells avoid most version dependent attributes. payload = b''.join([struct.pack(Pack.SHORT, v) for v in versions]) - return Cell.pack('VERSIONS', 3, payload) + return cls._pack('VERSIONS', 3, payload) class NetinfoCell(Cell): @@ -262,22 +258,22 @@ class AuthorizeCell(Cell): CELL_TYPES = ( - Cell('PADDING', 0, True, False), # Padding (section 7.2) - Cell('CREATE', 1, True, True), # Create a circuit (section 5.1) - Cell('CREATED', 2, True, True), # Acknowledge create (section 5.1) - Cell('RELAY', 3, True, True), # End-to-end data (section 5.5 and 6) - Cell('DESTROY', 4, True, True), # Stop using a circuit (section 5.4) - Cell('CREATE_FAST', 5, True, True), # Create a circuit, no PK (section 5.1) - Cell('CREATED_FAST', 6, True, True), # Circuit created, no PK (section 5.1) - Cell('VERSIONS', 7, False, False), # Negotiate proto version (section 4) - Cell('NETINFO', 8, True, False), # Time and address info (section 4.5) - Cell('RELAY_EARLY', 9, True, True), # End-to-end data; limited (section 5.6) - Cell('CREATE2', 10, True, True), # Extended CREATE cell (section 5.1) - Cell('CREATED2', 11, True, True), # Extended CREATED cell (section 5.1) - Cell('PADDING_NEGOTIATE', 12, True, False), # Padding negotiation (section 7.2) - Cell('VPADDING', 128, False, False), # Variable-length padding (section 7.2) - Cell('CERTS', 129, False, False), # Certificates (section 4.2) - Cell('AUTH_CHALLENGE', 130, False, False), # Challenge value (section 4.3) - Cell('AUTHENTICATE', 131, False, False), # Client authentication (section 4.5) - Cell('AUTHORIZE', 132, False, False), # Client authorization (not yet used) + PaddingCell, # Padding (section 7.2) + CreateCell, # Create a circuit (section 5.1) + CreatedCell, # Acknowledge create (section 5.1) + RelayCell, # End-to-end data (section 5.5 and 6) + DestroyCell, # Stop using a circuit (section 5.4) + CreateFastCell, # Create a circuit, no PK (section 5.1) + CreatedFastCell, # Circuit created, no PK (section 5.1) + VersionsCell, # Negotiate proto version (section 4) + NetinfoCell, # Time and address info (section 4.5) + RelayEarlyCell, # End-to-end data; limited (section 5.6) + Create2Cell, # Extended CREATE cell (section 5.1) + Created2Cell, # Extended CREATED cell (section 5.1) + PaddingNegotiateCell, # Padding negotiation (section 7.2) + VPaddingCell, # Variable-length padding (section 7.2) + CertsCell, # Certificates (section 4.2) + AuthChallengeCell, # Challenge value (section 4.3) + AuthenticateCell, # Client authentication (section 4.5) + AuthorizeCell, # Client authorization (not yet used) ) diff --git a/test/unit/client/cell.py b/test/unit/client/cell.py index 8a461aba..188fd773 100644 --- a/test/unit/client/cell.py +++ b/test/unit/client/cell.py @@ -2,44 +2,30 @@ Unit tests for the stem.client.cell. """ -import struct import unittest -from stem.client import Pack from stem.client.cell import Cell class TestCell(unittest.TestCase): def test_by_name(self): - cell = Cell.by_name('NETINFO') - self.assertEqual('NETINFO', cell.NAME) - self.assertEqual(8, cell.VALUE) - self.assertEqual(True, cell.IS_FIXED_SIZE) - self.assertEqual(False, cell.IS_FOR_CIRCUIT) + cls = Cell.by_name('NETINFO') + self.assertEqual('NETINFO', cls.NAME) + self.assertEqual(8, cls.VALUE) + self.assertEqual(True, cls.IS_FIXED_SIZE) + self.assertEqual(False, cls.IS_FOR_CIRCUIT) self.assertRaises(ValueError, Cell.by_name, 'NOPE') self.assertRaises(ValueError, Cell.by_name, 85) self.assertRaises(ValueError, Cell.by_name, None) def test_by_value(self): - cell = Cell.by_value(8) - self.assertEqual('NETINFO', cell.name) - self.assertEqual(8, cell.value) - self.assertEqual(True, cell.fixed_size) - self.assertEqual(False, cell.for_circuit) + cls = Cell.by_value(8) + self.assertEqual('NETINFO', cls.NAME) + self.assertEqual(8, cls.VALUE) + self.assertEqual(True, cls.IS_FIXED_SIZE) + self.assertEqual(False, cls.IS_FOR_CIRCUIT) self.assertRaises(ValueError, Cell.by_value, 'NOPE') self.assertRaises(ValueError, Cell.by_value, 85) self.assertRaises(ValueError, Cell.by_value, None) - - def test_pack(self): - version_payload = struct.pack(Pack.SHORT, 2) - - # basic link v2 and v4 VERSIONS cell - - self.assertEqual('\x00\x00\x07\x00\x02\x00\x02', Cell.pack('VERSIONS', 2, version_payload)) - self.assertEqual('\x00\x00\x00\x00\x07\x00\x02\x00\x02', Cell.pack('VERSIONS', 4, version_payload)) - - self.assertRaisesRegexp(ValueError, "'NOPE' isn't a valid cell type", Cell.pack, 'NOPE', 2, version_payload) - self.assertRaisesRegexp(ValueError, "VERSIONS cells don't concern circuits, circ_id is unused", Cell.pack, 'VERSIONS', 2, version_payload, circ_id = 5) - self.assertRaisesRegexp(ValueError, 'RELAY_EARLY cells require a circ_id', Cell.pack, 'RELAY_EARLY', 2, version_payload) [View Less]

1 0

[stem/master] Stub class constants for cell attributes
by atagar＠torproject.org 21 Jan '18

21 Jan '18

commit b3ede37e0aa4910fb0fad78ed4d8d8e5796fab7b Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jan 8 11:56:07 2018 -0800 Stub class constants for cell attributes Stem's Event subclsses do a similar pattern. Think this will make things cleaner... --- stem/client/cell.py | 14 ++++++++++++++ test/unit/client/cell.py | 8 ++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/stem/client/cell.py b/stem/client/cell.py index 5cd23c0e..… [View More]

1 0

[stem/master] Combine version cell packing tests
by atagar＠torproject.org 21 Jan '18

21 Jan '18

commit 947bb7644b63b15a824d1b197933eb4ce809ba0c Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 14 11:02:46 2018 -0800 Combine version cell packing tests While expanding our pack test to confirm we can unpack cells we ourselves make I realized that the unpack test was actually excercising the exact same thing with the same data. Might as well merge the tests. --- test/unit/client/cell.py | 25 +++++++++++-------------- 1 file changed, 11 insertions(+… [View More]

1 0

[stem/master] Split stem.client.cell into its own module
by atagar＠torproject.org 21 Jan '18

21 Jan '18

commit 9b5c6bf74e3d6bc7a718d84c9d24e07bac460f0d Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jan 8 11:42:46 2018 -0800 Split stem.client.cell into its own module --- stem/client/__init__.py | 141 +---------------------------- stem/client/cell.py | 151 ++++++++++++++++++++++++++++++++ test/settings.cfg | 2 +- test/unit/client/__init__.py | 7 ++ test/unit/{client.py => client/cell.py} | 13 … [View More]+-- 5 files changed, 169 insertions(+), 145 deletions(-) diff --git a/stem/client/__init__.py b/stem/client/__init__.py index a0288f52..21786835 100644 --- a/stem/client/__init__.py +++ b/stem/client/__init__.py @@ -31,128 +31,14 @@ a wrapper for :class:`~stem.socket.RelaySocket`, much the same way as Relay - Connection with a relay's ORPort. """ -import collections -import struct - from stem.util import enum ZERO = '\x00' -class Cell(collections.namedtuple('Cell', ['name', 'value', 'fixed_size', 'for_circuit'])): - """ - Metadata for ORPort cells. - - :var str name: command of the cell - :var int value: integer value of the command on the wire - :var bool fixed_size: **True** if cells have a fixed length, - **False** if variable - :var bool for_circuit: **True** if command is for a circuit, - **False** otherwise - """ - - @staticmethod - def by_name(name): - """ - Provides cell attributes by its name. - - :parm str name: cell command to fetch - - :raise: **ValueError** if cell type is invalid - """ - - for cell_type in CELL_TYPES: - if name == cell_type.name: - return cell_type - - raise ValueError("'%s' isn't a valid cell type" % name) - - @staticmethod - def by_value(value): - """ - Provides cell attributes by its value. - - :parm int value: cell value to fetch - - :raise: **ValueError** if cell type is invalid - """ - - for cell_type in CELL_TYPES: - if value == cell_type.value: - return cell_type - - raise ValueError("'%s' isn't a valid cell value" % value) - - @staticmethod - def pack(name, link_version, payload, circ_id = None): - """ - Provides bytes that can be used on the wire for these cell attributes. - - :param str name: cell command - :param int link_version: link protocol version - :param bytes payload: cell payload - :param int circ_id: circuit id, if for a circuit - - :raise: **ValueError** if... - * cell type or circuit id is invalid - * payload is too large - """ - - attr = Cell.by_name(name) - circ_id_len = Pack.LONG if link_version > 3 else Pack.SHORT - - if attr.for_circuit and circ_id is None: - if name.startswith('CREATE'): - # Since we're initiating the circuit we pick any value from a range - # that's determined by our link version. - - circ_id = 0x80000000 if link_version > 3 else 0x01 - else: - raise ValueError('%s cells require a circ_id' % name) - elif not attr.for_circuit: - if circ_id: - raise ValueError("%s cells don't concern circuits, circ_id is unused" % name) - - circ_id = 0 # field is still mandatory for all cells - - packed_circ_id = struct.pack(circ_id_len, circ_id) - packed_command = struct.pack(Pack.CHAR, attr.value) - packed_size = b'' if attr.fixed_size else struct.pack(Pack.SHORT, len(payload)) - cell = b''.join((packed_circ_id, packed_command, packed_size, payload)) - - # pad fixed sized cells to the required length - - if attr.fixed_size: - 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' % (name, len(cell), fixed_cell_len)) - - cell += ZERO * (fixed_cell_len - len(cell)) - - return cell - - -class VersionCell(Cell): - """ - Link version negotiation cell. - """ - - @staticmethod - def pack(versions): - """ - Provides the payload for a series of link versions. - - :param list versions: link versions to serialize - - :returns: **bytes** with a payload for these versions - """ - - # Used for link version negotiation so we don't have that yet. This is fine - # since VERSION cells avoid most version dependent attributes. - - payload = b''.join([struct.pack(Pack.SHORT, v) for v in versions]) - return Cell.pack('VERSIONS', 3, payload) +__all__ = [ + 'cell', +] class Relay(object): @@ -168,24 +54,3 @@ Pack = enum.Enum( ('LONG', '!L'), # 4 bytes ('LONG_LONG', '!Q'), # 8 bytes ) - -CELL_TYPES = ( - Cell('PADDING', 0, True, False), # Padding (section 7.2) - Cell('CREATE', 1, True, True), # Create a circuit (section 5.1) - Cell('CREATED', 2, True, True), # Acknowledge create (section 5.1) - Cell('RELAY', 3, True, True), # End-to-end data (section 5.5 and 6) - Cell('DESTROY', 4, True, True), # Stop using a circuit (section 5.4) - Cell('CREATE_FAST', 5, True, True), # Create a circuit, no PK (section 5.1) - Cell('CREATED_FAST', 6, True, True), # Circuit created, no PK (section 5.1) - Cell('VERSIONS', 7, False, False), # Negotiate proto version (section 4) - Cell('NETINFO', 8, True, False), # Time and address info (section 4.5) - Cell('RELAY_EARLY', 9, True, True), # End-to-end data; limited (section 5.6) - Cell('CREATE2', 10, True, True), # Extended CREATE cell (section 5.1) - Cell('CREATED2', 11, True, True), # Extended CREATED cell (section 5.1) - Cell('PADDING_NEGOTIATE', 12, True, False), # Padding negotiation (section 7.2) - Cell('VPADDING', 128, False, False), # Variable-length padding (section 7.2) - Cell('CERTS', 129, False, False), # Certificates (section 4.2) - Cell('AUTH_CHALLENGE', 130, False, False), # Challenge value (section 4.3) - Cell('AUTHENTICATE', 131, False, False), # Client authentication (section 4.5) - Cell('AUTHORIZE', 132, False, False), # Client authorization (not yet used) -) diff --git a/stem/client/cell.py b/stem/client/cell.py new file mode 100644 index 00000000..5cd23c0e --- /dev/null +++ b/stem/client/cell.py @@ -0,0 +1,151 @@ +# Copyright 2018, Damian Johnson and The Tor Project +# See LICENSE for licensing information + +""" +Messages communicated over a Tor relay's ORPort. + +.. versionadded:: 1.7.0 +""" + +import collections +import struct + +from stem.client import ZERO, Pack + + +class Cell(collections.namedtuple('Cell', ['name', 'value', 'fixed_size', 'for_circuit'])): + """ + Metadata for ORPort cells. + + :var str name: command of the cell + :var int value: integer value of the command on the wire + :var bool fixed_size: **True** if cells have a fixed length, + **False** if variable + :var bool for_circuit: **True** if command is for a circuit, + **False** otherwise + """ + + @staticmethod + def by_name(name): + """ + Provides cell attributes by its name. + + :parm str name: cell command to fetch + + :raise: **ValueError** if cell type is invalid + """ + + for cell_type in CELL_TYPES: + if name == cell_type.name: + return cell_type + + raise ValueError("'%s' isn't a valid cell type" % name) + + @staticmethod + def by_value(value): + """ + Provides cell attributes by its value. + + :parm int value: cell value to fetch + + :raise: **ValueError** if cell type is invalid + """ + + for cell_type in CELL_TYPES: + if value == cell_type.value: + return cell_type + + raise ValueError("'%s' isn't a valid cell value" % value) + + @staticmethod + def pack(name, link_version, payload, circ_id = None): + """ + Provides bytes that can be used on the wire for these cell attributes. + + :param str name: cell command + :param int link_version: link protocol version + :param bytes payload: cell payload + :param int circ_id: circuit id, if for a circuit + + :raise: **ValueError** if... + * cell type or circuit id is invalid + * payload is too large + """ + + attr = Cell.by_name(name) + circ_id_len = Pack.LONG if link_version > 3 else Pack.SHORT + + if attr.for_circuit and circ_id is None: + if name.startswith('CREATE'): + # Since we're initiating the circuit we pick any value from a range + # that's determined by our link version. + + circ_id = 0x80000000 if link_version > 3 else 0x01 + else: + raise ValueError('%s cells require a circ_id' % name) + elif not attr.for_circuit: + if circ_id: + raise ValueError("%s cells don't concern circuits, circ_id is unused" % name) + + circ_id = 0 # field is still mandatory for all cells + + packed_circ_id = struct.pack(circ_id_len, circ_id) + packed_command = struct.pack(Pack.CHAR, attr.value) + packed_size = b'' if attr.fixed_size else struct.pack(Pack.SHORT, len(payload)) + cell = b''.join((packed_circ_id, packed_command, packed_size, payload)) + + # pad fixed sized cells to the required length + + if attr.fixed_size: + 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' % (name, len(cell), fixed_cell_len)) + + cell += ZERO * (fixed_cell_len - len(cell)) + + return cell + + +class VersionCell(Cell): + """ + Link version negotiation cell. + """ + + @staticmethod + def pack(versions): + """ + Provides the payload for a series of link versions. + + :param list versions: link versions to serialize + + :returns: **bytes** with a payload for these versions + """ + + # Used for link version negotiation so we don't have that yet. This is fine + # since VERSION cells avoid most version dependent attributes. + + payload = b''.join([struct.pack(Pack.SHORT, v) for v in versions]) + return Cell.pack('VERSIONS', 3, payload) + + +CELL_TYPES = ( + Cell('PADDING', 0, True, False), # Padding (section 7.2) + Cell('CREATE', 1, True, True), # Create a circuit (section 5.1) + Cell('CREATED', 2, True, True), # Acknowledge create (section 5.1) + Cell('RELAY', 3, True, True), # End-to-end data (section 5.5 and 6) + Cell('DESTROY', 4, True, True), # Stop using a circuit (section 5.4) + Cell('CREATE_FAST', 5, True, True), # Create a circuit, no PK (section 5.1) + Cell('CREATED_FAST', 6, True, True), # Circuit created, no PK (section 5.1) + Cell('VERSIONS', 7, False, False), # Negotiate proto version (section 4) + Cell('NETINFO', 8, True, False), # Time and address info (section 4.5) + Cell('RELAY_EARLY', 9, True, True), # End-to-end data; limited (section 5.6) + Cell('CREATE2', 10, True, True), # Extended CREATE cell (section 5.1) + Cell('CREATED2', 11, True, True), # Extended CREATED cell (section 5.1) + Cell('PADDING_NEGOTIATE', 12, True, False), # Padding negotiation (section 7.2) + Cell('VPADDING', 128, False, False), # Variable-length padding (section 7.2) + Cell('CERTS', 129, False, False), # Certificates (section 4.2) + Cell('AUTH_CHALLENGE', 130, False, False), # Challenge value (section 4.3) + Cell('AUTHENTICATE', 131, False, False), # Client authentication (section 4.5) + Cell('AUTHORIZE', 132, False, False), # Client authorization (not yet used) +) diff --git a/test/settings.cfg b/test/settings.cfg index 501dff9c..b4b125a8 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -229,7 +229,7 @@ test.unit_tests |test.unit.response.authchallenge.TestAuthChallengeResponse |test.unit.response.protocolinfo.TestProtocolInfoResponse |test.unit.response.mapaddress.TestMapAddressResponse -|test.unit.client.TestClient +|test.unit.client.cell.TestCell |test.unit.connection.authentication.TestAuthenticate |test.unit.connection.connect.TestConnect |test.unit.control.controller.TestControl diff --git a/test/unit/client/__init__.py b/test/unit/client/__init__.py new file mode 100644 index 00000000..e35416a8 --- /dev/null +++ b/test/unit/client/__init__.py @@ -0,0 +1,7 @@ +""" +Unit tests for stem.client.* contents. +""" + +__all__ = [ + 'cell', +] diff --git a/test/unit/client.py b/test/unit/client/cell.py similarity index 87% rename from test/unit/client.py rename to test/unit/client/cell.py index 6faa3e8e..8093b8d9 100644 --- a/test/unit/client.py +++ b/test/unit/client/cell.py @@ -1,15 +1,16 @@ """ -Unit tests for the stem.client. +Unit tests for the stem.client.cell. """ import struct import unittest -from stem.client import Pack, Cell +from stem.client import Pack +from stem.client.cell import Cell -class TestClient(unittest.TestCase): - def test_cell_by_name(self): +class TestCell(unittest.TestCase): + def test_by_name(self): cell = Cell.by_name('NETINFO') self.assertEqual('NETINFO', cell.name) self.assertEqual(8, cell.value) @@ -20,7 +21,7 @@ class TestClient(unittest.TestCase): self.assertRaises(ValueError, Cell.by_name, 85) self.assertRaises(ValueError, Cell.by_name, None) - def test_cell_by_value(self): + def test_by_value(self): cell = Cell.by_value(8) self.assertEqual('NETINFO', cell.name) self.assertEqual(8, cell.value) @@ -31,7 +32,7 @@ class TestClient(unittest.TestCase): self.assertRaises(ValueError, Cell.by_value, 85) self.assertRaises(ValueError, Cell.by_value, None) - def test_cell_pack(self): + def test_pack(self): version_payload = struct.pack(Pack.SHORT, 2) # basic link v2 and v4 VERSIONS cell [View Less]

1 0

[stem/master] Dynamically fetch cell types
by atagar＠torproject.org 21 Jan '18

21 Jan '18

commit 34e6195e30ab1089a0570f934081636ad91fad9e Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jan 10 11:30:14 2018 -0800 Dynamically fetch cell types No need for a big static listing. We can simply iterate over the stuff in our module. --- stem/client/cell.py | 35 ++++++++--------------------------- 1 file changed, 8 insertions(+), 27 deletions(-) diff --git a/stem/client/cell.py b/stem/client/cell.py index ec95fe50..15adceae 100644 --- a/stem/client/… [View More]

1 0

[stem/master] Replace IS_FOR_CIRCUIT with CircuitCell class
by atagar＠torproject.org 21 Jan '18

21 Jan '18

commit 73078881ad4ad0908f85915fa6142322a1d86774 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jan 10 10:34:54 2018 -0800 Replace IS_FOR_CIRCUIT with CircuitCell class Adding an intermediate class for the family of cells that concern circuits, rather than a class attribute. --- stem/client/cell.py | 86 ++++++++++++++++++++++-------------------------- test/unit/client/cell.py | 2 -- 2 files changed, 40 insertions(+), 48 deletions(-) diff --git a/… [View More]stem/client/cell.py b/stem/client/cell.py index e3fb6a71..1f70b685 100644 --- a/stem/client/cell.py +++ b/stem/client/cell.py @@ -28,7 +28,6 @@ class Cell(collections.namedtuple('Cell', ['name', 'value', 'fixed_size', 'for_c NAME = 'UNKNOWN' VALUE = -1 IS_FIXED_SIZE = False - IS_FOR_CIRCUIT = False @staticmethod def by_name(name): @@ -63,37 +62,21 @@ class Cell(collections.namedtuple('Cell', ['name', 'value', 'fixed_size', 'for_c raise ValueError("'%s' isn't a valid cell value" % value) @classmethod - def _pack(cls, link_version, payload, circ_id = None): + def _pack(cls, link_version, payload, circ_id = 0): """ Provides bytes that can be used on the wire for these cell attributes. :param str name: cell command :param int link_version: link protocol version :param bytes payload: cell payload - :param int circ_id: circuit id, if for a circuit + :param int circ_id: circuit id, if a CircuitCell :raise: **ValueError** if... * cell type or circuit id is invalid * payload is too large """ - circ_id_len = Pack.LONG if link_version > 3 else Pack.SHORT - - if cls.IS_FOR_CIRCUIT and circ_id is None: - if cls.NAME.startswith('CREATE'): - # Since we're initiating the circuit we pick any value from a range - # that's determined by our link version. - - circ_id = 0x80000000 if link_version > 3 else 0x01 - else: - raise ValueError('%s cells require a circ_id' % cls.NAME) - elif not cls.IS_FOR_CIRCUIT: - if circ_id: - raise ValueError("%s cells don't concern circuits, circ_id is unused" % cls.NAME) - - circ_id = 0 # field is still mandatory for all cells - - packed_circ_id = struct.pack(circ_id_len, circ_id) + packed_circ_id = struct.pack(Pack.LONG if link_version > 3 else Pack.SHORT, circ_id) packed_command = struct.pack(Pack.CHAR, cls.VALUE) packed_size = b'' if cls.IS_FIXED_SIZE else struct.pack(Pack.SHORT, len(payload)) cell = b''.join((packed_circ_id, packed_command, packed_size, payload)) @@ -111,53 +94,75 @@ class Cell(collections.namedtuple('Cell', ['name', 'value', 'fixed_size', 'for_c return cell +class CircuitCell(Cell): + """ + Cell concerning circuits. + """ + + @classmethod + def _pack(cls, link_version, payload, circ_id): + """ + Provides bytes that can be used on the wire for these cell attributes. + + :param str name: cell command + :param int link_version: link protocol version + :param bytes payload: cell payload + :param int circ_id: circuit id + + :raise: **ValueError** if cell type is invalid or payload is too large + """ + + if circ_id is None and cls.NAME.startswith('CREATE'): + # Since we're initiating the circuit we pick any value from a range + # that's determined by our link version. + + circ_id = 0x80000000 if link_version > 3 else 0x01 + else: + raise ValueError('%s cells require a circ_id' % cls.NAME) + + return Cell._pack(link_version, payload, circ_id) + + class PaddingCell(Cell): NAME = 'PADDING' VALUE = 0 IS_FIXED_SIZE = True - IS_FOR_CIRCUIT = False -class CreateCell(Cell): +class CreateCell(CircuitCell): NAME = 'CREATE' VALUE = 1 IS_FIXED_SIZE = True - IS_FOR_CIRCUIT = True -class CreatedCell(Cell): +class CreatedCell(CircuitCell): NAME = 'CREATED' VALUE = 2 IS_FIXED_SIZE = True - IS_FOR_CIRCUIT = True -class RelayCell(Cell): +class RelayCell(CircuitCell): NAME = 'RELAY' VALUE = 3 IS_FIXED_SIZE = True - IS_FOR_CIRCUIT = True -class DestroyCell(Cell): +class DestroyCell(CircuitCell): NAME = 'DESTROY' VALUE = 4 IS_FIXED_SIZE = True - IS_FOR_CIRCUIT = True -class CreateFastCell(Cell): +class CreateFastCell(CircuitCell): NAME = 'CREATE_FAST' VALUE = 5 IS_FIXED_SIZE = True - IS_FOR_CIRCUIT = True -class CreatedFastCell(Cell): +class CreatedFastCell(CircuitCell): NAME = 'CREATED_FAST' VALUE = 6 IS_FIXED_SIZE = True - IS_FOR_CIRCUIT = True class VersionsCell(Cell): @@ -168,7 +173,6 @@ class VersionsCell(Cell): NAME = 'VERSIONS' VALUE = 7 IS_FIXED_SIZE = False - IS_FOR_CIRCUIT = False @classmethod def pack(cls, versions): @@ -191,70 +195,60 @@ class NetinfoCell(Cell): NAME = 'NETINFO' VALUE = 8 IS_FIXED_SIZE = True - IS_FOR_CIRCUIT = False -class RelayEarlyCell(Cell): +class RelayEarlyCell(CircuitCell): NAME = 'RELAY_EARLY' VALUE = 9 IS_FIXED_SIZE = True - IS_FOR_CIRCUIT = True -class Create2Cell(Cell): +class Create2Cell(CircuitCell): NAME = 'CREATE2' VALUE = 10 IS_FIXED_SIZE = True - IS_FOR_CIRCUIT = True class Created2Cell(Cell): NAME = 'CREATED2' VALUE = 11 IS_FIXED_SIZE = True - IS_FOR_CIRCUIT = False class PaddingNegotiateCell(Cell): NAME = 'PADDING_NEGOTIATE' VALUE = 12 IS_FIXED_SIZE = True - IS_FOR_CIRCUIT = False class VPaddingCell(Cell): NAME = 'VPADDING' VALUE = 128 IS_FIXED_SIZE = False - IS_FOR_CIRCUIT = False class CertsCell(Cell): NAME = 'CERTS' VALUE = 129 IS_FIXED_SIZE = False - IS_FOR_CIRCUIT = False class AuthChallengeCell(Cell): NAME = 'AUTH_CHALLENGE' VALUE = 130 IS_FIXED_SIZE = False - IS_FOR_CIRCUIT = False class AuthenticateCell(Cell): NAME = 'AUTHENTICATE' VALUE = 131 IS_FIXED_SIZE = False - IS_FOR_CIRCUIT = False class AuthorizeCell(Cell): NAME = 'AUTHORIZE' VALUE = 132 IS_FIXED_SIZE = False - IS_FOR_CIRCUIT = False CELL_TYPES = ( diff --git a/test/unit/client/cell.py b/test/unit/client/cell.py index c8161a7e..b688d9e5 100644 --- a/test/unit/client/cell.py +++ b/test/unit/client/cell.py @@ -13,7 +13,6 @@ class TestCell(unittest.TestCase): self.assertEqual('NETINFO', cls.NAME) self.assertEqual(8, cls.VALUE) self.assertEqual(True, cls.IS_FIXED_SIZE) - self.assertEqual(False, cls.IS_FOR_CIRCUIT) self.assertRaises(ValueError, Cell.by_name, 'NOPE') self.assertRaises(ValueError, Cell.by_name, 85) @@ -24,7 +23,6 @@ class TestCell(unittest.TestCase): self.assertEqual('NETINFO', cls.NAME) self.assertEqual(8, cls.VALUE) self.assertEqual(True, cls.IS_FIXED_SIZE) - self.assertEqual(False, cls.IS_FOR_CIRCUIT) self.assertRaises(ValueError, Cell.by_value, 'NOPE') self.assertRaises(ValueError, Cell.by_value, 85) [View Less]

1 0

[stem/master] Unpack cell header
by atagar＠torproject.org 21 Jan '18

21 Jan '18

commit 4e07952399317df4f3250db162165b55fd94ada4 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jan 11 12:07:49 2018 -0800 Unpack cell header Just unpacking enough to know which class unpack function for us to defer to. --- stem/client/cell.py | 11 ++++++++--- test/unit/client/cell.py | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/stem/client/cell.py b/stem/client/cell.py index 42fe87e1..7a1644b3 100644 --- a/stem/client/cell.py ++… [View More]+ b/stem/client/cell.py @@ -93,11 +93,12 @@ class Cell(collections.namedtuple('Cell', ['name', 'value', 'fixed_size', 'for_c raise ValueError("'%s' isn't a valid cell value" % value) @staticmethod - def unpack(content): + def unpack(content, link_version): """ Unpacks encoded bytes into a Cell subclass. :param bytes content: payload to decode + :param int link_version: link protocol version :returns: :class:`~stem.client.cell.Cell` subclass @@ -106,7 +107,9 @@ class Cell(collections.namedtuple('Cell', ['name', 'value', 'fixed_size', 'for_c * NotImplementedError if unable to unpack this cell type """ - return AuthorizeCell._unpack(content) + circ_id, content = Size.LONG.pop(content) if link_version > 3 else Size.SHORT.pop(content) + command, content = Size.CHAR.pop(content) + return Cell.by_value(command)._unpack(content, link_version, circ_id) @classmethod def _pack(cls, link_version, payload, circ_id = 0): @@ -141,11 +144,13 @@ class Cell(collections.namedtuple('Cell', ['name', 'value', 'fixed_size', 'for_c return cell @classmethod - def _unpack(cls, content): + def _unpack(cls, content, circ_id, link_version): """ Subclass implementation for unpacking cell content. :param bytes content: payload to decode + :param int link_version: link protocol version + :param int circ_id: circuit id cell is for :returns: instance of this cell type diff --git a/test/unit/client/cell.py b/test/unit/client/cell.py index 1335a77c..857cab84 100644 --- a/test/unit/client/cell.py +++ b/test/unit/client/cell.py @@ -29,7 +29,7 @@ class TestCell(unittest.TestCase): self.assertRaises(ValueError, Cell.by_value, None) def test_unpack_not_implemented(self): - self.assertRaisesRegexp(NotImplementedError, 'Unpacking not yet implemented for AUTHORIZE cells', Cell.unpack, 'boom') + 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_versions_pack(self): self.assertEqual('\x00\x00\x07\x00\x00', VersionsCell.pack([])) [View Less]

1 0

[stem/master] Support CERTS cell packing
by atagar＠torproject.org 21 Jan '18

21 Jan '18

commit 9c5e228ef67f7f6dc71a927296c973fd5bcb8960 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 14 11:08:48 2018 -0800 Support CERTS cell packing --- stem/client/cell.py | 24 +++++++++++++++++++++++- test/unit/client/cell.py | 28 ++++++++++++++-------------- 2 files changed, 37 insertions(+), 15 deletions(-) diff --git a/stem/client/cell.py b/stem/client/cell.py index e3793491..73c1c8f2 100644 --- a/stem/client/cell.py +++ b/stem/client/cell.py @@ -37,6 +37,… [View More]7 @@ Messages communicated over a Tor relay's ORPort. """ import inspect +import io import sys from stem import UNDEFINED @@ -278,7 +279,7 @@ class VersionsCell(Cell): # since VERSION cells avoid most version dependent attributes. payload = b''.join([Size.SHORT.pack(v) for v in versions]) - return cls._pack(3, payload) + return cls._pack(2, payload) @classmethod def _unpack(cls, content, circ_id, link_version): @@ -342,6 +343,27 @@ class CertsCell(Cell): self.certificates = certs @classmethod + def pack(cls, certs, link_version): + """ + Provides the payload for a series of certificates. + + :param list certs: series of :class:`~stem.client.Certificate` for the cell + :param int link_version: link protocol version + + :returns: **bytes** with a payload for these versions + """ + + payload = io.BytesIO() + payload.write(Size.CHAR.pack(len(certs))) + + for cert in certs: + payload.write(Size.CHAR.pack(cert.type)) + payload.write(Size.SHORT.pack(len(cert.value))) + payload.write(cert.value) + + return cls._pack(link_version, payload.getvalue()) + + @classmethod def _unpack(cls, content, circ_id, link_version): cert_count, content = Size.CHAR.pop(content) certs = [] diff --git a/test/unit/client/cell.py b/test/unit/client/cell.py index 40b09d95..b26549e2 100644 --- a/test/unit/client/cell.py +++ b/test/unit/client/cell.py @@ -5,7 +5,7 @@ Unit tests for the stem.client.cell. import unittest from stem.client import Certificate -from stem.client.cell import Cell, VersionsCell +from stem.client.cell import Cell, VersionsCell, CertsCell from test.unit.client import test_data VERSIONS_CELLS = { @@ -14,6 +14,12 @@ VERSIONS_CELLS = { '\x00\x00\x07\x00\x06\x00\x01\x00\x02\x00\x03': [1, 2, 3], } +CERTS_CELLS = { + '\x00\x00\x81\x00\x01\x00': [], + '\x00\x00\x81\x00\x04\x01\x01\x00\x00': [Certificate(type = 1, value = '')], + '\x00\x00\x81\x00\x05\x01\x01\x00\x01\x08': [Certificate(type = 1, value = '\x08')], +} + class TestCell(unittest.TestCase): def test_by_name(self): @@ -45,19 +51,13 @@ class TestCell(unittest.TestCase): def test_versions_packing(self): for cell_bytes, versions in VERSIONS_CELLS.items(): - packed = VersionsCell.pack(versions) - self.assertEqual(cell_bytes, packed) - self.assertEqual(versions, Cell.unpack(packed, 2)[0].versions) - - def test_certs_unpack(self): - test_data = { - '\x00\x00\x81\x00\x01\x00': [], - '\x00\x00\x81\x00\x04\x01\x01\x00\x00': [Certificate(type = 1, value = '')], - '\x00\x00\x81\x00\x05\x01\x01\x00\x01\x08': [Certificate(type = 1, value = '\x08')], - } - - for cell_bytes, expected in test_data.items(): - self.assertEqual(expected, Cell.unpack(cell_bytes, 2)[0].certificates) + self.assertEqual(cell_bytes, VersionsCell.pack(versions)) + self.assertEqual(versions, Cell.unpack(cell_bytes, 2)[0].versions) + + def test_certs_packing(self): + for cell_bytes, certs in CERTS_CELLS.items(): + self.assertEqual(cell_bytes, CertsCell.pack(certs, 2)) + self.assertEqual(certs, Cell.unpack(cell_bytes, 2)[0].certificates) # extra bytes after the last certificate should be ignored [View Less]

1 0