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

[stem/master] Rename DigestHashType to DigestHash
by atagar＠torproject.org 15 Nov '18

15 Nov '18

commit 909fbee87461a98fbaa7e4319a86637168c96c6e Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Nov 15 08:53:58 2018 -0800 Rename DigestHashType to DigestHash Shorter is better in enum names, and the 'Type' suffix didn't convey anything. --- stem/descriptor/__init__.py | 6 +++--- stem/descriptor/extrainfo_descriptor.py | 18 +++++++++--------- test/unit/descriptor/extrainfo_descriptor.py | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index bb890afd..a35cd4e4 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -19,7 +19,7 @@ Package for parsing and processing descriptor data. |- get_unrecognized_lines - unparsed descriptor content +- __str__ - string that the descriptor was made from -.. data:: DigestHashType (enum) +.. data:: DigestHash (enum) .. versionadded:: 1.8.0 @@ -27,7 +27,7 @@ Package for parsing and processing descriptor data. hash padding to match Tor. =================== =========== - DigestHashType Description + DigestHash Description =================== =========== SHA1 SHA1 hash SHA256 SHA256 hash @@ -132,7 +132,7 @@ skFtXhOHHqTRN4GPPrZsAIUOQGzQtGb66IQgT4tO/pj+P6QmSCCdTfhvGfgTCsC+ WPi4Fl2qryzTb3QO5r5x7T8OsG2IBUET1bLQzmtbC560SYR49IvVAgMBAAE= """ -DigestHashType = stem.util.enum.UppercaseEnum( +DigestHash = stem.util.enum.UppercaseEnum( 'SHA1', 'SHA256', ) diff --git a/stem/descriptor/extrainfo_descriptor.py b/stem/descriptor/extrainfo_descriptor.py index f1e29cd2..a374ea03 100644 --- a/stem/descriptor/extrainfo_descriptor.py +++ b/stem/descriptor/extrainfo_descriptor.py @@ -80,7 +80,7 @@ import stem.util.str_tools from stem.descriptor import ( PGP_BLOCK_END, Descriptor, - DigestHashType, + DigestHash, create_signing_key, _descriptor_content, _read_until_keywords, @@ -868,7 +868,7 @@ class ExtraInfoDescriptor(Descriptor): else: self._entries = entries - def digest(self, hash_type = DigestHashType.SHA1): + def digest(self, hash_type = DigestHash.SHA1): """ Provides the upper-case hex encoded sha1 of our content. This value is part of the server descriptor entry for this relay. @@ -876,7 +876,7 @@ class ExtraInfoDescriptor(Descriptor): .. versionchanged:: 1.8.0 Added the hash_type argument. - :param stem.descriptor.DigestHashType hash_type: digest hashing algorithm + :param stem.descriptor.DigestHash hash_type: digest hashing algorithm :returns: **str** with the upper-case hex digest value for this server descriptor @@ -953,14 +953,14 @@ class RelayExtraInfoDescriptor(ExtraInfoDescriptor): return cls(cls.content(attr, exclude, sign, signing_key), validate = validate) @lru_cache() - def digest(self, hash_type = DigestHashType.SHA1): - if hash_type == DigestHashType.SHA1: + def digest(self, hash_type = DigestHash.SHA1): + if hash_type == DigestHash.SHA1: # our digest is calculated from everything except our signature raw_content, ending = str(self), '\nrouter-signature\n' raw_content = stem.util.str_tools._to_bytes(raw_content[:raw_content.find(ending) + len(ending)]) return hashlib.sha1(raw_content).hexdigest().upper() - elif hash_type == DigestHashType.SHA256: + elif hash_type == DigestHash.SHA256: # Due to a tor bug sha256 digests are calculated from the # whole descriptor rather than ommiting the signature... # @@ -1013,10 +1013,10 @@ class BridgeExtraInfoDescriptor(ExtraInfoDescriptor): ('router-digest', _random_fingerprint()), )) - def digest(self, hash_type = DigestHashType.SHA1): - if hash_type == DigestHashType.SHA1: + def digest(self, hash_type = DigestHash.SHA1): + if hash_type == DigestHash.SHA1: return self._digest - elif hash_type == DigestHashType.SHA256: + elif hash_type == DigestHash.SHA256: return self.router_digest_sha256 else: raise NotImplementedError('Bridge extrainfo digests are only available in sha1 and sha256, not %s' % hash_type) diff --git a/test/unit/descriptor/extrainfo_descriptor.py b/test/unit/descriptor/extrainfo_descriptor.py index 7a85dd06..f4823c72 100644 --- a/test/unit/descriptor/extrainfo_descriptor.py +++ b/test/unit/descriptor/extrainfo_descriptor.py @@ -53,8 +53,8 @@ k0d2aofcVbHr4fPQOSST0LXDrhFl5Fqo5um296zpJGvRUeO6S44U/EfJAGShtqWw self.assertEqual(datetime.datetime(2012, 5, 5, 17, 2, 45), desc.dir_write_history_end) self.assertEqual(900, desc.dir_write_history_interval) self.assertEqual(expected_signature, desc.signature) - self.assertEqual('00A57A9AAB5EA113898E2DD02A755E31AFC27227', desc.digest(stem.descriptor.DigestHashType.SHA1)) - self.assertEqual('n2+wh6uM+lbKnhbkOog2jv9X5tPytlrFdO+I+auSmME', desc.digest(stem.descriptor.DigestHashType.SHA256)) + self.assertEqual('00A57A9AAB5EA113898E2DD02A755E31AFC27227', desc.digest(stem.descriptor.DigestHash.SHA1)) + self.assertEqual('n2+wh6uM+lbKnhbkOog2jv9X5tPytlrFdO+I+auSmME', desc.digest(stem.descriptor.DigestHash.SHA256)) self.assertEqual([], desc.get_unrecognized_lines()) # The read-history, write-history, dirreq-read-history, and

