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

[translation/tor-messenger-privdtd] Update translations for tor-messenger-privdtd
by translation＠torproject.org 04 Jul '16

04 Jul '16

commit aaf5aabf73b4ec0c8e9bea0b83be4b5831fd919d Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 4 13:48:22 2016 +0000 Update translations for tor-messenger-privdtd --- ady/priv.dtd | 2 ++ ak/priv.dtd | 2 ++ ast/priv.dtd | 2 ++ 3 files changed, 6 insertions(+) diff --git a/ady/priv.dtd b/ady/priv.dtd new file mode 100644 index 0000000..7007979 --- /dev/null +++ b/ady/priv.dtd @@ -0,0 +1,2 @@ +<!ENTITY privDialog.title "Generating private key"> +<!ENTITY privDialog.done "Done"> \ No newline at end of file diff --git a/ak/priv.dtd b/ak/priv.dtd new file mode 100644 index 0000000..7007979 --- /dev/null +++ b/ak/priv.dtd @@ -0,0 +1,2 @@ +<!ENTITY privDialog.title "Generating private key"> +<!ENTITY privDialog.done "Done"> \ No newline at end of file diff --git a/ast/priv.dtd b/ast/priv.dtd new file mode 100644 index 0000000..7007979 --- /dev/null +++ b/ast/priv.dtd @@ -0,0 +1,2 @@ +<!ENTITY privDialog.title "Generating private key"> +<!ENTITY privDialog.done "Done"> \ No newline at end of file

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 04 Jul '16

04 Jul '16

commit 857a319830d1c37fceac1720b4fc99dd921581ee Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 4 11:15:26 2016 +0000 Update translations for https_everywhere --- az/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/az/https-everywhere.dtd b/az/https-everywhere.dtd index ccd3cdb..0c9c16d 100644 --- a/az/https-everywhere.dtd +++ b/az/https-everywhere.dtd @@ -1,4 +1,4 @@ -<!ENTITY https-everywhere.about.title "Hər yerdə HTTPS haqqında"> +<!ENTITY https-everywhere.about.title "Hər yerdə HTTPS haqda"> <!ENTITY https-everywhere.about.ext_name "Hər yerdə HTTPS"> <!ENTITY https-everywhere.about.ext_description "Veb-i şifrələ! Bir çox saytlarda HTTPS-i avtomatik istifadə et."> <!ENTITY https-everywhere.about.version "Versiya">

1 0

[stem/master] Support parsing shared randomness
by atagar＠torproject.org 03 Jul '16

03 Jul '16

