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

[stem/master] Add dannenberg's ipv6 endpoint
by atagar＠torproject.org 12 Jul '18

12 Jul '18

commit 7c6a2856d0c7d05ebe0e71716e3e599c5c3182e2 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jul 11 10:48:51 2018 -0700 Add dannenberg's ipv6 endpoint Newish change in tor's dirauth configuration. --- stem/directory.py | 1 + 1 file changed, 1 insertion(+) diff --git a/stem/directory.py b/stem/directory.py index afbc39c3..ba0ef702 100644 --- a/stem/directory.py +++ b/stem/directory.py @@ -609,6 +609,7 @@ DIRECTORY_AUTHORITIES = { address = '193.23.244.244', or_port = 443, dir_port = 80, + orport_v6 = ('2001:678:558:1000::244', 443), fingerprint = '7BE683E65D48141321C5ED92F075C55364AC7123', v3ident = '0232AF901C31A04EE9848595AF9BB7620D4C5B2E', ),

1 0

[stem/master] Add Cell tests for repacking to the same bytes as unpacked from
by atagar＠torproject.org 12 Jul '18

12 Jul '18

commit 15b71235d7151465047afbe10b010bd0d82cb917 Author: Dave Rolek <dmr-x(a)riseup.net> Date: Mon Jul 9 18:34:03 2018 +0000 Add Cell tests for repacking to the same bytes as unpacked from Add TODOs for a few areas that don't have this structure yet. NOTE: this fails for DestroyCell, whose tests actually have non-ZERO 'unused' portions. (The implementation for fixing #26766 comes in a later commit.) --- test/unit/client/cell.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/test/unit/client/cell.py b/test/unit/client/cell.py index 36abc77c..c273798a 100644 --- a/test/unit/client/cell.py +++ b/test/unit/client/cell.py @@ -179,6 +179,8 @@ class TestCell(unittest.TestCase): self.assertEqual(cell_bytes, PaddingCell(payload).pack(2)) self.assertEqual(payload, Cell.pop(cell_bytes, 2)[0].payload) + # TODO: unpack, repack + def test_relay_cell(self): for cell_bytes, (command, command_int, circ_id, stream_id, data, digest) in RELAY_CELLS.items(): self.assertEqual(cell_bytes, RelayCell(circ_id, command, data, digest, stream_id).pack(2)) @@ -192,6 +194,7 @@ class TestCell(unittest.TestCase): self.assertEqual(digest, cell.digest) self.assertEqual(stream_id, cell.stream_id) self.assertEqual(ZERO * (498 - len(cell.data)), cell.unused) + self.assertEqual(cell_bytes, cell.pack(2)) digest = hashlib.sha1(b'hi') self.assertEqual(3257622417, RelayCell(5, 'RELAY_BEGIN_DIR', '', digest, 564346860).digest) @@ -227,6 +230,7 @@ class TestCell(unittest.TestCase): self.assertEqual(reason, cell.reason) self.assertEqual(reason_int, cell.reason_int) self.assertEqual(unused, cell.unused) + self.assertEqual(cell_bytes, cell.pack(5)) def test_create_fast_cell(self): for cell_bytes, (circ_id, key_material) in CREATE_FAST_CELLS.items(): @@ -236,6 +240,7 @@ class TestCell(unittest.TestCase): self.assertEqual(circ_id, cell.circ_id) self.assertEqual(key_material, cell.key_material) self.assertEqual(ZERO * 489, cell.unused) + self.assertEqual(cell_bytes, cell.pack(5)) self.assertRaisesRegexp(ValueError, 'Key material should be 20 bytes, but was 3', CreateFastCell, 5, 'boo') @@ -248,6 +253,7 @@ class TestCell(unittest.TestCase): self.assertEqual(key_material, cell.key_material) self.assertEqual(derivative_key, cell.derivative_key) self.assertEqual(ZERO * 469, cell.unused) + self.assertEqual(cell_bytes, cell.pack(5)) self.assertRaisesRegexp(ValueError, 'Key material should be 20 bytes, but was 3', CreateFastCell, 5, 'boo') @@ -256,6 +262,8 @@ class TestCell(unittest.TestCase): self.assertEqual(cell_bytes, VersionsCell(versions).pack(link_protocol)) self.assertEqual(versions, Cell.pop(cell_bytes, link_protocol)[0].versions) + # TODO: unpack, repack + def test_netinfo_cell(self): for cell_bytes, (timestamp, receiver_address, sender_addresses) in NETINFO_CELLS.items(): self.assertEqual(cell_bytes, NetinfoCell(receiver_address, sender_addresses, timestamp).pack(2)) @@ -265,12 +273,15 @@ class TestCell(unittest.TestCase): self.assertEqual(receiver_address, cell.receiver_address) self.assertEqual(sender_addresses, cell.sender_addresses) self.assertEqual(ZERO * 492, cell.unused) + self.assertEqual(cell_bytes, cell.pack(2)) def test_vpadding_cell(self): for cell_bytes, payload in VPADDING_CELLS.items(): self.assertEqual(cell_bytes, VPaddingCell(payload = payload).pack(2)) self.assertEqual(payload, Cell.pop(cell_bytes, 2)[0].payload) + # TODO: unpack, repack + empty_constructed_cell = VPaddingCell(size = 0) self.assertEqual(VPADDING_CELL_EMPTY_PACKED, empty_constructed_cell.pack(2)) self.assertEqual(b'', empty_constructed_cell.payload) @@ -284,6 +295,8 @@ class TestCell(unittest.TestCase): self.assertEqual(cell_bytes, CertsCell(certs).pack(2)) self.assertEqual(certs, Cell.pop(cell_bytes, 2)[0].certificates) + # TODO: unpack, repack + # extra bytes after the last certificate should be ignored self.assertEqual([Certificate(1, '\x08')], Cell.pop(b'\x00\x00\x81\x00\x07\x01\x01\x00\x01\x08\x06\x04', 2)[0].certificates) @@ -301,6 +314,7 @@ class TestCell(unittest.TestCase): self.assertEqual(challenge, cell.challenge) self.assertEqual(methods, cell.methods) self.assertEqual(b'', cell.unused) + self.assertEqual(cell_bytes, cell.pack(2)) self.assertRaisesRegexp(ValueError, 'AUTH_CHALLENGE cell should have a payload of 38 bytes, but only had 16', Cell.pop, b'\x00\x00\x82\x00&' + CHALLENGE[:10] + b'\x00\x02\x00\x01\x00\x03', 2) self.assertRaisesRegexp(ValueError, 'AUTH_CHALLENGE should have 3 methods, but only had 4 bytes for it', Cell.pop, b'\x00\x00\x82\x00&' + CHALLENGE + b'\x00\x03\x00\x01\x00\x03', 2)

1 0

[stem/master] Add note and tests for Cell types that always have empty unused content
by atagar＠torproject.org 12 Jul '18

12 Jul '18