1 0

[stem/master] Compute extrainfo sha256 digests from the whole descriptor
by atagar＠torproject.org 15 Nov '18

15 Nov '18

commit f214309e04a6e9924206c26ff4bb22637c826383 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Nov 13 17:32:27 2018 -0800 Compute extrainfo sha256 digests from the whole descriptor Accounting for a tor bug that's prompting an upcoming spec change... https://trac.torproject.org/projects/tor/ticket/28415 --- stem/descriptor/extrainfo_descriptor.py | 22 ++++++++++++++-------- test/unit/descriptor/extrainfo_descriptor.py | 3 ++- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/stem/descriptor/extrainfo_descriptor.py b/stem/descriptor/extrainfo_descriptor.py index 2df4bc71..f1e29cd2 100644 --- a/stem/descriptor/extrainfo_descriptor.py +++ b/stem/descriptor/extrainfo_descriptor.py @@ -954,17 +954,23 @@ class RelayExtraInfoDescriptor(ExtraInfoDescriptor): @lru_cache() def digest(self, hash_type = DigestHashType.SHA1): - # our digest is calculated from everything except our signature - raw_content, ending = str(self), '\nrouter-signature\n' - raw_content = stem.util.str_tools._to_bytes(raw_content[:raw_content.find(ending) + len(ending)]) - if hash_type == DigestHashType.SHA1: + # our digest is calculated from everything except our signature + + raw_content, ending = str(self), '\nrouter-signature\n' + raw_content = stem.util.str_tools._to_bytes(raw_content[:raw_content.find(ending) + len(ending)]) return hashlib.sha1(raw_content).hexdigest().upper() elif hash_type == DigestHashType.SHA256: - # descriptors drop '=' hash padding from its fields (such as our server - # descriptor's extra-info-digest), so doing the same here so we match - - return base64.b64encode(hashlib.sha256(raw_content).digest()).rstrip('=') + # Due to a tor bug sha256 digests are calculated from the + # whole descriptor rather than ommiting the signature... + # + # https://trac.torproject.org/projects/tor/ticket/28415 + # + # Descriptors drop '=' hash padding from its fields (such + # as our server descriptor's extra-info-digest), so doing + # the same here so we match. + + return base64.b64encode(hashlib.sha256(str(self)).digest()).rstrip('=') else: raise NotImplementedError('Extrainfo descriptor digests are only available in sha1 and sha256, not %s' % hash_type) diff --git a/test/unit/descriptor/extrainfo_descriptor.py b/test/unit/descriptor/extrainfo_descriptor.py index f3252d4e..7a85dd06 100644 --- a/test/unit/descriptor/extrainfo_descriptor.py +++ b/test/unit/descriptor/extrainfo_descriptor.py @@ -53,7 +53,8 @@ k0d2aofcVbHr4fPQOSST0LXDrhFl5Fqo5um296zpJGvRUeO6S44U/EfJAGShtqWw self.assertEqual(datetime.datetime(2012, 5, 5, 17, 2, 45), desc.dir_write_history_end) self.assertEqual(900, desc.dir_write_history_interval) self.assertEqual(expected_signature, desc.signature) - self.assertEqual('00A57A9AAB5EA113898E2DD02A755E31AFC27227', desc.digest()) + self.assertEqual('00A57A9AAB5EA113898E2DD02A755E31AFC27227', desc.digest(stem.descriptor.DigestHashType.SHA1)) + self.assertEqual('n2+wh6uM+lbKnhbkOog2jv9X5tPytlrFdO+I+auSmME', desc.digest(stem.descriptor.DigestHashType.SHA256)) self.assertEqual([], desc.get_unrecognized_lines()) # The read-history, write-history, dirreq-read-history, and

1 0

[stem/master] Sha256 extrainfo descriptor digests
by atagar＠torproject.org 15 Nov '18

15 Nov '18