commit bccda333d40ba6a17131725475f9fdb025c4690a Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 2 20:18:04 2016 -0700 Support parsing shared randomness Adding support for the new shared randomness parameters in the consenuses and votes... https://gitweb.torproject.org/torspec.git/commit/?id=9949f64 --- docs/change_log.rst | 1 + stem/descriptor/networkstatus.py | 102 +++++++++++++++++++++- test/mocking.py | 8 +- test/unit/descriptor/networkstatus/document_v3.py | 89 +++++++++++++++++++ 4 files changed, 197 insertions(+), 3 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 3ef8900..1713360 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -66,6 +66,7 @@ The following are only available within Stem's `git repository * `Shorthand functions for stem.descriptor.remote <api/descriptor/remote.html#stem.descriptor.remote.get_instance>`_ * Added `fallback directory information <api/descriptor/remote.html#stem.descriptor.remote.FallbackDirectory>`_. * Support for ed25519 descriptor fields (:spec:`5a79d67`) + * Added consensus and vote's new shared randomness attributes (:spec:`9949f64`) * Added server descriptor's new allow_tunneled_dir_requests attribute (:spec:`8bc30d6`) * Server descriptor validation fails with 'extra-info-digest line had an invalid value' from additions in proposal 228 (:trac:`16227`) * :class:`~stem.descriptor.server_descriptor.BridgeDescriptor` now has 'ntor_onion_key' like its unsanitized counterparts diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index dcbfc5d..815e5f5 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -70,6 +70,7 @@ from stem.descriptor import ( _read_until_keywords, _value, _parse_simple_line, + _parse_if_present, _parse_timestamp_line, _parse_forty_character_hex, _parse_key_block, @@ -118,6 +119,10 @@ HEADER_STATUS_DOCUMENT_FIELDS = ( ('package', True, True, False), ('known-flags', True, True, True), ('flag-thresholds', True, False, False), + ('shared-rand-participate', True, False, False), + ('shared-rand-commit', True, False, False), + ('shared-rand-previous-value', True, True, False), + ('shared-rand-current-value', True, True, False), ('params', True, True, False), ) @@ -196,6 +201,7 @@ PARAM_RANGE = { 'GuardLifetime': (2592000, 157766400), # min: 30 days, max: 1826 days 'NumNTorsPerTAP': (1, 100000), 'AllowNonearlyExtend': (0, 1), + 'AuthDirNumSRVAgreements': (1, MAX_PARAM), } @@ -210,6 +216,19 @@ class PackageVersion(collections.namedtuple('PackageVersion', ['name', 'version' """ +class SharedRandomnessCommitment(collections.namedtuple('SharedRandomnessCommitment', ['version', 'algorithm', 'identity', 'commit', 'reveal'])): + """ + Directory authority's commitment for generating the next shared random value. + + :var int version: shared randomness protocol version + :var str algorithm: hash algorithm used to make the commitment + :var str identity: authority's sha1 identity fingerprint + :var str commit: base64 encoded commitment hash to the shared random value + :var str reveal: base64 encoded commitment to the shared random value, + **None** of not provided + """ + + def _parse_file(document_file, document_type = None, validate = False, is_microdescriptor = False, document_handler = DocumentHandler.ENTRIES, **kwargs): """ Parses a network status and iterates over the RouterStatusEntry in it. The @@ -681,6 +700,54 @@ def _parse_package_line(descriptor, entries): descriptor.packages = package_versions +def _parsed_shared_rand_commit(descriptor, entries): + # "shared-rand-commit" Version AlgName Identity Commit [Reveal] + + commitments = [] + + for value, _, _ in entries['shared-rand-commit']: + value_comp = value.split() + + if len(value_comp) < 4: + raise ValueError("'shared-rand-commit' must at least have a 'Version AlgName Identity Commit': %s" % value) + + version, algorithm, identity, commit = value_comp[:4] + reveal = value_comp[4] if len(value_comp) >= 5 else None + + if not version.isdigit(): + raise ValueError("The version on our 'shared-rand-commit' line wasn't an integer: %s" % value) + + commitments.append(SharedRandomnessCommitment(int(version), algorithm, identity, commit, reveal)) + + descriptor.shared_randomness_commitments = commitments + + +def _parse_shared_rand_previous_value(descriptor, entries): + # "shared-rand-previous-value" NumReveals Value + + value = _value('shared-rand-previous-value', entries) + value_comp = value.split(' ') + + if len(value_comp) == 2 and value_comp[0].isdigit(): + descriptor.shared_randomness_previous_reveal_count = int(value_comp[0]) + descriptor.shared_randomness_previous_value = value_comp[1] + else: + raise ValueError("A network status document's 'shared-rand-previous-value' line must be a pair of values, the first an integer but was '%s'" % value) + + +def _parse_shared_rand_current_value(descriptor, entries): + # "shared-rand-current-value" NumReveals Value + + value = _value('shared-rand-current-value', entries) + value_comp = value.split(' ') + + if len(value_comp) == 2 and value_comp[0].isdigit(): + descriptor.shared_randomness_current_reveal_count = int(value_comp[0]) + descriptor.shared_randomness_current_value = value_comp[1] + else: + raise ValueError("A network status document's 'shared-rand-current-value' line must be a pair of values, the first an integer but was '%s'" % value) + + _parse_header_valid_after_line = _parse_timestamp_line('valid-after', 'valid_after') _parse_header_fresh_until_line = _parse_timestamp_line('fresh-until', 'fresh_until') _parse_header_valid_until_line = _parse_timestamp_line('valid-until', 'valid_until') @@ -688,6 +755,7 @@ _parse_header_client_versions_line = _parse_versions_line('client-versions', 'cl _parse_header_server_versions_line = _parse_versions_line('server-versions', 'server_versions') _parse_header_known_flags_line = _parse_simple_line('known-flags', 'known_flags', func = lambda v: [entry for entry in v.split(' ') if entry]) _parse_footer_bandwidth_weights_line = _parse_simple_line('bandwidth-weights', 'bandwidth_weights', func = lambda v: _parse_int_mappings('bandwidth-weights', v, True)) +_parse_shared_rand_participate_line = _parse_if_present('shared-rand-participate', 'is_shared_randomness_participate') class NetworkStatusDocumentV3(NetworkStatusDocument): @@ -731,11 +799,31 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): :var datetime published: time when the document was published :var dict flag_thresholds: **\*** mapping of internal performance thresholds used while making the vote, values are **ints** or **floats** + :var bool is_shared_randomness_participate: **\*** **True** if this authority + participates in establishing a shared random value, **False** otherwise + :var list shared_randomness_commitments: **\*** list of + :data:`~stem.descriptor.networkstatus.SharedRandomnessCommitment` entries + :var int shared_randomness_previous_reveal_count: number of commitments + used to generate the last shared random value + :var str shared_randomness_previous_value: base64 encoded last shared random + value + :var int shared_randomness_current_reveal_count: number of commitments + used to generate the current shared random value + :var str shared_randomness_current_value: base64 encoded current shared + random value + **\*** attribute is either required when we're parsed with validation or has a default value, others are left as None if undefined .. versionchanged:: 1.4.0 Added the packages attribute. + + .. versionchanged:: 1.5.0 + Added the is_shared_randomness_participate, shared_randomness_commitments, + shared_randomness_previous_reveal_count, + shared_randomness_previous_value, + shared_randomness_current_reveal_count, and + shared_randomness_current_value attributes. """ ATTRIBUTES = { @@ -757,6 +845,12 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): 'packages': ([], _parse_package_line), 'known_flags': ([], _parse_header_known_flags_line), 'flag_thresholds': ({}, _parse_header_flag_thresholds_line), + 'is_shared_randomness_participate': (False, _parse_shared_rand_participate_line), + 'shared_randomness_commitments': ([], _parsed_shared_rand_commit), + 'shared_randomness_previous_reveal_count': (None, _parse_shared_rand_previous_value), + 'shared_randomness_previous_value': (None, _parse_shared_rand_previous_value), + 'shared_randomness_current_reveal_count': (None, _parse_shared_rand_current_value), + 'shared_randomness_current_value': (None, _parse_shared_rand_current_value), 'params': ({}, _parse_header_parameters_line), 'signatures': ([], _parse_footer_directory_signature_line), @@ -778,6 +872,10 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): 'package': _parse_package_line, 'known-flags': _parse_header_known_flags_line, 'flag-thresholds': _parse_header_flag_thresholds_line, + 'shared-rand-participate': _parse_shared_rand_participate_line, + 'shared-rand-commit': _parsed_shared_rand_commit, + 'shared-rand-previous-value': _parse_shared_rand_previous_value, + 'shared-rand-current-value': _parse_shared_rand_current_value, 'params': _parse_header_parameters_line, } @@ -869,7 +967,7 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): # all known header fields can only appear once except for keyword, values in list(entries.items()): - if len(values) > 1 and keyword in HEADER_FIELDS and keyword != 'package': + if len(values) > 1 and keyword in HEADER_FIELDS and keyword != 'package' and keyword != 'shared-rand-commit': raise ValueError("Network status documents can only have a single '%s' line, got %i" % (keyword, len(values))) if self._default_params: @@ -1016,7 +1114,7 @@ def _check_for_misordered_fields(entries, expected): if actual != expected: actual_label = ', '.join(actual) expected_label = ', '.join(expected) - raise ValueError("The fields in a section of the document are misordered. It should be '%s' but was '%s'" % (actual_label, expected_label)) + raise ValueError("The fields in a section of the document are misordered. It should be '%s' but was '%s'" % (expected_label, actual_label)) def _parse_int_mappings(keyword, value, validate): diff --git a/test/mocking.py b/test/mocking.py index 165a5d4..5a86690 100644 --- a/test/mocking.py +++ b/test/mocking.py @@ -60,6 +60,12 @@ try: except ImportError: from mock import Mock, patch +try: + # added in python 2.7 + from collections import OrderedDict +except ImportError: + from stem.util.ordereddict import OrderedDict + CRYPTO_BLOB = """ MIGJAoGBAJv5IIWQ+WDWYUdyA/0L8qbIkEVH/cwryZWoIaPAzINfrw1WfNZGtBmg skFtXhOHHqTRN4GPPrZsAIUOQGzQtGb66IQgT4tO/pj+P6QmSCCdTfhvGfgTCsC+ @@ -321,7 +327,7 @@ def _get_descriptor_content(attr = None, exclude = (), header_template = (), foo if attr is None: attr = {} - attr = dict(attr) # shallow copy since we're destructive + attr = OrderedDict(attr) # shallow copy since we're destructive for content, template in ((header_content, header_template), (footer_content, footer_template)): diff --git a/test/unit/descriptor/networkstatus/document_v3.py b/test/unit/descriptor/networkstatus/document_v3.py index cb4a1a0..aae12a6 100644 --- a/test/unit/descriptor/networkstatus/document_v3.py +++ b/test/unit/descriptor/networkstatus/document_v3.py @@ -39,6 +39,12 @@ from test.mocking import ( from test.unit.descriptor import get_resource +try: + # added in python 2.7 + from collections import OrderedDict +except ImportError: + from stem.util.ordereddict import OrderedDict + BANDWIDTH_WEIGHT_ENTRIES = ( 'Wbd', 'Wbe', 'Wbg', 'Wbm', 'Wdb', @@ -331,6 +337,12 @@ DnN5aFtYKiTc19qIC7Nmo+afPdDEf0MlJvEOP5EWl3w= self.assertEqual(expected_known_flags, document.known_flags) self.assertEqual([], document.packages) self.assertEqual({}, document.flag_thresholds) + self.assertEqual(False, document.is_shared_randomness_participate) + self.assertEqual([], document.shared_randomness_commitments) + self.assertEqual(None, document.shared_randomness_previous_reveal_count) + self.assertEqual(None, document.shared_randomness_previous_value) + self.assertEqual(None, document.shared_randomness_current_reveal_count) + self.assertEqual(None, document.shared_randomness_current_value) self.assertEqual(DEFAULT_PARAMS, document.params) self.assertEqual((), document.directory_authorities) self.assertEqual({}, document.bandwidth_weights) @@ -366,6 +378,12 @@ DnN5aFtYKiTc19qIC7Nmo+afPdDEf0MlJvEOP5EWl3w= self.assertEqual(expected_known_flags, document.known_flags) self.assertEqual([], document.packages) self.assertEqual({}, document.flag_thresholds) + self.assertEqual(False, document.is_shared_randomness_participate) + self.assertEqual([], document.shared_randomness_commitments) + self.assertEqual(None, document.shared_randomness_previous_reveal_count) + self.assertEqual(None, document.shared_randomness_previous_value) + self.assertEqual(None, document.shared_randomness_current_reveal_count) + self.assertEqual(None, document.shared_randomness_current_value) self.assertEqual(DEFAULT_PARAMS, document.params) self.assertEqual({}, document.bandwidth_weights) self.assertEqual([DOC_SIG], document.signatures) @@ -837,6 +855,77 @@ DnN5aFtYKiTc19qIC7Nmo+afPdDEf0MlJvEOP5EWl3w= document = NetworkStatusDocumentV3(content, False) self.assertEqual({}, document.flag_thresholds) + def test_shared_randomness(self): + """ + Parses the shared randomness attributes. + """ + + COMMITMENT_1 = '1 sha3-256 4CAEC248004A0DC6CE86EBD5F608C9B05500C70C AAAAAFd4/kAaklgYr4ijHZjXXy/B354jQfL31BFhhE46nuOHSPITyw== AAAAAFd4/kCpZeis3yJyr//rz8hXCeeAhHa4k3lAcAiMJd1vEMTPuw==' + COMMITMENT_2 = '1 sha3-256 598536A9DD4E6C0F18B4AD4B88C7875A0A29BA31 AAAAAFd4/kC7S920awC5/HF5RfX4fKZtYqjm6qMh9G91AcjZm13DQQ==' + + document = get_network_status_document_v3(OrderedDict([ + ('vote-status', 'vote'), + ('shared-rand-participate', ''), + ('shared-rand-commit', '%s\nshared-rand-commit %s' % (COMMITMENT_1, COMMITMENT_2)), + ('shared-rand-previous-value', '8 hAQLxyt0U3gu7QR2owixRCbIltcyPrz3B0YBfUshOkE='), + ('shared-rand-current-value', '7 KEIfSB7Db+ToasQIzJhbh0CtkeSePHLEehO+ams/RTU='), + ])) + + self.assertEqual(True, document.is_shared_randomness_participate) + self.assertEqual(8, document.shared_randomness_previous_reveal_count) + self.assertEqual('hAQLxyt0U3gu7QR2owixRCbIltcyPrz3B0YBfUshOkE=', document.shared_randomness_previous_value) + self.assertEqual(7, document.shared_randomness_current_reveal_count) + self.assertEqual('KEIfSB7Db+ToasQIzJhbh0CtkeSePHLEehO+ams/RTU=', document.shared_randomness_current_value) + + self.assertEqual(2, len(document.shared_randomness_commitments)) + + first_commitment = document.shared_randomness_commitments[0] + self.assertEqual(1, first_commitment.version) + self.assertEqual('sha3-256', first_commitment.algorithm) + self.assertEqual('4CAEC248004A0DC6CE86EBD5F608C9B05500C70C', first_commitment.identity) + self.assertEqual('AAAAAFd4/kAaklgYr4ijHZjXXy/B354jQfL31BFhhE46nuOHSPITyw==', first_commitment.commit) + self.assertEqual('AAAAAFd4/kCpZeis3yJyr//rz8hXCeeAhHa4k3lAcAiMJd1vEMTPuw==', first_commitment.reveal) + + second_commitment = document.shared_randomness_commitments[1] + self.assertEqual(1, second_commitment.version) + self.assertEqual('sha3-256', second_commitment.algorithm) + self.assertEqual('598536A9DD4E6C0F18B4AD4B88C7875A0A29BA31', second_commitment.identity) + self.assertEqual('AAAAAFd4/kC7S920awC5/HF5RfX4fKZtYqjm6qMh9G91AcjZm13DQQ==', second_commitment.commit) + self.assertEqual(None, second_commitment.reveal) + + def test_shared_randomness_malformed(self): + """ + Checks shared randomness with malformed values. + """ + + test_values = [ + ({'vote-status': 'vote', 'shared-rand-commit': 'hi sha3-256 598536A9DD4E6C0F18B4AD4B88C7875A0A29BA31 AAAAAFd4/kC7S920awC5/HF5RfX4fKZtYqjm6qMh9G91AcjZm13DQQ=='}, + "The version on our 'shared-rand-commit' line wasn't an integer: hi sha3-256 598536A9DD4E6C0F18B4AD4B88C7875A0A29BA31 AAAAAFd4/kC7S920awC5/HF5RfX4fKZtYqjm6qMh9G91AcjZm13DQQ=="), + ({'vote-status': 'vote', 'shared-rand-commit': 'sha3-256 598536A9DD4E6C0F18B4AD4B88C7875A0A29BA31 AAAAAFd4/kC7S920awC5/HF5RfX4fKZtYqjm6qMh9G91AcjZm13DQQ=='}, + "'shared-rand-commit' must at least have a 'Version AlgName Identity Commit': sha3-256 598536A9DD4E6C0F18B4AD4B88C7875A0A29BA31 AAAAAFd4/kC7S920awC5/HF5RfX4fKZtYqjm6qMh9G91AcjZm13DQQ=="), + ({'vote-status': 'vote', 'shared-rand-current-value': 'hi KEIfSB7Db+ToasQIzJhbh0CtkeSePHLEehO+ams/RTU='}, + "A network status document's 'shared-rand-current-value' line must be a pair of values, the first an integer but was 'hi KEIfSB7Db+ToasQIzJhbh0CtkeSePHLEehO+ams/RTU='"), + ({'vote-status': 'vote', 'shared-rand-current-value': 'KEIfSB7Db+ToasQIzJhbh0CtkeSePHLEehO+ams/RTU='}, + "A network status document's 'shared-rand-current-value' line must be a pair of values, the first an integer but was 'KEIfSB7Db+ToasQIzJhbh0CtkeSePHLEehO+ams/RTU='"), + ] + + for attr, expected_exception in test_values: + content = get_network_status_document_v3(attr, content = True) + + try: + NetworkStatusDocumentV3(content, True) + self.fail("validation should've rejected malformed shared randomness attribute") + except ValueError as exc: + self.assertEqual(expected_exception, str(exc)) + + document = NetworkStatusDocumentV3(content, False) + + self.assertEqual([], document.shared_randomness_commitments) + self.assertEqual(None, document.shared_randomness_previous_reveal_count) + self.assertEqual(None, document.shared_randomness_previous_value) + self.assertEqual(None, document.shared_randomness_current_reveal_count) + self.assertEqual(None, document.shared_randomness_current_value) + def test_params(self): """ General testing for the 'params' line, exercising the happy cases.