commit dc7be2c5faa9675279a3e9da263f2975e78ef762 Author: Dave Rolek <dmr-x(a)riseup.net> Date: Mon Jul 9 19:24:26 2018 +0000 Add note and tests for Cell types that always have empty unused content --- stem/client/cell.py | 5 +++++ test/unit/client/cell.py | 3 +++ 2 files changed, 8 insertions(+) diff --git a/stem/client/cell.py b/stem/client/cell.py index d04c387e..948201fd 100644 --- a/stem/client/cell.py +++ b/stem/client/cell.py @@ -80,6 +80,11 @@ class Cell(object): Unused padding are **not** used in equality checks or hashing. If two cells differ only in their *unused* attribute they are functionally equal. + The following cell types explicitly don't have *unused* content: + * PaddingCell (we consider all content part of payload) + * VersionsCell (all content is unpacked and treated as a version specification) + * VPaddingCell (we consider all content part of payload) + :var bytes unused: unused filler that padded the cell to the expected size """ diff --git a/test/unit/client/cell.py b/test/unit/client/cell.py index bf2b9275..c7eb6f00 100644 --- a/test/unit/client/cell.py +++ b/test/unit/client/cell.py @@ -180,6 +180,7 @@ class TestCell(unittest.TestCase): cell = Cell.pop(cell_bytes, 2)[0] self.assertEqual(payload, cell.payload) + self.assertEqual(b'', cell.unused) # always empty self.assertEqual(cell_bytes, cell.pack(2)) def test_relay_cell(self): @@ -264,6 +265,7 @@ class TestCell(unittest.TestCase): cell = Cell.pop(cell_bytes, link_protocol)[0] self.assertEqual(versions, cell.versions) + self.assertEqual(b'', cell.unused) # always empty self.assertEqual(cell_bytes, cell.pack(link_protocol)) def test_netinfo_cell(self): @@ -283,6 +285,7 @@ class TestCell(unittest.TestCase): cell = Cell.pop(cell_bytes, 2)[0] self.assertEqual(payload, cell.payload) + self.assertEqual(b'', cell.unused) # always empty self.assertEqual(cell_bytes, cell.pack(2)) empty_constructed_cell = VPaddingCell(size = 0)

1 0

[stem/master] Refactor link_protocol in test loops into test data (i.e. not hardcoded magic numbers)
by atagar＠torproject.org 12 Jul '18

12 Jul '18