commit 70d6e35047b3dc15fcd8438a9eb824e0105ed364 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Nov 12 10:38:55 2018 -0800 Sha256 extrainfo descriptor digests When referencing digests tor now includes both sha1 and sha256 digests. As such, beginning to expand our digest() methods to do the same... https://trac.torproject.org/projects/tor/ticket/28398 I'm starting with extrainfo descriptors because their hashes are referenced by our server descriptors, providing easy test data to see if we're doing this right or not... % curl http://128.31.0.39:9131/tor/server/fp/3BB34C63072D9D10E836EE42968713F7B9325… > /tmp/my_server_desc % curl http://128.31.0.39:9131/tor/server/extra/3BB34C63072D9D10E836EE42968713F7B9… > /tmp/my_extrainfo_desc % grep extra /tmp/my_server_desc extra-info-digest 5BEBC13FDA976050D3A0632EE6508FD1BF1D1750 FNzZZtYPlMjBeb78Wv0zS5DUIPGB3TrpJ3k79MZURMU % python >>> import stem.descriptor >>> desc = next(stem.descriptor.parse_file('/tmp/my_extrainfo_desc', 'extra-info 1.0')) # Good! The below shows that our sha1 digest matches what our server # descriptor says it should be. >>> desc.digest(stem.descriptor.DigestHashType.SHA1) '5BEBC13FDA976050D3A0632EE6508FD1BF1D1750' # Bad! This should *not* mismatch. >:( >>> desc.digest(stem.descriptor.DigestHashType.SHA256) 'ciuNPeDfpiBQfowP7N1g7jPsuHR9fwceTTFyknNdyvY' Unfortunately while I'm clearly doing something wrong, I'm puzzled about why we mismatch. Our dir-spec's extra-info-digest description is pretty clear... "sha256-digest" is a base64-encoded SHA256 digest of the extra-info document, computed over the same data. We're definitely hashing the same data (otherwise the sha1 wouldn't match). This code also certainly seems to be doing exactly what the spec says (base64 encoding the sha256 digest). So... huh. Gonna punt this over to irl who requested this to see if he can spot what I'm doing wrong. --- stem/descriptor/__init__.py | 5 +++++ stem/descriptor/extrainfo_descriptor.py | 33 +++++++++++++++++++++++++++------ 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 13c69f11..943106c4 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -118,6 +118,11 @@ skFtXhOHHqTRN4GPPrZsAIUOQGzQtGb66IQgT4tO/pj+P6QmSCCdTfhvGfgTCsC+ WPi4Fl2qryzTb3QO5r5x7T8OsG2IBUET1bLQzmtbC560SYR49IvVAgMBAAE= """ +DigestHashType = stem.util.enum.UppercaseEnum( + 'SHA1', + 'SHA256', +) + DocumentHandler = stem.util.enum.UppercaseEnum( 'ENTRIES', 'DOCUMENT', diff --git a/stem/descriptor/extrainfo_descriptor.py b/stem/descriptor/extrainfo_descriptor.py index 8d8894d1..2df4bc71 100644 --- a/stem/descriptor/extrainfo_descriptor.py +++ b/stem/descriptor/extrainfo_descriptor.py @@ -67,6 +67,7 @@ Extra-info descriptors are available from a few sources... ===================== =========== """ +import base64 import functools import hashlib import re @@ -79,6 +80,7 @@ import stem.util.str_tools from stem.descriptor import ( PGP_BLOCK_END, Descriptor, + DigestHashType, create_signing_key, _descriptor_content, _read_until_keywords, @@ -866,11 +868,16 @@ class ExtraInfoDescriptor(Descriptor): else: self._entries = entries - def digest(self): + def digest(self, hash_type = DigestHashType.SHA1): """ Provides the upper-case hex encoded sha1 of our content. This value is part of the server descriptor entry for this relay. + .. versionchanged:: 1.8.0 + Added the hash_type argument. + + :param stem.descriptor.DigestHashType hash_type: digest hashing algorithm + :returns: **str** with the upper-case hex digest value for this server descriptor """ @@ -946,11 +953,20 @@ class RelayExtraInfoDescriptor(ExtraInfoDescriptor): return cls(cls.content(attr, exclude, sign, signing_key), validate = validate) @lru_cache() - def digest(self): + def digest(self, hash_type = DigestHashType.SHA1): # our digest is calculated from everything except our signature raw_content, ending = str(self), '\nrouter-signature\n' - raw_content = raw_content[:raw_content.find(ending) + len(ending)] - return hashlib.sha1(stem.util.str_tools._to_bytes(raw_content)).hexdigest().upper() + raw_content = stem.util.str_tools._to_bytes(raw_content[:raw_content.find(ending) + len(ending)]) + + if hash_type == DigestHashType.SHA1: + return hashlib.sha1(raw_content).hexdigest().upper() + elif hash_type == DigestHashType.SHA256: + # descriptors drop '=' hash padding from its fields (such as our server + # descriptor's extra-info-digest), so doing the same here so we match + + return base64.b64encode(hashlib.sha256(raw_content).digest()).rstrip('=') + else: + raise NotImplementedError('Extrainfo descriptor digests are only available in sha1 and sha256, not %s' % hash_type) class BridgeExtraInfoDescriptor(ExtraInfoDescriptor): @@ -991,8 +1007,13 @@ class BridgeExtraInfoDescriptor(ExtraInfoDescriptor): ('router-digest', _random_fingerprint()), )) - def digest(self): - return self._digest + def digest(self, hash_type = DigestHashType.SHA1): + if hash_type == DigestHashType.SHA1: + return self._digest + elif hash_type == DigestHashType.SHA256: + return self.router_digest_sha256 + else: + raise NotImplementedError('Bridge extrainfo digests are only available in sha1 and sha256, not %s' % hash_type) def _required_fields(self): excluded_fields = [