1 0

[stem/master] Move _hash_attr() to stem.util
by atagar＠torproject.org 03 Jul '16

03 Jul '16

commit 873d2ecf8931b70181cd6d7c7271a7ce3670ec9b Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 2 12:20:34 2016 -0700 Move _hash_attr() to stem.util On reflection more fitting in the util module. --- stem/__init__.py | 26 -------------------------- stem/descriptor/remote.py | 10 ++++------ stem/exit_policy.py | 6 +++--- stem/manual.py | 7 ++++--- stem/util/__init__.py | 26 ++++++++++++++++++++++++++ stem/version.py | 5 +++-- 6 files changed, 40 insertions(+), 40 deletions(-) diff --git a/stem/__init__.py b/stem/__init__.py index 56d294d..1f61075 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -860,29 +860,3 @@ HSAuth = stem.util.enum.UppercaseEnum( 'STEALTH_AUTH', 'UNKNOWN', ) - - -def _hash_attr(obj, *attributes, **kwargs): - """ - Provide a hash value for the given set of attributes. - - :param Object obj: object to be hashed - :param list attributes: attribute names to take into account - :param class parent: parent object to include in the hash value - """ - - my_hash = 0 if kwargs.get('parent') == None else kwargs.get('parent').__hash__(obj) - - for attr in attributes: - my_hash *= 1024 - - attr_value = getattr(obj, attr) - - if attr_value is not None: - if isinstance(attr_value, dict): - for k, v in attr_value.items(): - my_hash = (my_hash + hash(k)) * 1024 + hash(v) - else: - my_hash += hash(attr_value) - - return my_hash diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index 69f4d39..f25d58e 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -91,8 +91,6 @@ import threading import time import zlib -import stem - try: # account for urllib's change between python 2.x and 3.x import urllib.request as urllib @@ -102,7 +100,7 @@ except ImportError: import stem.descriptor from stem import Flag -from stem.util import connection, log, str_tools, tor_tools +from stem.util import _hash_attr, connection, log, str_tools, tor_tools # Tor has a limited number of descriptors we can fetch explicitly by their # fingerprint or hashes due to a limit on the url length by squid proxies. @@ -719,7 +717,7 @@ class Directory(object): self.fingerprint = fingerprint def __hash__(self): - return stem._hash_attr(self, 'address', 'or_port', 'dir_port', 'fingerprint') + return _hash_attr(self, 'address', 'or_port', 'dir_port', 'fingerprint') def __eq__(self, other): return hash(self) == hash(other) if isinstance(other, Directory) else False @@ -772,7 +770,7 @@ class DirectoryAuthority(Directory): self.is_bandwidth_authority = is_bandwidth_authority def __hash__(self): - return stem._hash_attr(self, 'nickname', 'v3ident', 'is_bandwidth_authority', parent = Directory) + return _hash_attr(self, 'nickname', 'v3ident', 'is_bandwidth_authority', parent = Directory) def __eq__(self, other): return hash(self) == hash(other) if isinstance(other, DirectoryAuthority) else False @@ -1066,7 +1064,7 @@ class FallbackDirectory(Directory): return results def __hash__(self): - return stem._hash_attr(self, 'orport_v6', parent = Directory) + return _hash_attr(self, 'orport_v6', parent = Directory) def __eq__(self, other): return hash(self) == hash(other) if isinstance(other, FallbackDirectory) else False diff --git a/stem/exit_policy.py b/stem/exit_policy.py index a0b3064..e84a456 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -70,13 +70,13 @@ from __future__ import absolute_import import socket import zlib -import stem import stem.prereq import stem.util.connection import stem.util.enum import stem.util.str_tools from stem import str_type +from stem.util import _hash_attr try: # added in python 3.2 @@ -1014,7 +1014,7 @@ class ExitPolicyRule(object): def __hash__(self): if self._hash is None: - self._hash = stem._hash_attr(self, 'is_accept', 'address', 'min_port', 'max_port') * 1024 + hash(self.get_mask(False)) + self._hash = _hash_attr(self, 'is_accept', 'address', 'min_port', 'max_port') * 1024 + hash(self.get_mask(False)) return self._hash @@ -1060,7 +1060,7 @@ class MicroExitPolicyRule(ExitPolicyRule): def __hash__(self): if self._hash is None: - self._hash = stem._hash_attr(self, 'is_accept', 'min_port', 'max_port') + self._hash = _hash_attr(self, 'is_accept', 'min_port', 'max_port') return self._hash diff --git a/stem/manual.py b/stem/manual.py index fe83487..70cae73 100644 --- a/stem/manual.py +++ b/stem/manual.py @@ -52,13 +52,14 @@ import shutil import sys import tempfile -import stem import stem.prereq import stem.util.conf import stem.util.enum import stem.util.log import stem.util.system +from stem.util import _hash_attr + try: # added in python 2.7 from collections import OrderedDict @@ -112,7 +113,7 @@ class ConfigOption(object): self.description = description def __hash__(self): - return stem._hash_attr(self, 'name', 'category', 'usage', 'summary', 'description') + return _hash_attr(self, 'name', 'category', 'usage', 'summary', 'description') def __eq__(self, other): return hash(self) == hash(other) if isinstance(other, ConfigOption) else False @@ -468,7 +469,7 @@ class Manual(object): conf.save(path) def __hash__(self): - return stem._hash_attr(self, 'name', 'synopsis', 'description', 'commandline_options', 'signals', 'files', 'config_options') + return _hash_attr(self, 'name', 'synopsis', 'description', 'commandline_options', 'signals', 'files', 'config_options') def __eq__(self, other): return hash(self) == hash(other) if isinstance(other, Manual) else False diff --git a/stem/util/__init__.py b/stem/util/__init__.py index beb0ee6..63609d9 100644 --- a/stem/util/__init__.py +++ b/stem/util/__init__.py @@ -40,3 +40,29 @@ def datetime_to_unix(timestamp): return int(timestamp.strftime('%s')) - int(datetime.datetime(1970, 1, 1).strftime('%s')) + 3600 else: return (timestamp - datetime.datetime(1970, 1, 1)).total_seconds() + + +def _hash_attr(obj, *attributes, **kwargs): + """ + Provide a hash value for the given set of attributes. + + :param Object obj: object to be hashed + :param list attributes: attribute names to take into account + :param class parent: parent object to include in the hash value + """ + + my_hash = 0 if kwargs.get('parent') == None else kwargs.get('parent').__hash__(obj) + + for attr in attributes: + my_hash *= 1024 + + attr_value = getattr(obj, attr) + + if attr_value is not None: + if isinstance(attr_value, dict): + for k, v in attr_value.items(): + my_hash = (my_hash + hash(k)) * 1024 + hash(v) + else: + my_hash += hash(attr_value) + + return my_hash diff --git a/stem/version.py b/stem/version.py index de4a784..e13c420 100644 --- a/stem/version.py +++ b/stem/version.py @@ -72,10 +72,11 @@ easily parsed and compared, for instance... import os import re -import stem import stem.util.enum import stem.util.system +from stem.util import _hash_attr + try: # added in python 3.2 from functools import lru_cache @@ -235,7 +236,7 @@ class Version(object): def __hash__(self): if self._hash is None: - self._hash = stem._hash_attr(self, 'major', 'minor', 'micro', 'patch', 'status') + self._hash = _hash_attr(self, 'major', 'minor', 'micro', 'patch', 'status') return self._hash

