October 2019 - tor-commits - lists.torproject.org

[stem/master] Hex method unavailable in python 2.x
by atagar＠torproject.org 05 Oct '19

05 Oct '19

commit 1298d8fe460474703cac5598f6a4587ddd659dd3 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 22 15:35:57 2019 -0700 Hex method unavailable in python 2.x Python 3.5 added the hex() method. Prior to that binascii is used for hex conversion. https://stackoverflow.com/questions/6624453/whats-the-correct-way-to-conver… ====================================================================== ERROR: test_for_decrypt ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/atagar/Desktop/stem/test/unit/descriptor/hidden_service_v3.py", line 57, in test_for_decrypt desc._decrypt('sltib6sxkuxh2scmtuvd5w2g7pahnzkovefxpo4e4ptnkzl5kkq5h2ad.onion') File "/home/atagar/Desktop/stem/stem/descriptor/hidden_service.py", line 581, in _decrypt subcredential_bytes = stem.descriptor.hsv3_crypto.get_subcredential(identity_public_key_bytes, blinded_key_bytes) File "/home/atagar/Desktop/stem/stem/descriptor/hsv3_crypto.py", line 112, in get_subcredential print('public_identity_key: %s' % (public_identity_key.hex())) AttributeError: 'str' object has no attribute 'hex' ---------------------------------------------------------------------- --- stem/descriptor/hsv3_crypto.py | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/stem/descriptor/hsv3_crypto.py b/stem/descriptor/hsv3_crypto.py index a12ce52b..67ab2762 100644 --- a/stem/descriptor/hsv3_crypto.py +++ b/stem/descriptor/hsv3_crypto.py @@ -1,6 +1,6 @@ import base64 +import binascii import hashlib - import stem.prereq # SHA3 requires Python 3.6+ *or* the pysha3 module... @@ -109,10 +109,10 @@ def get_subcredential(public_identity_key, blinded_key): credential = hashlib.sha3_256(b'%s%s' % (cred_bytes_constant, public_identity_key)).digest() subcredential = hashlib.sha3_256(b'%s%s%s' % (subcred_bytes_constant, credential, blinded_key)).digest() - print('public_identity_key: %s' % (public_identity_key.hex())) - print('credential: %s' % (credential.hex())) - print('blinded_key: %s' % (blinded_key.hex())) - print('subcredential: %s' % (subcredential.hex())) + print('public_identity_key: %s' % (binascii.hexlify(public_identity_key))) + print('credential: %s' % (binascii.hexlify(credential))) + print('blinded_key: %s' % (binascii.hexlify(blinded_key))) + print('subcredential: %s' % (binascii.hexlify(subcredential))) print('===') @@ -173,8 +173,8 @@ def _ciphertext_mac_is_valid(key, salt, ciphertext, mac): my_mac = hashlib.sha3_256(my_mac_body).digest() print('===') - print('my mac: %s' % my_mac.hex()) - print('their mac: %s' % mac.hex()) + print('my mac: %s' % binascii.hexlify(my_mac)) + print('their mac: %s' % binascii.hexlify(mac)) # Compare the two MACs return my_mac == mac @@ -198,9 +198,9 @@ def _decrypt_descriptor_layer(ciphertext_blob_b64, revision_counter, public_iden mac = ciphertext_blob[-32:] print('encrypted blob lenth :%s' % len(ciphertext_blob)) - print('salt: %s' % salt.hex()) + print('salt: %s' % binascii.hexlify(salt)) print('ciphertext length: %s' % len(ciphertext)) - print('mac: %s' % mac.hex()) + print('mac: %s' % binascii.hexlify(mac)) print('===') # INT_8(revision_counter) @@ -208,10 +208,10 @@ def _decrypt_descriptor_layer(ciphertext_blob_b64, revision_counter, public_iden secret_input = b'%s%s%s' % (secret_data, subcredential, rev_counter_int_8) secret_input = secret_input - print('secret_data (%d): %s' % (len(secret_data), secret_data.hex())) - print('subcredential (%d): %s' % (len(subcredential), subcredential.hex())) - print('rev counter int 8 (%d): %s' % (len(rev_counter_int_8), rev_counter_int_8.hex())) - print('secret_input (%s): %s' % (len(secret_input), secret_input.hex())) + print('secret_data (%d): %s' % (len(secret_data), binascii.hexlify(secret_data))) + print('subcredential (%d): %s' % (len(subcredential), binascii.hexlify(subcredential))) + print('rev counter int 8 (%d): %s' % (len(rev_counter_int_8), binascii.hexlify(rev_counter_int_8))) + print('secret_input (%s): %s' % (len(secret_input), binascii.hexlify(secret_input))) print('===') kdf = hashlib.shake_256(b'%s%s%s' % (secret_input, salt, string_constant)) @@ -221,9 +221,9 @@ def _decrypt_descriptor_layer(ciphertext_blob_b64, revision_counter, public_iden secret_iv = keys[S_KEY_LEN:S_KEY_LEN + S_IV_LEN] mac_key = keys[S_KEY_LEN + S_IV_LEN:] - print('secret_key: %s' % secret_key.hex()) - print('secret_iv: %s' % secret_iv.hex()) - print('mac_key: %s' % mac_key.hex()) + print('secret_key: %s' % binascii.hexlify(secret_key)) + print('secret_iv: %s' % binascii.hexlify(secret_iv)) + print('mac_key: %s' % binascii.hexlify(mac_key)) # Now time to decrypt descriptor cipher = Cipher(algorithms.AES(secret_key), modes.CTR(secret_iv), default_backend())

1 0

[stem/master] Provide digest values when mismatching
by atagar＠torproject.org 05 Oct '19

05 Oct '19

commit 18237dea28cdf53e337d0cd120bd788d9d333e2f Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 22 15:44:11 2019 -0700 Provide digest values when mismatching Did I bugger something up? George's unit test fails for me with... ====================================================================== ERROR: test_for_decrypt ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/atagar/Desktop/stem/test/unit/descriptor/hidden_service_v3.py", line 57, in test_for_decrypt desc._decrypt('sltib6sxkuxh2scmtuvd5w2g7pahnzkovefxpo4e4ptnkzl5kkq5h2ad.onion') File "/home/atagar/Desktop/stem/stem/descriptor/hidden_service.py", line 576, in _decrypt identity_public_key = stem.descriptor.hsv3_crypto.decode_address(onion_address) File "/home/atagar/Desktop/stem/stem/descriptor/hsv3_crypto.py", line 76, in decode_address raise ValueError('Bad checksum (expected %s but was %s)' % (binascii.hexlify(checksum), binascii.hexlify(my_checksum))) ValueError: Bad checksum (expected d3e8 but was c658fff6a9b3ba2e151d237641e9b50c74a93dc33a3dc149136b4e402ed79800) ---------------------------------------------------------------------- Checking with him on irc. --- stem/descriptor/hsv3_crypto.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stem/descriptor/hsv3_crypto.py b/stem/descriptor/hsv3_crypto.py index 67ab2762..7c641363 100644 --- a/stem/descriptor/hsv3_crypto.py +++ b/stem/descriptor/hsv3_crypto.py @@ -73,7 +73,7 @@ def decode_address(onion_address_str): my_checksum = hashlib.sha3_256(my_checksum_body).digest() if (checksum != my_checksum[:2]): - raise ValueError('Bad checksum') + raise ValueError('Bad checksum (expected %s but was %s)' % (binascii.hexlify(checksum), binascii.hexlify(my_checksum))) return Ed25519PublicKey.from_public_bytes(pubkey)

1 0