1 0

[stem/master] Internal _content_range() helper
by atagar＠torproject.org 15 Nov '18

15 Nov '18

commit f816134a0623cf464282ae1053e58edf312aa7a7 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Nov 15 10:18:16 2018 -0800 Internal _content_range() helper Our new digest type and encoding arguments make our _digest_for_content() helper a poor fit. The only useful thing this helper does is narrow our content to a specific range. As such adding a helper that does only that. This doesn't yet change any of our _digest_for_content() callers. That's next. --- stem/descriptor/__init__.py | 39 +++++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index cf661c58..07ed5b1b 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -929,19 +929,38 @@ class Descriptor(object): :raises: ValueError if the digest canot be calculated """ - raw_descriptor = self.get_bytes() + digest_content = self._content_range(start, end) + digest_hash = hashlib.sha1(stem.util.str_tools._to_bytes(digest_content)) + return stem.util.str_tools._to_unicode(digest_hash.hexdigest().upper()) - start_index = raw_descriptor.find(start) - end_index = raw_descriptor.find(end, start_index) + def _content_range(self, start = None, end = None): + """ + Provides the descriptor content inclusively between two substrings. - if start_index == -1: - raise ValueError("Digest is for the range starting with '%s' but that isn't in our descriptor" % start) - elif end_index == -1: - raise ValueError("Digest is for the range ending with '%s' but that isn't in our descriptor" % end) + :param bytes start: start of the content range to get + :param bytes end: end of the content range to get - digest_content = raw_descriptor[start_index:end_index + len(end)] - digest_hash = hashlib.sha1(stem.util.str_tools._to_bytes(digest_content)) - return stem.util.str_tools._to_unicode(digest_hash.hexdigest().upper()) + :raises: ValueError if either the start or end substring are not within our content + """ + + content = self.get_bytes() + start_index, end_index = None, None + + if start is not None: + start_index = content.find(start) + + if start_index == -1: + raise ValueError("'%s' is not present within our descriptor content" % start) + + if end is not None: + end_index = content.find(end, start_index) + + if end_index == -1: + raise ValueError("'%s' is not present within our descriptor content" % end) + + end_index += len(end) # make the ending index inclusive + + return content[start_index:end_index] def __getattr__(self, name): # We can't use standard hasattr() since it calls this function, recursing.

1 0

[stem/master] Replace remaining _digest_for_content() usage
by atagar＠torproject.org 15 Nov '18

15 Nov '18

commit 6beaaf49df9c0960f12e443b717cbd1c46ce765c Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Nov 15 12:06:27 2018 -0800 Replace remaining _digest_for_content() usage Swapping out our remmaining _digest_for_content() usage so we can drop that helper. --- docs/change_log.rst | 1 + stem/descriptor/__init__.py | 25 ++++--------------------- stem/descriptor/extrainfo_descriptor.py | 2 +- stem/descriptor/hidden_service_descriptor.py | 3 ++- stem/descriptor/networkstatus.py | 4 +++- 5 files changed, 11 insertions(+), 24 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index f8db0b52..a0d89db7 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -52,6 +52,7 @@ The following are only available within Stem's `git repository * **Descriptors** * Added :func:`~stem.descriptor.Descriptor.type_annotation` method (:trac:`28397`) + * Added the **hash_type** and **encoding** arguments to `ServerDescriptor <api/descriptor/server_descriptor.html#stem.descriptor.server_descriptor.ServerDescriptor.digest>`_ and `ExtraInfo's <api/descriptor/extrainfo_descriptor.html#stem.descriptor.extrainfo_descriptor.ExtraInfoDescriptor.digest>`_ digest methods (:trac:`28398`) * DescriptorDownloader crashed if **use_mirrors** is set (:trac:`28393`) * Don't download from Serge, a bridge authority that frequently timeout diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 07ed5b1b..66a34f6e 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -87,7 +87,6 @@ import base64 import codecs import collections import copy -import hashlib import os import random import re @@ -674,9 +673,9 @@ def _encode_digest(hash_value, encoding): if encoding == DigestEncoding.RAW: return hash_value elif encoding == DigestEncoding.HEX: - return hash_value.hexdigest().upper() + return stem.util.str_tools._to_unicode(hash_value.hexdigest().upper()) elif encoding == DigestEncoding.BASE64: - return base64.b64encode(hash_value.digest()).rstrip('=') + return stem.util.str_tools._to_unicode(base64.b64encode(hash_value.digest()).rstrip(b'=')) else: raise NotImplementedError('BUG: stem.descriptor._encode_digest should recognize all DigestEncoding, lacked %s' % encoding) @@ -917,22 +916,6 @@ class Descriptor(object): digest_hex = codecs.encode(decrypted_bytes[seperator_index + 1:], 'hex_codec') return stem.util.str_tools._to_unicode(digest_hex.upper()) - def _digest_for_content(self, start, end): - """ - Provides the digest of our descriptor's content in a given range. - - :param bytes start: start of the range to generate a digest for - :param bytes end: end of the range to generate a digest for - - :returns: the digest string encoded in uppercase hex - - :raises: ValueError if the digest canot be calculated - """ - - digest_content = self._content_range(start, end) - digest_hash = hashlib.sha1(stem.util.str_tools._to_bytes(digest_content)) - return stem.util.str_tools._to_unicode(digest_hash.hexdigest().upper()) - def _content_range(self, start = None, end = None): """ Provides the descriptor content inclusively between two substrings. @@ -947,13 +930,13 @@ class Descriptor(object): start_index, end_index = None, None if start is not None: - start_index = content.find(start) + start_index = content.find(stem.util.str_tools._to_bytes(start)) if start_index == -1: raise ValueError("'%s' is not present within our descriptor content" % start) if end is not None: - end_index = content.find(end, start_index) + end_index = content.find(stem.util.str_tools._to_bytes(end), start_index) if end_index == -1: raise ValueError("'%s' is not present within our descriptor content" % end) diff --git a/stem/descriptor/extrainfo_descriptor.py b/stem/descriptor/extrainfo_descriptor.py index 401b9643..ea74ea52 100644 --- a/stem/descriptor/extrainfo_descriptor.py +++ b/stem/descriptor/extrainfo_descriptor.py @@ -974,7 +974,7 @@ class RelayExtraInfoDescriptor(ExtraInfoDescriptor): # # https://trac.torproject.org/projects/tor/ticket/28415 - return stem.descriptor._encode_digest(hashlib.sha256(str(self)), encoding) + return stem.descriptor._encode_digest(hashlib.sha256(self.get_bytes()), encoding) else: raise NotImplementedError('Extrainfo descriptor digests are only available in sha1 and sha256, not %s' % hash_type) diff --git a/stem/descriptor/hidden_service_descriptor.py b/stem/descriptor/hidden_service_descriptor.py index a7cc0e3d..ad68c349 100644 --- a/stem/descriptor/hidden_service_descriptor.py +++ b/stem/descriptor/hidden_service_descriptor.py @@ -280,7 +280,8 @@ class HiddenServiceDescriptor(Descriptor): if not skip_crypto_validation and stem.prereq.is_crypto_available(): signed_digest = self._digest_for_signature(self.permanent_key, self.signature) - content_digest = self._digest_for_content(b'rendezvous-service-descriptor ', b'\nsignature\n') + digest_content = self._content_range('rendezvous-service-descriptor ', '\nsignature\n') + content_digest = hashlib.sha1(digest_content).hexdigest().upper() if signed_digest != content_digest: raise ValueError('Decrypted digest does not match local digest (calculated: %s, local: %s)' % (signed_digest, content_digest)) diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index 63483c94..02dd55fb 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -55,6 +55,7 @@ For more information see :func:`~stem.descriptor.__init__.DocumentHandler`... """ import collections +import hashlib import io import stem.descriptor.router_status_entry @@ -1115,7 +1116,8 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): # sha1 hash of the body and header - local_digest = self._digest_for_content(b'network-status-version', b'directory-signature ') + digest_content = self._content_range('network-status-version', 'directory-signature ') + local_digest = hashlib.sha1(digest_content).hexdigest().upper() valid_digests, total_digests = 0, 0 required_digests = len(self.signatures) / 2.0

