February 2020 - tor-commits - lists.torproject.org

[stem/master] Drop 'sign' argument from base descriptor methods
by atagar＠torproject.org 10 Feb '20

10 Feb '20

commit 3e597d10f73db029ec733c26eaa9f76ab65b6bdb Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Feb 9 18:00:50 2020 -0800 Drop 'sign' argument from base descriptor methods Just a few classes implemented a sign argument. Subclasses already customize their signature when necessary so we can limit it to just the classes that use it. --- stem/descriptor/__init__.py | 10 +++------- stem/descriptor/bandwidth_file.py | 5 +---- stem/descriptor/extrainfo_descriptor.py | 10 ++-------- stem/descriptor/hidden_service.py | 15 ++++++--------- stem/descriptor/microdescriptor.py | 5 +---- stem/descriptor/networkstatus.py | 33 +++++++++------------------------ stem/descriptor/router_status_entry.py | 15 +++------------ stem/descriptor/server_descriptor.py | 10 ++-------- 8 files changed, 27 insertions(+), 76 deletions(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 0b9e2056..556970c3 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -865,7 +865,7 @@ class Descriptor(object): raise ValueError("Descriptor.from_str() expected a single descriptor, but had %i instead. Please include 'multiple = True' if you want a list of results instead." % len(results)) @classmethod - def content(cls, attr = None, exclude = (), sign = False): + def content(cls, attr = None, exclude = ()): """ Creates descriptor content with the given attributes. Mandatory fields are filled with dummy information unless data is supplied. This doesn't yet @@ -876,7 +876,6 @@ class Descriptor(object): :param dict attr: keyword/value mappings to be included in the descriptor :param list exclude: mandatory keywords to exclude from the descriptor, this results in an invalid descriptor - :param bool sign: includes cryptographic signatures and digests if True :returns: **str** with the content of a descriptor @@ -885,12 +884,10 @@ class Descriptor(object): * **NotImplementedError** if not implemented for this descriptor type """ - # TODO: drop the 'sign' argument in stem 2.x (only a few subclasses use this) - raise NotImplementedError("The create and content methods haven't been implemented for %s" % cls.__name__) @classmethod - def create(cls, attr = None, exclude = (), validate = True, sign = False): + def create(cls, attr = None, exclude = (), validate = True): """ Creates a descriptor with the given attributes. Mandatory fields are filled with dummy information unless data is supplied. This doesn't yet create a @@ -903,7 +900,6 @@ class Descriptor(object): results in an invalid descriptor :param bool validate: checks the validity of the descriptor's content if **True**, skips these checks otherwise - :param bool sign: includes cryptographic signatures and digests if True :returns: :class:`~stem.descriptor.Descriptor` subclass @@ -913,7 +909,7 @@ class Descriptor(object): * **NotImplementedError** if not implemented for this descriptor type """ - return cls(cls.content(attr, exclude, sign), validate = validate) + return cls(cls.content(attr, exclude), validate = validate) def type_annotation(self): """ diff --git a/stem/descriptor/bandwidth_file.py b/stem/descriptor/bandwidth_file.py index 43c43aff..3cf20595 100644 --- a/stem/descriptor/bandwidth_file.py +++ b/stem/descriptor/bandwidth_file.py @@ -301,7 +301,7 @@ class BandwidthFile(Descriptor): ATTRIBUTES.update(dict([(k, (None, _parse_header)) for k in HEADER_ATTR.keys()])) @classmethod - def content(cls, attr = None, exclude = (), sign = False): + def content(cls, attr = None, exclude = ()): """ Creates descriptor content with the given attributes. This descriptor type differs somewhat from others and treats our attr/exclude attributes as @@ -324,9 +324,6 @@ class BandwidthFile(Descriptor): }) """ - if sign: - raise NotImplementedError('Signing of %s not implemented' % cls.__name__) - header = collections.OrderedDict(attr) if attr is not None else collections.OrderedDict() timestamp = header.pop('timestamp', str(int(time.time()))) content = header.pop('content', []) diff --git a/stem/descriptor/extrainfo_descriptor.py b/stem/descriptor/extrainfo_descriptor.py index f53d9502..c9125efa 100644 --- a/stem/descriptor/extrainfo_descriptor.py +++ b/stem/descriptor/extrainfo_descriptor.py @@ -924,10 +924,7 @@ class RelayExtraInfoDescriptor(ExtraInfoDescriptor): ('published', _random_date()), ) - if signing_key: - sign = True - - if sign: + if sign or signing_key: if attr and 'router-signature' in attr: raise ValueError('Cannot sign the descriptor if a router-signature has been provided') @@ -990,10 +987,7 @@ class BridgeExtraInfoDescriptor(ExtraInfoDescriptor): }) @classmethod - def content(cls, attr = None, exclude = (), sign = False): - if sign: - raise NotImplementedError('Signing of %s not implemented' % cls.__name__) - + def content(cls, attr = None, exclude = ()): return _descriptor_content(attr, exclude, ( ('extra-info', 'ec2bridgereaac65a3 %s' % _random_fingerprint()), ('published', _random_date()), diff --git a/stem/descriptor/hidden_service.py b/stem/descriptor/hidden_service.py index ed455fd1..8d6fa813 100644 --- a/stem/descriptor/hidden_service.py +++ b/stem/descriptor/hidden_service.py @@ -688,10 +688,7 @@ class HiddenServiceDescriptorV2(BaseHiddenServiceDescriptor): } @classmethod - def content(cls, attr = None, exclude = (), sign = False): - if sign: - raise NotImplementedError('Signing of %s not implemented' % cls.__name__) - + def content(cls, attr = None, exclude = ()): return _descriptor_content(attr, exclude, ( ('rendezvous-service-descriptor', 'y3olqqblqw2gbh6phimfuiroechjjafa'), ('version', '2'), @@ -705,8 +702,8 @@ class HiddenServiceDescriptorV2(BaseHiddenServiceDescriptor): )) @classmethod - def create(cls, attr = None, exclude = (), validate = True, sign = False): - return cls(cls.content(attr, exclude, sign), validate = validate, skip_crypto_validation = not sign) + def create(cls, attr = None, exclude = (), validate = True): + return cls(cls.content(attr, exclude), validate = validate) def __init__(self, raw_contents, validate = False, skip_crypto_validation = False): super(HiddenServiceDescriptorV2, self).__init__(raw_contents, lazy_load = not validate) @@ -1302,7 +1299,7 @@ class InnerLayer(Descriptor): return _encrypt_layer(self.get_bytes(), b'hsdir-encrypted-data', revision_counter, subcredential, blinded_key) @classmethod - def content(cls, attr = None, exclude = (), sign = False, introduction_points = None): + def content(cls, attr = None, exclude = (), introduction_points = None): if introduction_points: suffix = '\n' + '\n'.join(map(IntroductionPointV3.encode, introduction_points)) else: @@ -1313,8 +1310,8 @@ class InnerLayer(Descriptor): )) + stem.util.str_tools._to_bytes(suffix) @classmethod - def create(cls, attr = None, exclude = (), validate = True, sign = False, introduction_points = None): - return cls(cls.content(attr, exclude, sign, introduction_points), validate = validate) + def create(cls, attr = None, exclude = (), validate = True, introduction_points = None): + return cls(cls.content(attr, exclude, introduction_points), validate = validate) def __init__(self, content, validate = False, outer_layer = None): super(InnerLayer, self).__init__(content, lazy_load = not validate) diff --git a/stem/descriptor/microdescriptor.py b/stem/descriptor/microdescriptor.py index f8ee58e8..42d115d6 100644 --- a/stem/descriptor/microdescriptor.py +++ b/stem/descriptor/microdescriptor.py @@ -245,10 +245,7 @@ class Microdescriptor(Descriptor): } @classmethod - def content(cls, attr = None, exclude = (), sign = False): - if sign: - raise NotImplementedError('Signing of %s not implemented' % cls.__name__) - + def content(cls, attr = None, exclude = ()): return _descriptor_content(attr, exclude, ( ('onion-key', _random_crypto_blob('RSA PUBLIC KEY')), )) diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index 444ec0c2..77c6d612 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -598,10 +598,7 @@ class NetworkStatusDocumentV2(NetworkStatusDocument): } @classmethod - def content(cls, attr = None, exclude = (), sign = False): - if sign: - raise NotImplementedError('Signing of %s not implemented' % cls.__name__) - + def content(cls, attr = None, exclude = ()): return _descriptor_content(attr, exclude, ( ('network-status-version', '2'), ('dir-source', '%s %s 80' % (_random_ipv4_address(), _random_ipv4_address())), @@ -1099,10 +1096,7 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): } @classmethod - def content(cls, attr = None, exclude = (), sign = False, authorities = None, routers = None): - if sign: - raise NotImplementedError('Signing of %s not implemented' % cls.__name__) - + def content(cls, attr = None, exclude = (), authorities = None, routers = None): attr = {} if attr is None else dict(attr) is_vote = attr.get('vote-status') == 'vote' @@ -1174,8 +1168,8 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): return desc_content @classmethod - def create(cls, attr = None, exclude = (), validate = True, sign = False, authorities = None, routers = None): - return cls(cls.content(attr, exclude, sign, authorities, routers), validate = validate) + def create(cls, attr = None, exclude = (), validate = True, authorities = None, routers = None): + return cls(cls.content(attr, exclude, authorities, routers), validate = validate) def __init__(self, raw_content, validate = False, default_params = True): """ @@ -1586,10 +1580,7 @@ class DirectoryAuthority(Descriptor): } @classmethod - def content(cls, attr = None, exclude = (), sign = False, is_vote = False): - if sign: - raise NotImplementedError('Signing of %s not implemented' % cls.__name__) - + def content(cls, attr = None, exclude = (), is_vote = False): attr = {} if attr is None else dict(attr) # include mandatory 'vote-digest' if a consensus @@ -1608,8 +1599,8 @@ class DirectoryAuthority(Descriptor): return content @classmethod - def create(cls, attr = None, exclude = (), validate = True, sign = False, is_vote = False): - return cls(cls.content(attr, exclude, sign, is_vote), validate = validate, is_vote = is_vote) + def create(cls, attr = None, exclude = (), validate = True, is_vote = False): + return cls(cls.content(attr, exclude, is_vote), validate = validate, is_vote = is_vote) def __init__(self, raw_content, validate = False, is_vote = False): """ @@ -1761,10 +1752,7 @@ class KeyCertificate(Descriptor): } @classmethod - def content(cls, attr = None, exclude = (), sign = False): - if sign: - raise NotImplementedError('Signing of %s not implemented' % cls.__name__) - + def content(cls, attr = None, exclude = ()): return _descriptor_content(attr, exclude, ( ('dir-key-certificate-version', '3'), ('fingerprint', _random_fingerprint()), @@ -1910,10 +1898,7 @@ class DetachedSignature(Descriptor): } @classmethod - def content(cls, attr = None, exclude = (), sign = False): - if sign: - raise NotImplementedError('Signing of %s not implemented' % cls.__name__) - + def content(cls, attr = None, exclude = ()): return _descriptor_content(attr, exclude, ( ('consensus-digest', '6D3CC0EFA408F228410A4A8145E1B0BB0670E442'), ('valid-after', _random_date()), diff --git a/stem/descriptor/router_status_entry.py b/stem/descriptor/router_status_entry.py index f84997ac..0486d78d 100644 --- a/stem/descriptor/router_status_entry.py +++ b/stem/descriptor/router_status_entry.py @@ -513,10 +513,7 @@ class RouterStatusEntryV2(RouterStatusEntry): }) @classmethod - def content(cls, attr = None, exclude = (), sign = False): - if sign: - raise NotImplementedError('Signing of %s not implemented' % cls.__name__) - + def content(cls, attr = None, exclude = ()): return _descriptor_content(attr, exclude, ( ('r', '%s p1aag7VwarGxqctS7/fS0y5FU+s oQZFLYe9e4A7bOkWKR7TaNxb0JE %s %s 9001 0' % (_random_nickname(), _random_date(), _random_ipv4_address())), )) @@ -607,10 +604,7 @@ class RouterStatusEntryV3(RouterStatusEntry): }) @classmethod - def content(cls, attr = None, exclude = (), sign = False): - if sign: - raise NotImplementedError('Signing of %s not implemented' % cls.__name__) - + def content(cls, attr = None, exclude = ()): return _descriptor_content(attr, exclude, ( ('r', '%s p1aag7VwarGxqctS7/fS0y5FU+s oQZFLYe9e4A7bOkWKR7TaNxb0JE %s %s 9001 0' % (_random_nickname(), _random_date(), _random_ipv4_address())), ('s', 'Fast Named Running Stable Valid'), @@ -675,10 +669,7 @@ class RouterStatusEntryMicroV3(RouterStatusEntry): }) @classmethod - def content(cls, attr = None, exclude = (), sign = False): - if sign: - raise NotImplementedError('Signing of %s not implemented' % cls.__name__) - + def content(cls, attr = None, exclude = ()): return _descriptor_content(attr, exclude, ( ('r', '%s ARIJF2zbqirB9IwsW0mQznccWww %s %s 9001 9030' % (_random_nickname(), _random_date(), _random_ipv4_address())), ('m', 'aiUklwBrua82obG5AsTX+iEpkjQA2+AQHxZ7GwMfY70'), diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 36ddb624..d38bac9d 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -781,9 +781,6 @@ class RelayDescriptor(ServerDescriptor): @classmethod def content(cls, attr = None, exclude = (), sign = False, signing_key = None, exit_policy = None): - if signing_key: - sign = True - if attr is None: attr = {} @@ -801,7 +798,7 @@ class RelayDescriptor(ServerDescriptor): ('signing-key', _random_crypto_blob('RSA PUBLIC KEY')), ] - if sign: + if sign or signing_key: if attr and 'signing-key' in attr: raise ValueError('Cannot sign the descriptor if a signing-key has been provided') elif attr and 'router-signature' in attr: @@ -939,10 +936,7 @@ class BridgeDescriptor(ServerDescriptor): }) @classmethod - def content(cls, attr = None, exclude = (), sign = False): - if sign: - raise NotImplementedError('Signing of %s not implemented' % cls.__name__) - + def content(cls, attr = None, exclude = ()): return _descriptor_content(attr, exclude, ( ('router', '%s %s 9001 0 0' % (_random_nickname(), _random_ipv4_address())), ('router-digest', '006FD96BA35E7785A6A3B8B75FE2E2435A13BDB4'),

1 0

[stem/master] Drop renamed fingerprint attribute
by atagar＠torproject.org 10 Feb '20

10 Feb '20

commit bae1ef0ab944cb930fe349821c844ee87bf47414 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Feb 9 14:34:10 2020 -0800 Drop renamed fingerprint attribute Old alias for v3ident. --- stem/descriptor/networkstatus.py | 10 ---------- test/unit/descriptor/networkstatus/directory_authority.py | 10 +++++----- test/unit/descriptor/networkstatus/document_v3.py | 4 ++-- 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index 1cab602c..743076be 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -1560,10 +1560,6 @@ class DirectoryAuthority(Descriptor): **\\*** mandatory attribute - .. versionchanged:: 1.4.0 - Renamed our 'fingerprint' attribute to 'v3ident' (prior attribute exists - for backward compatability, but is deprecated). - .. versionchanged:: 1.6.0 Added the is_shared_randomness_participate, shared_randomness_commitments, shared_randomness_previous_reveal_count, @@ -1702,12 +1698,6 @@ class DirectoryAuthority(Descriptor): else: self._entries = entries - # TODO: Due to a bug we had a 'fingerprint' rather than 'v3ident' attribute - # for a long while. Keeping this around for backward compatability, but - # this will be dropped in stem's 2.0 release. - - self.fingerprint = self.v3ident - def _parse_dir_address_line(descriptor, entries): # "dir-address" IPPort diff --git a/test/unit/descriptor/networkstatus/directory_authority.py b/test/unit/descriptor/networkstatus/directory_authority.py index 80d70927..325fad12 100644 --- a/test/unit/descriptor/networkstatus/directory_authority.py +++ b/test/unit/descriptor/networkstatus/directory_authority.py @@ -23,7 +23,7 @@ class TestDirectoryAuthority(unittest.TestCase): authority = DirectoryAuthority.create() self.assertTrue(authority.nickname.startswith('Unnamed')) - self.assertEqual(40, len(authority.fingerprint)) + self.assertEqual(40, len(authority.v3ident)) self.assertEqual('no.place.com', authority.hostname) self.assertEqual(9030, authority.dir_port) self.assertEqual(9090, authority.or_port) @@ -42,7 +42,7 @@ class TestDirectoryAuthority(unittest.TestCase): authority = DirectoryAuthority.create(is_vote = True) self.assertTrue(authority.nickname.startswith('Unnamed')) - self.assertEqual(40, len(authority.fingerprint)) + self.assertEqual(40, len(authority.v3ident)) self.assertEqual('no.place.com', authority.hostname) self.assertEqual(9030, authority.dir_port) self.assertEqual(9090, authority.or_port) @@ -73,7 +73,7 @@ class TestDirectoryAuthority(unittest.TestCase): authority = DirectoryAuthority(content, is_vote = False) self.assertEqual('gabelmoo-legacy', authority.nickname) - self.assertEqual('81349FC1F2DBA2C2C11B45CB9706637D480AB913', authority.fingerprint) + self.assertEqual('81349FC1F2DBA2C2C11B45CB9706637D480AB913', authority.v3ident) self.assertEqual('131.188.40.189', authority.hostname) self.assertEqual('131.188.40.189', authority.address) self.assertEqual(80, authority.dir_port) @@ -148,7 +148,7 @@ class TestDirectoryAuthority(unittest.TestCase): authority = DirectoryAuthority(content, False) self.assertEqual(None, authority.nickname) - self.assertEqual(None, authority.fingerprint) + self.assertEqual(None, authority.v3ident) self.assertEqual(None, authority.hostname) self.assertEqual(None, authority.address) self.assertEqual(None, authority.dir_port) @@ -171,7 +171,7 @@ class TestDirectoryAuthority(unittest.TestCase): self.assertRaises(ValueError, DirectoryAuthority, content, True) authority = DirectoryAuthority(content, False) - self.assertEqual(None, authority.fingerprint) + self.assertEqual(None, authority.v3ident) def test_malformed_address(self): """ diff --git a/test/unit/descriptor/networkstatus/document_v3.py b/test/unit/descriptor/networkstatus/document_v3.py index 93f98d77..22d49b5f 100644 --- a/test/unit/descriptor/networkstatus/document_v3.py +++ b/test/unit/descriptor/networkstatus/document_v3.py @@ -132,7 +132,7 @@ ci356fosgLiM1sVqCUkNdA== authority = document.directory_authorities[0] self.assertEqual(2, len(document.directory_authorities)) self.assertEqual('test001a', authority.nickname) - self.assertEqual('596CD48D61FDA4E868F4AA10FF559917BE3B1A35', authority.fingerprint) + self.assertEqual('596CD48D61FDA4E868F4AA10FF559917BE3B1A35', authority.v3ident) self.assertEqual('127.0.0.1', authority.hostname) self.assertEqual('127.0.0.1', authority.address) self.assertEqual(7001, authority.dir_port) @@ -256,7 +256,7 @@ DnN5aFtYKiTc19qIC7Nmo+afPdDEf0MlJvEOP5EWl3w= authority = document.directory_authorities[0] self.assertEqual(1, len(document.directory_authorities)) self.assertEqual('turtles', authority.nickname) - self.assertEqual('27B6B5996C426270A5C95488AA5BCEB6BCC86956', authority.fingerprint) + self.assertEqual('27B6B5996C426270A5C95488AA5BCEB6BCC86956', authority.v3ident) self.assertEqual('76.73.17.194', authority.hostname) self.assertEqual('76.73.17.194', authority.address) self.assertEqual(9030, authority.dir_port)

1 0

[stem/master] Drop Ed25519 certificate encoded attribute
by atagar＠torproject.org 10 Feb '20

10 Feb '20

commit 9aa0988b116841c4c845419136897521065b851d Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Feb 9 17:36:31 2020 -0800 Drop Ed25519 certificate encoded attribute Redundant with the to_base64() method. --- stem/descriptor/certificate.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/stem/descriptor/certificate.py b/stem/descriptor/certificate.py index 950fcf6b..fed16bac 100644 --- a/stem/descriptor/certificate.py +++ b/stem/descriptor/certificate.py @@ -137,12 +137,10 @@ class Ed25519Certificate(object): Base class for an Ed25519 certificate. :var int version: certificate format version - :var unicode encoded: base64 encoded ed25519 certificate """ def __init__(self, version): self.version = version - self.encoded = None # TODO: remove in stem 2.x @staticmethod def unpack(content): @@ -236,10 +234,6 @@ class Ed25519Certificate(object): def __str__(self): return self.to_base64(pem = True) - @staticmethod - def parse(content): - return Ed25519Certificate.from_base64(content) # TODO: drop this alias in stem 2.x - class Ed25519CertificateV1(Ed25519Certificate): """

1 0

[stem/master] Rename IntroductionPoints to IntroductionPointV2
by atagar＠torproject.org 10 Feb '20

10 Feb '20

commit c5c6834b72fde9a923a2784d818a7163022672d4 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Feb 9 18:18:52 2020 -0800 Rename IntroductionPoints to IntroductionPointV2 Renaming this class to more fittingly live aside their v3 counterpart. --- stem/descriptor/hidden_service.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/stem/descriptor/hidden_service.py b/stem/descriptor/hidden_service.py index 8d6fa813..5625fee6 100644 --- a/stem/descriptor/hidden_service.py +++ b/stem/descriptor/hidden_service.py @@ -133,9 +133,7 @@ class DecryptionFailure(Exception): """ -# TODO: rename in stem 2.x (add 'V2' and drop plural) - -class IntroductionPoints(collections.namedtuple('IntroductionPoints', INTRODUCTION_POINTS_ATTR.keys())): +class IntroductionPointV2(collections.namedtuple('IntroductionPointV2', INTRODUCTION_POINTS_ATTR.keys())): """ Introduction point for a v2 hidden service. @@ -738,7 +736,7 @@ class HiddenServiceDescriptorV2(BaseHiddenServiceDescriptor): """ Provided this service's introduction points. - :returns: **list** of :class:`~stem.descriptor.hidden_service.IntroductionPoints` + :returns: **list** of :class:`~stem.descriptor.hidden_service.IntroductionPointV2` :raises: * **ValueError** if the our introduction-points is malformed @@ -833,7 +831,7 @@ class HiddenServiceDescriptorV2(BaseHiddenServiceDescriptor): @staticmethod def _parse_introduction_points(content): """ - Provides the parsed list of IntroductionPoints for the unencrypted content. + Provides the parsed list of IntroductionPointV2 for the unencrypted content. """ introduction_points = [] @@ -880,7 +878,7 @@ class HiddenServiceDescriptorV2(BaseHiddenServiceDescriptor): auth_type, auth_data = auth_value.split(' ')[:2] auth_entries.append((auth_type, auth_data)) - introduction_points.append(IntroductionPoints(**attr)) + introduction_points.append(IntroductionPointV2(**attr)) return introduction_points

1 0

[stem/master] Drop deprecated microdescriptor identifiers
by atagar＠torproject.org 10 Feb '20

10 Feb '20

commit 531119df58f4512afbdb3c71a14b0c40684f641f Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Feb 8 13:21:35 2020 -0800 Drop deprecated microdescriptor identifiers Microdescriptor identifiers can appear multiple times so these attributes were replaced with a hash. --- stem/descriptor/microdescriptor.py | 15 +-------------- test/unit/descriptor/microdescriptor.py | 6 ------ 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/stem/descriptor/microdescriptor.py b/stem/descriptor/microdescriptor.py index 17d06d90..f8ee58e8 100644 --- a/stem/descriptor/microdescriptor.py +++ b/stem/descriptor/microdescriptor.py @@ -172,8 +172,6 @@ def _parse_id_line(descriptor, entries): if key_type in identities: raise ValueError("There can only be one 'id' line per a key type, but '%s' appeared multiple times" % key_type) - descriptor.identifier_type = key_type - descriptor.identifier = key_value identities[key_type] = key_value else: raise ValueError("'id' lines should contain both the key type and digest: id %s" % entry) @@ -206,19 +204,10 @@ class Microdescriptor(Descriptor): (:trac:`11743`) :var dict protocols: mapping of protocols to their supported versions - :var str identifier: base64 encoded identity digest (**deprecated**, use - identifiers instead) - :var str identifier_type: identity digest key type (**deprecated**, use - identifiers instead) - **\\*** attribute is required when we're parsed with validation - .. versionchanged:: 1.1.0 - Added the identifier and identifier_type attributes. - .. versionchanged:: 1.5.0 - Added the identifiers attribute, and deprecated identifier and - identifier_type since the field can now appear multiple times. + Added the identifiers attribute. .. versionchanged:: 1.6.0 Added the protocols attribute. @@ -240,8 +229,6 @@ class Microdescriptor(Descriptor): 'family': ([], _parse_family_line), 'exit_policy': (stem.exit_policy.MicroExitPolicy('reject 1-65535'), _parse_p_line), 'exit_policy_v6': (None, _parse_p6_line), - 'identifier_type': (None, _parse_id_line), # deprecated in favor of identifiers - 'identifier': (None, _parse_id_line), # deprecated in favor of identifiers 'identifiers': ({}, _parse_id_line), 'protocols': ({}, _parse_pr_line), } diff --git a/test/unit/descriptor/microdescriptor.py b/test/unit/descriptor/microdescriptor.py index f8e03a12..8d2c07e7 100644 --- a/test/unit/descriptor/microdescriptor.py +++ b/test/unit/descriptor/microdescriptor.py @@ -95,8 +95,6 @@ class TestMicrodescriptor(unittest.TestCase): self.assertEqual(stem.exit_policy.MicroExitPolicy('reject 1-65535'), desc.exit_policy) self.assertEqual(None, desc.exit_policy_v6) self.assertEqual({}, desc.identifiers) - self.assertEqual(None, desc.identifier_type) - self.assertEqual(None, desc.identifier) self.assertEqual({}, desc.protocols) self.assertEqual([], desc.get_unrecognized_lines()) @@ -184,8 +182,6 @@ class TestMicrodescriptor(unittest.TestCase): desc = Microdescriptor.create({'id': 'rsa1024 Cd47okjCHD83YGzThGBDptXs9Z4'}) self.assertEqual({'rsa1024': 'Cd47okjCHD83YGzThGBDptXs9Z4'}, desc.identifiers) - self.assertEqual('rsa1024', desc.identifier_type) - self.assertEqual('Cd47okjCHD83YGzThGBDptXs9Z4', desc.identifier) # check when there's multiple key types @@ -197,8 +193,6 @@ class TestMicrodescriptor(unittest.TestCase): desc = Microdescriptor(desc_text, validate = True) self.assertEqual({'rsa1024': 'Cd47okjCHD83YGzThGBDptXs9Z4', 'ed25519': '50f6ddbecdc848dcc6b818b14d1'}, desc.identifiers) - self.assertEqual('ed25519', desc.identifier_type) - self.assertEqual('50f6ddbecdc848dcc6b818b14d1', desc.identifier) # check when there's conflicting keys

1 0

[stem/master] Drop redundant microdescriptor digest
by atagar＠torproject.org 10 Feb '20

10 Feb '20

commit d72573be3ea8a5acd42b6593fff67136333a612c Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Feb 8 14:41:33 2020 -0800 Drop redundant microdescriptor digest --- stem/descriptor/router_status_entry.py | 11 +---------- test/unit/descriptor/router_status_entry.py | 3 +-- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/stem/descriptor/router_status_entry.py b/stem/descriptor/router_status_entry.py index d248774a..f84997ac 100644 --- a/stem/descriptor/router_status_entry.py +++ b/stem/descriptor/router_status_entry.py @@ -346,10 +346,6 @@ def _parse_microdescriptor_m_line(descriptor, entries): descriptor.microdescriptor_digest = _value('m', entries) - # TODO: drop the following in stem 2.x - - descriptor.digest = _base64_to_hex(_value('m', entries), check_if_fingerprint = False) - def _base64_to_hex(identity, check_if_fingerprint = True): """ @@ -644,9 +640,6 @@ class RouterStatusEntryMicroV3(RouterStatusEntry): :var list unrecognized_bandwidth_entries: **\\*** bandwidth weighting information that isn't yet recognized :var dict protocols: mapping of protocols to their supported versions - - :var str digest: **\\*** router's hex encoded digest of our corresponding - microdescriptor (**deprecated**, use microdescriptor_digest instead) :var str microdescriptor_digest: **\\*** router's base64 encoded digest of our corresponding microdescriptor .. versionchanged:: 1.6.0 @@ -656,7 +649,7 @@ class RouterStatusEntryMicroV3(RouterStatusEntry): Added the or_addresses attribute. .. versionchanged:: 1.7.0 - Added the microdescriptor_digest attribute to replace our now deprecated digest attribute. + Added the microdescriptor_digest attribute. **\\*** attribute is either required when we're parsed with validation or has a default value, others are left as **None** if undefined @@ -671,9 +664,7 @@ class RouterStatusEntryMicroV3(RouterStatusEntry): 'is_unmeasured': (False, _parse_w_line), 'unrecognized_bandwidth_entries': ([], _parse_w_line), 'protocols': ({}, _parse_pr_line), - 'microdescriptor_digest': (None, _parse_microdescriptor_m_line), - 'digest': (None, _parse_microdescriptor_m_line), }) PARSER_FOR_LINE = dict(RouterStatusEntry.PARSER_FOR_LINE, **{ diff --git a/test/unit/descriptor/router_status_entry.py b/test/unit/descriptor/router_status_entry.py index 7ee942e0..3aa02ecc 100644 --- a/test/unit/descriptor/router_status_entry.py +++ b/test/unit/descriptor/router_status_entry.py @@ -173,7 +173,6 @@ class TestRouterStatusEntry(unittest.TestCase): self.assertEqual(None, entry.version_line) self.assertEqual(None, entry.version) self.assertEqual('aiUklwBrua82obG5AsTX+iEpkjQA2+AQHxZ7GwMfY70', entry.microdescriptor_digest) - self.assertEqual('6A252497006BB9AF36A1B1B902C4D7FA2129923400DBE0101F167B1B031F63BD', entry.digest) self.assertEqual([], entry.get_unrecognized_lines()) @test.require.cryptography @@ -282,7 +281,7 @@ class TestRouterStatusEntry(unittest.TestCase): self.assertEqual(False, entry.is_unmeasured) self.assertEqual([], entry.unrecognized_bandwidth_entries) self.assertEqual(expected_protocols, entry.protocols) - self.assertEqual('1966FEC636AFD1FB2EC0FC0F36752F5BD43522F9399F3F26D4C70408CE0A63C0', entry.digest) + self.assertEqual('GWb+xjav0fsuwPwPNnUvW9Q1Ivk5nz8m1McECM4KY8A', entry.microdescriptor_digest) self.assertEqual([], entry.get_unrecognized_lines()) def test_missing_fields(self):

1 0

[stem/master] Drop obsolete hidden_service_dir attribute
by atagar＠torproject.org 10 Feb '20

10 Feb '20

commit 15bec6376b12108dbfb896d208d4294de53a3235 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Feb 9 17:02:31 2020 -0800 Drop obsolete hidden_service_dir attribute --- stem/descriptor/server_descriptor.py | 10 ---------- test/unit/descriptor/server_descriptor.py | 2 -- 2 files changed, 12 deletions(-) diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 4a54e42f..36ddb624 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -502,10 +502,6 @@ class ServerDescriptor(Descriptor): .. versionchanged:: 1.7.0 Added the is_hidden_service_dir attribute. - - .. versionchanged:: 1.7.0 - Deprecated the hidden_service_dir field, it's never been populated - (:spec:`43c2f78`). This field will be removed in Stem 2.0. """ ATTRIBUTES = { @@ -610,12 +606,6 @@ class ServerDescriptor(Descriptor): entries, self._unparsed_exit_policy = _descriptor_components(stem.util.str_tools._to_unicode(raw_contents), validate, extra_keywords = ('accept', 'reject'), non_ascii_fields = ('contact', 'platform')) - # TODO: Remove the following field in Stem 2.0. It has never been populated... - # - # https://gitweb.torproject.org/torspec.git/commit/?id=43c2f78 - - self.hidden_service_dir = ['2'] - if validate: self._parse(entries, validate) diff --git a/test/unit/descriptor/server_descriptor.py b/test/unit/descriptor/server_descriptor.py index 55b1ac42..6524f9d8 100644 --- a/test/unit/descriptor/server_descriptor.py +++ b/test/unit/descriptor/server_descriptor.py @@ -147,9 +147,7 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= self.assertEqual(expected_signature, desc.signature) self.assertEqual([], desc.get_unrecognized_lines()) self.assertEqual('2C7B27BEAB04B4E2459D89CA6D5CD1CC5F95A689', desc.digest()) - self.assertEqual('@type server-descriptor 1.0', str(desc.type_annotation())) - self.assertEqual(['2'], desc.hidden_service_dir) # obsolete field def test_metrics_descriptor_multiple(self): """

1 0

[stem/master] Rename BaseHiddenServiceDescriptor to HiddenServiceDescriptor
by atagar＠torproject.org 10 Feb '20

10 Feb '20

commit bb7d382e65301bb6c85349b6dfd06e0757ea9051 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Feb 9 18:22:08 2020 -0800 Rename BaseHiddenServiceDescriptor to HiddenServiceDescriptor Huh, odd. I could've sworn that I called this BaseHiddenServiceDescriptor because HiddenServiceDescriptorV2 was originally called that so it still retained an alias for the old name but I'm not spotting it. Oh well. --- stem/descriptor/hidden_service.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/stem/descriptor/hidden_service.py b/stem/descriptor/hidden_service.py index 5625fee6..8860b594 100644 --- a/stem/descriptor/hidden_service.py +++ b/stem/descriptor/hidden_service.py @@ -18,7 +18,7 @@ These are only available through the Controller's :: - BaseHiddenServiceDescriptor - Common parent for hidden service descriptors + HiddenServiceDescriptor - Common parent for hidden service descriptors |- HiddenServiceDescriptorV2 - Version 2 hidden service descriptor +- HiddenServiceDescriptorV3 - Version 3 hidden service descriptor |- address_from_identity_key - convert an identity key to address @@ -437,7 +437,7 @@ def _parse_file(descriptor_file, desc_type = None, validate = False, **kwargs): Iterates over the hidden service descriptors in a file. :param file descriptor_file: file with descriptor content - :param class desc_type: BaseHiddenServiceDescriptor subclass + :param class desc_type: HiddenServiceDescriptor subclass :param bool validate: checks the validity of the descriptor's content if **True**, skips these checks otherwise :param dict kwargs: additional arguments for the descriptor constructor @@ -621,17 +621,15 @@ _parse_v3_inner_intro_auth = _parse_simple_line('intro-auth-required', 'intro_au _parse_v3_inner_single_service = _parse_if_present('single-onion-service', 'is_single_service') -class BaseHiddenServiceDescriptor(Descriptor): +class HiddenServiceDescriptor(Descriptor): """ Hidden service descriptor. .. versionadded:: 1.8.0 """ - # TODO: rename this class to HiddenServiceDescriptor in stem 2.x - -class HiddenServiceDescriptorV2(BaseHiddenServiceDescriptor): +class HiddenServiceDescriptorV2(HiddenServiceDescriptor): """ Version 2 hidden service descriptor. @@ -883,7 +881,7 @@ class HiddenServiceDescriptorV2(BaseHiddenServiceDescriptor): return introduction_points -class HiddenServiceDescriptorV3(BaseHiddenServiceDescriptor): +class HiddenServiceDescriptorV3(HiddenServiceDescriptor): """ Version 3 hidden service descriptor. @@ -900,8 +898,6 @@ class HiddenServiceDescriptorV3(BaseHiddenServiceDescriptor): .. versionadded:: 1.8.0 """ - # TODO: requested this @type on https://trac.torproject.org/projects/tor/ticket/31481 - TYPE_ANNOTATION_NAME = 'hidden-service-descriptor-3' ATTRIBUTES = {

1 0

[stem/master] Drop obsolete NetworkStatusDocumentV3 attributes
by atagar＠torproject.org 10 Feb '20

10 Feb '20

commit d719f98a9b1b6db64bab26d5a6bcdadd5a36d93a Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Feb 9 17:42:29 2020 -0800 Drop obsolete NetworkStatusDocumentV3 attributes Couple attributes that were never used (they were misdocumentations in the spec). --- stem/descriptor/networkstatus.py | 15 +-------------- test/unit/descriptor/networkstatus/document_v3.py | 4 ---- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index 743076be..444ec0c2 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -1009,8 +1009,7 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): Added the packages attribute. .. versionchanged:: 1.5.0 - Added the is_shared_randomness_participate, shared_randomness_commitments, - shared_randomness_previous_reveal_count, + Added the shared_randomness_previous_reveal_count, shared_randomness_previous_value, shared_randomness_current_reveal_count, and shared_randomness_current_value attributes. @@ -1019,11 +1018,6 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): Added the recommended_client_protocols, recommended_relay_protocols, required_client_protocols, and required_relay_protocols attributes. - .. versionchanged:: 1.6.0 - The is_shared_randomness_participate and shared_randomness_commitments - were misdocumented in the tor spec and as such never set. They're now an - attribute of votes in the **directory_authorities**. - .. versionchanged:: 1.7.0 The shared_randomness_current_reveal_count and shared_randomness_previous_reveal_count attributes were undocumented and @@ -1198,13 +1192,6 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): super(NetworkStatusDocumentV3, self).__init__(raw_content, lazy_load = not validate) document_file = io.BytesIO(raw_content) - # TODO: Tor misdocumented these as being in the header rather than the - # authority section. As such these have never been set but we need the - # attributes for stem 1.5 compatability. Drop these in 2.0. - - self.is_shared_randomness_participate = False - self.shared_randomness_commitments = [] - self._default_params = default_params self._header(document_file, validate) diff --git a/test/unit/descriptor/networkstatus/document_v3.py b/test/unit/descriptor/networkstatus/document_v3.py index 22d49b5f..62ce6073 100644 --- a/test/unit/descriptor/networkstatus/document_v3.py +++ b/test/unit/descriptor/networkstatus/document_v3.py @@ -312,8 +312,6 @@ DnN5aFtYKiTc19qIC7Nmo+afPdDEf0MlJvEOP5EWl3w= self.assertEqual(expected_known_flags, document.known_flags) self.assertEqual([], document.packages) self.assertEqual({}, document.flag_thresholds) - self.assertEqual(False, document.is_shared_randomness_participate) - self.assertEqual([], document.shared_randomness_commitments) self.assertEqual(None, document.shared_randomness_previous_reveal_count) self.assertEqual(None, document.shared_randomness_previous_value) self.assertEqual(None, document.shared_randomness_current_reveal_count) @@ -352,8 +350,6 @@ DnN5aFtYKiTc19qIC7Nmo+afPdDEf0MlJvEOP5EWl3w= self.assertEqual(expected_known_flags, document.known_flags) self.assertEqual([], document.packages) self.assertEqual({}, document.flag_thresholds) - self.assertEqual(False, document.is_shared_randomness_participate) - self.assertEqual([], document.shared_randomness_commitments) self.assertEqual(None, document.shared_randomness_previous_reveal_count) self.assertEqual(None, document.shared_randomness_previous_value) self.assertEqual(None, document.shared_randomness_current_reveal_count)

1 0

[stem/master] Drop legacy pep8 support
by atagar＠torproject.org 10 Feb '20

10 Feb '20

commit 4fa9a1fb149ae3694fd82b628a936c6470c39726 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Feb 9 18:08:43 2020 -0800 Drop legacy pep8 support The pep8 module renamed itself to pycodestyle at Guido's request a while ago. Stem was compatible with both but this was long enough ago that we can drop support for the old module. --- stem/util/test_tools.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/stem/util/test_tools.py b/stem/util/test_tools.py index 117d273e..5888eb86 100644 --- a/stem/util/test_tools.py +++ b/stem/util/test_tools.py @@ -44,7 +44,6 @@ import stem.util.enum import stem.util.system CONFIG = stem.util.conf.config_dict('test', { - 'pep8.ignore': [], # TODO: drop with stem 2.x, legacy alias for pycodestyle.ignore 'pycodestyle.ignore': [], 'pyflakes.ignore': [], 'exclude_paths': [], @@ -345,8 +344,6 @@ def is_pycodestyle_available(): if _module_exists('pycodestyle'): import pycodestyle - elif _module_exists('pep8'): - import pep8 as pycodestyle else: return False @@ -417,7 +414,7 @@ def stylistic_issues(paths, check_newlines = False, check_exception_keyword = Fa ignore_for_file = [] ignore_all_for_files = [] - for rule in CONFIG['pycodestyle.ignore'] + CONFIG['pep8.ignore']: + for rule in CONFIG['pycodestyle.ignore']: if '=>' in rule: path, rule_entry = rule.split('=>', 1) @@ -441,10 +438,7 @@ def stylistic_issues(paths, check_newlines = False, check_exception_keyword = Fa return False if is_pycodestyle_available(): - if _module_exists('pep8'): - import pep8 as pycodestyle - else: - import pycodestyle + import pycodestyle class StyleReport(pycodestyle.BaseReport): def init_file(self, filename, lines, expected, line_offset):

1 0