[stem/master] Fix checksum validation
by atagar＠torproject.org 05 Oct '19

05 Oct '19

commit a4224b63af07f196f75397a562416153357b5831 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 23 13:12:50 2019 -0700 Fix checksum validation Figured it out. Python3 indexing into a byte array provides an int, whereas python2 gives a str. Using a range to both simplify and normalize this... Python 2.7: >>> version_str = b'\x03' >>> version_str[0] '\x03' >>> version_str[0:1] '\x03' >>> bytes([version_str[0]]) "['\\x03']" Python 3.5: >>> version_str = b'\x03' >>> version_str[0] 3 >>> version_str[0:1] b'\x03' >>> bytes([version_str[0]]) b'\x03' --- stem/descriptor/certificate.py | 2 +- stem/descriptor/hsv3_crypto.py | 15 ++++----------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/stem/descriptor/certificate.py b/stem/descriptor/certificate.py index 2293a7a3..e9196319 100644 --- a/stem/descriptor/certificate.py +++ b/stem/descriptor/certificate.py @@ -250,7 +250,7 @@ class Ed25519CertificateV1(Ed25519Certificate): Validates our signing key and that the given descriptor content matches its Ed25519 signature. - :param stem.descriptor.server_descriptor.Ed25519 server_descriptor: relay + :param stem.descriptor.server_descriptor.RelayDescriptor server_descriptor: relay server descriptor to validate :raises: diff --git a/stem/descriptor/hsv3_crypto.py b/stem/descriptor/hsv3_crypto.py index 2eb340ba..5439771a 100644 --- a/stem/descriptor/hsv3_crypto.py +++ b/stem/descriptor/hsv3_crypto.py @@ -68,21 +68,14 @@ def decode_address(onion_address_str): # extract pieces of information pubkey = onion_address[:32] checksum = onion_address[32:34] - version = onion_address[34] + version = onion_address[34:35] # Do checksum validation - my_checksum_body = b'%s%s%s' % (CHECKSUM_CONSTANT, pubkey, bytes([version])) + my_checksum_body = b'%s%s%s' % (CHECKSUM_CONSTANT, pubkey, version) my_checksum = hashlib.sha3_256(my_checksum_body).digest() - # TODO: the following causes our unit test to break for me... - # - # ValueError: Bad checksum (expected d3e8 but was c658fff6a9b3ba2e151d237641e9b50c74a93dc33a3dc149136b4e402ed79800) - # - # Skipping checksum validation while working on getting the rest of this - # module productionized. - - # if (checksum != my_checksum[:2]): - # raise ValueError('Bad checksum (expected %s but was %s)' % (binascii.hexlify(checksum), binascii.hexlify(my_checksum))) + if (checksum != my_checksum[:2]): + raise ValueError('Bad checksum (expected %s but was %s)' % (binascii.hexlify(checksum), binascii.hexlify(my_checksum[:2]))) return Ed25519PublicKey.from_public_bytes(pubkey)

1 0

[stem/master] Disable checksum validation
by atagar＠torproject.org 05 Oct '19

05 Oct '19

commit 3932563ed3fec0f4dcda99dd37f8ff4224f169d0 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 22 17:20:44 2019 -0700 Disable checksum validation Just temporary so I can run our unit test while productionizing this. Obviously we'll need to circle back and fix this. ;P --- stem/descriptor/hsv3_crypto.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/stem/descriptor/hsv3_crypto.py b/stem/descriptor/hsv3_crypto.py index 1da07b1b..2eb340ba 100644 --- a/stem/descriptor/hsv3_crypto.py +++ b/stem/descriptor/hsv3_crypto.py @@ -74,8 +74,15 @@ def decode_address(onion_address_str): my_checksum_body = b'%s%s%s' % (CHECKSUM_CONSTANT, pubkey, bytes([version])) my_checksum = hashlib.sha3_256(my_checksum_body).digest() - if (checksum != my_checksum[:2]): - raise ValueError('Bad checksum (expected %s but was %s)' % (binascii.hexlify(checksum), binascii.hexlify(my_checksum))) + # TODO: the following causes our unit test to break for me... + # + # ValueError: Bad checksum (expected d3e8 but was c658fff6a9b3ba2e151d237641e9b50c74a93dc33a3dc149136b4e402ed79800) + # + # Skipping checksum validation while working on getting the rest of this + # module productionized. + + # if (checksum != my_checksum[:2]): + # raise ValueError('Bad checksum (expected %s but was %s)' % (binascii.hexlify(checksum), binascii.hexlify(my_checksum))) return Ed25519PublicKey.from_public_bytes(pubkey)

1 0

[stem/master] Assert decrypted inner/outer layer content
by atagar＠torproject.org 05 Oct '19

05 Oct '19