1 0

[stem/master] Add hash_type and encoding arguments to descriptor digest() methods
by atagar＠torproject.org 15 Nov '18

15 Nov '18

commit 5d3565002b954ca49e1bc45d6dc68e1c99716069 Merge: 0a8b47e8 6beaaf49 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Nov 15 12:18:03 2018 -0800 Add hash_type and encoding arguments to descriptor digest() methods Iain made a great point that it's tougher to calculate descriptor digests than it should be... https://trac.torproject.org/projects/tor/ticket/28398 Digest type and encoding varies by their use. Mostly our spec sticks with sha1/hex or sha256/base64, but sometimes it differs. For instance, the consensus cites sha1/base64 server desciptor digests, whereas according to Karsten Tor Metrics uses sha1/hex digests for filenames. Presently server and extrainfo descriptors are the only classes with digest() methods. Microdescriptors should (consensus votes cite microdescriptor digests) but nobody has asked for those so we'll cross that bridge when we come to it. This branch expands our digest() methods in the following ways... * Add a hash_type argument so callers can specify sha1 or sha256 hashing. * Add an encoding argument so callers can specify hex, base64, or no encoding. * In our digest documentation cite what references that descriptor type's digest (ie. 'what the heck is this useful for?'). docs/change_log.rst | 1 + stem/descriptor/__init__.py | 91 ++++++++++++++++++++++------ stem/descriptor/extrainfo_descriptor.py | 55 +++++++++++++---- stem/descriptor/hidden_service_descriptor.py | 3 +- stem/descriptor/networkstatus.py | 4 +- stem/descriptor/server_descriptor.py | 38 +++++++++--- test/unit/descriptor/extrainfo_descriptor.py | 3 +- test/unit/descriptor/server_descriptor.py | 1 + 8 files changed, 155 insertions(+), 41 deletions(-)

1 0

[stem/master] Support hash types and encodings for server descriptor digests
by atagar＠torproject.org 15 Nov '18

15 Nov '18