1 0

[stem/master] Move str_type and int_type to stem.util
by atagar＠torproject.org 03 Jul '16

03 Jul '16

commit 9df0bd0a595cba93eb8c51a7839a1a484e5b9475 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 2 12:34:47 2016 -0700 Move str_type and int_type to stem.util Either spot works but I prefer to keep the base stem module strictly about tor type enums. --- stem/__init__.py | 9 --------- stem/control.py | 4 ++-- stem/descriptor/__init__.py | 2 +- stem/descriptor/reader.py | 2 +- stem/descriptor/server_descriptor.py | 2 +- stem/exit_policy.py | 3 +-- stem/response/events.py | 3 +-- stem/util/__init__.py | 7 +++++++ stem/util/connection.py | 3 +-- stem/util/enum.py | 2 +- stem/util/str_tools.py | 2 +- stem/util/system.py | 4 ++-- test/unit/descriptor/microdescriptor.py | 2 +- test/unit/descriptor/networkstatus/document_v3.py | 3 ++- test/unit/descriptor/reader.py | 3 +-- test/unit/descriptor/server_descriptor.py | 2 +- test/unit/tutorial_examples.py | 2 +- test/unit/util/system.py | 3 +-- 18 files changed, 26 insertions(+), 32 deletions(-) diff --git a/stem/__init__.py b/stem/__init__.py index 1f61075..feb156a 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -468,15 +468,6 @@ Library for working with the tor process. ================= =========== """ -import stem.prereq - -if stem.prereq.is_python_3(): - str_type = str - int_type = int -else: - str_type = unicode - int_type = long - import stem.util.enum __version__ = '1.4.1-dev' diff --git a/stem/control.py b/stem/control.py index f29fb71..9101cc1 100644 --- a/stem/control.py +++ b/stem/control.py @@ -274,8 +274,8 @@ import stem.util.system import stem.util.tor_tools import stem.version -from stem import UNDEFINED, CircStatus, Signal, str_type -from stem.util import log +from stem import UNDEFINED, CircStatus, Signal +from stem.util import str_type, log # state changes a control socket can have diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 05c6087..fc44843 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -50,7 +50,7 @@ import stem.util.enum import stem.util.str_tools import stem.util.system -from stem import str_type +from stem.util import str_type try: # added in python 2.7 diff --git a/stem/descriptor/reader.py b/stem/descriptor/reader.py index d047fb0..acfce67 100644 --- a/stem/descriptor/reader.py +++ b/stem/descriptor/reader.py @@ -91,7 +91,7 @@ import stem.descriptor import stem.prereq import stem.util.system -from stem import str_type +from stem.util import str_type # flag to indicate when the reader thread is out of descriptor files to read FINISHED = 'DONE' diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 931601a..9f7d8d1 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -43,7 +43,7 @@ import stem.util.str_tools import stem.util.tor_tools import stem.version -from stem import str_type +from stem.util import str_type from stem.descriptor import ( PGP_BLOCK_END, diff --git a/stem/exit_policy.py b/stem/exit_policy.py index e84a456..9379d9c 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -75,8 +75,7 @@ import stem.util.connection import stem.util.enum import stem.util.str_tools -from stem import str_type -from stem.util import _hash_attr +from stem.util import _hash_attr, str_type try: # added in python 3.2 diff --git a/stem/response/events.py b/stem/response/events.py index 22adc25..86ed2b4 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -11,8 +11,7 @@ import stem.descriptor.router_status_entry import stem.response import stem.version -from stem import str_type, int_type -from stem.util import connection, log, str_tools, tor_tools +from stem.util import str_type, int_type, connection, log, str_tools, tor_tools # Matches keyword=value arguments. This can't be a simple "(.*)=(.*)" pattern # because some positional arguments, like circuit paths, can have an equal diff --git a/stem/util/__init__.py b/stem/util/__init__.py index 63609d9..fd5bfad 100644 --- a/stem/util/__init__.py +++ b/stem/util/__init__.py @@ -24,6 +24,13 @@ __all__ = [ 'datetime_to_unix', ] +if stem.prereq.is_python_3(): + str_type = str + int_type = int +else: + str_type = unicode + int_type = long + def datetime_to_unix(timestamp): """ diff --git a/stem/util/connection.py b/stem/util/connection.py index 4c64cc3..49a410b 100644 --- a/stem/util/connection.py +++ b/stem/util/connection.py @@ -53,8 +53,7 @@ import re import stem.util.proc import stem.util.system -from stem import str_type -from stem.util import conf, enum, log +from stem.util import str_type, conf, enum, log # Connection resolution is risky to log about since it's highly likely to # contain sensitive information. That said, it's also difficult to get right in diff --git a/stem/util/enum.py b/stem/util/enum.py index 0927b4b..e6b62c8 100644 --- a/stem/util/enum.py +++ b/stem/util/enum.py @@ -40,7 +40,7 @@ constructed as simple type listings... +- __iter__ - iterator over our enum keys """ -from stem import str_type +from stem.util import str_type def UppercaseEnum(*args): diff --git a/stem/util/str_tools.py b/stem/util/str_tools.py index a01eb8a..6d59303 100644 --- a/stem/util/str_tools.py +++ b/stem/util/str_tools.py @@ -29,7 +29,7 @@ import sys import stem.prereq import stem.util.enum -from stem import str_type +from stem.util import str_type # label conversion tuples of the form... # (bits / bytes / seconds, short label, long label) diff --git a/stem/util/system.py b/stem/util/system.py index 5ef61c6..7798048 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -62,8 +62,8 @@ import time import stem.util.proc import stem.util.str_tools -from stem import UNDEFINED, str_type -from stem.util import log +from stem import UNDEFINED +from stem.util import str_type, log # Mapping of commands to if they're available or not. diff --git a/test/unit/descriptor/microdescriptor.py b/test/unit/descriptor/microdescriptor.py index f21e518..10ccd15 100644 --- a/test/unit/descriptor/microdescriptor.py +++ b/test/unit/descriptor/microdescriptor.py @@ -8,7 +8,7 @@ import stem.exit_policy import stem.descriptor -from stem import str_type +from stem.util import str_type from stem.descriptor.microdescriptor import Microdescriptor from test.mocking import ( diff --git a/test/unit/descriptor/networkstatus/document_v3.py b/test/unit/descriptor/networkstatus/document_v3.py index aaf857a..cb4a1a0 100644 --- a/test/unit/descriptor/networkstatus/document_v3.py +++ b/test/unit/descriptor/networkstatus/document_v3.py @@ -9,7 +9,8 @@ import unittest import stem.descriptor import stem.version -from stem import Flag, str_type +from stem import Flag +from stem.util import str_type from stem.descriptor.networkstatus import ( HEADER_STATUS_DOCUMENT_FIELDS, diff --git a/test/unit/descriptor/reader.py b/test/unit/descriptor/reader.py index f21ea75..fe9c9e7 100644 --- a/test/unit/descriptor/reader.py +++ b/test/unit/descriptor/reader.py @@ -17,8 +17,7 @@ import stem.descriptor.reader import test.runner import test.unit.descriptor -from stem import str_type -from stem.util import system +from stem.util import str_type, system try: # added in python 3.3 diff --git a/test/unit/descriptor/server_descriptor.py b/test/unit/descriptor/server_descriptor.py index c9d606f..834d1ea 100644 --- a/test/unit/descriptor/server_descriptor.py +++ b/test/unit/descriptor/server_descriptor.py @@ -14,7 +14,7 @@ import stem.prereq import stem.version import stem.util.str_tools -from stem import str_type +from stem.util import str_type from stem.descriptor.server_descriptor import RelayDescriptor, BridgeDescriptor from test.mocking import ( diff --git a/test/unit/tutorial_examples.py b/test/unit/tutorial_examples.py index a21937f..e316766 100644 --- a/test/unit/tutorial_examples.py +++ b/test/unit/tutorial_examples.py @@ -17,8 +17,8 @@ import stem.prereq import test.runner -from stem import str_type from stem.control import Controller +from stem.util import str_type from stem.descriptor.remote import DIRECTORY_AUTHORITIES from test import mocking diff --git a/test/unit/util/system.py b/test/unit/util/system.py index 242a7fb..0bb59f3 100644 --- a/test/unit/util/system.py +++ b/test/unit/util/system.py @@ -12,8 +12,7 @@ import posixpath import tempfile import unittest -from stem import str_type -from stem.util import system +from stem.util import str_type, system try: # added in python 3.3