commit b19ea50c1791539783b5eaa61208e60ad01c2fea Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Oct 1 15:47:51 2019 -0700 Assert decrypted inner/outer layer content No parsing yet, just basic assertions that we decrypt content properly. Aside from decryption coverage I'm beginning with this because we'll be able to use this data for parsing unit tests. Aside from decryption test coverage this gives me inner/outer layer test data I'll be able to use for parsing assertions. --- stem/descriptor/hidden_service.py | 5 +- .../descriptor/data/hidden_service_v3_inner_layer | 89 +++++++++++++++++++++ .../descriptor/data/hidden_service_v3_outer_layer | Bin 0 -> 10000 bytes test/unit/descriptor/hidden_service_v3.py | 8 +- 4 files changed, 100 insertions(+), 2 deletions(-) diff --git a/stem/descriptor/hidden_service.py b/stem/descriptor/hidden_service.py index 33806ce5..075625c6 100644 --- a/stem/descriptor/hidden_service.py +++ b/stem/descriptor/hidden_service.py @@ -554,7 +554,7 @@ class HiddenServiceDescriptorV3(BaseHiddenServiceDescriptor): # progress. This will probably become something like "body()" which decrypts # and parses the internal descriptor content. - def _decrypt(self, onion_address): + def _decrypt(self, onion_address, outer_layer = False): cert_lines = self.signing_cert.split('\n') desc_signing_cert = stem.descriptor.certificate.Ed25519Certificate.parse(''.join(cert_lines[1:-1])) @@ -577,6 +577,9 @@ class HiddenServiceDescriptorV3(BaseHiddenServiceDescriptor): outter_layer_plaintext = stem.descriptor.hsv3_crypto.decrypt_outter_layer(self.superencrypted, self.revision_counter, identity_public_key_bytes, blinded_key_bytes, subcredential_bytes) + if outer_layer: + return outter_layer_plaintext + # ATAGAR XXX this parsing function is a hack. need to replace it with some stem parsing. inner_layer_ciphertext = stem.descriptor.hsv3_crypto.parse_superencrypted_plaintext(outter_layer_plaintext) diff --git a/test/unit/descriptor/data/hidden_service_v3_inner_layer b/test/unit/descriptor/data/hidden_service_v3_inner_layer new file mode 100644 index 00000000..5c87c0f7 --- /dev/null +++ b/test/unit/descriptor/data/hidden_service_v3_inner_layer @@ -0,0 +1,89 @@ +create2-formats 2 +intro-auth-required ed25519 +single-onion-service +introduction-point AgIUQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0MABgECAwQjKQ== +onion-key ntor AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= +auth-key +-----BEGIN ED25519 CERT----- +AQkABl60ARIg+8ID2l9EFNrp3qf08I9d9Bu+gWSU6GGqn53hKVTqAQAgBACS5oD6 +V1UufUhMnSo+20b7wHblTqkLd7uE4+bVZX1SoQF2F6rF7XAR4Av1rqhp++dOn6Yc +mwOqTOk+b9oHm5ExVFnGH7ydn3TdHAAI9wZcws4ss79meXrB/ZEAkH2Pnw0= +-----END ED25519 CERT----- +enc-key ntor AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= +enc-key-cert +-----BEGIN ED25519 CERT----- +AQsABqUQAX1ZvjPt5IfeQ4qjcopk0JIh/YtWhOeYZkL1UzxKlwqIAQAgBACS5oD6 +V1UufUhMnSo+20b7wHblTqkLd7uE4+bVZX1SobXTTrsUe/Xl+AH4oLj5Xrt+1M/r +ZHcUIWtuPgLtrkWl+al5QB3pKLgARtpAEouuqjrVgm+YX14QUofeiQUvFgQ= +-----END ED25519 CERT----- +introduction-point AgIUQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0MBEiYAAAAAAAAAAAAAAAAAAAEjKQ== +onion-key ntor AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= +auth-key +-----BEGIN ED25519 CERT----- +AQkABl60AZOscXiUe8VefcJsgzY/UbSANPDjGu6gnvc5377u9nqhAQAgBACS5oD6 +V1UufUhMnSo+20b7wHblTqkLd7uE4+bVZX1SoUhWakSHcEE8Nv+i7qW8zhm/qfus +YpERdNByhb/3qhXbxLIzChP70n7oe8Jml0Haq0F+6PlbJBQitGoTWJFLGAA= +-----END ED25519 CERT----- +enc-key ntor AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= +enc-key-cert +-----BEGIN ED25519 CERT----- +AQsABqUQAY4807i5FIp0Vm62Dfb3P+qYWfupxKJYvhohwaZpV2vLAQAgBACS5oD6 +V1UufUhMnSo+20b7wHblTqkLd7uE4+bVZX1SoXBJ1gsXH7NPxct0ACiqbX2Fy05M +acKfJBgWwVCA3MFaJEhwxuNgQ1KdoIl6E2IURnGOIrccAOkx7b8zSsXPbAM= +-----END ED25519 CERT----- +introduction-point AgIUQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0MABgMCAQQjKQ== +onion-key ntor AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= +auth-key +-----BEGIN ED25519 CERT----- +AQkABl60AbxIKMU6fXXSXVfbTwH0YaBThkdH5PUYYllgb5EfQSiPAQAgBACS5oD6 +V1UufUhMnSo+20b7wHblTqkLd7uE4+bVZX1SoS+xSpN1Uk5+v+W/i9AHLj6o6YUB +EVQdxnN3A/N3PDdXajGDOxtXzTvr/Xtr8cirOCI5InH6rQcxPzOiZVpd5wQ= +-----END ED25519 CERT----- +enc-key ntor AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= +enc-key-cert +-----BEGIN ED25519 CERT----- +AQsABqUQAf/BK3icOEN4Ajh6RUrWLabS7PfZDvVXXUOz4BZUCv6tAQAgBACS5oD6 +V1UufUhMnSo+20b7wHblTqkLd7uE4+bVZX1SoXyIM4yf4yV2+u9IzIgUw9fGXsiF +z2E0Ch2LSM0gWwUpm8wkEVAa/nbXXH3vNDpwe+QBXodM7yZuBMv6kfeEGw4= +-----END ED25519 CERT----- +legacy-key +-----BEGIN RSA PUBLIC KEY----- +MIGJAoGBALKowzZN8UZXm1UFNVpvEtWWfzXjqcNq8h1HqrvwMJQyHxl/OSSH0tuX +U1fhFT4CasJkw+rbX8SMhHFFDJF2A9glUt2n3p4Z5icTOYySq9eKzBe8OD+1eqyP +Il5iygcxBYNOkIt+NijgrWiXWyDxUizjBB6rmiDpBJ2aEGjPszKpAgMBAAE= +-----END RSA PUBLIC KEY----- +legacy-key-cert +-----BEGIN CROSSCERT----- +kuaA+ldVLn1ITJ0qPttG+8B25U6pC3e7hOPm1WV9UqEABl60gKqbazI7Gv7g/C0R +SiWTMuwDDgsGhnidJuLbDvGb7UyogT6tqt/qE53hfLK1uvpcRd3coFjVJab7yEUL +CuW9mglk+uQO/gLJNfCpvvGmOitSyA0+arpWzqJ33UIBFMhNJC4c2Tc7jGw976GD +kjHWf9h49yGEAUuEATBugKgBv7ix +-----END CROSSCERT----- +introduction-point AgIUQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0MABgUGBwgjKQ== +onion-key ntor AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= +auth-key +-----BEGIN ED25519 CERT----- +AQkABl60Acq8QW8O7ONgImfilmjrEIeISkZmGuedsdkZucakUBZbAQAgBACS5oD6 +V1UufUhMnSo+20b7wHblTqkLd7uE4+bVZX1Soded2A7SaJOyvI2FBNvljCNgl5T/ +eLNpci4yTizyDv2A0/QB4SyaZ2+SOM/uQn3DKKyhUwwNuaD/sSuUI25gkgY= +-----END ED25519 CERT----- +enc-key ntor AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= +enc-key-cert +-----BEGIN ED25519 CERT----- +AQsABqUQARe6uX12UazJAo5Qt2iP0rJ29hq/GEEi28dAsKqCOHa6AQAgBACS5oD6 +V1UufUhMnSo+20b7wHblTqkLd7uE4+bVZX1SoY1XfpJjLTI3tJwIrFM/JFP3XbVF +CtwFlIHgSS1/M9Rr+eznM17+5hd+0SHL4/+WV5ukxyPOWIL6X1z+KPg4hA0= +-----END ED25519 CERT----- +legacy-key +-----BEGIN RSA PUBLIC KEY----- +MIGJAoGBAMO3ZXrcA+PclKppGCh9TOG0H6mubTAgji4fLF87GelggQs5bnPdQeaS +v4HgP42J/mMinSLpbg5LhL5gd7AqwOxe9cpEhbvwrM63ot7gkj2tJqs2PLlokqSx +ZBEAssKbE/8F2iVoEWoXd8g8Pn5nG7wRKDGGQRAjintrBSncTvfRAgMBAAE= +-----END RSA PUBLIC KEY----- +legacy-key-cert +-----BEGIN CROSSCERT----- +kuaA+ldVLn1ITJ0qPttG+8B25U6pC3e7hOPm1WV9UqEABl60gH1LLE5C2kl5BBpb +E2Ajh6kJuf2fXMW7csYYNtPACZjFoG+kb16fh7y9L2pLuBFNKpkVDMsiQVcdwWWg +Nu6qpGj1vHDR1XUM7ocoXB3QMVXCIxvA9b8k3q7KFvXgImi9GZ7l1/K+emm58MYM +CxhNKazjiFgXjbs9kf+S9HxaF/Yw +-----END CROSSCERT----- diff --git a/test/unit/descriptor/data/hidden_service_v3_outer_layer b/test/unit/descriptor/data/hidden_service_v3_outer_layer new file mode 100644 index 00000000..82a7dbe7 Binary files /dev/null and b/test/unit/descriptor/data/hidden_service_v3_outer_layer differ diff --git a/test/unit/descriptor/hidden_service_v3.py b/test/unit/descriptor/hidden_service_v3.py index 7efa1aad..fc4b57dc 100644 --- a/test/unit/descriptor/hidden_service_v3.py +++ b/test/unit/descriptor/hidden_service_v3.py @@ -23,6 +23,8 @@ from test.unit.descriptor import ( expect_invalid_attr = functools.partial(base_expect_invalid_attr, HiddenServiceDescriptorV3, 'version', 3) expect_invalid_attr_for_text = functools.partial(base_expect_invalid_attr_for_text, HiddenServiceDescriptorV3, 'version', 3) +HS_ADDRESS = 'sltib6sxkuxh2scmtuvd5w2g7pahnzkovefxpo4e4ptnkzl5kkq5h2ad.onion' + EXPECTED_SIGNING_CERT = """\ -----BEGIN ED25519 CERT----- AQgABl5/AZLmgPpXVS59SEydKj7bRvvAduVOqQt3u4Tj5tVlfVKhAQAgBABUhpfe @@ -51,7 +53,11 @@ class TestHiddenServiceDescriptorV3(unittest.TestCase): self.assertEqual('aglChCQF+lbzKgyxJJTpYGVShV/GMDRJ4+cRGCp+a2y/yX/tLSh7hzqI7rVZrUoGj74Xr1CLMYO3fXYCS+DPDQ', desc.signature) if stem.prereq.is_crypto_available(ed25519 = True) and stem.descriptor.hsv3_crypto.SHA3_AVAILABLE: - desc._decrypt('sltib6sxkuxh2scmtuvd5w2g7pahnzkovefxpo4e4ptnkzl5kkq5h2ad.onion') + with open(get_resource('hidden_service_v3_outer_layer'), 'rb') as outer_layer_file: + self.assertEqual(outer_layer_file.read(), desc._decrypt(HS_ADDRESS, outer_layer = True)) + + with open(get_resource('hidden_service_v3_inner_layer'), 'rb') as outer_layer_file: + self.assertEqual(outer_layer_file.read(), desc._decrypt(HS_ADDRESS, outer_layer = False)) def test_required_fields(self): """