commit de42798f432d05fc1e7d626ab8ce311b1368f5f0 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Nov 15 11:56:20 2018 -0800 Support hash types and encodings for server descriptor digests Replicating what I just did for extrainfo descriptors with server descriptors. --- stem/descriptor/extrainfo_descriptor.py | 5 ++-- stem/descriptor/server_descriptor.py | 38 ++++++++++++++++++++++++------- test/unit/descriptor/server_descriptor.py | 1 + 3 files changed, 33 insertions(+), 11 deletions(-) diff --git a/stem/descriptor/extrainfo_descriptor.py b/stem/descriptor/extrainfo_descriptor.py index 4319bb05..401b9643 100644 --- a/stem/descriptor/extrainfo_descriptor.py +++ b/stem/descriptor/extrainfo_descriptor.py @@ -966,9 +966,8 @@ class RelayExtraInfoDescriptor(ExtraInfoDescriptor): if hash_type == DigestHash.SHA1: # our digest is calculated from everything except our signature - raw_content, ending = str(self), '\nrouter-signature\n' - raw_content = stem.util.str_tools._to_bytes(raw_content[:raw_content.find(ending) + len(ending)]) - return stem.descriptor._encode_digest(hashlib.sha1(raw_content), encoding) + content = self._content_range(end = '\nrouter-signature\n') + return stem.descriptor._encode_digest(hashlib.sha1(content), encoding) elif hash_type == DigestHash.SHA256: # Due to a tor bug sha256 digests are calculated from the # whole descriptor rather than ommiting the signature... diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 0d12f875..748a2a9d 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -68,6 +68,8 @@ from stem.descriptor.router_status_entry import RouterStatusEntryV3 from stem.descriptor import ( PGP_BLOCK_END, Descriptor, + DigestHash, + DigestEncoding, create_signing_key, _descriptor_content, _descriptor_components, @@ -654,12 +656,22 @@ class ServerDescriptor(Descriptor): else: self._entries = entries - def digest(self): + def digest(self, hash_type = DigestHash.SHA1, encoding = DigestEncoding.HEX): """ - Provides the hex encoded sha1 of our content. This value is part of the - network status entry for this relay. + Digest of this descriptor's content. These are referenced by... - :returns: **unicode** with the upper-case hex digest value for this server descriptor + * **Consensus** + + * Referer: :class:`~stem.descriptor.router_status_entry.RouterStatusEntryV3` **digest** attribute + * Format: **SHA1/BASE64** + + .. versionchanged:: 1.8.0 + Added the hash_type and encoding arguments. + + :param stem.descriptor.DigestHash hash_type: digest hashing algorithm + :param stem.descriptor.DigestEncoding encoding: digest encoding + + :returns: **hashlib.HASH** or **str** based on our encoding argument """ raise NotImplementedError('Unsupported Operation: this should be implemented by the ServerDescriptor subclass') @@ -890,7 +902,7 @@ class RelayDescriptor(ServerDescriptor): return cls(cls.content(attr, exclude, sign, signing_key), validate = validate, skip_crypto_validation = not sign) @lru_cache() - def digest(self): + def digest(self, hash_type = DigestHash.SHA1, encoding = DigestEncoding.HEX): """ Provides the digest of our descriptor's content. @@ -899,7 +911,14 @@ class RelayDescriptor(ServerDescriptor): :raises: ValueError if the digest cannot be calculated """ - return self._digest_for_content(b'router ', b'\nrouter-signature\n') + content = self._content_range(start = 'router', end = '\nrouter-signature\n') + + if hash_type == DigestHash.SHA1: + return stem.descriptor._encode_digest(hashlib.sha1(content), encoding) + elif hash_type == DigestHash.SHA256: + return stem.descriptor._encode_digest(hashlib.sha256(content), encoding) + else: + raise NotImplementedError('Server descriptor digests are only available in sha1 and sha256, not %s' % hash_type) def make_router_status_entry(self): """ @@ -1026,8 +1045,11 @@ class BridgeDescriptor(ServerDescriptor): ('reject', '*:*'), )) - def digest(self): - return self._digest + def digest(self, hash_type = DigestHash.SHA1, encoding = DigestEncoding.HEX): + if hash_type == DigestHash.SHA1 and encoding == DigestEncoding.HEX: + return self._digest + else: + raise NotImplementedError('Bridge server descriptor digests are only available as sha1/hex, not %s/%s' % (hash_type, encoding)) def is_scrubbed(self): """ diff --git a/test/unit/descriptor/server_descriptor.py b/test/unit/descriptor/server_descriptor.py index ec1af553..796286c5 100644 --- a/test/unit/descriptor/server_descriptor.py +++ b/test/unit/descriptor/server_descriptor.py @@ -154,6 +154,7 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= self.assertEqual(expected_signature, desc.signature) self.assertEqual([], desc.get_unrecognized_lines()) self.assertEqual('2C7B27BEAB04B4E2459D89CA6D5CD1CC5F95A689', desc.digest()) + self.assertEqual('LHsnvqsEtOJFnYnKbVzRzF+Vpok', desc.digest(encoding = stem.descriptor.DigestEncoding.BASE64)) self.assertEqual('@type server-descriptor 1.0', str(desc.type_annotation())) self.assertEqual(['2'], desc.hidden_service_dir) # obsolete field

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 15 Nov '18