1 0

[stem/master] Removed urras as a directory authority
by atagar＠torproject.org 03 Jul '16

03 Jul '16

commit 62c6063b1152903bc7d72d8048f0cfa392c20688 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 3 11:12:19 2016 -0700 Removed urras as a directory authority Updating our authority list as per... https://trac.torproject.org/projects/tor/ticket/19271 --- docs/change_log.rst | 1 + stem/descriptor/remote.py | 9 --------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 230533a..3ef8900 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -79,6 +79,7 @@ The following are only available within Stem's `git repository * Bracketed IPv6 addresses were mistreated as being invalid content * Better validation for non-ascii descriptor content * Updated dannenberg's v3ident (:trac:`17906`) + * Removed urras as a directory authority (:trac:`19271`) * **Utilities** diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index f25d58e..d16170c 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -834,15 +834,6 @@ DIRECTORY_AUTHORITIES = { fingerprint = '7BE683E65D48141321C5ED92F075C55364AC7123', v3ident = '0232AF901C31A04EE9848595AF9BB7620D4C5B2E', ), - 'urras': DirectoryAuthority( - nickname = 'urras', - address = '208.83.223.34', - or_port = 80, - dir_port = 443, - is_bandwidth_authority = False, - fingerprint = '0AD3FA884D18F89EEA2D89C019379E0E7FD94417', - v3ident = '80550987E1D626E3EBA5E5E75A458DE0626D088C', - ), 'maatuska': DirectoryAuthority( nickname = 'maatuska', address = '171.25.193.9',