1 0

[stem/master] Adjust and test decode_address()
by atagar＠torproject.org 05 Oct '19

05 Oct '19

commit 382fdadb81c42d5ddfda83ada3ba93a8c1aea677 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Oct 2 13:31:15 2019 -0700 Adjust and test decode_address() Ok, I really love George's decode_address() function. Clear, elegant, and self contained. Not doing anything important to it - just some minor adjustments and added test coverage. --- stem/descriptor/hidden_service.py | 56 ++++++++++++++++++++++--------- stem/descriptor/hsv3_crypto.py | 35 ------------------- test/unit/descriptor/hidden_service_v3.py | 12 +++++++ 3 files changed, 52 insertions(+), 51 deletions(-) diff --git a/stem/descriptor/hidden_service.py b/stem/descriptor/hidden_service.py index 38c7a34b..b1644f81 100644 --- a/stem/descriptor/hidden_service.py +++ b/stem/descriptor/hidden_service.py @@ -101,6 +101,7 @@ SINGLE_INTRODUCTION_POINT_FIELDS = [ BASIC_AUTH = 1 STEALTH_AUTH = 2 +CHECKSUM_CONSTANT = b'.onion checksum' class IntroductionPoints(collections.namedtuple('IntroductionPoints', INTRODUCTION_POINTS_ATTR.keys())): @@ -556,23 +557,14 @@ class HiddenServiceDescriptorV3(BaseHiddenServiceDescriptor): # and parses the internal descriptor content. def _decrypt(self, onion_address, outer_layer = False): - if onion_address.endswith('.onion'): - onion_address = onion_address[:-6] - if not stem.prereq.is_crypto_available(ed25519 = True): raise ImportError('Hidden service descriptor decryption requires cryptography version 2.6') elif not stem.prereq._is_sha3_available(): raise ImportError('Hidden service descriptor decryption requires python 3.6+ or the pysha3 module (https://pypi.org/project/pysha3/)') - elif not stem.util.tor_tools.is_valid_hidden_service_address(onion_address, version = 3): - raise ValueError("'%s.onion' isn't a valid hidden service v3 address" % onion_address) cert_lines = self.signing_cert.split('\n') desc_signing_cert = stem.descriptor.certificate.Ed25519Certificate.parse(''.join(cert_lines[1:-1])) - # Get crypto material. - # ASN XXX Extract to its own function and assign them to class variables - from cryptography.hazmat.primitives import serialization - for extension in desc_signing_cert.extensions: if extension.type == ExtensionType.HAS_SIGNING_KEY: blinded_key_bytes = extension.data @@ -581,23 +573,55 @@ class HiddenServiceDescriptorV3(BaseHiddenServiceDescriptor): if not blinded_key_bytes: raise ValueError('No signing key extension present') - identity_public_key = stem.descriptor.hsv3_crypto.decode_address(onion_address) - identity_public_key_bytes = identity_public_key.public_bytes(encoding=serialization.Encoding.Raw, - format=serialization.PublicFormat.Raw) - subcredential_bytes = stem.descriptor.hsv3_crypto.get_subcredential(identity_public_key_bytes, blinded_key_bytes) + identity_public_key = HiddenServiceDescriptorV3._public_key_from_address(onion_address) + subcredential_bytes = stem.descriptor.hsv3_crypto.get_subcredential(identity_public_key, blinded_key_bytes) - outter_layer_plaintext = stem.descriptor.hsv3_crypto.decrypt_outter_layer(self.superencrypted, self.revision_counter, identity_public_key_bytes, blinded_key_bytes, subcredential_bytes) + outter_layer_plaintext = stem.descriptor.hsv3_crypto.decrypt_outter_layer(self.superencrypted, self.revision_counter, identity_public_key, blinded_key_bytes, subcredential_bytes) if outer_layer: return outter_layer_plaintext - # ATAGAR XXX this parsing function is a hack. need to replace it with some stem parsing. inner_layer_ciphertext = stem.descriptor.hsv3_crypto.parse_superencrypted_plaintext(outter_layer_plaintext) - inner_layer_plaintext = stem.descriptor.hsv3_crypto.decrypt_inner_layer(inner_layer_ciphertext, self.revision_counter, identity_public_key_bytes, blinded_key_bytes, subcredential_bytes) + inner_layer_plaintext = stem.descriptor.hsv3_crypto.decrypt_inner_layer(inner_layer_ciphertext, self.revision_counter, identity_public_key, blinded_key_bytes, subcredential_bytes) return inner_layer_plaintext + @staticmethod + def _public_key_from_address(onion_address): + # provides our hidden service ed25519 public key + + if onion_address.endswith('.onion'): + onion_address = onion_address[:-6] + + if not stem.util.tor_tools.is_valid_hidden_service_address(onion_address, version = 3): + raise ValueError("'%s.onion' isn't a valid hidden service v3 address" % onion_address) + + from cryptography.hazmat.primitives import serialization + from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PublicKey + + # onion_address = base32(PUBKEY | CHECKSUM | VERSION) + '.onion' + # CHECKSUM = H('.onion checksum' | PUBKEY | VERSION)[:2] + + decoded_address = base64.b32decode(onion_address.upper()) + + pubkey = decoded_address[:32] + checksum = decoded_address[32:34] + version = decoded_address[34:35] + + # validate our address checksum + + my_checksum_body = b'%s%s%s' % (CHECKSUM_CONSTANT, pubkey, version) + my_checksum = hashlib.sha3_256(my_checksum_body).digest()[:2] + + if (checksum != my_checksum): + raise ValueError('Bad checksum (expected %s but was %s)' % (binascii.hexlify(checksum), binascii.hexlify(my_checksum))) + + return Ed25519PublicKey.from_public_bytes(pubkey).public_bytes( + encoding = serialization.Encoding.Raw, + format = serialization.PublicFormat.Raw + ) + # TODO: drop this alias in stem 2.x diff --git a/stem/descriptor/hsv3_crypto.py b/stem/descriptor/hsv3_crypto.py index 7b651418..e6e8c03e 100644 --- a/stem/descriptor/hsv3_crypto.py +++ b/stem/descriptor/hsv3_crypto.py @@ -1,5 +1,4 @@ import base64 -import binascii import hashlib import struct @@ -15,40 +14,6 @@ Onion addresses - CHECKSUM is truncated to two bytes before inserting it in onion_address """ -CHECKSUM_CONSTANT = b'.onion checksum' - - -def decode_address(onion_address): - """ - Parse onion_address_str and return the pubkey. - - onion_address = base32(PUBKEY | CHECKSUM | VERSION) + '.onion' - CHECKSUM = H('.onion checksum' | PUBKEY | VERSION)[:2] - - :return: Ed25519PublicKey - - :raises: ValueError - """ - - from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PublicKey - - # base32 decode the addr (convert to uppercase since that's what python expects) - onion_address = base64.b32decode(onion_address.upper()) - - # extract pieces of information - pubkey = onion_address[:32] - checksum = onion_address[32:34] - version = onion_address[34:35] - - # Do checksum validation - my_checksum_body = b'%s%s%s' % (CHECKSUM_CONSTANT, pubkey, version) - my_checksum = hashlib.sha3_256(my_checksum_body).digest() - - if (checksum != my_checksum[:2]): - raise ValueError('Bad checksum (expected %s but was %s)' % (binascii.hexlify(checksum), binascii.hexlify(my_checksum[:2]))) - - return Ed25519PublicKey.from_public_bytes(pubkey) - """ Blinded key stuff diff --git a/test/unit/descriptor/hidden_service_v3.py b/test/unit/descriptor/hidden_service_v3.py index 60cc06b8..2242d617 100644 --- a/test/unit/descriptor/hidden_service_v3.py +++ b/test/unit/descriptor/hidden_service_v3.py @@ -117,3 +117,15 @@ class TestHiddenServiceDescriptorV3(unittest.TestCase): for test_value in test_values: expect_invalid_attr(self, {'revision-counter': test_value}, 'revision_counter') + + def test_public_key_from_address(self): + if not stem.prereq.is_crypto_available(ed25519 = True): + self.skipTest('(requires cryptography ed25519 support)') + return + elif not stem.prereq._is_sha3_available(): + self.skipTest('(requires sha3 support)') + return + + self.assertEqual(b'\x92\xe6\x80\xfaWU.}HL\x9d*>\xdbF\xfb\xc0v\xe5N\xa9\x0bw\xbb\x84\xe3\xe6\xd5e}R\xa1', HiddenServiceDescriptorV3._public_key_from_address(HS_ADDRESS)) + self.assertRaisesWith(ValueError, "'boom.onion' isn't a valid hidden service v3 address", HiddenServiceDescriptorV3._public_key_from_address, 'boom') + self.assertRaisesWith(ValueError, 'Bad checksum (expected def7 but was 842e)', HiddenServiceDescriptorV3._public_key_from_address, '5' * 56)

1 0

[stem/master] Perform decryption prereq checks upfront
by atagar＠torproject.org 05 Oct '19

05 Oct '19

commit 46686fe160d082a488b3f4d1edefdd7e7c973f00 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Oct 1 17:29:30 2019 -0700 Perform decryption prereq checks upfront Simplifying our prerequirement checks by doing them upfront, and moving sha3 checking into our prereq module. --- stem/descriptor/hidden_service.py | 11 +++++++++ stem/descriptor/hsv3_crypto.py | 40 +------------------------------ stem/prereq.py | 38 +++++++++++++++++++++++------ stem/util/tor_tools.py | 24 +++++++++++++++---- test/settings.cfg | 2 +- test/unit/descriptor/hidden_service_v3.py | 3 +-- 6 files changed, 65 insertions(+), 53 deletions(-) diff --git a/stem/descriptor/hidden_service.py b/stem/descriptor/hidden_service.py index 075625c6..38c7a34b 100644 --- a/stem/descriptor/hidden_service.py +++ b/stem/descriptor/hidden_service.py @@ -36,6 +36,7 @@ import stem.descriptor.hsv3_crypto import stem.prereq import stem.util.connection import stem.util.str_tools +import stem.util.tor_tools from stem.descriptor import ( PGP_BLOCK_END, @@ -555,6 +556,16 @@ class HiddenServiceDescriptorV3(BaseHiddenServiceDescriptor): # and parses the internal descriptor content. def _decrypt(self, onion_address, outer_layer = False): + if onion_address.endswith('.onion'): + onion_address = onion_address[:-6] + + if not stem.prereq.is_crypto_available(ed25519 = True): + raise ImportError('Hidden service descriptor decryption requires cryptography version 2.6') + elif not stem.prereq._is_sha3_available(): + raise ImportError('Hidden service descriptor decryption requires python 3.6+ or the pysha3 module (https://pypi.org/project/pysha3/)') + elif not stem.util.tor_tools.is_valid_hidden_service_address(onion_address, version = 3): + raise ValueError("'%s.onion' isn't a valid hidden service v3 address" % onion_address) + cert_lines = self.signing_cert.split('\n') desc_signing_cert = stem.descriptor.certificate.Ed25519Certificate.parse(''.join(cert_lines[1:-1])) diff --git a/stem/descriptor/hsv3_crypto.py b/stem/descriptor/hsv3_crypto.py index f768659f..7b651418 100644 --- a/stem/descriptor/hsv3_crypto.py +++ b/stem/descriptor/hsv3_crypto.py @@ -3,24 +3,6 @@ import binascii import hashlib import struct -import stem.prereq - -# SHA3 requires Python 3.6+ *or* the pysha3 module... -# -# https://github.com/tiran/pysha3 -# -# If pysha3 is present then importing sha3 will monkey patch the methods we -# want onto hashlib. - -if not hasattr(hashlib, 'sha3_256') or not hasattr(hashlib, 'shake_256'): - try: - import sha3 - except ImportError: - pass - -SHA3_AVAILABLE = hasattr(hashlib, 'sha3_256') and hasattr(hashlib, 'shake_256') -SHA3_ERROR_MSG = '%s requires python 3.6+ or the pysha3 module (https://pypi.org/project/pysha3/)' - """ Onion addresses @@ -36,7 +18,7 @@ Onion addresses CHECKSUM_CONSTANT = b'.onion checksum' -def decode_address(onion_address_str): +def decode_address(onion_address): """ Parse onion_address_str and return the pubkey. @@ -48,19 +30,8 @@ def decode_address(onion_address_str): :raises: ValueError """ - if not stem.prereq.is_crypto_available(ed25519 = True): - raise ImportError('Onion address decoding requires cryptography version 2.6') - elif not SHA3_AVAILABLE: - raise ImportError(SHA3_ERROR_MSG % 'Onion address decoding') - from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PublicKey - if (len(onion_address_str) != 56 + len('.onion')): - raise ValueError('Wrong address length') - - # drop the '.onion' - onion_address = onion_address_str[:56] - # base32 decode the addr (convert to uppercase since that's what python expects) onion_address = base64.b32decode(onion_address.upper()) @@ -101,9 +72,6 @@ Both keys are in bytes def get_subcredential(public_identity_key, blinded_key): - if not SHA3_AVAILABLE: - raise ImportError(SHA3_ERROR_MSG % 'Hidden service subcredentials') - cred_bytes_constant = 'credential'.encode() subcred_bytes_constant = 'subcredential'.encode() @@ -156,9 +124,6 @@ def _ciphertext_mac_is_valid(key, salt, ciphertext, mac): XXX spec: H(mac_key_len | mac_key | salt_len | salt | encrypted) """ - if not SHA3_AVAILABLE: - raise ImportError(SHA3_ERROR_MSG % 'Hidden service validation') - # Construct our own MAC first key_len = struct.pack('>Q', len(key)) salt_len = struct.pack('>Q', len(salt)) @@ -171,9 +136,6 @@ def _ciphertext_mac_is_valid(key, salt, ciphertext, mac): def _decrypt_descriptor_layer(ciphertext_blob_b64, revision_counter, public_identity_key, subcredential, secret_data, string_constant): - if not SHA3_AVAILABLE: - raise ImportError(SHA3_ERROR_MSG % 'Hidden service descriptor decryption') - from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes from cryptography.hazmat.backends import default_backend diff --git a/stem/prereq.py b/stem/prereq.py index bf86ddef..e8218e7f 100644 --- a/stem/prereq.py +++ b/stem/prereq.py @@ -2,13 +2,12 @@ # See LICENSE for licensing information """ -Checks for stem dependencies. We require python 2.6 or greater (including the -3.x series), but note we'll be bumping our requirements to python 2.7 in stem -2.0. Other requirements for complete functionality are... +Checks for stem dependencies. -* cryptography module - - * validating descriptor signature integrity +Aside from Python itself Stem only has soft dependencies, which is to say +module unavailability only impacts features that require it. For example, +descriptor signature validation requires 'cryptography'. If unavailable +stem will still read descriptors - just without signature checks. :: @@ -22,6 +21,7 @@ Checks for stem dependencies. We require python 2.6 or greater (including the """ import functools +import hashlib import inspect import platform import sys @@ -52,6 +52,9 @@ def _is_python_26(): Checks if we're running python 2.6. This isn't for users as it'll be removed in stem 2.0 (when python 2.6 support goes away). + .. deprecated:: 1.8.0 + Stem 2.x will remove this method along with Python 2.x support. + :returns: **True** if we're running python 2.6, **False** otherwise """ @@ -65,7 +68,7 @@ def is_python_27(): Checks if we're running python 2.7 or above (including the 3.x series). .. deprecated:: 1.5.0 - Function lacks much utility and will be eventually removed. + Stem 2.x will remove this method along with Python 2.x support. :returns: **True** if we meet this requirement and **False** otherwise """ @@ -79,6 +82,9 @@ def is_python_3(): """ Checks if we're in the 3.0 - 3.x range. + .. deprecated:: 1.8.0 + Stem 2.x will remove this method along with Python 2.x support. + :returns: **True** if we meet this requirement and **False** otherwise """ @@ -267,3 +273,21 @@ def _is_crypto_ed25519_supported(): else: log.log_once('stem.prereq._is_crypto_ed25519_supported', log.INFO, ED25519_UNSUPPORTED) return False + + +def _is_sha3_available(): + """ + Check if hashlib has sha3 support. This requires Python 3.6+ *or* the `pysha3 + module <https://github.com/tiran/pysha3>`_. + """ + + # If pysha3 is present then importing sha3 will monkey patch the methods we + # want onto hashlib. + + if not hasattr(hashlib, 'sha3_256') or not hasattr(hashlib, 'shake_256'): + try: + import sha3 + except ImportError: + pass + + return hasattr(hashlib, 'sha3_256') and hasattr(hashlib, 'shake_256') diff --git a/stem/util/tor_tools.py b/stem/util/tor_tools.py index 2aed5130..b703fa50 100644 --- a/stem/util/tor_tools.py +++ b/stem/util/tor_tools.py @@ -128,14 +128,17 @@ def is_valid_connection_id(entry): return is_valid_circuit_id(entry) -def is_valid_hidden_service_address(entry): +def is_valid_hidden_service_address(entry, version = None): """ Checks if a string is a valid format for being a hidden service address (not including the '.onion' suffix). .. versionchanged:: 1.8.0 - Responds with **True** if a version 3 hidden service address, rather than - just version 2 addresses. + Added the **version** argument, and responds with **True** if a version 3 + hidden service address rather than just version 2 addresses. + + :param int,list version: versions to check for, if unspecified either v2 or v3 + hidden service address will provide **True** :returns: **True** if the string could be a hidden service address, **False** otherwise @@ -144,8 +147,21 @@ def is_valid_hidden_service_address(entry): if isinstance(entry, bytes): entry = stem.util.str_tools._to_unicode(entry) + if version is None: + version = (2, 3) + elif isinstance(version, int): + version = [version] + elif not isinstance(version, (list, tuple)): + raise ValueError('Hidden service version must be an integer or list, not a %s' % type(version).__name__) + try: - return bool(HS_V2_ADDRESS_PATTERN.match(entry)) or bool(HS_V3_ADDRESS_PATTERN.match(entry)) + if 2 in version and bool(HS_V2_ADDRESS_PATTERN.match(entry)): + return True + + if 3 in version and bool(HS_V3_ADDRESS_PATTERN.match(entry)): + return True + + return False except TypeError: return False diff --git a/test/settings.cfg b/test/settings.cfg index 5d755bad..eca719df 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -197,6 +197,7 @@ pyflakes.ignore stem/prereq.py => 'unittest' imported but unused pyflakes.ignore stem/prereq.py => 'unittest.mock' imported but unused pyflakes.ignore stem/prereq.py => 'long_to_bytes' imported but unused pyflakes.ignore stem/prereq.py => 'encoding' imported but unused +pyflakes.ignore stem/prereq.py => 'sha3' imported but unused pyflakes.ignore stem/prereq.py => 'signing' imported but unused pyflakes.ignore stem/prereq.py => 'sqlite3' imported but unused pyflakes.ignore stem/prereq.py => 'cryptography.utils.int_to_bytes' imported but unused @@ -212,7 +213,6 @@ pyflakes.ignore stem/prereq.py => 'lzma' imported but unused pyflakes.ignore stem/client/datatype.py => redefinition of unused 'pop' from * pyflakes.ignore stem/descriptor/hidden_service_descriptor.py => 'stem.descriptor.hidden_service.*' imported but unused pyflakes.ignore stem/descriptor/hidden_service_descriptor.py => 'from stem.descriptor.hidden_service import *' used; unable to detect undefined names -pyflakes.ignore stem/descriptor/hsv3_crypto.py => 'sha3' imported but unused pyflakes.ignore stem/interpreter/__init__.py => undefined name 'raw_input' pyflakes.ignore stem/response/events.py => undefined name 'long' pyflakes.ignore stem/util/__init__.py => undefined name 'long' diff --git a/test/unit/descriptor/hidden_service_v3.py b/test/unit/descriptor/hidden_service_v3.py index fc4b57dc..60cc06b8 100644 --- a/test/unit/descriptor/hidden_service_v3.py +++ b/test/unit/descriptor/hidden_service_v3.py @@ -6,7 +6,6 @@ import functools import unittest import stem.descriptor -import stem.descriptor.hsv3_crypto import stem.prereq from stem.descriptor.hidden_service import ( @@ -52,7 +51,7 @@ class TestHiddenServiceDescriptorV3(unittest.TestCase): self.assertTrue('eaH8VdaTKS' in desc.superencrypted) self.assertEqual('aglChCQF+lbzKgyxJJTpYGVShV/GMDRJ4+cRGCp+a2y/yX/tLSh7hzqI7rVZrUoGj74Xr1CLMYO3fXYCS+DPDQ', desc.signature) - if stem.prereq.is_crypto_available(ed25519 = True) and stem.descriptor.hsv3_crypto.SHA3_AVAILABLE: + if stem.prereq.is_crypto_available(ed25519 = True) and stem.prereq._is_sha3_available(): with open(get_resource('hidden_service_v3_outer_layer'), 'rb') as outer_layer_file: self.assertEqual(outer_layer_file.read(), desc._decrypt(HS_ADDRESS, outer_layer = True))

1 0

[stem/master] Strip cert header/footer in Ed25519Certificate.parse()
by atagar＠torproject.org 05 Oct '19

05 Oct '19

commit 5b6cbad9892f7eba6e970e0f063864817d944cab Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Oct 2 13:39:38 2019 -0700 Strip cert header/footer in Ed25519Certificate.parse() Both server and hidden service descriptors do this stripping. On reflection this is cleaner if Ed25519Certificate.parse() normalizes instead. --- stem/descriptor/certificate.py | 9 +++++++-- stem/descriptor/hidden_service.py | 3 +-- stem/descriptor/server_descriptor.py | 5 +---- test/unit/descriptor/certificate.py | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/stem/descriptor/certificate.py b/stem/descriptor/certificate.py index e3e41ca4..01238182 100644 --- a/stem/descriptor/certificate.py +++ b/stem/descriptor/certificate.py @@ -112,7 +112,7 @@ class Ed25519Certificate(object): Base class for an Ed25519 certificate. :var int version: certificate format version - :var str encoded: base64 encoded ed25519 certificate + :var unicode encoded: base64 encoded ed25519 certificate """ def __init__(self, version, encoded): @@ -132,8 +132,13 @@ class Ed25519Certificate(object): :raises: **ValueError** if content is malformed """ + content = stem.util.str_tools._to_unicode(content) + + if content.startswith('-----BEGIN ED25519 CERT-----\n') and content.endswith('\n-----END ED25519 CERT-----'): + content = content[29:-27] + try: - decoded = base64.b64decode(stem.util.str_tools._to_bytes(content)) + decoded = base64.b64decode(content) if not decoded: raise TypeError('empty') diff --git a/stem/descriptor/hidden_service.py b/stem/descriptor/hidden_service.py index b1644f81..29fc838a 100644 --- a/stem/descriptor/hidden_service.py +++ b/stem/descriptor/hidden_service.py @@ -562,8 +562,7 @@ class HiddenServiceDescriptorV3(BaseHiddenServiceDescriptor): elif not stem.prereq._is_sha3_available(): raise ImportError('Hidden service descriptor decryption requires python 3.6+ or the pysha3 module (https://pypi.org/project/pysha3/)') - cert_lines = self.signing_cert.split('\n') - desc_signing_cert = stem.descriptor.certificate.Ed25519Certificate.parse(''.join(cert_lines[1:-1])) + desc_signing_cert = stem.descriptor.certificate.Ed25519Certificate.parse(self.signing_cert) for extension in desc_signing_cert.extensions: if extension.type == ExtensionType.HAS_SIGNING_KEY: diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 7eaf6e93..71f3a803 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -404,10 +404,7 @@ def _parse_identity_ed25519_line(descriptor, entries): _parse_key_block('identity-ed25519', 'ed25519_certificate', 'ED25519 CERT')(descriptor, entries) if descriptor.ed25519_certificate: - cert_lines = descriptor.ed25519_certificate.split('\n') - - if cert_lines[0] == '-----BEGIN ED25519 CERT-----' and cert_lines[-1] == '-----END ED25519 CERT-----': - descriptor.certificate = stem.descriptor.certificate.Ed25519Certificate.parse(''.join(cert_lines[1:-1])) + descriptor.certificate = stem.descriptor.certificate.Ed25519Certificate.parse(descriptor.ed25519_certificate) _parse_master_key_ed25519_line = _parse_simple_line('master-key-ed25519', 'ed25519_master_key') diff --git a/test/unit/descriptor/certificate.py b/test/unit/descriptor/certificate.py index ca0a626e..51960525 100644 --- a/test/unit/descriptor/certificate.py +++ b/test/unit/descriptor/certificate.py @@ -58,7 +58,7 @@ class TestEd25519Certificate(unittest.TestCase): self.assertEqual(Ed25519CertificateV1, type(cert)) self.assertEqual(1, cert.version) - self.assertEqual(cert_bytes, cert.encoded) + self.assertEqual(stem.util.str_tools._to_unicode(cert_bytes), cert.encoded) self.assertEqual(CertType.SIGNING, cert.type) self.assertEqual(datetime.datetime(1970, 1, 1, 0, 0), cert.expiration) self.assertEqual(1, cert.key_type)

1 0

[stem/master] Drop assertion statements
by atagar＠torproject.org 05 Oct '19

05 Oct '19

commit e1e49342284f2826c8b669e3641a40dd8ff9d3a1 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 28 13:39:58 2019 -0700 Drop assertion statements We don't use python assertions in Stem as they're largely useless. They don't get invoked unless explicitly enabled when invoking python, and most of these checks are redundant. For example, checking for '---BEGIN ED25519 CERT---' in "cert_lines" is already done by _parse_key_block(). If any of these assertions are important they should be integrated into descriptor validation - not an AssertionError. --- stem/descriptor/hidden_service.py | 5 ----- stem/descriptor/hsv3_crypto.py | 3 --- 2 files changed, 8 deletions(-) diff --git a/stem/descriptor/hidden_service.py b/stem/descriptor/hidden_service.py index fda5147b..802ca6c4 100644 --- a/stem/descriptor/hidden_service.py +++ b/stem/descriptor/hidden_service.py @@ -555,10 +555,7 @@ class HiddenServiceDescriptorV3(BaseHiddenServiceDescriptor): # and parses the internal descriptor content. def _decrypt(self, onion_address): - assert(self.signing_cert) cert_lines = self.signing_cert.split('\n') - assert(cert_lines[0] == '-----BEGIN ED25519 CERT-----' and cert_lines[-1] == '-----END ED25519 CERT-----') - desc_signing_cert = stem.descriptor.certificate.Ed25519Certificate.parse(''.join(cert_lines[1:-1])) # Get crypto material. @@ -576,8 +573,6 @@ class HiddenServiceDescriptorV3(BaseHiddenServiceDescriptor): identity_public_key = stem.descriptor.hsv3_crypto.decode_address(onion_address) identity_public_key_bytes = identity_public_key.public_bytes(encoding=serialization.Encoding.Raw, format=serialization.PublicFormat.Raw) - assert(len(identity_public_key_bytes) == 32) - subcredential_bytes = stem.descriptor.hsv3_crypto.get_subcredential(identity_public_key_bytes, blinded_key_bytes) outter_layer_plaintext = stem.descriptor.hsv3_crypto.decrypt_outter_layer(self.superencrypted, self.revision_counter, identity_public_key_bytes, blinded_key_bytes, subcredential_bytes) diff --git a/stem/descriptor/hsv3_crypto.py b/stem/descriptor/hsv3_crypto.py index 5439771a..248eacec 100644 --- a/stem/descriptor/hsv3_crypto.py +++ b/stem/descriptor/hsv3_crypto.py @@ -63,7 +63,6 @@ def decode_address(onion_address_str): # base32 decode the addr (convert to uppercase since that's what python expects) onion_address = base64.b32decode(onion_address.upper()) - assert(len(onion_address) == 35) # extract pieces of information pubkey = onion_address[:32] @@ -245,8 +244,6 @@ def decrypt_outter_layer(superencrypted_blob_b64, revision_counter, public_ident # XXX Remove the BEGIN MESSSAGE around the thing superencrypted_blob_b64_lines = superencrypted_blob_b64.split('\n') - assert(superencrypted_blob_b64_lines[0] == '-----BEGIN MESSAGE-----') - assert(superencrypted_blob_b64_lines[-1] == '-----END MESSAGE-----') superencrypted_blob_b64 = ''.join(superencrypted_blob_b64_lines[1:-1]) print('====== Decrypting outter layer =======')

1 0

[stem/master] Parse signing_cert as an ed25519 certificate
by atagar＠torproject.org 05 Oct '19

05 Oct '19

commit 80f4934183a0037926f11e18b54eda09bacb012c Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Oct 2 15:59:10 2019 -0700 Parse signing_cert as an ed25519 certificate I was mistaken to parse signing_cert as a key blob. Server descriptors are deprecating their key blob copy (the 'ed25519_certificate' attribute) in favor of a Ed25519Certificate instance, and hidden service descriptors should do the same. Hidden service v3 parsing isn't yet in a release so we can simply fix this in place without concern for backward compatibility. --- stem/descriptor/certificate.py | 15 +++++++++++++++ stem/descriptor/hidden_service.py | 14 +++++++------- stem/descriptor/server_descriptor.py | 2 ++ test/unit/descriptor/hidden_service_v3.py | 2 +- 4 files changed, 25 insertions(+), 8 deletions(-) diff --git a/stem/descriptor/certificate.py b/stem/descriptor/certificate.py index 4a78fa3f..e336bbda 100644 --- a/stem/descriptor/certificate.py +++ b/stem/descriptor/certificate.py @@ -152,6 +152,21 @@ class Ed25519Certificate(object): else: raise ValueError('Ed25519 certificate is version %i. Parser presently only supports version 1.' % version) + @staticmethod + def _from_descriptor(keyword, attribute): + def _parse(descriptor, entries): + value, block_type, block_contents = entries[keyword][0] + + if not block_contents or block_type != 'ED25519 CERT': + raise ValueError("'%s' should be followed by a ED25519 CERT block, but was a %s" % (keyword, block_type)) + + setattr(descriptor, attribute, Ed25519Certificate.parse(block_contents)) + + return _parse + + def __str__(self): + return '-----BEGIN ED25519 CERT-----\n%s\n-----END ED25519 CERT-----' % self.encoded + class Ed25519CertificateV1(Ed25519Certificate): """ diff --git a/stem/descriptor/hidden_service.py b/stem/descriptor/hidden_service.py index 2ca9f4bf..bf11c685 100644 --- a/stem/descriptor/hidden_service.py +++ b/stem/descriptor/hidden_service.py @@ -31,13 +31,14 @@ import collections import hashlib import io -import stem.descriptor.certificate import stem.descriptor.hsv3_crypto import stem.prereq import stem.util.connection import stem.util.str_tools import stem.util.tor_tools +from stem.descriptor.certificate import Ed25519Certificate + from stem.descriptor import ( PGP_BLOCK_END, Descriptor, @@ -199,7 +200,7 @@ _parse_v2_signature_line = _parse_key_block('signature', 'signature', 'SIGNATURE _parse_v3_version_line = _parse_int_line('hs-descriptor', 'version', allow_negative = False) _parse_lifetime_line = _parse_int_line('descriptor-lifetime', 'lifetime', allow_negative = False) -_parse_signing_key_line = _parse_key_block('descriptor-signing-key-cert', 'signing_cert', 'ED25519 CERT') +_parse_signing_cert = Ed25519Certificate._from_descriptor('descriptor-signing-key-cert', 'signing_cert') _parse_revision_counter_line = _parse_int_line('revision-counter', 'revision_counter', allow_negative = False) _parse_superencrypted_line = _parse_key_block('superencrypted', 'superencrypted', 'MESSAGE') _parse_v3_signature_line = _parse_simple_line('signature', 'signature') @@ -481,7 +482,7 @@ class HiddenServiceDescriptorV3(BaseHiddenServiceDescriptor): :var int version: **\\*** hidden service descriptor version :var int lifetime: **\\*** minutes after publication this descriptor is valid - :var str signing_cert: **\\*** cross-certifier for the short-term descriptor signing key + :var stem.certificate.Ed25519Certificate signing_cert: **\\*** cross-certifier for the short-term descriptor signing key :var int revision_counter: **\\*** descriptor revision number :var str superencrypted: **\\*** encrypted HS-DESC-ENC payload :var str signature: **\\*** signature of this descriptor @@ -497,7 +498,7 @@ class HiddenServiceDescriptorV3(BaseHiddenServiceDescriptor): ATTRIBUTES = { 'version': (None, _parse_v3_version_line), 'lifetime': (None, _parse_lifetime_line), - 'signing_cert': (None, _parse_signing_key_line), + 'signing_cert': (None, _parse_signing_cert), 'revision_counter': (None, _parse_revision_counter_line), 'superencrypted': (None, _parse_superencrypted_line), 'signature': (None, _parse_v3_signature_line), @@ -506,7 +507,7 @@ class HiddenServiceDescriptorV3(BaseHiddenServiceDescriptor): PARSER_FOR_LINE = { 'hs-descriptor': _parse_v3_version_line, 'descriptor-lifetime': _parse_lifetime_line, - 'descriptor-signing-key-cert': _parse_signing_key_line, + 'descriptor-signing-key-cert': _parse_signing_cert, 'revision-counter': _parse_revision_counter_line, 'superencrypted': _parse_superencrypted_line, 'signature': _parse_v3_signature_line, @@ -560,8 +561,7 @@ class HiddenServiceDescriptorV3(BaseHiddenServiceDescriptor): elif not stem.prereq._is_sha3_available(): raise ImportError('Hidden service descriptor decryption requires python 3.6+ or the pysha3 module (https://pypi.org/project/pysha3/)') - cert = stem.descriptor.certificate.Ed25519Certificate.parse(self.signing_cert) - blinded_key = cert.signing_key() + blinded_key = self.signing_cert.signing_key() if not blinded_key: raise ValueError('No signing key extension present') diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 71f3a803..ebadcde2 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -401,6 +401,8 @@ def _parse_exit_policy(descriptor, entries): def _parse_identity_ed25519_line(descriptor, entries): + # TODO: replace this with Ed25519Certificate._from_descriptor() in stem 2.x + _parse_key_block('identity-ed25519', 'ed25519_certificate', 'ED25519 CERT')(descriptor, entries) if descriptor.ed25519_certificate: diff --git a/test/unit/descriptor/hidden_service_v3.py b/test/unit/descriptor/hidden_service_v3.py index 2242d617..3824c8a6 100644 --- a/test/unit/descriptor/hidden_service_v3.py +++ b/test/unit/descriptor/hidden_service_v3.py @@ -46,7 +46,7 @@ class TestHiddenServiceDescriptorV3(unittest.TestCase): self.assertEqual(3, desc.version) self.assertEqual(180, desc.lifetime) - self.assertEqual(EXPECTED_SIGNING_CERT, desc.signing_cert) + self.assertEqual(EXPECTED_SIGNING_CERT, str(desc.signing_cert)) self.assertEqual(42, desc.revision_counter) self.assertTrue('eaH8VdaTKS' in desc.superencrypted) self.assertEqual('aglChCQF+lbzKgyxJJTpYGVShV/GMDRJ4+cRGCp+a2y/yX/tLSh7hzqI7rVZrUoGj74Xr1CLMYO3fXYCS+DPDQ', desc.signature)

1 0