15 Nov '18

commit 099e13b5d810df5762e60db692e9d9b2ec9d4894 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 15 18:49:34 2018 +0000 Update translations for support-portal --- contents+ka.po | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/contents+ka.po b/contents+ka.po index 15d9d9e21..f27d75866 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -318,6 +318,9 @@ msgid "" "There is no official version of Tor for iOS yet, though we recommend " "<mark><a href=\"https://onionbrowser.com/\">Onion Browser</a></mark>." msgstr "" +"Tor-ის ოფიციალური ვერსია ჯერჯერობით არაა iOS-ისთვის ხელმისაწვდომი, " +"შესაბამისად გირჩევთ <mark><a href=\"https://onionbrowser.com/\">Onion-" +"ბრაუზერს</a></mark>." #: http//localhost/faq/faq-5/ (content/faq/faq-5/contents+en.lrquestion.title) #: http//localhost/misc/misc-13/ @@ -1259,11 +1262,13 @@ msgid "" "Both options are located in the Menu, but you can also access the New " "Circuit option inside the site information menu, in the URL bar." msgstr "" +"ორივე მდებარეობს მენიუში, თუმცა ახალი წრედის არჩევა, აგრეთვე შეგიძლიათ " +"საიტის მონაცემების მენიუდან, URL-ველში." #: http//localhost/tbb/tbb-29/ #: (content/tbb/tbb-29/contents+en.lrquestion.description) msgid "##### New Identity" -msgstr "" +msgstr "##### ახალი ვინაობა" #: http//localhost/tbb/tbb-29/ #: (content/tbb/tbb-29/contents+en.lrquestion.description) @@ -1271,6 +1276,8 @@ msgid "" "This option is useful if you want to prevent your subsequent browser " "activity from being linkable to what you were doing before." msgstr "" +"ეს პარამეტრი გამოსადეგია, თუ გსურთ, რომ თქვენი მომდევნო მოქმედებები " +"ვებგვერდებზე, არ იყოს დაკავშირებული წინა მოქმედებებთან." #: http//localhost/tbb/tbb-29/ #: (content/tbb/tbb-29/contents+en.lrquestion.description) @@ -1279,6 +1286,9 @@ msgid "" "information such as cookies and browsing history, and use new Tor circuits " "for all connections." msgstr "" +"შედეგად, ყველა გახსნილი ჩანართი და ფანჯარა დაიხურება, გასუფთავდება პირადი " +"მონაცემები, როგორიცაა ფუნთუშები და ისტორია, შემდეგ კი ახალი კავშირებისთვის, " +"ახალი Tor-წრედები შეიქმნება." #: http//localhost/tbb/tbb-29/ #: (content/tbb/tbb-29/contents+en.lrquestion.description) @@ -1286,6 +1296,9 @@ msgid "" "Tor Browser will warn you that all activity and downloads will be stopped, " "so take this into account before clicking \"New Identity\"." msgstr "" +"Tor-ბრაუზერი გაგაფრთხილებთ, რომ ყველა თქვენი მოქმედება და ჩამოტვირთვა " +"შეწყდება, ასე რომ გაითვალისწინეთ ეს ყველაფერი, სანამ გამოიყენებთ „ახალ " +"ვინაობას“." #: http//localhost/tbb/tbb-29/ #: (content/tbb/tbb-29/contents+en.lrquestion.description) @@ -1305,6 +1318,8 @@ msgid "" "This option is useful if the exit relay you are using is unable to connect " "to the website you require, or is not loading it properly." msgstr "" +"ეს პარამეტრი გამოსადეგია მაშინ, როცა არსებული გამსვლელი წერტილით ვერ " +"ხერხდება საჭირო საიტთან დაკავშირება ან მისი სათანადოდ ჩატვირთვა. " #: http//localhost/tbb/tbb-29/ #: (content/tbb/tbb-29/contents+en.lrquestion.description) @@ -1319,6 +1334,8 @@ msgid "" "Other open tabs and windows from the same website will use the new circuit " "as well once they are reloaded." msgstr "" +"დანარჩენი ჩანართები და ფანჯრები, რომლებშიც იგივე საიტის სხვა გვერდებია " +"გახსნილი, აგრეთვე ახალ წრედს გამოიყენებს, ხელახლა ჩატვირთვის შემდეგ." #: http//localhost/tbb/tbb-29/ #: (content/tbb/tbb-29/contents+en.lrquestion.description) @@ -1326,6 +1343,9 @@ msgid "" "This option does not clear any private information or unlink your activity, " "nor does it affect your current connections to other websites." msgstr "" +"ამ შემთხვევაში, პირადი მონაცემები არ წაიშლება და არც თქვენი მოქმედებების " +"განცალკევება არ მოხდება, ასევე ეს ყველაფერი არ იმოქმედებს თქვენს კავშირზე " +"სხვა საიტებთან." #: http//localhost/tbb/tbb-29/ #: (content/tbb/tbb-29/contents+en.lrquestion.description) @@ -1352,6 +1372,8 @@ msgid "" "A website (bank, email provider, etc..) locks me out whenever I use Tor, " "what can I do?" msgstr "" +"საიტი (ბანკი, ელფოსტის მომწოდებელი და ა.შ.) ზღუდავს ჩემს ანგარიშს Tor-ის " +"გამოყენებისას, რა შეიძლება მოვიმოქმედო?" #: http//localhost/tbb/tbb-30/ #: (content/tbb/tbb-30/contents+en.lrquestion.description) @@ -1359,6 +1381,8 @@ msgid "" "Tor Browser often makes your connection appear as though it is coming from " "an entirely different part of the world." msgstr "" +"Tor-ბრაუზერით კავშირისას, უმეტეს შემთხვევაში ჩანს, რომ მსოფლიოს სულ სხვა " +"წერტილიდან შედიხართ საიტზე." #: http//localhost/tbb/tbb-30/ #: (content/tbb/tbb-30/contents+en.lrquestion.description) @@ -1366,6 +1390,9 @@ msgid "" "Some websites, such as banks or email providers, might interpret this as a " "sign that your account has been compromised, and lock you out." msgstr "" +"ზოგიერთმა მათგანმა კი, მაგალითად ბანკებმა ან ელფოსტის მომსახურების " +"მომწოდებლებმა, ეს შეიძლება აღიქვას თქვენი ანგარიშის უკანონო ხელყოფად და " +"მასზე წვდომის უფლება სრულად შეზღუდოს. " #: http//localhost/tbb/tbb-30/ #: (content/tbb/tbb-30/contents+en.lrquestion.description) @@ -1374,6 +1401,9 @@ msgid "" "procedure for account recovery, or contacting the operators and explaining " "the situation." msgstr "" +"ერთადერთი გზა ამის მოსაგვარებლად, ანგარიშის აღდგენაა, საიტზე მოცემული " +"მითითებების მიხედვით ან მხარდაჭერის სამსახურთან დაკავშირება და მათთვის " +"არსებული მდგომარეობის ახსნა." #: http//localhost/tbb/tbb-30/ #: (content/tbb/tbb-30/contents+en.lrquestion.description) @@ -1382,6 +1412,10 @@ msgid "" "authentication, which is a much better security option than IP-based " "reputations." msgstr "" +"ამ ყველაფრის არიდება შესაძლებელია იმ შემთხვევაში, თუ თქვენი მომსახურების " +"მომწოდებელი გთავაზობთ 2-საფეხურიან დამოწმებას ანგარიშზე შესვლისას, რაც " +"დაცვის გაცილებით უკეთეს საშუალებას წარმოადგენს, ვიდრე IP-მისამართების " +"გამოყენება." #: http//localhost/tbb/tbb-30/ #: (content/tbb/tbb-30/contents+en.lrquestion.description) @@ -1410,7 +1444,7 @@ msgstr "" #: http//localhost/tbb/tbb-31/ #: (content/tbb/tbb-31/contents+en.lrquestion.seo_slug) msgid "which-platform-tor-browser-available" -msgstr "" +msgstr "რომელ-სისტემებზეა-tor-ბრაუზერი-ხელმისაწვდომი" #: http//localhost/tbb/tbb-32/ #: (content/tbb/tbb-32/contents+en.lrquestion.title)

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 15 Nov '18