1 0

[stem/master] Add trnnr to examples page
by atagar＠torproject.org 03 Jul '16

03 Jul '16

commit 3e50f19857d69c602c29cbf8316a00df42ca9df1 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 2 17:29:56 2016 -0700 Add trnnr to examples page Adding Philipp's new project... https://lists.torproject.org/pipermail/metrics-team/2016-July/000157.html --- docs/tutorials/double_double_toil_and_trouble.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/tutorials/double_double_toil_and_trouble.rst b/docs/tutorials/double_double_toil_and_trouble.rst index 61f8c79..abab871 100644 --- a/docs/tutorials/double_double_toil_and_trouble.rst +++ b/docs/tutorials/double_double_toil_and_trouble.rst @@ -74,6 +74,7 @@ Applications `OnionShare <https://github.com/micahflee/onionshare>`_ Hidden service based file sharing application. `Syboa <https://gitorious.org/syboa/syboa>`_ GTK Tor interface similar to `TorK <http://sourceforge.net/projects/tork/>`_. `hs-health <https://gitlab.com/hs-health/hs-health>`_ Experiment to measure churn and reachability of hidden services. +`trnnr <https://github.com/NullHypothesis/trnnr>`_ Python implementation of tor's nearest neighbour ranking. `TorTP <https://github.com/vinc3nt/stem-tortp>`_ Configures iptables to torify all traffic. =========================================================================================================== ==========

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 03 Jul '16