commit ccd2294c062adbdec599509c67328d69ff90870e Author: Dave Rolek <dmr-x(a)riseup.net> Date: Mon Jul 9 19:47:52 2018 +0000 Refactor link_protocol in test loops into test data (i.e. not hardcoded magic numbers) This removes most - but not all - use of magic numbers for link_protocol values. --- test/unit/client/cell.py | 114 +++++++++++++++++++++++------------------------ 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/test/unit/client/cell.py b/test/unit/client/cell.py index c7eb6f00..b706fcd6 100644 --- a/test/unit/client/cell.py +++ b/test/unit/client/cell.py @@ -30,28 +30,28 @@ RANDOM_PAYLOAD = os.urandom(FIXED_PAYLOAD_LEN) CHALLENGE = b'\x89Y\t\x99\xb2\x1e\xd9*V\xb6\x1bn\n\x05\xd8/\xe3QH\x85\x13Z\x17\xfc\x1c\x00{\xa9\xae\x83^K' PADDING_CELLS = { - b'\x00\x00\x00' + RANDOM_PAYLOAD: RANDOM_PAYLOAD, + b'\x00\x00\x00' + RANDOM_PAYLOAD: (RANDOM_PAYLOAD, 2), } RELAY_CELLS = { - b'\x00\x01\x03\r\x00\x00\x00\x01!\xa3?\xec' + ZERO * 500: ('RELAY_BEGIN_DIR', 13, 1, 1, b'', 564346860), - b'\x00\x01\x03\x02\x00\x00\x00\x01\x15:m\xe0\x00&GET /tor/server/authority HTTP/1.0\r\n\r\n' + ZERO * 460: ('RELAY_DATA', 2, 1, 1, b'GET /tor/server/authority HTTP/1.0\r\n\r\n', 356150752), + b'\x00\x01\x03\r\x00\x00\x00\x01!\xa3?\xec' + ZERO * 500: ('RELAY_BEGIN_DIR', 13, 1, 1, b'', 564346860, 2), + b'\x00\x01\x03\x02\x00\x00\x00\x01\x15:m\xe0\x00&GET /tor/server/authority HTTP/1.0\r\n\r\n' + ZERO * 460: ('RELAY_DATA', 2, 1, 1, b'GET /tor/server/authority HTTP/1.0\r\n\r\n', 356150752, 2), } DESTROY_CELLS = { - b'\x80\x00\x00\x00\x04\x00' + ZERO * 508: (2147483648, CloseReason.NONE, 0, ZERO * 508), - b'\x80\x00\x00\x00\x04\x03' + ZERO * 508: (2147483648, CloseReason.REQUESTED, 3, ZERO * 508), - b'\x80\x00\x00\x00\x04\x01' + b'\x01' + ZERO * 507: (2147483648, CloseReason.PROTOCOL, 1, b'\x01' + ZERO * 507), + b'\x80\x00\x00\x00\x04\x00' + ZERO * 508: (2147483648, CloseReason.NONE, 0, ZERO * 508, 5), + b'\x80\x00\x00\x00\x04\x03' + ZERO * 508: (2147483648, CloseReason.REQUESTED, 3, ZERO * 508, 5), + b'\x80\x00\x00\x00\x04\x01' + b'\x01' + ZERO * 507: (2147483648, CloseReason.PROTOCOL, 1, b'\x01' + ZERO * 507, 5), } CREATE_FAST_CELLS = { - (b'\x80\x00\x00\x00\x05\x92O\x0c\xcb\xa8\xac\xfb\xc9\x7f\xd0\rz\x1a\x03u\x91\xceas\xce' + ZERO * 489): (2147483648, b'\x92O\x0c\xcb\xa8\xac\xfb\xc9\x7f\xd0\rz\x1a\x03u\x91\xceas\xce'), - (b'\x80\x00\x00\x00\x05\x92O\x0c\xcb\xa8\xac\xfb\xc9\x7f\xd0\rz\x1a\x03u\x91\xceas\x00' + ZERO * 489): (2147483648, b'\x92O\x0c\xcb\xa8\xac\xfb\xc9\x7f\xd0\rz\x1a\x03u\x91\xceas\x00'), + (b'\x80\x00\x00\x00\x05\x92O\x0c\xcb\xa8\xac\xfb\xc9\x7f\xd0\rz\x1a\x03u\x91\xceas\xce' + ZERO * 489): (2147483648, b'\x92O\x0c\xcb\xa8\xac\xfb\xc9\x7f\xd0\rz\x1a\x03u\x91\xceas\xce', 5), + (b'\x80\x00\x00\x00\x05\x92O\x0c\xcb\xa8\xac\xfb\xc9\x7f\xd0\rz\x1a\x03u\x91\xceas\x00' + ZERO * 489): (2147483648, b'\x92O\x0c\xcb\xa8\xac\xfb\xc9\x7f\xd0\rz\x1a\x03u\x91\xceas\x00', 5), } CREATED_FAST_CELLS = { - (b'\x80\x00\x00\x00\x06\x92O\x0c\xcb\xa8\xac\xfb\xc9\x7f\xd0\rz\x1a\x03u\x91\xceas\xce\x13Z\x99\xb2\x1e\xb6\x05\x85\x17\xfc\x1c\x00{\xa9\xae\x83^K\x99\xb2' + ZERO * 469): (2147483648, b'\x92O\x0c\xcb\xa8\xac\xfb\xc9\x7f\xd0\rz\x1a\x03u\x91\xceas\xce', b'\x13Z\x99\xb2\x1e\xb6\x05\x85\x17\xfc\x1c\x00{\xa9\xae\x83^K\x99\xb2'), - (b'\x80\x00\x00\x00\x06\x92O\x0c\xcb\xa8\xac\xfb\xc9\x7f\xd0\rz\x1a\x03u\x91\xceas\xce\x13Z\x99\xb2\x1e\xb6\x05\x85\x17\xfc\x1c\x00{\xa9\xae\x83^K\x99\x00' + ZERO * 469): (2147483648, b'\x92O\x0c\xcb\xa8\xac\xfb\xc9\x7f\xd0\rz\x1a\x03u\x91\xceas\xce', b'\x13Z\x99\xb2\x1e\xb6\x05\x85\x17\xfc\x1c\x00{\xa9\xae\x83^K\x99\x00'), + (b'\x80\x00\x00\x00\x06\x92O\x0c\xcb\xa8\xac\xfb\xc9\x7f\xd0\rz\x1a\x03u\x91\xceas\xce\x13Z\x99\xb2\x1e\xb6\x05\x85\x17\xfc\x1c\x00{\xa9\xae\x83^K\x99\xb2' + ZERO * 469): (2147483648, b'\x92O\x0c\xcb\xa8\xac\xfb\xc9\x7f\xd0\rz\x1a\x03u\x91\xceas\xce', b'\x13Z\x99\xb2\x1e\xb6\x05\x85\x17\xfc\x1c\x00{\xa9\xae\x83^K\x99\xb2', 5), + (b'\x80\x00\x00\x00\x06\x92O\x0c\xcb\xa8\xac\xfb\xc9\x7f\xd0\rz\x1a\x03u\x91\xceas\xce\x13Z\x99\xb2\x1e\xb6\x05\x85\x17\xfc\x1c\x00{\xa9\xae\x83^K\x99\x00' + ZERO * 469): (2147483648, b'\x92O\x0c\xcb\xa8\xac\xfb\xc9\x7f\xd0\rz\x1a\x03u\x91\xceas\xce', b'\x13Z\x99\xb2\x1e\xb6\x05\x85\x17\xfc\x1c\x00{\xa9\xae\x83^K\x99\x00', 5), } VERSIONS_CELLS = { @@ -62,26 +62,26 @@ VERSIONS_CELLS = { } NETINFO_CELLS = { - b'\x00\x00\x08ZZ\xb6\x90\x04\x04\x7f\x00\x00\x01\x01\x04\x04aq\x0f\x02' + ZERO * (FIXED_PAYLOAD_LEN - 17): (datetime.datetime(2018, 1, 14, 1, 46, 56), Address('127.0.0.1'), [Address('97.113.15.2')]), + b'\x00\x00\x08ZZ\xb6\x90\x04\x04\x7f\x00\x00\x01\x01\x04\x04aq\x0f\x02' + ZERO * (FIXED_PAYLOAD_LEN - 17): (datetime.datetime(2018, 1, 14, 1, 46, 56), Address('127.0.0.1'), [Address('97.113.15.2')], 2), } VPADDING_CELL_EMPTY_PACKED = b'\x00\x00\x80\x00\x00' VPADDING_CELLS = { - VPADDING_CELL_EMPTY_PACKED: b'', - b'\x00\x00\x80\x00\x01\x08': b'\x08', - b'\x00\x00\x80\x00\x02\x08\x11': b'\x08\x11', - b'\x00\x00\x80\x01\xfd' + RANDOM_PAYLOAD: RANDOM_PAYLOAD, + VPADDING_CELL_EMPTY_PACKED: (b'', 2), + b'\x00\x00\x80\x00\x01\x08': (b'\x08', 2), + b'\x00\x00\x80\x00\x02\x08\x11': (b'\x08\x11', 2), + b'\x00\x00\x80\x01\xfd' + RANDOM_PAYLOAD: (RANDOM_PAYLOAD, 2), } CERTS_CELLS = { - b'\x00\x00\x81\x00\x01\x00': [], - b'\x00\x00\x81\x00\x04\x01\x01\x00\x00': [Certificate(1, b'')], - b'\x00\x00\x81\x00\x05\x01\x01\x00\x01\x08': [Certificate(1, b'\x08')], + b'\x00\x00\x81\x00\x01\x00': ([], 2), + b'\x00\x00\x81\x00\x04\x01\x01\x00\x00': ([Certificate(1, b'')], 2), + b'\x00\x00\x81\x00\x05\x01\x01\x00\x01\x08': ([Certificate(1, b'\x08')], 2), } AUTH_CHALLENGE_CELLS = { - b'\x00\x00\x82\x00&' + CHALLENGE + b'\x00\x02\x00\x01\x00\x03': (CHALLENGE, [1, 3]), + b'\x00\x00\x82\x00&' + CHALLENGE + b'\x00\x02\x00\x01\x00\x03': (CHALLENGE, [1, 3], 2), } @@ -175,20 +175,20 @@ class TestCell(unittest.TestCase): self.assertEqual(b'', content) # check that we've consumed all of the bytes def test_padding_cell(self): - for cell_bytes, payload in PADDING_CELLS.items(): - self.assertEqual(cell_bytes, PaddingCell(payload).pack(2)) + for cell_bytes, (payload, link_protocol) in PADDING_CELLS.items(): + self.assertEqual(cell_bytes, PaddingCell(payload).pack(link_protocol)) - cell = Cell.pop(cell_bytes, 2)[0] + cell = Cell.pop(cell_bytes, link_protocol)[0] self.assertEqual(payload, cell.payload) self.assertEqual(b'', cell.unused) # always empty - self.assertEqual(cell_bytes, cell.pack(2)) + self.assertEqual(cell_bytes, cell.pack(link_protocol)) def test_relay_cell(self): - for cell_bytes, (command, command_int, circ_id, stream_id, data, digest) in RELAY_CELLS.items(): - self.assertEqual(cell_bytes, RelayCell(circ_id, command, data, digest, stream_id).pack(2)) - self.assertEqual(cell_bytes, RelayCell(circ_id, command_int, data, digest, stream_id).pack(2)) + for cell_bytes, (command, command_int, circ_id, stream_id, data, digest, link_protocol) in RELAY_CELLS.items(): + self.assertEqual(cell_bytes, RelayCell(circ_id, command, data, digest, stream_id).pack(link_protocol)) + self.assertEqual(cell_bytes, RelayCell(circ_id, command_int, data, digest, stream_id).pack(link_protocol)) - cell = Cell.pop(cell_bytes, 2)[0] + cell = Cell.pop(cell_bytes, link_protocol)[0] self.assertEqual(circ_id, cell.circ_id) self.assertEqual(command, cell.command) self.assertEqual(command_int, cell.command_int) @@ -196,7 +196,7 @@ class TestCell(unittest.TestCase): self.assertEqual(digest, cell.digest) self.assertEqual(stream_id, cell.stream_id) self.assertEqual(ZERO * (498 - len(cell.data)), cell.unused) - self.assertEqual(cell_bytes, cell.pack(2)) + self.assertEqual(cell_bytes, cell.pack(link_protocol)) digest = hashlib.sha1(b'hi') self.assertEqual(3257622417, RelayCell(5, 'RELAY_BEGIN_DIR', '', digest, 564346860).digest) @@ -219,43 +219,43 @@ class TestCell(unittest.TestCase): self.assertRaisesRegexp(ValueError, '^%s$' % re.escape(expected_message), Cell.pop, mismatched_data_length_bytes, 2) def test_destroy_cell(self): - for cell_bytes, (circ_id, reason, reason_int, unused) in DESTROY_CELLS.items(): + for cell_bytes, (circ_id, reason, reason_int, unused, link_protocol) in DESTROY_CELLS.items(): # Packed cells always pad with zeros, so if we're testing something with # non-zero padding then skip this check. if not unused.strip(ZERO): - self.assertEqual(cell_bytes, DestroyCell(circ_id, reason).pack(5)) - self.assertEqual(cell_bytes, DestroyCell(circ_id, reason_int).pack(5)) + self.assertEqual(cell_bytes, DestroyCell(circ_id, reason).pack(link_protocol)) + self.assertEqual(cell_bytes, DestroyCell(circ_id, reason_int).pack(link_protocol)) - cell = Cell.pop(cell_bytes, 5)[0] + cell = Cell.pop(cell_bytes, link_protocol)[0] self.assertEqual(circ_id, cell.circ_id) self.assertEqual(reason, cell.reason) self.assertEqual(reason_int, cell.reason_int) self.assertEqual(unused, cell.unused) - self.assertEqual(cell_bytes, cell.pack(5)) + self.assertEqual(cell_bytes, cell.pack(link_protocol)) def test_create_fast_cell(self): - for cell_bytes, (circ_id, key_material) in CREATE_FAST_CELLS.items(): - self.assertEqual(cell_bytes, CreateFastCell(circ_id, key_material).pack(5)) + for cell_bytes, (circ_id, key_material, link_protocol) in CREATE_FAST_CELLS.items(): + self.assertEqual(cell_bytes, CreateFastCell(circ_id, key_material).pack(link_protocol)) - cell = Cell.pop(cell_bytes, 5)[0] + cell = Cell.pop(cell_bytes, link_protocol)[0] self.assertEqual(circ_id, cell.circ_id) self.assertEqual(key_material, cell.key_material) self.assertEqual(ZERO * 489, cell.unused) - self.assertEqual(cell_bytes, cell.pack(5)) + self.assertEqual(cell_bytes, cell.pack(link_protocol)) self.assertRaisesRegexp(ValueError, 'Key material should be 20 bytes, but was 3', CreateFastCell, 5, 'boo') def test_created_fast_cell(self): - for cell_bytes, (circ_id, key_material, derivative_key) in CREATED_FAST_CELLS.items(): - self.assertEqual(cell_bytes, CreatedFastCell(circ_id, derivative_key, key_material).pack(5)) + for cell_bytes, (circ_id, key_material, derivative_key, link_protocol) in CREATED_FAST_CELLS.items(): + self.assertEqual(cell_bytes, CreatedFastCell(circ_id, derivative_key, key_material).pack(link_protocol)) - cell = Cell.pop(cell_bytes, 5)[0] + cell = Cell.pop(cell_bytes, link_protocol)[0] self.assertEqual(circ_id, cell.circ_id) self.assertEqual(key_material, cell.key_material) self.assertEqual(derivative_key, cell.derivative_key) self.assertEqual(ZERO * 469, cell.unused) - self.assertEqual(cell_bytes, cell.pack(5)) + self.assertEqual(cell_bytes, cell.pack(link_protocol)) self.assertRaisesRegexp(ValueError, 'Key material should be 20 bytes, but was 3', CreateFastCell, 5, 'boo') @@ -269,24 +269,24 @@ class TestCell(unittest.TestCase): self.assertEqual(cell_bytes, cell.pack(link_protocol)) def test_netinfo_cell(self): - for cell_bytes, (timestamp, receiver_address, sender_addresses) in NETINFO_CELLS.items(): - self.assertEqual(cell_bytes, NetinfoCell(receiver_address, sender_addresses, timestamp).pack(2)) + for cell_bytes, (timestamp, receiver_address, sender_addresses, link_protocol) in NETINFO_CELLS.items(): + self.assertEqual(cell_bytes, NetinfoCell(receiver_address, sender_addresses, timestamp).pack(link_protocol)) - cell = Cell.pop(cell_bytes, 2)[0] + cell = Cell.pop(cell_bytes, link_protocol)[0] self.assertEqual(timestamp, cell.timestamp) self.assertEqual(receiver_address, cell.receiver_address) self.assertEqual(sender_addresses, cell.sender_addresses) self.assertEqual(ZERO * 492, cell.unused) - self.assertEqual(cell_bytes, cell.pack(2)) + self.assertEqual(cell_bytes, cell.pack(link_protocol)) def test_vpadding_cell(self): - for cell_bytes, payload in VPADDING_CELLS.items(): - self.assertEqual(cell_bytes, VPaddingCell(payload = payload).pack(2)) + for cell_bytes, (payload, link_protocol) in VPADDING_CELLS.items(): + self.assertEqual(cell_bytes, VPaddingCell(payload = payload).pack(link_protocol)) - cell = Cell.pop(cell_bytes, 2)[0] + cell = Cell.pop(cell_bytes, link_protocol)[0] self.assertEqual(payload, cell.payload) self.assertEqual(b'', cell.unused) # always empty - self.assertEqual(cell_bytes, cell.pack(2)) + self.assertEqual(cell_bytes, cell.pack(link_protocol)) empty_constructed_cell = VPaddingCell(size = 0) self.assertEqual(VPADDING_CELL_EMPTY_PACKED, empty_constructed_cell.pack(2)) @@ -297,12 +297,12 @@ class TestCell(unittest.TestCase): self.assertRaisesRegexp(ValueError, re.escape('VPaddingCell constructor must specify payload or size'), VPaddingCell) def test_certs_cell(self): - for cell_bytes, certs in CERTS_CELLS.items(): - self.assertEqual(cell_bytes, CertsCell(certs).pack(2)) + for cell_bytes, (certs, link_protocol) in CERTS_CELLS.items(): + self.assertEqual(cell_bytes, CertsCell(certs).pack(link_protocol)) - cell = Cell.pop(cell_bytes, 2)[0] + cell = Cell.pop(cell_bytes, link_protocol)[0] self.assertEqual(certs, cell.certificates) - self.assertEqual(cell_bytes, cell.pack(2)) + self.assertEqual(cell_bytes, cell.pack(link_protocol)) # extra bytes after the last certificate should be ignored @@ -314,14 +314,14 @@ class TestCell(unittest.TestCase): self.assertRaisesRegexp(ValueError, 'CERTS cell indicates it should have 2 certificates, but only contained 1', Cell.pop, b'\x00\x00\x81\x00\x05\x02\x01\x00\x01\x08', 2) def test_auth_challenge_cell(self): - for cell_bytes, (challenge, methods) in AUTH_CHALLENGE_CELLS.items(): - self.assertEqual(cell_bytes, AuthChallengeCell(methods, challenge).pack(2)) + for cell_bytes, (challenge, methods, link_protocol) in AUTH_CHALLENGE_CELLS.items(): + self.assertEqual(cell_bytes, AuthChallengeCell(methods, challenge).pack(link_protocol)) - cell = Cell.pop(cell_bytes, 2)[0] + cell = Cell.pop(cell_bytes, link_protocol)[0] self.assertEqual(challenge, cell.challenge) self.assertEqual(methods, cell.methods) self.assertEqual(b'', cell.unused) - self.assertEqual(cell_bytes, cell.pack(2)) + self.assertEqual(cell_bytes, cell.pack(link_protocol)) self.assertRaisesRegexp(ValueError, 'AUTH_CHALLENGE cell should have a payload of 38 bytes, but only had 16', Cell.pop, b'\x00\x00\x82\x00&' + CHALLENGE[:10] + b'\x00\x02\x00\x01\x00\x03', 2) self.assertRaisesRegexp(ValueError, 'AUTH_CHALLENGE should have 3 methods, but only had 4 bytes for it', Cell.pop, b'\x00\x00\x82\x00&' + CHALLENGE + b'\x00\x03\x00\x01\x00\x03', 2)

1 0

[stem/master] Restructure the other test sets to add in unpack/repack tests
by atagar＠torproject.org 12 Jul '18

12 Jul '18

commit 9c931591a7ef4ffa2f82f3d7c970c2fcb584ae9a Author: Dave Rolek <dmr-x(a)riseup.net> Date: Mon Jul 9 18:53:13 2018 +0000 Restructure the other test sets to add in unpack/repack tests --- test/unit/client/cell.py | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/test/unit/client/cell.py b/test/unit/client/cell.py index c273798a..c67f4d9e 100644 --- a/test/unit/client/cell.py +++ b/test/unit/client/cell.py @@ -177,9 +177,10 @@ class TestCell(unittest.TestCase): def test_padding_cell(self): for cell_bytes, payload in PADDING_CELLS.items(): self.assertEqual(cell_bytes, PaddingCell(payload).pack(2)) - self.assertEqual(payload, Cell.pop(cell_bytes, 2)[0].payload) - # TODO: unpack, repack + cell = Cell.pop(cell_bytes, 2)[0] + self.assertEqual(payload, cell.payload) + self.assertEqual(cell_bytes, cell.pack(2)) def test_relay_cell(self): for cell_bytes, (command, command_int, circ_id, stream_id, data, digest) in RELAY_CELLS.items(): @@ -260,9 +261,10 @@ class TestCell(unittest.TestCase): def test_versions_cell(self): for cell_bytes, (versions, link_protocol) in VERSIONS_CELLS.items(): self.assertEqual(cell_bytes, VersionsCell(versions).pack(link_protocol)) - self.assertEqual(versions, Cell.pop(cell_bytes, link_protocol)[0].versions) - # TODO: unpack, repack + cell = Cell.pop(cell_bytes, link_protocol)[0] + self.assertEqual(versions, cell.versions) + self.assertEqual(cell_bytes, cell.pack(link_protocol)) def test_netinfo_cell(self): for cell_bytes, (timestamp, receiver_address, sender_addresses) in NETINFO_CELLS.items(): @@ -278,9 +280,10 @@ class TestCell(unittest.TestCase): def test_vpadding_cell(self): for cell_bytes, payload in VPADDING_CELLS.items(): self.assertEqual(cell_bytes, VPaddingCell(payload = payload).pack(2)) - self.assertEqual(payload, Cell.pop(cell_bytes, 2)[0].payload) - # TODO: unpack, repack + cell = Cell.pop(cell_bytes, 2)[0] + self.assertEqual(payload, cell.payload) + self.assertEqual(cell_bytes, cell.pack(2)) empty_constructed_cell = VPaddingCell(size = 0) self.assertEqual(VPADDING_CELL_EMPTY_PACKED, empty_constructed_cell.pack(2)) @@ -293,9 +296,10 @@ class TestCell(unittest.TestCase): def test_certs_cell(self): for cell_bytes, certs in CERTS_CELLS.items(): self.assertEqual(cell_bytes, CertsCell(certs).pack(2)) - self.assertEqual(certs, Cell.pop(cell_bytes, 2)[0].certificates) - # TODO: unpack, repack + cell = Cell.pop(cell_bytes, 2)[0] + self.assertEqual(certs, cell.certificates) + self.assertEqual(cell_bytes, cell.pack(2)) # extra bytes after the last certificate should be ignored

1 0

[stem/master] Include a cell's 'unused' portion prior to remaining padding
by atagar＠torproject.org 12 Jul '18

12 Jul '18

commit b00100d73410850d245cb1d1666829748f41ad69 Author: Dave Rolek <dmr-x(a)riseup.net> Date: Mon Jul 9 19:11:16 2018 +0000 Include a cell's 'unused' portion prior to remaining padding This fixes #26766, as well as makes the aforementioned failing DestroyCell test pass. Also change a few tests that used _pack() directly, since the parameter order changed with keyword arguments. --- stem/client/cell.py | 21 ++++++++++++--------- test/unit/client/cell.py | 6 +++--- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/stem/client/cell.py b/stem/client/cell.py index 83019621..d04c387e 100644 --- a/stem/client/cell.py +++ b/stem/client/cell.py @@ -178,7 +178,7 @@ class Cell(object): return cls._unpack(payload, circ_id, link_protocol), content @classmethod - def _pack(cls, link_protocol, payload, circ_id = None): + def _pack(cls, link_protocol, payload, unused = b'', circ_id = None): """ 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 @@ -215,9 +215,12 @@ class Cell(object): cell = bytearray() cell += link_protocol.circ_id_size.pack(circ_id) cell += Size.CHAR.pack(cls.VALUE) - cell += b'' if cls.IS_FIXED_SIZE else Size.SHORT.pack(len(payload)) + cell += b'' if cls.IS_FIXED_SIZE else Size.SHORT.pack(len(payload) + len(unused)) cell += payload + # include the unused portion (typically from unpacking) + cell += unused + # pad fixed sized cells to the required length if cls.IS_FIXED_SIZE: @@ -366,7 +369,7 @@ class RelayCell(CircuitCell): payload += Size.SHORT.pack(len(self.data)) payload += self.data - return RelayCell._pack(link_protocol, bytes(payload), self.circ_id) + return RelayCell._pack(link_protocol, bytes(payload), self.unused, self.circ_id) @classmethod def _unpack(cls, content, circ_id, link_protocol): @@ -403,7 +406,7 @@ class DestroyCell(CircuitCell): self.reason, self.reason_int = CloseReason.get(reason) def pack(self, link_protocol): - return DestroyCell._pack(link_protocol, Size.CHAR.pack(self.reason_int), self.circ_id) + return DestroyCell._pack(link_protocol, Size.CHAR.pack(self.reason_int), self.unused, self.circ_id) @classmethod def _unpack(cls, content, circ_id, link_protocol): @@ -436,7 +439,7 @@ class CreateFastCell(CircuitCell): self.key_material = key_material def pack(self, link_protocol): - return CreateFastCell._pack(link_protocol, self.key_material, self.circ_id) + return CreateFastCell._pack(link_protocol, self.key_material, self.unused, self.circ_id) @classmethod def _unpack(cls, content, circ_id, link_protocol): @@ -477,7 +480,7 @@ class CreatedFastCell(CircuitCell): self.derivative_key = derivative_key def pack(self, link_protocol): - return CreatedFastCell._pack(link_protocol, self.key_material + self.derivative_key, self.circ_id) + return CreatedFastCell._pack(link_protocol, self.key_material + self.derivative_key, self.unused, self.circ_id) @classmethod def _unpack(cls, content, circ_id, link_protocol): @@ -554,7 +557,7 @@ class NetinfoCell(Cell): for addr in self.sender_addresses: payload += addr.pack() - return NetinfoCell._pack(link_protocol, bytes(payload)) + return NetinfoCell._pack(link_protocol, bytes(payload), self.unused) @classmethod def _unpack(cls, content, circ_id, link_protocol): @@ -659,7 +662,7 @@ class CertsCell(Cell): self.certificates = certs def pack(self, link_protocol): - return CertsCell._pack(link_protocol, Size.CHAR.pack(len(self.certificates)) + b''.join([cert.pack() for cert in self.certificates])) + return CertsCell._pack(link_protocol, Size.CHAR.pack(len(self.certificates)) + b''.join([cert.pack() for cert in self.certificates]), self.unused) @classmethod def _unpack(cls, content, circ_id, link_protocol): @@ -710,7 +713,7 @@ class AuthChallengeCell(Cell): for method in self.methods: payload += Size.SHORT.pack(method) - return AuthChallengeCell._pack(link_protocol, bytes(payload)) + return AuthChallengeCell._pack(link_protocol, bytes(payload), self.unused) @classmethod def _unpack(cls, content, circ_id, link_protocol): diff --git a/test/unit/client/cell.py b/test/unit/client/cell.py index c67f4d9e..bf2b9275 100644 --- a/test/unit/client/cell.py +++ b/test/unit/client/cell.py @@ -129,15 +129,15 @@ class TestCell(unittest.TestCase): def test_circuit_id_validation(self): # only CircuitCell subclasses should provide a circ_id - self.assertRaisesRegexp(ValueError, 'PADDING cells should not specify a circuit identifier', PaddingCell._pack, 5, b'', 12) + self.assertRaisesRegexp(ValueError, 'PADDING cells should not specify a circuit identifier', PaddingCell._pack, 5, b'', circ_id = 12) # CircuitCell should validate its circ_id - self.assertRaisesRegexp(ValueError, 'RELAY cells require a circuit identifier', RelayCell._pack, 5, b'', None) + self.assertRaisesRegexp(ValueError, 'RELAY cells require a circuit identifier', RelayCell._pack, 5, b'', circ_id = None) for circ_id in (0, -1, -50): expected_msg = 'Circuit identifiers must a positive integer, not %s' % circ_id - self.assertRaisesRegexp(ValueError, expected_msg, RelayCell._pack, 5, b'', circ_id) + self.assertRaisesRegexp(ValueError, expected_msg, RelayCell._pack, 5, b'', circ_id = circ_id) def test_unpack_for_new_link(self): expected_certs = (

1 0

[stem/master] Refactor 'unused' content specified in test loops into test data
by atagar＠torproject.org 12 Jul '18

12 Jul '18

commit f248e5ee1137e2d43c832fee722668fb17aab8ac Author: Dave Rolek <dmr-x(a)riseup.net> Date: Mon Jul 9 21:55:57 2018 +0000 Refactor 'unused' content specified in test loops into test data This is in preparation to make it much easier to manage data-driven test cases for 'unused' content. --- test/unit/client/cell.py | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/test/unit/client/cell.py b/test/unit/client/cell.py index b706fcd6..ade5d407 100644 --- a/test/unit/client/cell.py +++ b/test/unit/client/cell.py @@ -34,8 +34,8 @@ PADDING_CELLS = { } RELAY_CELLS = { - b'\x00\x01\x03\r\x00\x00\x00\x01!\xa3?\xec' + ZERO * 500: ('RELAY_BEGIN_DIR', 13, 1, 1, b'', 564346860, 2), - b'\x00\x01\x03\x02\x00\x00\x00\x01\x15:m\xe0\x00&GET /tor/server/authority HTTP/1.0\r\n\r\n' + ZERO * 460: ('RELAY_DATA', 2, 1, 1, b'GET /tor/server/authority HTTP/1.0\r\n\r\n', 356150752, 2), + b'\x00\x01\x03\r\x00\x00\x00\x01!\xa3?\xec\x00\x00' + ZERO * 498: ('RELAY_BEGIN_DIR', 13, 1, 1, b'', 564346860, ZERO * 498, 2), + b'\x00\x01\x03\x02\x00\x00\x00\x01\x15:m\xe0\x00&GET /tor/server/authority HTTP/1.0\r\n\r\n' + ZERO * 460: ('RELAY_DATA', 2, 1, 1, b'GET /tor/server/authority HTTP/1.0\r\n\r\n', 356150752, ZERO * 460, 2), } DESTROY_CELLS = { @@ -45,13 +45,13 @@ DESTROY_CELLS = { } CREATE_FAST_CELLS = { - (b'\x80\x00\x00\x00\x05\x92O\x0c\xcb\xa8\xac\xfb\xc9\x7f\xd0\rz\x1a\x03u\x91\xceas\xce' + ZERO * 489): (2147483648, b'\x92O\x0c\xcb\xa8\xac\xfb\xc9\x7f\xd0\rz\x1a\x03u\x91\xceas\xce', 5), - (b'\x80\x00\x00\x00\x05\x92O\x0c\xcb\xa8\xac\xfb\xc9\x7f\xd0\rz\x1a\x03u\x91\xceas\x00' + ZERO * 489): (2147483648, b'\x92O\x0c\xcb\xa8\xac\xfb\xc9\x7f\xd0\rz\x1a\x03u\x91\xceas\x00', 5), + (b'\x80\x00\x00\x00\x05\x92O\x0c\xcb\xa8\xac\xfb\xc9\x7f\xd0\rz\x1a\x03u\x91\xceas\xce' + ZERO * 489): (2147483648, b'\x92O\x0c\xcb\xa8\xac\xfb\xc9\x7f\xd0\rz\x1a\x03u\x91\xceas\xce', ZERO * 489, 5), + (b'\x80\x00\x00\x00\x05\x92O\x0c\xcb\xa8\xac\xfb\xc9\x7f\xd0\rz\x1a\x03u\x91\xceas\x00' + ZERO * 489): (2147483648, b'\x92O\x0c\xcb\xa8\xac\xfb\xc9\x7f\xd0\rz\x1a\x03u\x91\xceas\x00', ZERO * 489, 5), } CREATED_FAST_CELLS = { - (b'\x80\x00\x00\x00\x06\x92O\x0c\xcb\xa8\xac\xfb\xc9\x7f\xd0\rz\x1a\x03u\x91\xceas\xce\x13Z\x99\xb2\x1e\xb6\x05\x85\x17\xfc\x1c\x00{\xa9\xae\x83^K\x99\xb2' + ZERO * 469): (2147483648, b'\x92O\x0c\xcb\xa8\xac\xfb\xc9\x7f\xd0\rz\x1a\x03u\x91\xceas\xce', b'\x13Z\x99\xb2\x1e\xb6\x05\x85\x17\xfc\x1c\x00{\xa9\xae\x83^K\x99\xb2', 5), - (b'\x80\x00\x00\x00\x06\x92O\x0c\xcb\xa8\xac\xfb\xc9\x7f\xd0\rz\x1a\x03u\x91\xceas\xce\x13Z\x99\xb2\x1e\xb6\x05\x85\x17\xfc\x1c\x00{\xa9\xae\x83^K\x99\x00' + ZERO * 469): (2147483648, b'\x92O\x0c\xcb\xa8\xac\xfb\xc9\x7f\xd0\rz\x1a\x03u\x91\xceas\xce', b'\x13Z\x99\xb2\x1e\xb6\x05\x85\x17\xfc\x1c\x00{\xa9\xae\x83^K\x99\x00', 5), + (b'\x80\x00\x00\x00\x06\x92O\x0c\xcb\xa8\xac\xfb\xc9\x7f\xd0\rz\x1a\x03u\x91\xceas\xce\x13Z\x99\xb2\x1e\xb6\x05\x85\x17\xfc\x1c\x00{\xa9\xae\x83^K\x99\xb2' + ZERO * 469): (2147483648, b'\x92O\x0c\xcb\xa8\xac\xfb\xc9\x7f\xd0\rz\x1a\x03u\x91\xceas\xce', b'\x13Z\x99\xb2\x1e\xb6\x05\x85\x17\xfc\x1c\x00{\xa9\xae\x83^K\x99\xb2', ZERO * 469, 5), + (b'\x80\x00\x00\x00\x06\x92O\x0c\xcb\xa8\xac\xfb\xc9\x7f\xd0\rz\x1a\x03u\x91\xceas\xce\x13Z\x99\xb2\x1e\xb6\x05\x85\x17\xfc\x1c\x00{\xa9\xae\x83^K\x99\x00' + ZERO * 469): (2147483648, b'\x92O\x0c\xcb\xa8\xac\xfb\xc9\x7f\xd0\rz\x1a\x03u\x91\xceas\xce', b'\x13Z\x99\xb2\x1e\xb6\x05\x85\x17\xfc\x1c\x00{\xa9\xae\x83^K\x99\x00', ZERO * 469, 5), } VERSIONS_CELLS = { @@ -62,7 +62,7 @@ VERSIONS_CELLS = { } NETINFO_CELLS = { - b'\x00\x00\x08ZZ\xb6\x90\x04\x04\x7f\x00\x00\x01\x01\x04\x04aq\x0f\x02' + ZERO * (FIXED_PAYLOAD_LEN - 17): (datetime.datetime(2018, 1, 14, 1, 46, 56), Address('127.0.0.1'), [Address('97.113.15.2')], 2), + b'\x00\x00\x08ZZ\xb6\x90\x04\x04\x7f\x00\x00\x01\x01\x04\x04aq\x0f\x02' + ZERO * (FIXED_PAYLOAD_LEN - 17): (datetime.datetime(2018, 1, 14, 1, 46, 56), Address('127.0.0.1'), [Address('97.113.15.2')], ZERO * 492, 2), } VPADDING_CELL_EMPTY_PACKED = b'\x00\x00\x80\x00\x00' @@ -81,7 +81,7 @@ CERTS_CELLS = { } AUTH_CHALLENGE_CELLS = { - b'\x00\x00\x82\x00&' + CHALLENGE + b'\x00\x02\x00\x01\x00\x03': (CHALLENGE, [1, 3], 2), + b'\x00\x00\x82\x00&' + CHALLENGE + b'\x00\x02\x00\x01\x00\x03': (CHALLENGE, [1, 3], b'', 2), } @@ -184,7 +184,7 @@ class TestCell(unittest.TestCase): self.assertEqual(cell_bytes, cell.pack(link_protocol)) def test_relay_cell(self): - for cell_bytes, (command, command_int, circ_id, stream_id, data, digest, link_protocol) in RELAY_CELLS.items(): + for cell_bytes, (command, command_int, circ_id, stream_id, data, digest, unused, link_protocol) in RELAY_CELLS.items(): self.assertEqual(cell_bytes, RelayCell(circ_id, command, data, digest, stream_id).pack(link_protocol)) self.assertEqual(cell_bytes, RelayCell(circ_id, command_int, data, digest, stream_id).pack(link_protocol)) @@ -195,7 +195,7 @@ class TestCell(unittest.TestCase): self.assertEqual(data, cell.data) self.assertEqual(digest, cell.digest) self.assertEqual(stream_id, cell.stream_id) - self.assertEqual(ZERO * (498 - len(cell.data)), cell.unused) + self.assertEqual(unused, cell.unused) self.assertEqual(cell_bytes, cell.pack(link_protocol)) digest = hashlib.sha1(b'hi') @@ -235,26 +235,26 @@ class TestCell(unittest.TestCase): self.assertEqual(cell_bytes, cell.pack(link_protocol)) def test_create_fast_cell(self): - for cell_bytes, (circ_id, key_material, link_protocol) in CREATE_FAST_CELLS.items(): + for cell_bytes, (circ_id, key_material, unused, link_protocol) in CREATE_FAST_CELLS.items(): self.assertEqual(cell_bytes, CreateFastCell(circ_id, key_material).pack(link_protocol)) cell = Cell.pop(cell_bytes, link_protocol)[0] self.assertEqual(circ_id, cell.circ_id) self.assertEqual(key_material, cell.key_material) - self.assertEqual(ZERO * 489, cell.unused) + self.assertEqual(unused, cell.unused) self.assertEqual(cell_bytes, cell.pack(link_protocol)) self.assertRaisesRegexp(ValueError, 'Key material should be 20 bytes, but was 3', CreateFastCell, 5, 'boo') def test_created_fast_cell(self): - for cell_bytes, (circ_id, key_material, derivative_key, link_protocol) in CREATED_FAST_CELLS.items(): + for cell_bytes, (circ_id, key_material, derivative_key, unused, link_protocol) in CREATED_FAST_CELLS.items(): self.assertEqual(cell_bytes, CreatedFastCell(circ_id, derivative_key, key_material).pack(link_protocol)) cell = Cell.pop(cell_bytes, link_protocol)[0] self.assertEqual(circ_id, cell.circ_id) self.assertEqual(key_material, cell.key_material) self.assertEqual(derivative_key, cell.derivative_key) - self.assertEqual(ZERO * 469, cell.unused) + self.assertEqual(unused, cell.unused) self.assertEqual(cell_bytes, cell.pack(link_protocol)) self.assertRaisesRegexp(ValueError, 'Key material should be 20 bytes, but was 3', CreateFastCell, 5, 'boo') @@ -269,14 +269,14 @@ class TestCell(unittest.TestCase): self.assertEqual(cell_bytes, cell.pack(link_protocol)) def test_netinfo_cell(self): - for cell_bytes, (timestamp, receiver_address, sender_addresses, link_protocol) in NETINFO_CELLS.items(): + for cell_bytes, (timestamp, receiver_address, sender_addresses, unused, link_protocol) in NETINFO_CELLS.items(): self.assertEqual(cell_bytes, NetinfoCell(receiver_address, sender_addresses, timestamp).pack(link_protocol)) cell = Cell.pop(cell_bytes, link_protocol)[0] self.assertEqual(timestamp, cell.timestamp) self.assertEqual(receiver_address, cell.receiver_address) self.assertEqual(sender_addresses, cell.sender_addresses) - self.assertEqual(ZERO * 492, cell.unused) + self.assertEqual(unused, cell.unused) self.assertEqual(cell_bytes, cell.pack(link_protocol)) def test_vpadding_cell(self): @@ -314,13 +314,13 @@ class TestCell(unittest.TestCase): self.assertRaisesRegexp(ValueError, 'CERTS cell indicates it should have 2 certificates, but only contained 1', Cell.pop, b'\x00\x00\x81\x00\x05\x02\x01\x00\x01\x08', 2) def test_auth_challenge_cell(self): - for cell_bytes, (challenge, methods, link_protocol) in AUTH_CHALLENGE_CELLS.items(): + for cell_bytes, (challenge, methods, unused, link_protocol) in AUTH_CHALLENGE_CELLS.items(): self.assertEqual(cell_bytes, AuthChallengeCell(methods, challenge).pack(link_protocol)) cell = Cell.pop(cell_bytes, link_protocol)[0] self.assertEqual(challenge, cell.challenge) self.assertEqual(methods, cell.methods) - self.assertEqual(b'', cell.unused) + self.assertEqual(unused, cell.unused) self.assertEqual(cell_bytes, cell.pack(link_protocol)) self.assertRaisesRegexp(ValueError, 'AUTH_CHALLENGE cell should have a payload of 38 bytes, but only had 16', Cell.pop, b'\x00\x00\x82\x00&' + CHALLENGE[:10] + b'\x00\x02\x00\x01\x00\x03', 2)

1 0

[stem/master] Add tests for 'unused' content of CertsCell
by atagar＠torproject.org 12 Jul '18

12 Jul '18

commit 5f3376a1d0e569a4573d474a6dd13646beb82c8a Author: Dave Rolek <dmr-x(a)riseup.net> Date: Wed Jul 11 17:59:17 2018 +0000 Add tests for 'unused' content of CertsCell This was the only implemented cell type without any tests of 'unused' content, so now all have tests. However they don't necessarily test non-blank or non-ZERO data yet. --- test/unit/client/cell.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test/unit/client/cell.py b/test/unit/client/cell.py index ade5d407..d45886f8 100644 --- a/test/unit/client/cell.py +++ b/test/unit/client/cell.py @@ -75,9 +75,9 @@ VPADDING_CELLS = { } CERTS_CELLS = { - b'\x00\x00\x81\x00\x01\x00': ([], 2), - b'\x00\x00\x81\x00\x04\x01\x01\x00\x00': ([Certificate(1, b'')], 2), - b'\x00\x00\x81\x00\x05\x01\x01\x00\x01\x08': ([Certificate(1, b'\x08')], 2), + b'\x00\x00\x81\x00\x01\x00': ([], b'', 2), + b'\x00\x00\x81\x00\x04\x01\x01\x00\x00': ([Certificate(1, b'')], b'', 2), + b'\x00\x00\x81\x00\x05\x01\x01\x00\x01\x08': ([Certificate(1, b'\x08')], b'', 2), } AUTH_CHALLENGE_CELLS = { @@ -297,11 +297,12 @@ class TestCell(unittest.TestCase): self.assertRaisesRegexp(ValueError, re.escape('VPaddingCell constructor must specify payload or size'), VPaddingCell) def test_certs_cell(self): - for cell_bytes, (certs, link_protocol) in CERTS_CELLS.items(): + for cell_bytes, (certs, unused, link_protocol) in CERTS_CELLS.items(): self.assertEqual(cell_bytes, CertsCell(certs).pack(link_protocol)) cell = Cell.pop(cell_bytes, link_protocol)[0] self.assertEqual(certs, cell.certificates) + self.assertEqual(unused, cell.unused) self.assertEqual(cell_bytes, cell.pack(link_protocol)) # extra bytes after the last certificate should be ignored

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 12 Jul '18

12 Jul '18

commit 710188f84e9d6652662901403d0ae31392714306 Merge: f5e3bcb60 98ee23ca1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 12 14:32:16 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/task26771 | 4 ++++ src/or/auth_dirs.inc | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 12 Jul '18

12 Jul '18

commit dbfe8a42a4631795d4cea8d6020cb619d790cc62 Merge: 81b5483ee 710188f84 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 12 14:32:16 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/task26771 | 4 ++++ src/or/auth_dirs.inc | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)

1 0