15 Nov '18

commit 3d283767c69e418ab247ecd7827e13d2cd618197 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 15 18:49:23 2018 +0000 Update translations for whisperback --- ar/ar.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ar/ar.po b/ar/ar.po index 29f1d63a5..fb0610e54 100644 --- a/ar/ar.po +++ b/ar/ar.po @@ -14,8 +14,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-06-11 17:17+0200\n" -"PO-Revision-Date: 2018-10-04 01:05+0000\n" -"Last-Translator: erinm\n" +"PO-Revision-Date: 2018-11-15 18:25+0000\n" +"Last-Translator: Emma Peel\n" "Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 15 Nov '18

15 Nov '18

commit 64690a11c019295760325bb966464d6fe076a9b6 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 15 18:47:39 2018 +0000 Update translations for tor-browser-manual --- ar/ar.po | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ar/ar.po b/ar/ar.po index 1060f00ce..766794e58 100644 --- a/ar/ar.po +++ b/ar/ar.po @@ -327,6 +327,8 @@ msgid "" " should try the different transports: obfs3, obfs4, ScrambleSuit, fte, meek-" "azure and Snowflake." msgstr "" +"إن كنت تحاول تجاوز الحجب للمرة الأولى، فعليك تجربة النواقل المختلفة: obfs3، " +"و obfs4، و ScambleSuit، و fte، و meek-azure، و Snowflake." #: circumvention.page:72 msgid "" @@ -345,7 +347,7 @@ msgstr "كيفية تنزيل متصفّح تور" #: downloading.page:10 msgid "Downloading" -msgstr "التنزيل" +msgstr "جاري التحميل" #: downloading.page:12 msgid "" @@ -424,7 +426,7 @@ msgstr "" #: downloading.page:69 msgid "To use GetTor via Jabber/XMPP (Jitsi, CoyIM, etc.):" -msgstr "" +msgstr "لاستخدام GetTor عبر Jabber/XMPP (Jitsi، و CoyIM): " #: downloading.page:74 msgid ""

1 0