03 Jul '16

commit af180e33f032ecf02512ac030255053f2584109c Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 3 12:16:13 2016 +0000 Update translations for tor-launcher-network-settings --- fi/network-settings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fi/network-settings.dtd b/fi/network-settings.dtd index 31dae56..bfaa59a 100644 --- a/fi/network-settings.dtd +++ b/fi/network-settings.dtd @@ -13,7 +13,7 @@ <!ENTITY torSettings.firstQuestion "Mikä seuraavista kuvailee parhaiten tilannettasi?"> <!ENTITY torSettings.configurePrompt1 "Tämän tietokoneen internet-yhteys on sensuroitu tai kulkee välityspalvelimen kautta."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Minun täytyy configuroida joko silta- tai paikallinen välityspalvelimen asetukset ennen kuin yhdistän Tor verkkoon."> <!ENTITY torSettings.configure "Määritä"> <!ENTITY torSettings.connectPrompt2 "Haluan tehdä suoran yhteyden Tor-verkkoon."> <!ENTITY torSettings.connectPrompt3 "Tämä toimii useimmissa tilanteissa."> @@ -22,7 +22,7 @@ <!ENTITY torSettings.proxyPageTitle "Paikallisen välityspalvelimen määritys"> <!ENTITY torSettings.proxyQuestion "Tarvitseeko tämän tietokoneen käyttää paikallista välityspalvelinta Internet-pääsyyn?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> +<!ENTITY torSettings.proxyExplanation1 "Yleensä paikallista välityspalvelinta ei tarvita mutta se voidaan tarvia jos yhdistetään yrityksen, koulun tai yliopistpjen verkon kautta."> <!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> <!ENTITY torSettings.enterProxy "Kirjoita välityspalvelinasetukset."> <!ENTITY torSettings.bridgePageTitle "Tor-siltojen määritys">

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 03 Jul '16

