May 2017 - tor-commits - lists.torproject.org

[atlas/master] Replace the About footer link with a Wiki link
by irl＠torproject.org 02 May '17

02 May '17

commit 5598a1e83d87b5f2aaf02cf2b5ed9370557e1945 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Mon Apr 24 18:25:09 2017 +0000 Replace the About footer link with a Wiki link The About link in the footer is redundant because there is already a link to the About page in the navigation bar. Furthermore, there was no reference to the Atlas wiki page so the Wiki link now replaces the About link. Closes #22057. --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index b13fceb..9584f6d 100644 --- a/index.html +++ b/index.html @@ -64,7 +64,7 @@ <hr/> <footer> The Tor Project - <div style="display: inline" id="year"></div><br/> - <a href="#about">About</a> - + <a href="https://trac.torproject.org/projects/tor/wiki/doc/Atlas">Wiki</a> - <a href="https://gitweb.torproject.org/atlas.git">Source code</a> - <a href="https://trac.torproject.org/projects/tor/newticket?component=Metrics/Atlas">Report a bug</a> - <a href="mailto:irl@torproject.org">Contact</a>

1 0

[atlas/master] Replace custom splash styling with an hero-unit
by irl＠torproject.org 02 May '17

02 May '17

commit 811cb09856615b928ba4e0903723b80128199311 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Sat Apr 22 12:21:34 2017 +0000 Replace custom splash styling with an hero-unit The hero-unit by Bootstrap offers similar functionality to the custom splash screen and reduces the amount of custom CSS. Closes #22056. --- css/style.css | 42 ------------------------------------------ templates/search/main.html | 2 +- 2 files changed, 1 insertion(+), 43 deletions(-) diff --git a/css/style.css b/css/style.css index e4a7f07..e05774f 100644 --- a/css/style.css +++ b/css/style.css @@ -3,41 +3,6 @@ height: 362px; } -.splash { - padding-top: 56px; - padding-bottom: 72px; - position: relative; -} - - -.splash h1 { - text-align: center; - font-size: 80px; - letter-spacing: -1px; - line-height: 1; - margin-bottom: 18px; -} - -.splash p { - margin-left: 5%; - margin-right: 5%; - line-height: 36px; - font-weight: 300; - font-size: 30px; -} - -.splash .learn-more { - margin-left: 5%; - margin-right: 5%; - text-align: center; - font-size: 30px; - line-height: 36px; -} - -.splash .learn-more { - -} - .progress { width: 50%; margin: 100px auto; @@ -104,13 +69,6 @@ input { .navbar-search input { max-width:100%; } - .splash h1 { - font-size:40px; - } - .splash p { - line-height: 30px; - font-size: 24px; - } .span6.hide { display: none !important; } diff --git a/templates/search/main.html b/templates/search/main.html index c8b82bc..6060dae 100644 --- a/templates/search/main.html +++ b/templates/search/main.html @@ -1,5 +1,5 @@ <div class="container"> - <div class="splash"> + <div class="hero-unit"> <h1>Welcome to Atlas.</h1> <p>Atlas is a web application to learn about currently running Tor relays. Enter your search in the above box to get started.</p> <p class="learn-more"><a class="btn btn-info btn-large" href="#about">Learn more »</a></p>

1 0

[atlas/master] Make the `Learn more` button more prominent
by irl＠torproject.org 02 May '17

02 May '17

commit ae5673e61758526b87acd15cc76505c6b5b92194 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Mon Apr 24 17:47:38 2017 +0000 Make the `Learn more` button more prominent The changes to make the button more prominent include using primary button styling which changes the colour to a darker blue and removing the guillemet. Additionally, the learn-more class is removed from the button because this class is unused. --- templates/search/main.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/search/main.html b/templates/search/main.html index 6060dae..6c8508a 100644 --- a/templates/search/main.html +++ b/templates/search/main.html @@ -2,7 +2,7 @@ <div class="hero-unit"> <h1>Welcome to Atlas.</h1> <p>Atlas is a web application to learn about currently running Tor relays. Enter your search in the above box to get started.</p> - <p class="learn-more"><a class="btn btn-info btn-large" href="#about">Learn more »</a></p> + <p><a class="btn btn-primary btn-large" href="#about">Learn more</a></p> </div> </div>

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 02 May '17

02 May '17

commit ee63bbf302f99f9112c1555df83095d6521347cc Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 2 20:15:22 2017 +0000 Update translations for https_everywhere --- es_AR/ssl-observatory.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/es_AR/ssl-observatory.dtd b/es_AR/ssl-observatory.dtd index 305afcc..9dabb39 100644 --- a/es_AR/ssl-observatory.dtd +++ b/es_AR/ssl-observatory.dtd @@ -3,9 +3,9 @@ <!ENTITY ssl-observatory.popup.later "Preguntarme después"> <!ENTITY ssl-observatory.popup.no "No"> -<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks -against your browser by sending the certificates you receive to the -Observatory. Turn this on?"> +<!ENTITY ssl-observatory.popup.text "En todos lados HTTPS puede detectar ataques +contra su navegador enviando los certificados que recibe al +observatorio. ¿Desea Activarlo?"> <!--<!ENTITY ssl-observatory.popup.text "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting

1 0

[stem/master] Stub descriptor creation method
by atagar＠torproject.org 02 May '17

02 May '17