03 Jul '16

commit e068bd70d48babd3a24bbd4704304f288392730c Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 3 10:46:27 2016 +0000 Update translations for tails-misc_completed --- bg.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bg.po b/bg.po index acb23eb..292c885 100644 --- a/bg.po +++ b/bg.po @@ -17,8 +17,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-25 20:25+0200\n" -"PO-Revision-Date: 2016-05-27 10:12+0000\n" +"POT-Creation-Date: 2016-06-06 14:26+0200\n" +"PO-Revision-Date: 2016-07-03 10:26+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Bulgarian (http://www.transifex.com/otf/torproject/language/bg/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 03 Jul '16

03 Jul '16

commit bc12efdd57d2a89e9f512f8a2ceb0dc426253529 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 3 10:46:19 2016 +0000 Update translations for tails-misc --- bg.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bg.po b/bg.po index acb23eb..292c885 100644 --- a/bg.po +++ b/bg.po @@ -17,8 +17,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-25 20:25+0200\n" -"PO-Revision-Date: 2016-05-27 10:12+0000\n" +"POT-Creation-Date: 2016-06-06 14:26+0200\n" +"PO-Revision-Date: 2016-07-03 10:26+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Bulgarian (http://www.transifex.com/otf/torproject/language/bg/)\n" "MIME-Version: 1.0\n"

1 0