commit acb791462a96dacefddb08934bedce6ff6ca0c9b Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Apr 24 10:51:47 2017 -0700 Stub descriptor creation method --- stem/descriptor/__init__.py | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index f80e6f6..d50b661 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -9,6 +9,7 @@ Package for parsing and processing descriptor data. :: parse_file - Parses the descriptors in a file. + create - Creates a new custom descriptor. Descriptor - Common parent for all descriptor file types. |- get_path - location of the descriptor on disk if it came from a file @@ -352,6 +353,41 @@ def _parse_metrics_file(descriptor_type, major_version, minor_version, descripto raise TypeError("Unrecognized metrics descriptor format. type: '%s', version: '%i.%i'" % (descriptor_type, major_version, minor_version)) +def create(desc_type, attr = None, exclude = (), validate = False, sign = False): + """ + Creates a descriptor with the given attributes. + + .. versionadded:: 1.6.0 + + :param DescriptorType desc_type: type of descriptor to be created + :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 validate: checks the validity of the descriptor's content if + **True**, skips these checks otherwise + :param bool sign_content: includes cryptographic digest if True + + :returns: :class:`~stem.descriptor.Descriptor` subclass + + :raises: + * **ValueError** if the contents is malformed and validate is True + * **ImportError** if cryptography is unavailable and sign is True + """ + + if desc_type == DescriptorType.SERVER: + pass + elif desc_type == DescriptorType.EXTRAINFO: + pass + elif desc_type == DescriptorType.MICRO: + pass + elif desc_type == DescriptorType.CONSENSUS: + pass + elif desc_type == DescriptorType.HIDDEN_SERVICE: + pass + else: + raise TypeError("'%s' isn't a valid descriptor type we can create" % desc_type) + + def _value(line, entries): return entries[line][0][0]

1 0

[stem/master] Note that created descriptors aren't signed
by atagar＠torproject.org 02 May '17

02 May '17

commit f655c68408924c87fc6dd170d0e108b8dd72a904 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon May 1 11:56:53 2017 -0700 Note that created descriptors aren't signed Love to have this capability but until we do we should note this. --- stem/descriptor/__init__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index c790e65..2b8ed5b 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -533,7 +533,8 @@ class Descriptor(object): def content(cls, attr = None, exclude = ()): """ Creates descriptor content with the given attributes. Mandatory fields are - filled with dummy information unless data is supplied. + filled with dummy information unless data is supplied. This doesn't yet + create a valid signature. .. versionadded:: 1.6.0 @@ -552,7 +553,8 @@ class Descriptor(object): 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. + with dummy information unless data is supplied. This doesn't yet create a + valid signature. .. versionadded:: 1.6.0

1 0

[stem/master] Drop sign_descriptor_content() testing helper
by atagar＠torproject.org 02 May '17

02 May '17

commit 6bc661515d20e733b730ea6722a4e3d3e72adddb Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Apr 30 23:36:42 2017 -0700 Drop sign_descriptor_content() testing helper This helper wasn't used by our tests any longer, and on reflection I can't make the router-signature it generates pass validation. There's one clear bug that slipped in a while ago: "b'b'.join()" should be "b'\n'.join()". But correcting that didn't make the function work. For now just dropping the broken helper. It would be sweeeet to be able to sign the descriptors we create but that's gonna take a bit of work. --- stem/descriptor/__init__.py | 13 ++--- stem/descriptor/server_descriptor.py | 6 +- test/mocking.py | 108 ----------------------------------- test/unit/tutorial.py | 2 - 4 files changed, 7 insertions(+), 122 deletions(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 32b7d7c..c790e65 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -530,7 +530,7 @@ class Descriptor(object): self._unrecognized_lines = [] @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. @@ -540,19 +540,16 @@ 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_content: includes cryptographic digest if True :returns: **str** with the content of a descriptor - :raises: - * **ImportError** if cryptography is unavailable and sign is True - * **NotImplementedError** if not implemented for this descriptor type + :raises: **NotImplementedError** if not implemented for this descriptor type """ 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. @@ -564,17 +561,15 @@ 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_content: includes cryptographic digest if True :returns: :class:`~stem.descriptor.Descriptor` subclass :raises: * **ValueError** if the contents is malformed and validate is True - * **ImportError** if cryptography is unavailable and sign is True * **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 get_path(self): """ diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 9f7c846..b4dcd23 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -809,12 +809,12 @@ class RelayDescriptor(ServerDescriptor): self.certificate.validate(self) @classmethod - def content(cls, attr = None, exclude = (), sign = False): + def content(cls, attr = None, exclude = ()): return _descriptor_content(attr, exclude, RELAY_SERVER_HEADER, RELAY_SERVER_FOOTER) @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, skip_crypto_validation = True) @lru_cache() def digest(self): diff --git a/test/mocking.py b/test/mocking.py index 4843a97..990aa89 100644 --- a/test/mocking.py +++ b/test/mocking.py @@ -663,111 +663,3 @@ def get_network_status_document_v3(attr = None, exclude = (), authorities = None return desc_content else: return stem.descriptor.networkstatus.NetworkStatusDocumentV3(desc_content, validate = True) - - -def sign_descriptor_content(desc_content): - """ - Add a valid signature to the supplied descriptor string. - - If cryptography is available the function will generate a key pair, and use - it to sign the descriptor string. Any existing fingerprint, signing-key or - router-signature data will be overwritten. If the library's unavailable the - code will return the unaltered descriptor. - - :param str desc_content: the descriptor string to sign - :returns: a descriptor string, signed if crypto available and unaltered otherwise - """ - - if not stem.prereq.is_crypto_available(): - return desc_content - else: - from cryptography.hazmat.backends import default_backend - from cryptography.hazmat.primitives import hashes - from cryptography.hazmat.primitives.asymmetric import rsa, padding - from cryptography.hazmat.primitives.serialization import Encoding, PublicFormat - - private_key = rsa.generate_private_key(public_exponent=65537, key_size=1024, backend=default_backend()) - public_key = private_key.public_key() - - # Get a string representation of the public key - - signing_key_token = b'\nsigning-key\n' # note the trailing '\n' is important here so as not to match the string elsewhere - signing_key_token_end = b'\n-----END RSA PUBLIC KEY-----\n' - new_sk = signing_key_token + public_key.public_bytes(encoding=Encoding.PEM, format=PublicFormat.PKCS1) - - # update the descriptor string with the new signing key - - skt_start = desc_content.find(signing_key_token) - skt_end = desc_content.find(signing_key_token_end, skt_start) - desc_content = desc_content[:skt_start] + new_sk + desc_content[skt_end + len(signing_key_token_end):] - - # generate the new fingerprint string - - seq_as_string = public_key.public_bytes(encoding=Encoding.DER, format=PublicFormat.PKCS1) - key_hash = stem.util.str_tools._to_bytes(hashlib.sha1(seq_as_string).hexdigest().upper()) - grouped_fingerprint = b'' - - for x in range(0, len(key_hash), 4): - grouped_fingerprint += b' ' + key_hash[x:x + 4] - fingerprint_token = b'\nfingerprint' - new_fp = fingerprint_token + grouped_fingerprint - - # update the descriptor string with the new fingerprint - - ft_start = desc_content.find(fingerprint_token) - if ft_start < 0: - fingerprint_token = b'\nopt fingerprint' - ft_start = desc_content.find(fingerprint_token) - - # if the descriptor does not already contain a fingerprint do not add one - - if ft_start >= 0: - ft_end = desc_content.find(b'\n', ft_start + 1) - desc_content = desc_content[:ft_start] + new_fp + desc_content[ft_end:] - - # create a temporary object to use to calculate the digest - - tempDesc = stem.descriptor.server_descriptor.RelayDescriptor(desc_content, validate=False) - - # calculate the new digest for the descriptor - - new_digest_hex = tempDesc.digest().lower() - - # remove the hex encoding - - if stem.prereq.is_python_3(): - new_digest = bytes.fromhex(new_digest_hex) - else: - new_digest = new_digest_hex.decode('hex_codec') - - # Generate the digest buffer. - # block is 128 bytes in size - # 2 bytes for the type info - # 1 byte for the separator - - digest_padding = b'' - - for x in range(125 - len(new_digest)): - digest_padding += b'\xFF' - digest_buffer = b'\x00\x01' + digest_padding + b'\x00' + new_digest - - # generate a new signature by signing the digest buffer with the private key - - signature_as_bytes = private_key.sign(digest_buffer, padding.PKCS1v15(), hashes.SHA1()) - signature_base64 = base64.b64encode(signature_as_bytes) - - signature_base64 = b'b'.join([ - signature_base64[:64], - signature_base64[64:128], - signature_base64[128:], - ]) - - # update the descriptor string with the new signature - - router_signature_token = b'\nrouter-signature\n' - router_signature_start = b'-----BEGIN SIGNATURE-----\n' - router_signature_end = b'\n-----END SIGNATURE-----\n' - rst_start = desc_content.find(router_signature_token) - desc_content = desc_content[:rst_start] + router_signature_token + router_signature_start + signature_base64 + router_signature_end - - return desc_content diff --git a/test/unit/tutorial.py b/test/unit/tutorial.py index 26ea2b1..a404b42 100644 --- a/test/unit/tutorial.py +++ b/test/unit/tutorial.py @@ -207,8 +207,6 @@ class TestTutorial(unittest.TestCase): return exit_descriptor = RelayDescriptor.content({'router': 'speedyexit 149.255.97.109 9001 0 0'}).replace(b'reject *:*', b'accept *:*') - - exit_descriptor = mocking.sign_descriptor_content(exit_descriptor) exit_descriptor = RelayDescriptor(exit_descriptor) downloader_mock().get_server_descriptors().run.return_value = [

1 0

[stem/master] RelayDescriptor creation
by atagar＠torproject.org 02 May '17

02 May '17

commit dafb4a6a96c0c1eb138a7c7d9499c5577864dc67 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Apr 30 16:37:16 2017 -0700 RelayDescriptor creation Implementing a function for creating our first descriptor type (relay server descriptors). This replacing our mocking util's get_relay_server_descriptor() with RelayDescriptor.create() and RelayDescriptor.content(). This is a little different from the API I was previously planning on but think I like this better. --- stem/descriptor/__init__.py | 154 ++++++++++++++++++++---------- stem/descriptor/server_descriptor.py | 30 +++++- test/mocking.py | 41 -------- test/unit/descriptor/export.py | 14 +-- test/unit/descriptor/server_descriptor.py | 95 ++++++++---------- test/unit/tutorial.py | 8 +- test/unit/tutorial_examples.py | 10 +- 7 files changed, 188 insertions(+), 164 deletions(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index d50b661..32b7d7c 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -18,22 +18,6 @@ Package for parsing and processing descriptor data. |- get_unrecognized_lines - unparsed descriptor content +- __str__ - string that the descriptor was made from -.. data:: DescriptorType (enum) - - Common descriptor types. - - .. versionadded:: 1.6.0 - - =================== =========== - DescriptorType Description - =================== =========== - **SERVER** :class:`~stem.descriptor.server_descriptor.RelayDescriptor` - **EXTRA** :class:`~stem.descriptor.extrainfo_descriptor.RelayExtraInfoDescriptor` - **MICRO** :class:`~stem.descriptor.microdescriptor.Microdescriptor` - **CONSENSUS** :class:`~stem.descriptor.networkstatus.NetworkStatusDocumentV3` - **HIDDEN_SERVICE** :class:`~stem.descriptor.hidden_service_descriptor.HiddenServiceDescriptor` - =================== =========== - .. data:: DocumentHandler (enum) Ways in which we can parse a @@ -97,20 +81,18 @@ PGP_BLOCK_START = re.compile('^-----BEGIN ([%s%s]+)-----$' % (KEYWORD_CHAR, WHIT PGP_BLOCK_END = '-----END %s-----' EMPTY_COLLECTION = ([], {}, set()) +CRYPTO_BLOB = """ +MIGJAoGBAJv5IIWQ+WDWYUdyA/0L8qbIkEVH/cwryZWoIaPAzINfrw1WfNZGtBmg +skFtXhOHHqTRN4GPPrZsAIUOQGzQtGb66IQgT4tO/pj+P6QmSCCdTfhvGfgTCsC+ +WPi4Fl2qryzTb3QO5r5x7T8OsG2IBUET1bLQzmtbC560SYR49IvVAgMBAAE= +""" + DocumentHandler = stem.util.enum.UppercaseEnum( 'ENTRIES', 'DOCUMENT', 'BARE_DOCUMENT', ) -DescriptorType = stem.util.enum.Enum( - ('SERVER', 'server-descriptor 1.0'), - ('EXTRAINFO', 'extra-info 1.0'), - ('MICRO', 'microdescriptor 1.0'), - ('CONSENSUS', 'network-status-consensus-3 1.0'), - ('HIDDEN_SERVICE', 'hidden-service-descriptor 1.0'), -) - def parse_file(descriptor_file, descriptor_type = None, validate = False, document_handler = DocumentHandler.ENTRIES, normalize_newlines = None, **kwargs): """ @@ -353,39 +335,64 @@ def _parse_metrics_file(descriptor_type, major_version, minor_version, descripto raise TypeError("Unrecognized metrics descriptor format. type: '%s', version: '%i.%i'" % (descriptor_type, major_version, minor_version)) -def create(desc_type, attr = None, exclude = (), validate = False, sign = False): +def _descriptor_content(attr = None, exclude = (), header_template = (), footer_template = ()): """ - Creates a descriptor with the given attributes. + Constructs a minimal descriptor with the given attributes. The content we + provide back is of the form... - .. versionadded:: 1.6.0 + * header_template (with matching attr filled in) + * unused attr entries + * footer_template (with matching attr filled in) - :param DescriptorType desc_type: type of descriptor to be created - :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 validate: checks the validity of the descriptor's content if - **True**, skips these checks otherwise - :param bool sign_content: includes cryptographic digest if True + So for instance... + + :: - :returns: :class:`~stem.descriptor.Descriptor` subclass + _descriptor_content( + attr = {'nickname': 'caerSidi', 'contact': 'atagar'}, + header_template = ( + ('nickname', 'foobar'), + ('fingerprint', '12345'), + ), + ) - :raises: - * **ValueError** if the contents is malformed and validate is True - * **ImportError** if cryptography is unavailable and sign is True + ... would result in... + + :: + + nickname caerSidi + fingerprint 12345 + contact atagar + + :param dict attr: keyword/value mappings to be included in the descriptor + :param list exclude: mandatory keywords to exclude from the descriptor + :param tuple header_template: key/value pairs for mandatory fields before unrecognized content + :param tuple footer_template: key/value pairs for mandatory fields after unrecognized content + + :returns: str with the requested descriptor content """ - if desc_type == DescriptorType.SERVER: - pass - elif desc_type == DescriptorType.EXTRAINFO: - pass - elif desc_type == DescriptorType.MICRO: - pass - elif desc_type == DescriptorType.CONSENSUS: - pass - elif desc_type == DescriptorType.HIDDEN_SERVICE: - pass - else: - raise TypeError("'%s' isn't a valid descriptor type we can create" % desc_type) + header_content, footer_content = [], [] + attr = {} if attr is None else dict(attr) # shallow copy since we're destructive + + for content, template in ((header_content, header_template), + (footer_content, footer_template)): + for keyword, value in template: + if keyword in exclude: + continue + + value = attr.pop(keyword, value) + + if not value: + content.append(keyword) + elif value.startswith('\n'): + # some values like crypto follow the line instead + content.append('%s%s' % (keyword, value)) + else: + content.append('%s %s' % (keyword, value)) + + remainder = [('%s %s' % (k, v) if v else k) for k, v in attr.items()] + return stem.util.str_tools._to_bytes('\n'.join(header_content + remainder + footer_content)) def _value(line, entries): @@ -522,6 +529,53 @@ class Descriptor(object): self._entries = {} self._unrecognized_lines = [] + @classmethod + def content(cls, attr = None, exclude = (), sign = False): + """ + Creates descriptor content with the given attributes. Mandatory fields are + filled with dummy information unless data is supplied. + + .. versionadded:: 1.6.0 + + :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_content: includes cryptographic digest if True + + :returns: **str** with the content of a descriptor + + :raises: + * **ImportError** if cryptography is unavailable and sign is True + * **NotImplementedError** if not implemented for this descriptor type + """ + + 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): + """ + Creates a descriptor with the given attributes. Mandatory fields are filled + with dummy information unless data is supplied. + + .. versionadded:: 1.6.0 + + :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 validate: checks the validity of the descriptor's content if + **True**, skips these checks otherwise + :param bool sign_content: includes cryptographic digest if True + + :returns: :class:`~stem.descriptor.Descriptor` subclass + + :raises: + * **ValueError** if the contents is malformed and validate is True + * **ImportError** if cryptography is unavailable and sign is True + * **NotImplementedError** if not implemented for this descriptor type + """ + + return cls(cls.content(attr, exclude, sign), validate = validate) + def get_path(self): """ Provides the absolute path that we loaded this descriptor from. diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index ddc1149..9f7c846 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -49,8 +49,10 @@ import stem.version from stem.util import str_type from stem.descriptor import ( + CRYPTO_BLOB, PGP_BLOCK_END, Descriptor, + _descriptor_content, _get_descriptor_components, _read_until_keywords, _bytes_for_block, @@ -110,6 +112,19 @@ SINGLE_FIELDS = ( DEFAULT_IPV6_EXIT_POLICY = stem.exit_policy.MicroExitPolicy('reject 1-65535') REJECT_ALL_POLICY = stem.exit_policy.ExitPolicy('reject *:*') +RELAY_SERVER_HEADER = ( + ('router', 'caerSidi 71.35.133.197 9001 0 0'), + ('published', '2012-03-01 17:15:27'), + ('bandwidth', '153600 256000 104590'), + ('reject', '*:*'), + ('onion-key', '\n-----BEGIN RSA PUBLIC KEY-----%s-----END RSA PUBLIC KEY-----' % CRYPTO_BLOB), + ('signing-key', '\n-----BEGIN RSA PUBLIC KEY-----%s-----END RSA PUBLIC KEY-----' % CRYPTO_BLOB), +) + +RELAY_SERVER_FOOTER = ( + ('router-signature', '\n-----BEGIN SIGNATURE-----%s-----END SIGNATURE-----' % CRYPTO_BLOB), +) + def _parse_file(descriptor_file, is_bridge = False, validate = False, **kwargs): """ @@ -738,6 +753,9 @@ class RelayDescriptor(ServerDescriptor): Our **ed25519_certificate** is deprecated in favor of our new **certificate** attribute. The base64 encoded certificate is available via the certificate's **encoded** attribute. + + .. versionchanged:: 1.6.0 + Added the **skip_crypto_validation** constructor argument. """ ATTRIBUTES = dict(ServerDescriptor.ATTRIBUTES, **{ @@ -765,7 +783,7 @@ class RelayDescriptor(ServerDescriptor): 'router-signature': _parse_router_signature_line, }) - def __init__(self, raw_contents, validate = False, annotations = None): + def __init__(self, raw_contents, validate = False, annotations = None, skip_crypto_validation = False): super(RelayDescriptor, self).__init__(raw_contents, validate, annotations) if validate: @@ -775,7 +793,7 @@ class RelayDescriptor(ServerDescriptor): if key_hash != self.fingerprint.lower(): raise ValueError('Fingerprint does not match the hash of our signing key (fingerprint: %s, signing key hash: %s)' % (self.fingerprint.lower(), key_hash)) - if stem.prereq.is_crypto_available(): + if not skip_crypto_validation and stem.prereq.is_crypto_available(): signed_digest = self._digest_for_signature(self.signing_key, self.signature) if signed_digest != self.digest(): @@ -790,6 +808,14 @@ class RelayDescriptor(ServerDescriptor): if stem.prereq._is_pynacl_available() and self.certificate: self.certificate.validate(self) + @classmethod + def content(cls, attr = None, exclude = (), sign = False): + return _descriptor_content(attr, exclude, RELAY_SERVER_HEADER, RELAY_SERVER_FOOTER) + + @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) + @lru_cache() def digest(self): """ diff --git a/test/mocking.py b/test/mocking.py index c293cf0..4843a97 100644 --- a/test/mocking.py +++ b/test/mocking.py @@ -14,7 +14,6 @@ Helper functions for creating mock objects. get_protocolinfo_response - stem.response.protocolinfo.ProtocolInfoResponse stem.descriptor.server_descriptor - get_relay_server_descriptor - RelayDescriptor get_bridge_server_descriptor - BridgeDescriptor stem.descriptor.microdescriptor @@ -80,19 +79,6 @@ DOC_SIG = stem.descriptor.networkstatus.DocumentSignature( 'BF112F1C6D5543CFD0A32215ACABD4197B5279AD', '-----BEGIN SIGNATURE-----%s-----END SIGNATURE-----' % CRYPTO_BLOB) -RELAY_SERVER_HEADER = ( - ('router', 'caerSidi 71.35.133.197 9001 0 0'), - ('published', '2012-03-01 17:15:27'), - ('bandwidth', '153600 256000 104590'), - ('reject', '*:*'), - ('onion-key', '\n-----BEGIN RSA PUBLIC KEY-----%s-----END RSA PUBLIC KEY-----' % CRYPTO_BLOB), - ('signing-key', '\n-----BEGIN RSA PUBLIC KEY-----%s-----END RSA PUBLIC KEY-----' % CRYPTO_BLOB), -) - -RELAY_SERVER_FOOTER = ( - ('router-signature', '\n-----BEGIN SIGNATURE-----%s-----END SIGNATURE-----' % CRYPTO_BLOB), -) - BRIDGE_SERVER_HEADER = ( ('router', 'Unnamed 10.45.227.253 9001 0 0'), ('router-digest', '006FD96BA35E7785A6A3B8B75FE2E2435A13BDB4'), @@ -366,33 +352,6 @@ def _get_descriptor_content(attr = None, exclude = (), header_template = (), foo return stem.util.str_tools._to_bytes('\n'.join(header_content + remainder + footer_content)) -def get_relay_server_descriptor(attr = None, exclude = (), content = False, sign_content = False): - """ - Provides the descriptor content for... - stem.descriptor.server_descriptor.RelayDescriptor - - :param dict attr: keyword/value mappings to be included in the descriptor - :param list exclude: mandatory keywords to exclude from the descriptor - :param bool content: provides the str content of the descriptor rather than the class if True - :param bool sign_content: sets a proper digest value if True - - :returns: RelayDescriptor for the requested descriptor content - """ - - desc_content = _get_descriptor_content(attr, exclude, RELAY_SERVER_HEADER, RELAY_SERVER_FOOTER) - - if content: - return desc_content - else: - if sign_content: - desc_content = sign_descriptor_content(desc_content) - - with patch('stem.prereq.is_crypto_available', Mock(return_value = False)): - desc = stem.descriptor.server_descriptor.RelayDescriptor(desc_content, validate = True) - - return desc - - def get_bridge_server_descriptor(attr = None, exclude = (), content = False): """ Provides the descriptor content for... diff --git a/test/unit/descriptor/export.py b/test/unit/descriptor/export.py index a262343..009c43d 100644 --- a/test/unit/descriptor/export.py +++ b/test/unit/descriptor/export.py @@ -11,10 +11,10 @@ except ImportError: import stem.prereq +from stem.descriptor.server_descriptor import RelayDescriptor from stem.descriptor.export import export_csv, export_csv_file from test.mocking import ( - get_relay_server_descriptor, get_bridge_server_descriptor, ) @@ -29,7 +29,7 @@ class TestExport(unittest.TestCase): self.skipTest('(header added in python 2.7)') return - desc = get_relay_server_descriptor() + desc = RelayDescriptor.create() desc_csv = export_csv(desc, included_fields = ('nickname', 'address', 'published'), header = False) expected = 'caerSidi,71.35.133.197,2012-03-01 17:15:27\n' @@ -50,7 +50,7 @@ class TestExport(unittest.TestCase): for nickname in nicknames: router_line = '%s 71.35.133.197 9001 0 0' % nickname - descriptors.append(get_relay_server_descriptor({'router': router_line})) + descriptors.append(RelayDescriptor.create({'router': router_line})) expected = '\n'.join(nicknames) + '\n' self.assertEqual(expected, export_csv(descriptors, included_fields = ('nickname',), header = False)) @@ -61,7 +61,7 @@ class TestExport(unittest.TestCase): the same output as export_csv(). """ - desc = get_relay_server_descriptor() + desc = RelayDescriptor.create() desc_csv = export_csv(desc) csv_buffer = StringIO() @@ -78,7 +78,7 @@ class TestExport(unittest.TestCase): self.skipTest('(header added in python 2.7)') return - desc = get_relay_server_descriptor() + desc = RelayDescriptor.create() desc_csv = export_csv(desc) self.assertTrue(',signature' in desc_csv) @@ -96,7 +96,7 @@ class TestExport(unittest.TestCase): Attempts to make a csv with attributes that don't exist. """ - desc = get_relay_server_descriptor() + desc = RelayDescriptor.create() self.assertRaises(ValueError, export_csv, desc, ('nickname', 'blarg!')) def test_multiple_descriptor_types(self): @@ -104,6 +104,6 @@ class TestExport(unittest.TestCase): Attempts to make a csv with multiple descriptor types. """ - server_desc = get_relay_server_descriptor() + server_desc = RelayDescriptor.create() bridge_desc = get_bridge_server_descriptor() self.assertRaises(ValueError, export_csv, (server_desc, bridge_desc)) diff --git a/test/unit/descriptor/server_descriptor.py b/test/unit/descriptor/server_descriptor.py index 747600c..1b754bf 100644 --- a/test/unit/descriptor/server_descriptor.py +++ b/test/unit/descriptor/server_descriptor.py @@ -21,7 +21,6 @@ from stem.descriptor.certificate import CertType, ExtensionType from stem.descriptor.server_descriptor import RelayDescriptor, BridgeDescriptor from test.mocking import ( - get_relay_server_descriptor, get_bridge_server_descriptor, CRYPTO_BLOB, ) @@ -433,8 +432,7 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= attributes. """ - desc = get_relay_server_descriptor() - + desc = RelayDescriptor.create() self.assertEqual('caerSidi', desc.nickname) self.assertEqual('71.35.133.197', desc.address) self.assertEqual(None, desc.fingerprint) @@ -445,7 +443,7 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= Includes an 'opt <keyword> <value>' entry. """ - desc = get_relay_server_descriptor({'opt': 'contact www.atagar.com/contact/'}) + desc = RelayDescriptor.create({'opt': 'contact www.atagar.com/contact/'}) self.assertEqual(b'www.atagar.com/contact/', desc.contact) def test_unrecognized_line(self): @@ -453,7 +451,7 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= Includes unrecognized content in the descriptor. """ - desc = get_relay_server_descriptor({'pepperjack': 'is oh so tasty!'}) + desc = RelayDescriptor.create({'pepperjack': 'is oh so tasty!'}) self.assertEqual(['pepperjack is oh so tasty!'], desc.get_unrecognized_lines()) def test_proceeding_line(self): @@ -461,79 +459,72 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= Includes a line prior to the 'router' entry. """ - desc_text = b'hibernate 1\n' + get_relay_server_descriptor(content = True) - self._expect_invalid_attr(desc_text) + desc_text = b'hibernate 1\n' + RelayDescriptor.content() + self._expect_invalid_attr_for_text(desc_text) def test_trailing_line(self): """ Includes a line after the 'router-signature' entry. """ - desc_text = get_relay_server_descriptor(content = True) + b'\nhibernate 1' - self._expect_invalid_attr(desc_text) + desc_text = RelayDescriptor.content() + b'\nhibernate 1' + self._expect_invalid_attr_for_text(desc_text) def test_nickname_missing(self): """ Constructs with a malformed router entry. """ - desc_text = get_relay_server_descriptor({'router': ' 71.35.133.197 9001 0 0'}, content = True) - self._expect_invalid_attr(desc_text, 'nickname') + self._expect_invalid_attr({'router': ' 71.35.133.197 9001 0 0'}, 'nickname') def test_nickname_too_long(self): """ Constructs with a nickname that is an invalid length. """ - desc_text = get_relay_server_descriptor({'router': 'saberrider2008ReallyLongNickname 71.35.133.197 9001 0 0'}, content = True) - self._expect_invalid_attr(desc_text, 'nickname') + self._expect_invalid_attr({'router': 'saberrider2008ReallyLongNickname 71.35.133.197 9001 0 0'}, 'nickname') def test_nickname_invalid_char(self): """ Constructs with an invalid relay nickname. """ - desc_text = get_relay_server_descriptor({'router': '$aberrider2008 71.35.133.197 9001 0 0'}, content = True) - self._expect_invalid_attr(desc_text, 'nickname') + self._expect_invalid_attr({'router': '$aberrider2008 71.35.133.197 9001 0 0'}, 'nickname') def test_address_malformed(self): """ Constructs with an invalid ip address. """ - desc_text = get_relay_server_descriptor({'router': 'caerSidi 371.35.133.197 9001 0 0'}, content = True) - self._expect_invalid_attr(desc_text, 'address') + self._expect_invalid_attr({'router': 'caerSidi 371.35.133.197 9001 0 0'}, 'address') def test_port_too_high(self): """ Constructs with an ORPort that is too large. """ - desc_text = get_relay_server_descriptor({'router': 'caerSidi 71.35.133.197 900001 0 0'}, content = True) - self._expect_invalid_attr(desc_text, 'or_port') + self._expect_invalid_attr({'router': 'caerSidi 71.35.133.197 900001 0 0'}, 'or_port') def test_port_malformed(self): """ Constructs with an ORPort that isn't numeric. """ - desc_text = get_relay_server_descriptor({'router': 'caerSidi 71.35.133.197 900a1 0 0'}, content = True) - self._expect_invalid_attr(desc_text, 'or_port') + self._expect_invalid_attr({'router': 'caerSidi 71.35.133.197 900a1 0 0'}, 'or_port') def test_port_newline(self): """ Constructs with a newline replacing the ORPort. """ - desc_text = get_relay_server_descriptor({'router': 'caerSidi 71.35.133.197 \n 0 0'}, content = True) - self._expect_invalid_attr(desc_text, 'or_port') + self._expect_invalid_attr({'router': 'caerSidi 71.35.133.197 \n 0 0'}, 'or_port') def test_platform_empty(self): """ Constructs with an empty platform entry. """ - desc_text = get_relay_server_descriptor({'platform': ''}, content = True) + desc_text = RelayDescriptor.content({'platform': ''}) desc = RelayDescriptor(desc_text, validate = False) self.assertEqual(b'', desc.platform) @@ -547,7 +538,7 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= Parse a platform line belonging to a node-Tor relay. """ - desc = get_relay_server_descriptor({'platform': 'node-Tor 0.1.0 on Linux x86_64'}) + desc = RelayDescriptor.create({'platform': 'node-Tor 0.1.0 on Linux x86_64'}) self.assertEqual(b'node-Tor 0.1.0 on Linux x86_64', desc.platform) self.assertEqual(stem.version.Version('0.1.0'), desc.tor_version) self.assertEqual('Linux x86_64', desc.operating_system) @@ -557,8 +548,7 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= Constructs with a protocols line without circuit versions. """ - desc_text = get_relay_server_descriptor({'opt': 'protocols Link 1 2'}, content = True) - self._expect_invalid_attr(desc_text, 'circuit_protocols') + self._expect_invalid_attr({'opt': 'protocols Link 1 2'}, 'circuit_protocols') @patch('stem.prereq.is_crypto_available', Mock(return_value = False)) def test_published_leap_year(self): @@ -567,20 +557,17 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= invalid. """ - desc_text = get_relay_server_descriptor({'published': '2011-02-29 04:03:19'}, content = True) - self._expect_invalid_attr(desc_text, 'published') + self._expect_invalid_attr({'published': '2011-02-29 04:03:19'}, 'published') - desc_text = get_relay_server_descriptor({'published': '2012-02-29 04:03:19'}, content = True) - expected_published = datetime.datetime(2012, 2, 29, 4, 3, 19) - self.assertEqual(expected_published, RelayDescriptor(desc_text).published) + desc = RelayDescriptor.create({'published': '2012-02-29 04:03:19'}) + self.assertEqual(datetime.datetime(2012, 2, 29, 4, 3, 19), desc.published) def test_published_no_time(self): """ Constructs with a published entry without a time component. """ - desc_text = get_relay_server_descriptor({'published': '2012-01-01'}, content = True) - self._expect_invalid_attr(desc_text, 'published') + self._expect_invalid_attr({'published': '2012-01-01'}, 'published') def test_read_and_write_history(self): """ @@ -591,7 +578,7 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= for field in ('read-history', 'write-history'): value = '2005-12-16 18:00:48 (900 s) 81,8848,8927,8927,83,8848' - desc = get_relay_server_descriptor({'opt %s' % field: value}) + desc = RelayDescriptor.create({'opt %s' % field: value}) if field == 'read-history': attr = (desc.read_history_end, desc.read_history_interval, desc.read_history_values) @@ -610,8 +597,7 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= Parses a read-history with an empty value. """ - value = '2005-12-17 01:23:11 (900 s) ' - desc = get_relay_server_descriptor({'opt read-history': value}) + desc = RelayDescriptor.create({'opt read-history': '2005-12-17 01:23:11 (900 s) '}) self.assertEqual(datetime.datetime(2005, 12, 17, 1, 23, 11), desc.read_history_end) self.assertEqual(900, desc.read_history_interval) self.assertEqual([], desc.read_history_values) @@ -623,7 +609,7 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= """ desc_text = b'@pepperjack very tasty\n@mushrooms not so much\n' - desc_text += get_relay_server_descriptor(content = True) + desc_text += RelayDescriptor.content() desc_text += b'\ntrailing text that should be invalid, ho hum' # running _parse_file should provide an iterator with a single descriptor @@ -631,7 +617,7 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= self.assertRaises(ValueError, list, desc_iter) desc_text = b'@pepperjack very tasty\n@mushrooms not so much\n' - desc_text += get_relay_server_descriptor(content = True) + desc_text += RelayDescriptor.content() desc_iter = stem.descriptor.server_descriptor._parse_file(io.BytesIO(desc_text)) desc_entries = list(desc_iter) @@ -649,9 +635,9 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= Constructs with a field appearing twice. """ - desc_text = get_relay_server_descriptor({'<replace>': ''}, content = True) + desc_text = RelayDescriptor.content({'<replace>': ''}) desc_text = desc_text.replace(b'<replace>', b'contact foo\ncontact bar') - self._expect_invalid_attr(desc_text, 'contact', b'foo') + self._expect_invalid_attr_for_text(desc_text, 'contact', b'foo') def test_missing_required_attr(self): """ @@ -659,7 +645,7 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= """ for attr in stem.descriptor.server_descriptor.REQUIRED_FIELDS: - desc_text = get_relay_server_descriptor(exclude = [attr], content = True) + desc_text = RelayDescriptor.content(exclude = [attr]) self.assertRaises(ValueError, RelayDescriptor, desc_text, True) # check that we can still construct it without validation @@ -680,24 +666,22 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= """ fingerprint = '4F0C 867D F0EF 6816 0568 C826 838F 482C EA7C FE45' - desc_text = get_relay_server_descriptor({'opt fingerprint': fingerprint}, content = True) - self._expect_invalid_attr(desc_text, 'fingerprint', fingerprint.replace(' ', '')) + self._expect_invalid_attr({'opt fingerprint': fingerprint}, 'fingerprint', fingerprint.replace(' ', '')) def test_ipv6_policy(self): """ Checks a 'ipv6-policy' line. """ - expected = stem.exit_policy.MicroExitPolicy('accept 22-23,53,80,110') - desc = get_relay_server_descriptor({'ipv6-policy': 'accept 22-23,53,80,110'}) - self.assertEqual(expected, desc.exit_policy_v6) + desc = RelayDescriptor.create({'ipv6-policy': 'accept 22-23,53,80,110'}) + self.assertEqual(stem.exit_policy.MicroExitPolicy('accept 22-23,53,80,110'), desc.exit_policy_v6) def test_extrainfo_sha256_digest(self): """ Extrainfo descriptor line with both a hex and base64 encoded sha256 digest. """ - desc = get_relay_server_descriptor({'extra-info-digest': '03272BF7C68484AFBDA508DAE3734D809E4A5BC4 DWMz1AEdqPlcroubwx3lPEoGbT+oX7S2BH653sPIqfI'}) + desc = RelayDescriptor.create({'extra-info-digest': '03272BF7C68484AFBDA508DAE3734D809E4A5BC4 DWMz1AEdqPlcroubwx3lPEoGbT+oX7S2BH653sPIqfI'}) self.assertEqual('03272BF7C68484AFBDA508DAE3734D809E4A5BC4', desc.extra_info_digest) self.assertEqual('DWMz1AEdqPlcroubwx3lPEoGbT+oX7S2BH653sPIqfI', desc.extra_info_sha256_digest) @@ -706,7 +690,7 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= Checks a 'proto' line. """ - desc = get_relay_server_descriptor({'proto': 'Cons=1 Desc=1 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 Link=1-4 LinkAuth=1 Microdesc=1 Relay=1-2'}) + desc = RelayDescriptor.create({'proto': 'Cons=1 Desc=1 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 Link=1-4 LinkAuth=1 Microdesc=1 Relay=1-2'}) self.assertEqual({'Cons': [1], 'Desc': [1], 'DirCache': [1], 'HSDir': [1], 'HSIntro': [3], 'HSRend': [1], 'Link': [1, 2, 3, 4], 'LinkAuth': [1], 'Microdesc': [1], 'Relay': [1, 2]}, desc.protocols) def test_protocols_with_no_mapping(self): @@ -715,7 +699,7 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= """ exc_msg = "Protocol entires are expected to be a series of 'key=value' pairs but was: proto Desc Link=1-4" - self.assertRaisesRegexp(ValueError, exc_msg, get_relay_server_descriptor, {'proto': 'Desc Link=1-4'}) + self.assertRaisesRegexp(ValueError, exc_msg, RelayDescriptor.create, {'proto': 'Desc Link=1-4'}) def test_parse_with_non_int_version(self): """ @@ -723,14 +707,14 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= """ exc_msg = 'Protocol values should be a number or number range, but was: proto Desc=hi Link=1-4' - self.assertRaisesRegexp(ValueError, exc_msg, get_relay_server_descriptor, {'proto': 'Desc=hi Link=1-4'}) + self.assertRaisesRegexp(ValueError, exc_msg, RelayDescriptor.create, {'proto': 'Desc=hi Link=1-4'}) def test_ntor_onion_key(self): """ Checks a 'ntor-onion-key' line. """ - desc = get_relay_server_descriptor({'ntor-onion-key': 'Od2Sj3UXFyDjwESLXk6fhatqW9z/oBL/vAKJ+tbDqUU='}) + desc = RelayDescriptor.create({'ntor-onion-key': 'Od2Sj3UXFyDjwESLXk6fhatqW9z/oBL/vAKJ+tbDqUU='}) self.assertEqual('Od2Sj3UXFyDjwESLXk6fhatqW9z/oBL/vAKJ+tbDqUU=', desc.ntor_onion_key) def test_minimal_bridge_descriptor(self): @@ -775,7 +759,7 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= its unsanatized content. """ - desc_text = get_relay_server_descriptor({'router-digest': '006FD96BA35E7785A6A3B8B75FE2E2435A13BDB4'}, content = True) + desc_text = RelayDescriptor.content({'router-digest': '006FD96BA35E7785A6A3B8B75FE2E2435A13BDB4'}) desc = BridgeDescriptor(desc_text) self.assertFalse(desc.is_scrubbed()) @@ -848,7 +832,10 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= desc = BridgeDescriptor(desc_text) self.assertEqual(expected_or_addresses, desc.or_addresses) - def _expect_invalid_attr(self, desc_text, attr = None, expected_value = None): + def _expect_invalid_attr(self, desc_attrs, attr = None, expected_value = None): + self._expect_invalid_attr_for_text(RelayDescriptor.content(desc_attrs), attr, expected_value) + + def _expect_invalid_attr_for_text(self, desc_text, attr = None, expected_value = None): """ Asserts that construction will fail due to desc_text having a malformed attribute. If an attr is provided then we check that it matches an expected diff --git a/test/unit/tutorial.py b/test/unit/tutorial.py index ac0bdd4..26ea2b1 100644 --- a/test/unit/tutorial.py +++ b/test/unit/tutorial.py @@ -165,7 +165,7 @@ class TestTutorial(unittest.TestCase): @patch('stem.descriptor.reader.DescriptorReader', spec = DescriptorReader) def test_mirror_mirror_on_the_wall_4(self, reader_mock, stdout_mock): reader = reader_mock().__enter__() - reader.__iter__.return_value = iter([mocking.get_relay_server_descriptor()]) + reader.__iter__.return_value = iter([RelayDescriptor.create()]) exec_documentation_example('past_descriptors.py') self.assertEqual('found relay caerSidi (None)\n', stdout_mock.getvalue()) @@ -206,16 +206,14 @@ class TestTutorial(unittest.TestCase): if count > 15: return - exit_descriptor = mocking.get_relay_server_descriptor({ - 'router': 'speedyexit 149.255.97.109 9001 0 0' - }, content = True).replace(b'reject *:*', b'accept *:*') + exit_descriptor = RelayDescriptor.content({'router': 'speedyexit 149.255.97.109 9001 0 0'}).replace(b'reject *:*', b'accept *:*') exit_descriptor = mocking.sign_descriptor_content(exit_descriptor) exit_descriptor = RelayDescriptor(exit_descriptor) downloader_mock().get_server_descriptors().run.return_value = [ exit_descriptor, - mocking.get_relay_server_descriptor(), # non-exit + RelayDescriptor.create(), # non-exit exit_descriptor, exit_descriptor, ] diff --git a/test/unit/tutorial_examples.py b/test/unit/tutorial_examples.py index de5079e..267fd3d 100644 --- a/test/unit/tutorial_examples.py +++ b/test/unit/tutorial_examples.py @@ -18,12 +18,12 @@ import stem.prereq from stem.control import Controller from stem.util import str_type from stem.descriptor.remote import DIRECTORY_AUTHORITIES +from stem.descriptor.server_descriptor import RelayDescriptor from test import mocking from test.unit import exec_documentation_example from test.mocking import ( - get_relay_server_descriptor, get_router_status_entry_v3, ROUTER_STATUS_ENTRY_V3_HEADER, get_network_status_document_v3, @@ -228,10 +228,10 @@ class TestTutorialExamples(unittest.TestCase): @patch('stem.descriptor.remote.DescriptorDownloader') def test_outdated_relays(self, downloader_mock, stdout_mock): downloader_mock().get_server_descriptors.return_value = [ - get_relay_server_descriptor({'platform': 'node-Tor 0.2.3.0 on Linux x86_64'}), - get_relay_server_descriptor({'platform': 'node-Tor 0.1.0 on Linux x86_64'}), - get_relay_server_descriptor({'opt': 'contact Random Person admin(a)gtr-10.de', 'platform': 'node-Tor 0.2.3.0 on Linux x86_64'}), - get_relay_server_descriptor({'opt': 'contact Sambuddha Basu', 'platform': 'node-Tor 0.1.0 on Linux x86_64'}), + RelayDescriptor.create({'platform': 'node-Tor 0.2.3.0 on Linux x86_64'}), + RelayDescriptor.create({'platform': 'node-Tor 0.1.0 on Linux x86_64'}), + RelayDescriptor.create({'opt': 'contact Random Person admin(a)gtr-10.de', 'platform': 'node-Tor 0.2.3.0 on Linux x86_64'}), + RelayDescriptor.create({'opt': 'contact Sambuddha Basu', 'platform': 'node-Tor 0.1.0 on Linux x86_64'}), ] exec_documentation_example('outdated_relays.py')

1 0

[stem/master] Rename _get_descriptor_components()
by atagar＠torproject.org 02 May '17

02 May '17

commit 90cb14b9e0d46a38e522d0e2d29f67099822cee1 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon May 1 11:59:29 2017 -0700 Rename _get_descriptor_components() When able we're dropping the 'get_' prefix from methods. This one's private so trivial to tweak. --- stem/descriptor/__init__.py | 2 +- stem/descriptor/extrainfo_descriptor.py | 4 ++-- stem/descriptor/hidden_service_descriptor.py | 6 +++--- stem/descriptor/microdescriptor.py | 4 ++-- stem/descriptor/networkstatus.py | 12 ++++++------ stem/descriptor/router_status_entry.py | 4 ++-- stem/descriptor/server_descriptor.py | 4 ++-- stem/descriptor/tordnsel.py | 4 ++-- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 2b8ed5b..c414a4c 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -936,7 +936,7 @@ def _get_pseudo_pgp_block(remaining_contents): return None -def _get_descriptor_components(raw_contents, validate, extra_keywords = (), non_ascii_fields = ()): +def _descriptor_components(raw_contents, validate, extra_keywords = (), non_ascii_fields = ()): """ Initial breakup of the server descriptor contents to make parsing easier. diff --git a/stem/descriptor/extrainfo_descriptor.py b/stem/descriptor/extrainfo_descriptor.py index 848ba3e..2843c8a 100644 --- a/stem/descriptor/extrainfo_descriptor.py +++ b/stem/descriptor/extrainfo_descriptor.py @@ -82,7 +82,7 @@ from stem.descriptor import ( Descriptor, _descriptor_content, _read_until_keywords, - _get_descriptor_components, + _descriptor_components, _value, _values, _parse_simple_line, @@ -862,7 +862,7 @@ class ExtraInfoDescriptor(Descriptor): """ super(ExtraInfoDescriptor, self).__init__(raw_contents, lazy_load = not validate) - entries = _get_descriptor_components(raw_contents, validate) + entries = _descriptor_components(raw_contents, validate) if validate: for keyword in self._required_fields(): diff --git a/stem/descriptor/hidden_service_descriptor.py b/stem/descriptor/hidden_service_descriptor.py index 9c87500..fb88368 100644 --- a/stem/descriptor/hidden_service_descriptor.py +++ b/stem/descriptor/hidden_service_descriptor.py @@ -33,7 +33,7 @@ import stem.util.str_tools from stem.descriptor import ( PGP_BLOCK_END, Descriptor, - _get_descriptor_components, + _descriptor_components, _read_until_keywords, _bytes_for_block, _value, @@ -232,7 +232,7 @@ class HiddenServiceDescriptor(Descriptor): def __init__(self, raw_contents, validate = False): super(HiddenServiceDescriptor, self).__init__(raw_contents, lazy_load = not validate) - entries = _get_descriptor_components(raw_contents, validate, non_ascii_fields = ('introduction-points')) + entries = _descriptor_components(raw_contents, validate, non_ascii_fields = ('introduction-points')) if validate: for keyword in REQUIRED_FIELDS: @@ -371,7 +371,7 @@ class HiddenServiceDescriptor(Descriptor): break # reached the end attr = dict(INTRODUCTION_POINTS_ATTR) - entries = _get_descriptor_components(content, False) + entries = _descriptor_components(content, False) for keyword, values in list(entries.items()): value, block_type, block_contents = values[0] diff --git a/stem/descriptor/microdescriptor.py b/stem/descriptor/microdescriptor.py index ce3eb08..a1e5346 100644 --- a/stem/descriptor/microdescriptor.py +++ b/stem/descriptor/microdescriptor.py @@ -70,7 +70,7 @@ import stem.exit_policy from stem.descriptor import ( Descriptor, - _get_descriptor_components, + _descriptor_components, _read_until_keywords, _values, _parse_simple_line, @@ -259,7 +259,7 @@ class Microdescriptor(Descriptor): def __init__(self, raw_contents, validate = False, annotations = None): super(Microdescriptor, self).__init__(raw_contents, lazy_load = not validate) self._annotation_lines = annotations if annotations else [] - entries = _get_descriptor_components(raw_contents, validate) + entries = _descriptor_components(raw_contents, validate) if validate: self.digest = hashlib.sha256(self.get_bytes()).hexdigest().upper() diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index cb801f0..2b00ebc 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -66,7 +66,7 @@ from stem.descriptor import ( PGP_BLOCK_END, Descriptor, DocumentHandler, - _get_descriptor_components, + _descriptor_components, _read_until_keywords, _value, _parse_simple_line, @@ -471,7 +471,7 @@ class NetworkStatusDocumentV2(NetworkStatusDocument): self.routers = dict((desc.fingerprint, desc) for desc in router_iter) - entries = _get_descriptor_components(document_content + b'\n' + document_file.read(), validate) + entries = _descriptor_components(document_content + b'\n' + document_file.read(), validate) if validate: self._check_constraints(entries) @@ -978,7 +978,7 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): def _header(self, document_file, validate): content = bytes.join(b'', _read_until_keywords((AUTH_START, ROUTERS_START, FOOTER_START), document_file)) - entries = _get_descriptor_components(content, validate) + entries = _descriptor_components(content, validate) header_fields = [attr[0] for attr in HEADER_STATUS_DOCUMENT_FIELDS] if validate: @@ -1011,7 +1011,7 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): self._entries.update(entries) def _footer(self, document_file, validate): - entries = _get_descriptor_components(document_file.read(), validate) + entries = _descriptor_components(document_file.read(), validate) footer_fields = [attr[0] for attr in FOOTER_STATUS_DOCUMENT_FIELDS] if validate: @@ -1294,7 +1294,7 @@ class DirectoryAuthority(Descriptor): else: self.key_certificate = None - entries = _get_descriptor_components(content, validate) + entries = _descriptor_components(content, validate) if validate and 'dir-source' != list(entries.keys())[0]: raise ValueError("Authority entries are expected to start with a 'dir-source' line:\n%s" % (content)) @@ -1446,7 +1446,7 @@ class KeyCertificate(Descriptor): def __init__(self, raw_content, validate = False): super(KeyCertificate, self).__init__(raw_content, lazy_load = not validate) - entries = _get_descriptor_components(raw_content, validate) + entries = _descriptor_components(raw_content, validate) if validate: if 'dir-key-certificate-version' != list(entries.keys())[0]: diff --git a/stem/descriptor/router_status_entry.py b/stem/descriptor/router_status_entry.py index 3cdb4ed..129f6f7 100644 --- a/stem/descriptor/router_status_entry.py +++ b/stem/descriptor/router_status_entry.py @@ -31,7 +31,7 @@ from stem.descriptor import ( Descriptor, _value, _values, - _get_descriptor_components, + _descriptor_components, _parse_protocol_line, _read_until_keywords, ) @@ -435,7 +435,7 @@ class RouterStatusEntry(Descriptor): super(RouterStatusEntry, self).__init__(content, lazy_load = not validate) self.document = document - entries = _get_descriptor_components(content, validate) + entries = _descriptor_components(content, validate) if validate: for keyword in self._required_fields(): diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index d764588..9367d1c 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -53,7 +53,7 @@ from stem.descriptor import ( PGP_BLOCK_END, Descriptor, _descriptor_content, - _get_descriptor_components, + _descriptor_components, _read_until_keywords, _bytes_for_block, _value, @@ -609,7 +609,7 @@ class ServerDescriptor(Descriptor): # influences the resulting exit policy, but for everything else the order # does not matter so breaking it into key / value pairs. - entries, self._unparsed_exit_policy = _get_descriptor_components(stem.util.str_tools._to_unicode(raw_contents), validate, extra_keywords = ('accept', 'reject'), non_ascii_fields = ('contact', 'platform')) + 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')) if validate: self._parse(entries, validate) diff --git a/stem/descriptor/tordnsel.py b/stem/descriptor/tordnsel.py index 731dbfa..d8b2b42 100644 --- a/stem/descriptor/tordnsel.py +++ b/stem/descriptor/tordnsel.py @@ -17,7 +17,7 @@ import stem.util.tor_tools from stem.descriptor import ( Descriptor, _read_until_keywords, - _get_descriptor_components, + _descriptor_components, ) @@ -63,7 +63,7 @@ class TorDNSEL(Descriptor): def __init__(self, raw_contents, validate): super(TorDNSEL, self).__init__(raw_contents) raw_contents = stem.util.str_tools._to_unicode(raw_contents) - entries = _get_descriptor_components(raw_contents, validate) + entries = _descriptor_components(raw_contents, validate) self.fingerprint = None self.published = None

1 0

[stem/master] BridgeDescriptor creation
by atagar＠torproject.org 02 May '17

02 May '17

commit ab765d3233090d0014b939b4f0d3e89e70d96c89 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon May 1 10:39:50 2017 -0700 BridgeDescriptor creation --- stem/descriptor/server_descriptor.py | 12 +++++++++++ test/mocking.py | 31 --------------------------- test/unit/descriptor/export.py | 10 ++------- test/unit/descriptor/server_descriptor.py | 35 ++++++++++++++----------------- 4 files changed, 30 insertions(+), 58 deletions(-) diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index b4dcd23..d764588 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -125,6 +125,14 @@ RELAY_SERVER_FOOTER = ( ('router-signature', '\n-----BEGIN SIGNATURE-----%s-----END SIGNATURE-----' % CRYPTO_BLOB), ) +BRIDGE_SERVER_HEADER = ( + ('router', 'Unnamed 10.45.227.253 9001 0 0'), + ('router-digest', '006FD96BA35E7785A6A3B8B75FE2E2435A13BDB4'), + ('published', '2012-03-22 17:34:38'), + ('bandwidth', '409600 819200 5120'), + ('reject', '*:*'), +) + def _parse_file(descriptor_file, is_bridge = False, validate = False, **kwargs): """ @@ -900,6 +908,10 @@ class BridgeDescriptor(ServerDescriptor): 'router-digest': _parse_router_digest_line, }) + @classmethod + def content(cls, attr = None, exclude = ()): + return _descriptor_content(attr, exclude, BRIDGE_SERVER_HEADER) + def digest(self): return self._digest diff --git a/test/mocking.py b/test/mocking.py index 990aa89..caf7d44 100644 --- a/test/mocking.py +++ b/test/mocking.py @@ -13,9 +13,6 @@ Helper functions for creating mock objects. get_message - stem.response.ControlMessage get_protocolinfo_response - stem.response.protocolinfo.ProtocolInfoResponse - stem.descriptor.server_descriptor - get_bridge_server_descriptor - BridgeDescriptor - stem.descriptor.microdescriptor get_microdescriptor - Microdescriptor @@ -79,14 +76,6 @@ DOC_SIG = stem.descriptor.networkstatus.DocumentSignature( 'BF112F1C6D5543CFD0A32215ACABD4197B5279AD', '-----BEGIN SIGNATURE-----%s-----END SIGNATURE-----' % CRYPTO_BLOB) -BRIDGE_SERVER_HEADER = ( - ('router', 'Unnamed 10.45.227.253 9001 0 0'), - ('router-digest', '006FD96BA35E7785A6A3B8B75FE2E2435A13BDB4'), - ('published', '2012-03-22 17:34:38'), - ('bandwidth', '409600 819200 5120'), - ('reject', '*:*'), -) - RELAY_EXTRAINFO_HEADER = ( ('extra-info', 'ninja B2289C3EAB83ECD6EB916A2F481A02E6B76A0A48'), ('published', '2012-05-05 17:03:50'), @@ -352,26 +341,6 @@ def _get_descriptor_content(attr = None, exclude = (), header_template = (), foo return stem.util.str_tools._to_bytes('\n'.join(header_content + remainder + footer_content)) -def get_bridge_server_descriptor(attr = None, exclude = (), content = False): - """ - Provides the descriptor content for... - stem.descriptor.server_descriptor.BridgeDescriptor - - :param dict attr: keyword/value mappings to be included in the descriptor - :param list exclude: mandatory keywords to exclude from the descriptor - :param bool content: provides the str content of the descriptor rather than the class if True - - :returns: BridgeDescriptor for the requested descriptor content - """ - - desc_content = _get_descriptor_content(attr, exclude, BRIDGE_SERVER_HEADER) - - if content: - return desc_content - else: - return stem.descriptor.server_descriptor.BridgeDescriptor(desc_content, validate = True) - - def get_relay_extrainfo_descriptor(attr = None, exclude = (), content = False): """ Provides the descriptor content for... diff --git a/test/unit/descriptor/export.py b/test/unit/descriptor/export.py index 009c43d..cd005d1 100644 --- a/test/unit/descriptor/export.py +++ b/test/unit/descriptor/export.py @@ -11,13 +11,9 @@ except ImportError: import stem.prereq -from stem.descriptor.server_descriptor import RelayDescriptor +from stem.descriptor.server_descriptor import RelayDescriptor, BridgeDescriptor from stem.descriptor.export import export_csv, export_csv_file -from test.mocking import ( - get_bridge_server_descriptor, -) - class TestExport(unittest.TestCase): def test_minimal_descriptor(self): @@ -104,6 +100,4 @@ class TestExport(unittest.TestCase): Attempts to make a csv with multiple descriptor types. """ - server_desc = RelayDescriptor.create() - bridge_desc = get_bridge_server_descriptor() - self.assertRaises(ValueError, export_csv, (server_desc, bridge_desc)) + self.assertRaises(ValueError, export_csv, (RelayDescriptor.create(), BridgeDescriptor.create())) diff --git a/test/unit/descriptor/server_descriptor.py b/test/unit/descriptor/server_descriptor.py index 1b754bf..f30fed6 100644 --- a/test/unit/descriptor/server_descriptor.py +++ b/test/unit/descriptor/server_descriptor.py @@ -20,11 +20,6 @@ from stem.util import str_type from stem.descriptor.certificate import CertType, ExtensionType from stem.descriptor.server_descriptor import RelayDescriptor, BridgeDescriptor -from test.mocking import ( - get_bridge_server_descriptor, - CRYPTO_BLOB, -) - from test.unit.descriptor import get_resource try: @@ -436,7 +431,7 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= self.assertEqual('caerSidi', desc.nickname) self.assertEqual('71.35.133.197', desc.address) self.assertEqual(None, desc.fingerprint) - self.assertTrue(CRYPTO_BLOB in desc.onion_key) + self.assertTrue(stem.descriptor.CRYPTO_BLOB in desc.onion_key) def test_with_opt(self): """ @@ -722,7 +717,7 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= Basic sanity check that we can parse a descriptor with minimal attributes. """ - desc = get_bridge_server_descriptor() + desc = BridgeDescriptor.create() self.assertEqual('Unnamed', desc.nickname) self.assertEqual('10.45.227.253', desc.address) @@ -744,13 +739,13 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= {'contact': 'Damian'}, {'or-address': '71.35.133.197:9001'}, {'or-address': '[12ab:2e19:3bcf::02:9970]:9001'}, - {'onion-key': '\n-----BEGIN RSA PUBLIC KEY-----%s-----END RSA PUBLIC KEY-----' % CRYPTO_BLOB}, - {'signing-key': '\n-----BEGIN RSA PUBLIC KEY-----%s-----END RSA PUBLIC KEY-----' % CRYPTO_BLOB}, - {'router-signature': '\n-----BEGIN SIGNATURE-----%s-----END SIGNATURE-----' % CRYPTO_BLOB}, + {'onion-key': '\n-----BEGIN RSA PUBLIC KEY-----%s-----END RSA PUBLIC KEY-----' % stem.descriptor.CRYPTO_BLOB}, + {'signing-key': '\n-----BEGIN RSA PUBLIC KEY-----%s-----END RSA PUBLIC KEY-----' % stem.descriptor.CRYPTO_BLOB}, + {'router-signature': '\n-----BEGIN SIGNATURE-----%s-----END SIGNATURE-----' % stem.descriptor.CRYPTO_BLOB}, ] for attr in unsanitized_attr: - desc = get_bridge_server_descriptor(attr) + desc = BridgeDescriptor.create(attr) self.assertFalse(desc.is_scrubbed()) def test_bridge_unsanitized_relay(self): @@ -771,12 +766,12 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= # checks with valid content router_digest = '068A2E28D4C934D9490303B7A645BA068DCA0504' - desc = get_bridge_server_descriptor({'router-digest': router_digest}) + desc = BridgeDescriptor.create({'router-digest': router_digest}) self.assertEqual(router_digest, desc.digest()) # checks when missing - desc_text = get_bridge_server_descriptor(exclude = ['router-digest'], content = True) + desc_text = BridgeDescriptor.content(exclude = ['router-digest']) self.assertRaises(ValueError, BridgeDescriptor, desc_text, True) # check that we can still construct it without validation @@ -793,7 +788,7 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= ) for value in test_values: - desc_text = get_bridge_server_descriptor({'router-digest': value}, content = True) + desc_text = BridgeDescriptor.content({'router-digest': value}) self.assertRaises(ValueError, BridgeDescriptor, desc_text, True) desc = BridgeDescriptor(desc_text, validate = False) @@ -804,7 +799,7 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= Constructs a bridge descriptor with a sanatized IPv4 or-address entry. """ - desc = get_bridge_server_descriptor({'or-address': '10.45.227.253:9001'}) + desc = BridgeDescriptor.create({'or-address': '10.45.227.253:9001'}) self.assertEqual([('10.45.227.253', 9001, False)], desc.or_addresses) def test_or_address_v6(self): @@ -812,7 +807,7 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= Constructs a bridge descriptor with a sanatized IPv6 or-address entry. """ - desc = get_bridge_server_descriptor({'or-address': '[fd9f:2e19:3bcf::02:9970]:9001'}) + desc = BridgeDescriptor.create({'or-address': '[fd9f:2e19:3bcf::02:9970]:9001'}) self.assertEqual([('fd9f:2e19:3bcf::02:9970', 9001, True)], desc.or_addresses) def test_or_address_multiple(self): @@ -820,9 +815,11 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= Constructs a bridge descriptor with multiple or-address entries and multiple ports. """ - desc_text = b'\n'.join((get_bridge_server_descriptor(content = True), - b'or-address 10.45.227.253:9001', - b'or-address [fd9f:2e19:3bcf::02:9970]:443')) + desc_text = b'\n'.join(( + BridgeDescriptor.content(), + b'or-address 10.45.227.253:9001', + b'or-address [fd9f:2e19:3bcf::02:9970]:443', + )) expected_or_addresses = [ ('10.45.227.253', 9001, False),

1 0