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

[stem/master] Long digest values caused stem.client errors
by atagar＠torproject.org 14 May '18

14 May '18

commit 148c038543196ecdc92716a67c71edfa72aab19a Author: Damian Johnson <atagar(a)torproject.org> Date: Sun May 13 13:52:42 2018 -0700 Long digest values caused stem.client errors Interesting. Tests were happy on my laptop but on my PC where I have an older python 2.7 and 3.x version there are errors... ====================================================================== ERROR: test_relay_cell ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/atagar/Desktop/stem/test/unit/client/cell.py", line 160, in test_relay_cell self.assertEqual(3257622417, RelayCell(5, 'RELAY_BEGIN_DIR', '', 3257622417, 564346860).digest) File "/home/atagar/Desktop/stem/stem/client/cell.py", line 315, in __init__ raise ValueError('RELAY cell digest must be a hash, string, or int but was a %s' % type(digest).__name__) ValueError: RELAY cell digest must be a hash, string, or int but was a long ---------------------------------------------------------------------- Fixing our isinstance checks so they recognize both ints and longs. Two quick things to note about this... * In python 2.7 this is usually done as "isinstance(my_value, (int, long))" but python3 drops the long type so that's a no-go. * When we drop the python 2.x series these should become "isinstance(my_value, int)" checks. --- stem/client/cell.py | 3 ++- stem/client/datatype.py | 8 ++++++-- test/unit/client/__init__.py | 4 ++-- test/unit/client/cell.py | 6 +++--- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/stem/client/cell.py b/stem/client/cell.py index a3a0f7f0..7f801fd6 100644 --- a/stem/client/cell.py +++ b/stem/client/cell.py @@ -40,6 +40,7 @@ Messages communicated over a Tor relay's ORPort. import datetime import inspect import io +import numbers import os import random import sys @@ -309,7 +310,7 @@ class RelayCell(CircuitCell): digest = Size.LONG.unpack(digest.digest()[:4]) elif isinstance(digest, (bytes, str_type)): digest = Size.LONG.unpack(digest[:4]) - elif isinstance(digest, int): + elif isinstance(digest, numbers.Integral): pass else: raise ValueError('RELAY cell digest must be a hash, string, or int but was a %s' % type(digest).__name__) diff --git a/stem/client/datatype.py b/stem/client/datatype.py index 687c5081..9abea36b 100644 --- a/stem/client/datatype.py +++ b/stem/client/datatype.py @@ -113,6 +113,7 @@ users.** See our :class:`~stem.client.Relay` the API you probably want. import collections import hashlib import io +import numbers import struct import stem.prereq @@ -158,7 +159,10 @@ class _IntegerEnum(stem.util.enum.Enum): Privides the (enum, int_value) tuple for a given value. """ - if isinstance(val, int): + # TODO: when we drop python 2.x support all "isinstance(val, + # numbers.Integral)" checks should become "isinstance(val, int)" + + if isinstance(val, numbers.Integral): return self._int_to_enum.get(val, self.UNKNOWN), val elif val in self: return val, self._enum_to_int.get(val, val) @@ -310,7 +314,7 @@ class Size(Field): raise NotImplementedError("Use our constant's unpack() and pop() instead") def pack(self, content): - if not isinstance(content, int): + if not isinstance(content, numbers.Integral): raise ValueError('Size.pack encodes an integer, but was a %s' % type(content).__name__) packed = struct.pack(self.format, content) diff --git a/test/unit/client/__init__.py b/test/unit/client/__init__.py index 91d3b2be..18677c62 100644 --- a/test/unit/client/__init__.py +++ b/test/unit/client/__init__.py @@ -2,6 +2,8 @@ Unit tests for stem.client.* contents. """ +import os + __all__ = [ 'address', 'cell', @@ -10,8 +12,6 @@ __all__ = [ 'size', ] -import os - TEST_DATA = os.path.join(os.path.dirname(__file__), 'data') diff --git a/test/unit/client/cell.py b/test/unit/client/cell.py index f066cc4f..76fe17ea 100644 --- a/test/unit/client/cell.py +++ b/test/unit/client/cell.py @@ -74,7 +74,7 @@ CERTS_CELLS = { } AUTH_CHALLENGE_CELLS = { - b'\x00\x00\x82\x00&%s\x00\x02\x00\x01\x00\x03' % CHALLENGE: (CHALLENGE, [1, 3]), + b'\x00\x00\x82\x00&' + CHALLENGE + b'\x00\x02\x00\x01\x00\x03': (CHALLENGE, [1, 3]), } @@ -237,5 +237,5 @@ class TestCell(unittest.TestCase): self.assertEqual(challenge, cell.challenge) self.assertEqual(methods, cell.methods) - self.assertRaisesRegexp(ValueError, 'AUTH_CHALLENGE cell should have a payload of 38 bytes, but only had 16', Cell.pop, b'\x00\x00\x82\x00&%s\x00\x02\x00\x01\x00\x03' % CHALLENGE[:10], 2) - self.assertRaisesRegexp(ValueError, 'AUTH_CHALLENGE should have 3 methods, but only had 4 bytes for it', Cell.pop, b'\x00\x00\x82\x00&%s\x00\x03\x00\x01\x00\x03' % CHALLENGE, 2) + self.assertRaisesRegexp(ValueError, 'AUTH_CHALLENGE cell should have a payload of 38 bytes, but only had 16', Cell.pop, b'\x00\x00\x82\x00&' + CHALLENGE[:10] + b'\x00\x02\x00\x01\x00\x03', 2) + self.assertRaisesRegexp(ValueError, 'AUTH_CHALLENGE should have 3 methods, but only had 4 bytes for it', Cell.pop, b'\x00\x00\x82\x00&' + CHALLENGE + b'\x00\x03\x00\x01\x00\x03', 2)

1 0

[stem/master] Drop stem.util.str_type
by atagar＠torproject.org 14 May '18

14 May '18

commit ec796c735b826dcce865ec2d1b109e0ce84fd365 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun May 13 17:28:24 2018 -0700 Drop stem.util.str_type Our str_type constant was used for a couple things... * Throughout our library it was pretty much exclusively a cross-version 'is this a string?' check. Replacing these with an is_str() function instead. * In our tests it was used to create test data. Interestingly it seems we actually do just fine without this. --- stem/client/cell.py | 9 ++--- stem/client/datatype.py | 9 ++--- stem/control.py | 13 +++---- stem/descriptor/__init__.py | 7 ++-- stem/descriptor/certificate.py | 5 ++- stem/descriptor/reader.py | 13 +++---- stem/descriptor/server_descriptor.py | 3 +- stem/exit_policy.py | 15 ++++----- stem/response/events.py | 5 +-- stem/util/__init__.py | 39 ++++++++++++++++++--- stem/util/connection.py | 7 ++-- stem/util/enum.py | 4 +-- stem/util/str_tools.py | 11 +++--- stem/util/system.py | 5 +-- test/settings.cfg | 8 +++-- test/unit/descriptor/microdescriptor.py | 5 ++- test/unit/descriptor/networkstatus/document_v3.py | 41 +++++++++++------------ test/unit/descriptor/reader.py | 37 ++++++++++---------- test/unit/descriptor/server_descriptor.py | 7 ++-- test/unit/tutorial_examples.py | 13 ++++--- test/unit/util/system.py | 5 ++- 21 files changed, 143 insertions(+), 118 deletions(-) diff --git a/stem/client/cell.py b/stem/client/cell.py index 7f801fd6..b40a737f 100644 --- a/stem/client/cell.py +++ b/stem/client/cell.py @@ -40,14 +40,15 @@ Messages communicated over a Tor relay's ORPort. import datetime import inspect import io -import numbers import os import random import sys +import stem.util + from stem import UNDEFINED from stem.client.datatype import HASH_LEN, ZERO, Address, Certificate, CloseReason, RelayCommand, Size, split -from stem.util import _hash_attr, datetime_to_unix, str_type, str_tools +from stem.util import _hash_attr, datetime_to_unix, str_tools FIXED_PAYLOAD_LEN = 509 AUTH_CHALLENGE_SIZE = 32 @@ -308,9 +309,9 @@ class RelayCell(CircuitCell): # isinstance() isn't such a great option. digest = Size.LONG.unpack(digest.digest()[:4]) - elif isinstance(digest, (bytes, str_type)): + elif stem.util._is_str(digest): digest = Size.LONG.unpack(digest[:4]) - elif isinstance(digest, numbers.Integral): + elif stem.util._is_int(digest): pass else: raise ValueError('RELAY cell digest must be a hash, string, or int but was a %s' % type(digest).__name__) diff --git a/stem/client/datatype.py b/stem/client/datatype.py index 9abea36b..038229d2 100644 --- a/stem/client/datatype.py +++ b/stem/client/datatype.py @@ -113,10 +113,10 @@ users.** See our :class:`~stem.client.Relay` the API you probably want. import collections import hashlib import io -import numbers import struct import stem.prereq +import stem.util import stem.util.connection import stem.util.enum @@ -159,10 +159,7 @@ class _IntegerEnum(stem.util.enum.Enum): Privides the (enum, int_value) tuple for a given value. """ - # TODO: when we drop python 2.x support all "isinstance(val, - # numbers.Integral)" checks should become "isinstance(val, int)" - - if isinstance(val, numbers.Integral): + if stem.util._is_int(val): return self._int_to_enum.get(val, self.UNKNOWN), val elif val in self: return val, self._enum_to_int.get(val, val) @@ -314,7 +311,7 @@ class Size(Field): raise NotImplementedError("Use our constant's unpack() and pop() instead") def pack(self, content): - if not isinstance(content, numbers.Integral): + if not stem.util._is_int(content): raise ValueError('Size.pack encodes an integer, but was a %s' % type(content).__name__) packed = struct.pack(self.format, content) diff --git a/stem/control.py b/stem/control.py index 244aed0b..d10989af 100644 --- a/stem/control.py +++ b/stem/control.py @@ -269,6 +269,7 @@ import stem.exit_policy import stem.response import stem.response.events import stem.socket +import stem.util import stem.util.conf import stem.util.connection import stem.util.enum @@ -278,7 +279,7 @@ import stem.util.tor_tools import stem.version from stem import UNDEFINED, CircStatus, Signal -from stem.util import str_type, log +from stem.util import log # When closing the controller we attempt to finish processing enqueued events, # but if it takes longer than this we terminate. @@ -1141,7 +1142,7 @@ class Controller(BaseController): start_time = time.time() reply = {} - if isinstance(params, (bytes, str_type)): + if stem.util._is_str(params): is_multiple = False params = set([params]) else: @@ -2191,7 +2192,7 @@ class Controller(BaseController): start_time = time.time() reply = {} - if isinstance(params, (bytes, str_type)): + if stem.util._is_str(params): params = [params] # remove strings which contain only whitespace @@ -2433,7 +2434,7 @@ class Controller(BaseController): for param, value in params: param = param.lower() - if isinstance(value, (bytes, str_type)): + if stem.util._is_str(value): value = [value] to_cache[param] = value @@ -3331,7 +3332,7 @@ class Controller(BaseController): * :class:`stem.InvalidArguments` if features passed were invalid """ - if isinstance(features, (bytes, str_type)): + if stem.util._is_str(features): features = [features] response = self.msg('USEFEATURE %s' % ' '.join(features)) @@ -3486,7 +3487,7 @@ class Controller(BaseController): args = [circuit_id] - if isinstance(path, (bytes, str_type)): + if stem.util._is_str(path): path = [path] if path: diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index d56b38b8..6a54ef29 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -68,12 +68,11 @@ import string import tarfile import stem.prereq +import stem.util import stem.util.enum import stem.util.str_tools import stem.util.system -from stem.util import str_type - try: # added in python 2.7 from collections import OrderedDict @@ -205,7 +204,7 @@ def parse_file(descriptor_file, descriptor_type = None, validate = False, docume handler = None - if isinstance(descriptor_file, (bytes, str_type)): + if stem.util._is_str(descriptor_file): if stem.util.system.is_tarfile(descriptor_file): handler = _parse_file_for_tar_path else: @@ -896,7 +895,7 @@ def _read_until_keywords(keywords, descriptor_file, inclusive = False, ignore_fi content = None if skip else [] ending_keyword = None - if isinstance(keywords, (bytes, str_type)): + if stem.util._is_str(keywords): keywords = (keywords,) if ignore_first: diff --git a/stem/descriptor/certificate.py b/stem/descriptor/certificate.py index 3cdf4163..0c4796af 100644 --- a/stem/descriptor/certificate.py +++ b/stem/descriptor/certificate.py @@ -162,7 +162,10 @@ class Ed25519CertificateV1(Ed25519Certificate): raise ValueError("BUG: Ed25519 certificate type is decoded from one byte. It shouldn't be possible to have a value of %i." % cert_type) # expiration time is in hours since epoch - self.expiration = datetime.datetime.utcfromtimestamp(stem.util.str_tools._to_int(decoded[2:6]) * 3600) + try: + self.expiration = datetime.datetime.utcfromtimestamp(stem.util.str_tools._to_int(decoded[2:6]) * 3600) + except ValueError as exc: + raise ValueError('Invalid expiration timestamp (%s): %s' % (exc, stem.util.str_tools._to_int(decoded[2:6]) * 3600)) self.key_type = stem.util.str_tools._to_int(decoded[6:7]) self.key = decoded[7:39] diff --git a/stem/descriptor/reader.py b/stem/descriptor/reader.py index 1c07cdae..0f8547d7 100644 --- a/stem/descriptor/reader.py +++ b/stem/descriptor/reader.py @@ -89,10 +89,10 @@ except ImportError: import stem.descriptor import stem.prereq +import stem.util +import stem.util.str_tools import stem.util.system -from stem.util import str_type - # flag to indicate when the reader thread is out of descriptor files to read FINISHED = 'DONE' @@ -179,9 +179,9 @@ def load_processed_files(path): processed_files = {} - with open(path) as input_file: + with open(path, 'rb') as input_file: for line in input_file.readlines(): - line = line.strip() + line = stem.util.str_tools._to_unicode(line.strip()) if not line: continue # skip blank lines @@ -265,10 +265,7 @@ class DescriptorReader(object): """ def __init__(self, target, validate = False, follow_links = False, buffer_size = 100, persistence_path = None, document_handler = stem.descriptor.DocumentHandler.ENTRIES, **kwargs): - if isinstance(target, (bytes, str_type)): - self._targets = [target] - else: - self._targets = target + self._targets = [target] if stem.util._is_str(target) else target # expand any relative paths we got diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 63a3d069..afbec8e6 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -64,7 +64,6 @@ import stem.util.tor_tools import stem.version from stem.descriptor.router_status_entry import RouterStatusEntryV3 -from stem.util import str_type from stem.descriptor import ( PGP_BLOCK_END, @@ -412,7 +411,7 @@ def _parse_history_line(keyword, history_end_attribute, history_interval_attribu def _parse_exit_policy(descriptor, entries): if hasattr(descriptor, '_unparsed_exit_policy'): - if descriptor._unparsed_exit_policy == [str_type('reject *:*')]: + if descriptor._unparsed_exit_policy and stem.util.str_tools._to_unicode(descriptor._unparsed_exit_policy[0]) == 'reject *:*': descriptor.exit_policy = REJECT_ALL_POLICY else: descriptor.exit_policy = stem.exit_policy.ExitPolicy(*descriptor._unparsed_exit_policy) diff --git a/stem/exit_policy.py b/stem/exit_policy.py index e921fb3c..27475858 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -72,12 +72,11 @@ import socket import zlib import stem.prereq +import stem.util import stem.util.connection import stem.util.enum import stem.util.str_tools -from stem.util import _hash_attr, str_type - try: # added in python 3.2 from functools import lru_cache @@ -130,7 +129,7 @@ def get_config_policy(rules, ip_address = None): elif ip_address and stem.util.connection.is_valid_ipv6_address(ip_address, allow_brackets = True) and not (ip_address[0] == '[' and ip_address[-1] == ']'): ip_address = '[%s]' % ip_address # ExitPolicy validation expects IPv6 addresses to be bracketed - if isinstance(rules, (bytes, str_type)): + if stem.util._is_str(rules): rules = rules.split(',') result = [] @@ -244,7 +243,7 @@ class ExitPolicy(object): # sanity check the types for rule in rules: - if not isinstance(rule, (bytes, str_type, ExitPolicyRule)): + if not stem.util._is_str(rule) and not isinstance(rule, ExitPolicyRule): raise TypeError('Exit policy rules can only contain strings or ExitPolicyRules, got a %s (%s)' % (type(rule), rules)) # Unparsed representation of the rules we were constructed with. Our @@ -255,7 +254,7 @@ class ExitPolicy(object): is_all_str = True for rule in rules: - if not isinstance(rule, (bytes, str_type)): + if not stem.util._is_str(rule): is_all_str = False if rules and is_all_str: @@ -467,7 +466,7 @@ class ExitPolicy(object): if isinstance(rule, bytes): rule = stem.util.str_tools._to_unicode(rule) - if isinstance(rule, str_type): + if stem.util._is_str(rule): if not rule.strip(): continue @@ -1028,7 +1027,7 @@ class ExitPolicyRule(object): def __hash__(self): if self._hash is None: - self._hash = _hash_attr(self, 'is_accept', 'address', 'min_port', 'max_port') * 1024 + hash(self.get_mask(False)) + self._hash = stem.util._hash_attr(self, 'is_accept', 'address', 'min_port', 'max_port') * 1024 + hash(self.get_mask(False)) return self._hash @@ -1074,7 +1073,7 @@ class MicroExitPolicyRule(ExitPolicyRule): def __hash__(self): if self._hash is None: - self._hash = _hash_attr(self, 'is_accept', 'min_port', 'max_port') + self._hash = stem.util._hash_attr(self, 'is_accept', 'min_port', 'max_port') return self._hash diff --git a/stem/response/events.py b/stem/response/events.py index cadbb0dc..de52c08f 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -10,9 +10,10 @@ import stem.control import stem.descriptor.router_status_entry import stem.prereq import stem.response +import stem.util import stem.version -from stem.util import str_type, connection, log, str_tools, tor_tools +from stem.util import 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 @@ -166,7 +167,7 @@ class Event(stem.response.ControlMessage): attr_values = getattr(self, attr) if attr_values: - if isinstance(attr_values, (bytes, str_type)): + if stem.util._is_str(attr_values): attr_values = [attr_values] for value in attr_values: diff --git a/stem/util/__init__.py b/stem/util/__init__.py index d022af85..c2b4999f 100644 --- a/stem/util/__init__.py +++ b/stem/util/__init__.py @@ -24,11 +24,6 @@ __all__ = [ 'datetime_to_unix', ] -if stem.prereq.is_python_3(): - str_type = str -else: - str_type = unicode - # Python hashes booleans to zero or one. Usually this would be fine, but since # we use hashes for equality checks we need them to be something less common. @@ -36,6 +31,40 @@ TRUE_HASH_VALUE = 4813749 FALSE_HASH_VALUE = 5826450 +def _is_str(val): + """ + Check if a value is a string. This will be removed when we no longer provide + backward compatibility for the Python 2.x series. + + :param object val: value to be checked + + :returns: **True** if the value is some form of string (unicode or bytes), + and **False** otherwise + """ + + if stem.prereq.is_python_3(): + return isinstance(val, (bytes, str)) + else: + return isinstance(val, (bytes, unicode)) + + +def _is_int(val): + """ + Check if a value is an integer. This will be removed when we no longer + provide backward compatibility for the Python 2.x series. + + :param object val: value to be checked + + :returns: **True** if the value is some form of integer (int or long), + and **False** otherwise + """ + + if stem.prereq.is_python_3(): + return isinstance(val, int) + else: + return isinstance(val, (int, long)) + + def datetime_to_unix(timestamp): """ Converts a utc datetime object to a unix timestamp. diff --git a/stem/util/connection.py b/stem/util/connection.py index 74fbdde2..4ac8b2ed 100644 --- a/stem/util/connection.py +++ b/stem/util/connection.py @@ -61,10 +61,11 @@ import os import platform import re +import stem.util import stem.util.proc import stem.util.system -from stem.util import str_type, conf, enum, log, str_tools +from stem.util import conf, enum, log, str_tools # 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 @@ -409,7 +410,7 @@ def is_valid_ipv4_address(address): if isinstance(address, bytes): address = str_tools._to_unicode(address) - elif not isinstance(address, str_type): + elif not stem.util._is_str(address): return False # checks if theres four period separated values @@ -439,7 +440,7 @@ def is_valid_ipv6_address(address, allow_brackets = False): if isinstance(address, bytes): address = str_tools._to_unicode(address) - elif not isinstance(address, str_type): + elif not stem.util._is_str(address): return False if allow_brackets: diff --git a/stem/util/enum.py b/stem/util/enum.py index 7b628d68..00835ca5 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.util import str_type +import stem.util def UppercaseEnum(*args): @@ -76,7 +76,7 @@ class Enum(object): keys, values = [], [] for entry in args: - if isinstance(entry, (bytes, str_type)): + if stem.util._is_str(entry): key, val = entry, _to_camel_case(entry) elif isinstance(entry, tuple) and len(entry) == 2: key, val = entry diff --git a/stem/util/str_tools.py b/stem/util/str_tools.py index 5066a5c8..0f31fb22 100644 --- a/stem/util/str_tools.py +++ b/stem/util/str_tools.py @@ -27,10 +27,9 @@ import re import sys import stem.prereq +import stem.util import stem.util.enum -from stem.util import str_type - # label conversion tuples of the form... # (bits / bytes / seconds, short label, long label) @@ -75,13 +74,13 @@ if stem.prereq.is_python_3(): return msg else: def _to_bytes_impl(msg): - if msg is not None and isinstance(msg, str_type): + if msg is not None and isinstance(msg, unicode): return codecs.latin_1_encode(msg, 'replace')[0] else: return msg def _to_unicode_impl(msg): - if msg is not None and not isinstance(msg, str_type): + if msg is not None and not isinstance(msg, unicode): return msg.decode('utf-8', 'replace') else: return msg @@ -497,7 +496,7 @@ def _parse_timestamp(entry): :raises: **ValueError** if the timestamp is malformed """ - if not isinstance(entry, (str, str_type)): + if not stem.util._is_str(entry): raise ValueError('parse_timestamp() input must be a str, got a %s' % type(entry)) try: @@ -523,7 +522,7 @@ def _parse_iso_timestamp(entry): :raises: **ValueError** if the timestamp is malformed """ - if not isinstance(entry, (str, str_type)): + if not stem.util._is_str(entry): raise ValueError('parse_iso_timestamp() input must be a str, got a %s' % type(entry)) # based after suggestions from... diff --git a/stem/util/system.py b/stem/util/system.py index 82891d7e..3eb2fd4d 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -80,12 +80,13 @@ import tarfile import threading import time +import stem.util import stem.util.enum import stem.util.proc import stem.util.str_tools from stem import UNDEFINED -from stem.util import str_type, log +from stem.util import log State = stem.util.enum.UppercaseEnum( 'PENDING', @@ -446,7 +447,7 @@ def is_running(command): if command_listing: command_listing = [c.strip() for c in command_listing] - if isinstance(command, (bytes, str_type)): + if stem.util._is_str(command): command = [command] for cmd in command: diff --git a/test/settings.cfg b/test/settings.cfg index bd99a9d2..c3952567 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -147,9 +147,8 @@ pycodestyle.ignore test/unit/util/connection.py => W291: _tor tor 158 pyflakes.ignore run_tests.py => 'unittest' imported but unused pyflakes.ignore stem/client/datatype.py => redefinition of unused 'pop' from * -pyflakes.ignore stem/util/__init__.py => undefined name 'long' -pyflakes.ignore stem/util/__init__.py => undefined name 'unicode' pyflakes.ignore stem/control.py => undefined name 'controller' +pyflakes.ignore stem/interpreter/__init__.py => undefined name 'raw_input' pyflakes.ignore stem/manual.py => undefined name 'unichr' pyflakes.ignore stem/prereq.py => 'int_to_bytes' imported but unused pyflakes.ignore stem/prereq.py => 'int_from_bytes' imported but unused @@ -174,13 +173,16 @@ pyflakes.ignore stem/prereq.py => 'cryptography.hazmat.primitives.ciphers.algori pyflakes.ignore stem/prereq.py => 'lzma' imported but unused pyflakes.ignore stem/prereq.py => 'nacl.encoding' imported but unused pyflakes.ignore stem/prereq.py => 'nacl.signing' imported but unused -pyflakes.ignore stem/interpreter/__init__.py => undefined name 'raw_input' +pyflakes.ignore stem/response/events.py => undefined name 'long' +pyflakes.ignore stem/util/__init__.py => undefined name 'long' +pyflakes.ignore stem/util/__init__.py => undefined name 'unicode' pyflakes.ignore stem/util/conf.py => undefined name 'unicode' pyflakes.ignore stem/util/test_tools.py => 'pyflakes' imported but unused pyflakes.ignore stem/util/test_tools.py => 'pycodestyle' imported but unused pyflakes.ignore test/unit/descriptor/reader.py => 'bz2' imported but unused pyflakes.ignore test/unit/response/events.py => 'from stem import *' used; unable to detect undefined names pyflakes.ignore test/unit/response/events.py => *may be undefined, or defined from star imports: stem +pyflakes.ignore stem/util/str_tools.py => undefined name 'unicode' pyflakes.ignore test/__init__.py => undefined name 'test' # Test modules we want to run. Modules are roughly ordered by the dependencies diff --git a/test/unit/descriptor/microdescriptor.py b/test/unit/descriptor/microdescriptor.py index aab9ab4c..4fd14f5b 100644 --- a/test/unit/descriptor/microdescriptor.py +++ b/test/unit/descriptor/microdescriptor.py @@ -8,7 +8,6 @@ import stem.descriptor import stem.exit_policy import test.require -from stem.util import str_type from stem.descriptor.microdescriptor import Microdescriptor from test.unit.descriptor import get_resource @@ -59,7 +58,7 @@ class TestMicrodescriptor(unittest.TestCase): router = next(descriptors) self.assertEqual(SECOND_ONION_KEY, router.onion_key) - self.assertEqual(str_type('r5572HzD+PMPBbXlZwBhsm6YEbxnYgis8vhZ1jmdI2k='), router.ntor_onion_key) + self.assertEqual('r5572HzD+PMPBbXlZwBhsm6YEbxnYgis8vhZ1jmdI2k=', router.ntor_onion_key) self.assertEqual([], router.or_addresses) self.assertEqual(['$6141629FA0D15A6AEAEF3A1BEB76E64C767B3174'], router.family) self.assertEqual(stem.exit_policy.MicroExitPolicy('reject 1-65535'), router.exit_policy) @@ -69,7 +68,7 @@ class TestMicrodescriptor(unittest.TestCase): router = next(descriptors) self.assertEqual(THIRD_ONION_KEY, router.onion_key) self.assertEqual(None, router.ntor_onion_key) - self.assertEqual([(str_type('2001:6b0:7:125::242'), 9001, True)], router.or_addresses) + self.assertEqual([('2001:6b0:7:125::242', 9001, True)], router.or_addresses) self.assertEqual([], router.family) self.assertEqual(stem.exit_policy.MicroExitPolicy('accept 80,443'), router.exit_policy) self.assertEqual({b'@last-listed': b'2013-02-24 00:18:36'}, router.get_annotations()) diff --git a/test/unit/descriptor/networkstatus/document_v3.py b/test/unit/descriptor/networkstatus/document_v3.py index a99d76be..20b38563 100644 --- a/test/unit/descriptor/networkstatus/document_v3.py +++ b/test/unit/descriptor/networkstatus/document_v3.py @@ -12,7 +12,6 @@ import stem.version import test.require from stem import Flag -from stem.util import str_type from stem.descriptor import CRYPTO_BLOB @@ -783,19 +782,19 @@ DnN5aFtYKiTc19qIC7Nmo+afPdDEf0MlJvEOP5EWl3w= test_values = ( ('', {}), - ('fast-speed=40960', {str_type('fast-speed'): 40960}), # numeric value - ('guard-wfu=94.669%', {str_type('guard-wfu'): 0.94669}), # percentage value - ('guard-wfu=94.669% guard-tk=691200', {str_type('guard-wfu'): 0.94669, str_type('guard-tk'): 691200}), # multiple values + ('fast-speed=40960', {'fast-speed': 40960}), # numeric value + ('guard-wfu=94.669%', {'guard-wfu': 0.94669}), # percentage value + ('guard-wfu=94.669% guard-tk=691200', {'guard-wfu': 0.94669, 'guard-tk': 691200}), # multiple values ('stable-uptime=0 stable-mtbf=0 fast-speed=0 guard-wfu=0.000% guard-tk=0 guard-bw-inc-exits=0 guard-bw-exc-exits=0 enough-mtbf=1 ignoring-advertised-bws=0', { - str_type('stable-uptime'): 0, - str_type('stable-mtbf'): 0, - str_type('fast-speed'): 0, - str_type('guard-wfu'): 0.0, - str_type('guard-tk'): 0, - str_type('guard-bw-inc-exits'): 0, - str_type('guard-bw-exc-exits'): 0, - str_type('enough-mtbf'): 1, - str_type('ignoring-advertised-bws'): 0, + 'stable-uptime': 0, + 'stable-mtbf': 0, + 'fast-speed': 0, + 'guard-wfu': 0.0, + 'guard-tk': 0, + 'guard-bw-inc-exits': 0, + 'guard-bw-exc-exits': 0, + 'enough-mtbf': 1, + 'ignoring-advertised-bws': 0, }), ) @@ -808,14 +807,14 @@ DnN5aFtYKiTc19qIC7Nmo+afPdDEf0MlJvEOP5EWl3w= full_line = 'stable-uptime=693369 stable-mtbf=153249 fast-speed=40960 guard-wfu=94.669% guard-tk=691200 guard-bw-inc-exits=174080 guard-bw-exc-exits=184320 enough-mtbf=1' expected_value = { - str_type('stable-uptime'): 693369, - str_type('stable-mtbf'): 153249, - str_type('fast-speed'): 40960, - str_type('guard-wfu'): 0.94669, - str_type('guard-tk'): 691200, - str_type('guard-bw-inc-exits'): 174080, - str_type('guard-bw-exc-exits'): 184320, - str_type('enough-mtbf'): 1, + 'stable-uptime': 693369, + 'stable-mtbf': 153249, + 'fast-speed': 40960, + 'guard-wfu': 0.94669, + 'guard-tk': 691200, + 'guard-bw-inc-exits': 174080, + 'guard-bw-exc-exits': 184320, + 'enough-mtbf': 1, } document = NetworkStatusDocumentV3.create({'vote-status': 'vote', 'flag-thresholds': full_line}) diff --git a/test/unit/descriptor/reader.py b/test/unit/descriptor/reader.py index e450f7ca..76d1d8f3 100644 --- a/test/unit/descriptor/reader.py +++ b/test/unit/descriptor/reader.py @@ -14,9 +14,10 @@ import time import unittest import stem.descriptor.reader -import test.unit.descriptor +import stem.util.str_tools +import stem.util.system -from stem.util import str_type, system +import test.unit.descriptor try: # added in python 3.3 @@ -89,13 +90,13 @@ class TestDescriptorReader(unittest.TestCase): """ test_lines = ( - str_type('/dir/ 0'), - str_type('/dir/file 12345'), - str_type('/dir/file with spaces 7138743'), - str_type(' /dir/with extra space 12345 '), - str_type(' \t '), - str_type(''), - str_type('/dir/after empty line 12345'), + '/dir/ 0', + '/dir/file 12345', + '/dir/file with spaces 7138743', + ' /dir/with extra space 12345 ', + ' \t ', + '', + '/dir/after empty line 12345', ) expected_value = { @@ -106,7 +107,7 @@ class TestDescriptorReader(unittest.TestCase): '/dir/after empty line': 12345, } - open_mock.return_value = io.StringIO(str_type('\n'.join(test_lines))) + open_mock.return_value = io.BytesIO(stem.util.str_tools._to_bytes('\n'.join(test_lines))) self.assertEqual(expected_value, stem.descriptor.reader.load_processed_files('')) @patch('stem.descriptor.reader.open', create = True) @@ -115,7 +116,7 @@ class TestDescriptorReader(unittest.TestCase): Tests the load_processed_files() function with an empty file. """ - open_mock.return_value = io.StringIO(str_type('')) + open_mock.return_value = io.BytesIO(stem.util.str_tools._to_bytes('')) self.assertEqual({}, stem.descriptor.reader.load_processed_files('')) @patch('stem.descriptor.reader.open', create = True) @@ -125,7 +126,7 @@ class TestDescriptorReader(unittest.TestCase): it is missing the file path. """ - open_mock.return_value = io.StringIO(str_type(' 12345')) + open_mock.return_value = io.BytesIO(stem.util.str_tools._to_bytes(' 12345')) self.assertRaises(TypeError, stem.descriptor.reader.load_processed_files, '') @patch('stem.descriptor.reader.open', create = True) @@ -135,7 +136,7 @@ class TestDescriptorReader(unittest.TestCase): it is missing the timestamp. """ - open_mock.return_value = io.StringIO(str_type('/dir/file ')) + open_mock.return_value = io.BytesIO(stem.util.str_tools._to_bytes('/dir/file ')) self.assertRaises(TypeError, stem.descriptor.reader.load_processed_files, '') @patch('stem.descriptor.reader.open', create = True) @@ -145,7 +146,7 @@ class TestDescriptorReader(unittest.TestCase): it has an invalid file path. """ - open_mock.return_value = io.StringIO(str_type('not_an_absolute_file 12345')) + open_mock.return_value = io.BytesIO(stem.util.str_tools._to_bytes('not_an_absolute_file 12345')) self.assertRaises(TypeError, stem.descriptor.reader.load_processed_files, '') @patch('stem.descriptor.reader.open', create = True) @@ -155,7 +156,7 @@ class TestDescriptorReader(unittest.TestCase): it has a non-numeric timestamp. """ - open_mock.return_value = io.StringIO(str_type('/dir/file 123a')) + open_mock.return_value = io.BytesIO(stem.util.str_tools._to_bytes('/dir/file 123a')) self.assertRaises(TypeError, stem.descriptor.reader.load_processed_files, '') def test_load_processed_files_from_data(self): @@ -197,7 +198,7 @@ class TestDescriptorReader(unittest.TestCase): # read-only flag with os.chmod(). For more information see... # http://docs.python.org/library/os.html#os.chmod - if system.is_windows(): + if stem.util.system.is_windows(): self.skipTest('(chmod not functional)') test_listing_path = self._make_processed_files_listing(BASIC_LISTING) @@ -418,7 +419,7 @@ class TestDescriptorReader(unittest.TestCase): # Skip on windows since SIGALRM is unavailable - if system.is_windows(): + if stem.util.system.is_windows(): self.skipTest('(SIGALRM unavailable)') is_test_running = True @@ -558,7 +559,7 @@ class TestDescriptorReader(unittest.TestCase): if getpass.getuser() == 'root': self.skipTest('(running as root)') return - elif system.is_windows(): + elif stem.util.system.is_windows(): self.skipTest('(chmod not functional)') return diff --git a/test/unit/descriptor/server_descriptor.py b/test/unit/descriptor/server_descriptor.py index 99d3c38e..ff1035c4 100644 --- a/test/unit/descriptor/server_descriptor.py +++ b/test/unit/descriptor/server_descriptor.py @@ -19,7 +19,6 @@ import stem.version import stem.util.str_tools import test.require -from stem.util import str_type from stem.descriptor.certificate import CertType, ExtensionType from stem.descriptor.server_descriptor import BridgeDistribution, RelayDescriptor, BridgeDescriptor @@ -42,9 +41,9 @@ except ImportError: from mock import Mock, patch TARFILE_FINGERPRINTS = set([ - str_type('B6D83EC2D9E18B0A7A33428F8CFA9C536769E209'), - str_type('E0BD57A11F00041A9789577C53A1B784473669E4'), - str_type('1F43EE37A0670301AD9CB555D94AFEC2C89FDE86'), + 'B6D83EC2D9E18B0A7A33428F8CFA9C536769E209', + 'E0BD57A11F00041A9789577C53A1B784473669E4', + '1F43EE37A0670301AD9CB555D94AFEC2C89FDE86', ]) expect_invalid_attr = functools.partial(base_expect_invalid_attr, RelayDescriptor, 'nickname', 'Unnamed') diff --git a/test/unit/tutorial_examples.py b/test/unit/tutorial_examples.py index 5ca5993e..c4b26ad0 100644 --- a/test/unit/tutorial_examples.py +++ b/test/unit/tutorial_examples.py @@ -21,7 +21,6 @@ from stem.descriptor.router_status_entry import RouterStatusEntryV3 from stem.descriptor.server_descriptor import RelayDescriptor from stem.directory import DIRECTORY_AUTHORITIES from stem.response import ControlMessage -from stem.util import str_type from test.unit import exec_documentation_example @@ -39,7 +38,7 @@ PURPOSE=%s' PATH_CONTENT = '$%s=%s,$%s=%s,$%s=%s' -LIST_CIRCUITS_OUTPUT = str_type("""\ +LIST_CIRCUITS_OUTPUT = """\ Circuit 4 (GENERAL) |- B1FA7D51B8B6F0CB585D944F450E7C06EDE7E44C (ByTORAndTheSnowDog, 173.209.180.61) @@ -55,9 +54,9 @@ Circuit 10 (GENERAL) |- B1FA7D51B8B6F0CB585D944F450E7C06EDE7E44C (ByTORAndTheSnowDog, 173.209.180.61) |- 00C2C2A16AEDB51D5E5FB7D6168FC66B343D822F (ph3x, 86.59.119.83) +- 65242C91BFF30F165DA4D132C81A9EBA94B71D62 (torexit16, 176.67.169.171) -""") +""" -EXIT_USED_OUTPUT = str_type("""\ +EXIT_USED_OUTPUT = """\ Tracking requests for tor exits. Press 'enter' to end. Exit relay for our connection to 64.15.112.44:80 @@ -66,15 +65,15 @@ Exit relay for our connection to 64.15.112.44:80 nickname: chaoscomputerclub19 locale: unknown -""") +""" -OUTDATED_RELAYS_OUTPUT = str_type("""\ +OUTDATED_RELAYS_OUTPUT = """\ Checking for outdated relays... 0.1.0 Sambuddha Basu 2 outdated relays found, 1 had contact information -""") +""" COMPARE_FLAGS_OUTPUT = """\ maatuska has the Running flag but moria1 doesn't: E2BB13AA2F6960CD93ABE5257A825687F3973C62 diff --git a/test/unit/util/system.py b/test/unit/util/system.py index fd8fe2d9..451e6e72 100644 --- a/test/unit/util/system.py +++ b/test/unit/util/system.py @@ -12,7 +12,7 @@ import posixpath import tempfile import unittest -from stem.util import str_type, system +from stem.util import system try: # added in python 3.3 @@ -128,8 +128,7 @@ class TestSystem(unittest.TestCase): """ # mock response with a linux and bsd resolver - running_commands = [str_type('irssi'), str_type('moc'), str_type('tor'), - str_type('ps'), str_type(' firefox ')] + running_commands = ['irssi', 'moc', 'tor', 'ps', ' firefox '] for ps_cmd in (system.IS_RUNNING_PS_LINUX, system.IS_RUNNING_PS_BSD): call_mock.side_effect = mock_call(ps_cmd, running_commands)

1 0

[stem/master] Improve string and integer normalization
by atagar＠torproject.org 14 May '18

14 May '18

commit fb019cc06c5c7c2ae18d1c5b4d7c03bef69b88b8 Merge: 8a065f42 ec796c73 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun May 13 17:37:55 2018 -0700 Improve string and integer normalization Like any library with python 2.x and 3.x compatibility we normalize strings (bytes/unicode) and integers (int/long). While fixing a normalization bug in stem.client I decided to revisit our str/int_type constants. Throughout most of our tests their usage was irrelevant, and in our library there were better options. stem/client/cell.py | 8 +++-- stem/client/datatype.py | 5 +-- stem/control.py | 13 +++---- stem/descriptor/__init__.py | 7 ++-- stem/descriptor/certificate.py | 5 ++- stem/descriptor/reader.py | 13 +++---- stem/descriptor/server_descriptor.py | 3 +- stem/exit_policy.py | 15 ++++---- stem/response/events.py | 42 +++++++++++++---------- stem/util/__init__.py | 41 ++++++++++++++++++---- stem/util/connection.py | 7 ++-- stem/util/enum.py | 4 +-- stem/util/str_tools.py | 11 +++--- stem/util/system.py | 5 +-- test/settings.cfg | 8 +++-- test/unit/client/__init__.py | 4 +-- test/unit/client/cell.py | 6 ++-- test/unit/descriptor/microdescriptor.py | 5 ++- test/unit/descriptor/networkstatus/document_v3.py | 41 +++++++++++----------- test/unit/descriptor/reader.py | 37 ++++++++++---------- test/unit/descriptor/server_descriptor.py | 7 ++-- test/unit/tutorial_examples.py | 13 ++++--- test/unit/util/system.py | 5 ++- 23 files changed, 169 insertions(+), 136 deletions(-)

1 0

[stem/master] Drop stem.util.int_type
by atagar＠torproject.org 14 May '18

14 May '18

commit 0b616568c06392eb1092690cd981eacff29e1dcf Author: Damian Johnson <atagar(a)torproject.org> Date: Sun May 13 14:21:51 2018 -0700 Drop stem.util.int_type Looking back this was added for python 2.6 support in stem.response.events. In python 2.7 int properly converts longs... >>> int('500000000000000000000000000000000000000000000000000000000000000000000000000') 500000000000000000000000000000000000000000000000000000000000000000000000000L Guessing this isn't the case with python 2.6? Regardless, we can more localize this hack, and flag it for removal when python 2.6 support goes away. --- stem/response/events.py | 39 ++++++++++++++++++++++----------------- stem/util/__init__.py | 2 -- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/stem/response/events.py b/stem/response/events.py index 6d62fbb8..cadbb0dc 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -8,10 +8,11 @@ import time import stem import stem.control import stem.descriptor.router_status_entry +import stem.prereq import stem.response import stem.version -from stem.util import str_type, int_type, connection, log, str_tools, tor_tools +from stem.util import str_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 @@ -22,6 +23,10 @@ QUOTED_KW_ARG = re.compile('^(.*) ([A-Za-z0-9_]+)="(.*)"$') CELL_TYPE = re.compile('^[a-z0-9_]+$') PARSE_NEWCONSENSUS_EVENTS = True +# TODO: We can remove the following when we drop python2.6 support. + +INT_TYPE = int if stem.prereq.is_python_3() else long + class Event(stem.response.ControlMessage): """ @@ -268,8 +273,8 @@ class BandwidthEvent(Event): The BW event was one of the first Control Protocol V1 events and was introduced in tor version 0.1.1.1-alpha. - :var long read: bytes received by tor that second - :var long written: bytes sent by tor that second + :var int read: bytes received by tor that second + :var int written: bytes sent by tor that second """ _POSITIONAL_ARGS = ('read', 'written') @@ -282,8 +287,8 @@ class BandwidthEvent(Event): elif not self.read.isdigit() or not self.written.isdigit(): raise stem.ProtocolError("A BW event's bytes sent and received should be a positive numeric value, received: %s" % self) - self.read = int_type(self.read) - self.written = int_type(self.written) + self.read = INT_TYPE(self.read) + self.written = INT_TYPE(self.written) class BuildTimeoutSetEvent(Event): @@ -1088,8 +1093,8 @@ class StreamBwEvent(Event): Added the time attribute. :var str id: stream identifier - :var long written: bytes sent by the application - :var long read: bytes received by the application + :var int written: bytes sent by the application + :var int read: bytes received by the application :var datetime time: time when the measurement was recorded """ @@ -1106,8 +1111,8 @@ class StreamBwEvent(Event): elif not self.read.isdigit() or not self.written.isdigit(): raise stem.ProtocolError("A STREAM_BW event's bytes sent and received should be a positive numeric value, received: %s" % self) - self.read = int_type(self.read) - self.written = int_type(self.written) + self.read = INT_TYPE(self.read) + self.written = INT_TYPE(self.written) self.time = self._iso_timestamp(self.time) @@ -1158,8 +1163,8 @@ class ConnectionBandwidthEvent(Event): :var str id: connection identifier :var stem.ConnectionType conn_type: connection type - :var long read: bytes received by tor that second - :var long written: bytes sent by tor that second + :var int read: bytes received by tor that second + :var int written: bytes sent by tor that second """ _KEYWORD_ARGS = { @@ -1185,8 +1190,8 @@ class ConnectionBandwidthEvent(Event): elif not tor_tools.is_valid_connection_id(self.id): raise stem.ProtocolError("Connection IDs must be one to sixteen alphanumeric characters, got '%s': %s" % (self.id, self)) - self.read = int_type(self.read) - self.written = int_type(self.written) + self.read = INT_TYPE(self.read) + self.written = INT_TYPE(self.written) self._log_if_unrecognized('conn_type', stem.ConnectionType) @@ -1204,8 +1209,8 @@ class CircuitBandwidthEvent(Event): Added the time attribute. :var str id: circuit identifier - :var long read: bytes received by tor that second - :var long written: bytes sent by tor that second + :var int read: bytes received by tor that second + :var int written: bytes sent by tor that second :var datetime time: time when the measurement was recorded """ @@ -1230,8 +1235,8 @@ class CircuitBandwidthEvent(Event): elif not tor_tools.is_valid_circuit_id(self.id): raise stem.ProtocolError("Circuit IDs must be one to sixteen alphanumeric characters, got '%s': %s" % (self.id, self)) - self.read = int_type(self.read) - self.written = int_type(self.written) + self.read = INT_TYPE(self.read) + self.written = INT_TYPE(self.written) self.time = self._iso_timestamp(self.time) diff --git a/stem/util/__init__.py b/stem/util/__init__.py index 711f28a5..d022af85 100644 --- a/stem/util/__init__.py +++ b/stem/util/__init__.py @@ -26,10 +26,8 @@ __all__ = [ if stem.prereq.is_python_3(): str_type = str - int_type = int else: str_type = unicode - int_type = long # Python hashes booleans to zero or one. Usually this would be fine, but since # we use hashes for equality checks we need them to be something less common.

1 0

[doctor/master] Drop usage of stem's is_bandwidth_authority attribute
by atagar＠torproject.org 13 May '18

13 May '18

commit 37dcbd5c5cf81e4d66fd9170340c1543e76fab05 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun May 13 12:58:08 2018 -0700 Drop usage of stem's is_bandwidth_authority attribute Stem no longer provides this information. Hardcoding it in DocTor. --- consensus_health_checker.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/consensus_health_checker.py b/consensus_health_checker.py index 993ef73..f152773 100755 --- a/consensus_health_checker.py +++ b/consensus_health_checker.py @@ -29,6 +29,7 @@ DIRECTORY_AUTHORITIES = stem.directory.Authority.from_cache() del DIRECTORY_AUTHORITIES['tor26'] # DirPort does not service requests without a '.z' suffix EMAIL_SUBJECT = 'Consensus issues' +BANDWIDTH_AUTHORITIES = ('moria1', 'gabelmoo', 'maatuska', 'Faravahar', 'bastet') CONFIG = stem.util.conf.config_dict('consensus_health', { 'msg': {}, @@ -584,9 +585,9 @@ def voting_bandwidth_scanners(latest_consensus, consensuses, votes): contains_measured_bandwidth = True break - if DIRECTORY_AUTHORITIES[authority].is_bandwidth_authority and not contains_measured_bandwidth: + if DIRECTORY_AUTHORITIES[authority].nickname in BANDWIDTH_AUTHORITIES and not contains_measured_bandwidth: missing_authorities.append(authority) - if not DIRECTORY_AUTHORITIES[authority].is_bandwidth_authority and contains_measured_bandwidth: + if not DIRECTORY_AUTHORITIES[authority].nickname in BANDWIDTH_AUTHORITIES and contains_measured_bandwidth: extra_authorities.append(authority) issues = [] @@ -608,7 +609,7 @@ def unmeasured_relays(latest_consensus, consensuses, votes): consensus_fingerprints = set([desc.fingerprint for desc in latest_consensus.routers.values()]) for authority, vote in votes.items(): - if DIRECTORY_AUTHORITIES[authority].is_bandwidth_authority: + if DIRECTORY_AUTHORITIES[authority].nickname in BANDWIDTH_AUTHORITIES: measured, unmeasured = 0, 0 for desc in vote.routers.values():

1 0

[atlas/master] Updates Exit Addresses field mouseover description (Fixes: #25881)
by irl＠torproject.org 13 May '18

13 May '18

commit 91cfa181fa18725e37a6c618afcc4b06408e7baf Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Sun May 13 19:16:49 2018 +0100 Updates Exit Addresses field mouseover description (Fixes: #25881) --- templates/details/router.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/details/router.html b/templates/details/router.html index 97c7aac..813f334 100644 --- a/templates/details/router.html +++ b/templates/details/router.html @@ -44,7 +44,7 @@ href="https://bugs.torproject.org/24256">#24256</a>).</div> <dt>Dir Address</dt> <dd><%= relay.get('dir_address') ? relay.get('dir_address') : 'none' %></dd> - <dt>Only lists addresses that are different from the OR addresses.">Exit Addresses</dt> + <dt>Exit Addresses</dt> <dd> <% if (relay.get('exit_addresses')) { %> <% _.each(relay.get('exit_addresses'), function(exit_address) { %>

1 0

[atlas/master] Updates Bandwidth field mouseover description (Fixes: #25854)
by irl＠torproject.org 13 May '18

13 May '18

commit 41ca22fdd556febeb2a16cb7df54467fde63dd18 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Sun May 13 19:19:29 2018 +0100 Updates Bandwidth field mouseover description (Fixes: #25854) --- templates/details/bridge.html | 2 +- templates/details/router.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/details/bridge.html b/templates/details/bridge.html index 690723e..8d676e9 100644 --- a/templates/details/bridge.html +++ b/templates/details/bridge.html @@ -19,7 +19,7 @@ <dd><%= relay.get('or_addresses') %></dd> <dt> - Advertised Bandwidth + <span class="tip" title="The volume of traffic that the relay is willing to sustain. The rate and burst limits apply separately to inbound and outbound traffic. The observed bandwidth is the minimum of recent inbound and outbound traffic, as reported by the relay.">Advertised Bandwidth </dt> <dd><%= relay.get('bandwidth_hr') ? relay.get('bandwidth_hr') : 'not defined' %></dd> </dl> diff --git a/templates/details/router.html b/templates/details/router.html index 813f334..149ea14 100644 --- a/templates/details/router.html +++ b/templates/details/router.html @@ -56,7 +56,7 @@ href="https://bugs.torproject.org/24256">#24256</a>).</div> </dd> <dt> - Advertised Bandwidth + <span class="tip" title="The volume of traffic that the relay is willing to sustain. The rate and burst limits apply separately to inbound and outbound traffic. The observed bandwidth is the minimum of recent inbound and outbound traffic, as reported by the relay.">Advertised Bandwidth </dt> <dd> Bandwidth burst: <%= relay.get('bandwidthb') %> Observed bandwidth: <%= relay.get('obandwidth') %>"><%= relay.get('bandwidth_hr') %></dd> <dt>IPv4 Exit Policy Summary</dt>

1 0

[atlas/master] Updates Unmeasured mouseover description (Fixes: #26079)
by irl＠torproject.org 13 May '18

13 May '18

commit 04d7af559ab436cb7c2629140d31d3f7a5fd9ffd Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Sun May 13 19:25:13 2018 +0100 Updates Unmeasured mouseover description (Fixes: #26079) --- js/models/relay.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/models/relay.js b/js/models/relay.js index cfb6dec..91bde2a 100644 --- a/js/models/relay.js +++ b/js/models/relay.js @@ -63,7 +63,7 @@ define([ output.push([flag,"notrecommended", "This relay is running a Tor version that is not recommended by the directory authorities and may contain known issues."]); } if (flag == "Unmeasured") { - output.push([flag,"unmeasured", "This relay has not been measured by at least 3 bandwidth authorities and so its consensus weight is currently capped. This is expected for new relays."]); + output.push([flag,"unmeasured", "This relay has not been measured by at least 3 bandwidth authorities and so its consensus weight is currently capped. This is expected for new relays, but may also be found on established relays at times. This is more likely to be an issue with the bandwidth authorities than an issue with your relay."]); } if (flag == "FallbackDir") { output.push([flag,"fallbackdir", "Tor clients contact fallback directory mirrors during bootstrap, and download the consensus and authority certificates from them. We include a default list of mirrors in the Tor source code. These default mirrors need to be long-term stable, and on the same IPv4 and IPv6 addresses and ports."]);

1 0

[translation/support-tbb] Update translations for support-tbb
by translation＠torproject.org 13 May '18

13 May '18

commit 503e7e2e0ba3f56f991a1fd33d01a182a16dff01 Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 13 15:19:26 2018 +0000 Update translations for support-tbb --- id.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/id.json b/id.json index 358b811ef..ec3093ee5 100644 --- a/id.json +++ b/id.json @@ -99,7 +99,7 @@ "id": "#tbb-16", "control": "tbb-16", "title": "Apakah saya dapat memilih negara sebagai exit node?", - "description": "Modifying the way that Tor creates its circuits is strongly discouraged. You get the best security that Tor can provide when you leave the route selection to Tor; overriding the entry / exit nodes can compromise your anonymity. If the outcome you want is simply to be able to access resources that are only available in one country, you may want to consider using a VPN instead of using Tor. Please note that VPNs do not have the same privacy properties as Tor, but they will help solve some geolocation restriction issues." + "description": "Memodifikasi cara Tor menciptakan sirkuit adalah sangat tidak disarankan. Anda akan mendapat keamanan terbaik saat membiarkan Tor memilih rute; melewati entry / exit nodes yang mengurangi anominitas Anda. Jika Anda hanya ingin mengakses sesuatu yang hanya tersedia di sebuah negara, mungkin Anda sebaiknya menggunakan VPN, bukan Tor. Ingat bahwa VPN tidak punya fasilitas privasi sebanyak Tor, tapi akan memberikan beberapa solusi terhadap beberapa masalah restriksi lokasi." }, "tbb-17": { "id": "#tbb-17", @@ -135,7 +135,7 @@ "id": "#tbb-22", "control": "tbb-22", "title": "Bagaimana cara membuat Tor Browser menjadi lebih cepat? Apakah Tor Browser memang lebih lamban daripada peramban lain?", - "description": "Using Tor Browser can sometimes be slower than other browsers. The Tor network has over a million daily users, and just over 6000 relays to route all of their traffic, and the load on each server can sometimes cause latency. You can help improve the speed of the network by running your own relay, or encouraging others to do so. That said, Tor is much faster than it used to be and you may not actually notice any change in speed from other browsers." + "description": "Tor Browser kadang lebih lambat daripada peramban lain. Jaringan Tor network digunakan jutaan orang per hari dan ada 6000 relays yang merutekan semua lalu lintas, dan beban setiap server akan menimbulkan latency. Anda dapat meningkatkan kecepatan jaringan dengan menjalankan relay sendiri atau mengajak orang lain melakukannya. Walau begitu, Tor berjalan lebih cepat dari sebelumnya dan mungkin Anda tidak merasa perbedaan kecepatan terhadap peramban lain." }, "tbb-23": { "id": "#tbb-23",

1 0

[translation/support-tbb] Update translations for support-tbb
by translation＠torproject.org 13 May '18

13 May '18

commit e1a3385b440a82722af1ba31ec69e54a7900a796 Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 13 14:49:31 2018 +0000 Update translations for support-tbb --- id.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/id.json b/id.json index 02e0cce73..358b811ef 100644 --- a/id.json +++ b/id.json @@ -9,7 +9,7 @@ "id": "#tbb-2", "control": "tbb-2", "title": "Kenapa alamat IP pertama di relay circuit saya selalu sama?", - "description": "That is normal Tor behavior. The first relay in your circuit is called an \"entry guard\" or \"guard.\" It is a fast and stable relay that remains the first one in your circuit for 2-3 months in order to protect against a known anonymity-breaking attack. The rest of your circuit changes with every new website you visit, and all together these relays provide the full privacy protections of Tor. For more information on how guard relays work, see this <a href=\"https://blog.torproject.org/improving-tors-anonymity-changing-guard-paramet…">blog post</a> and <a href=\"https://www-users.cs.umn.edu/~hoppernj/single_guard.pdf\">paper</a> on entry guards." + "description": "Ini adalah perilaku Tor yang normal. Relay pertama di sirkuit Anda disebut \"entry guard\" atau \"guard.\" Ini adalah relay yang cepat dan stabil yang berada di awal sirkuit Anda selama 2-3 bulan untuk melindungi Anda dari penyerangan yang merusak anonimitas. Bagian lain dari sirkuit Anda berubah setiap Anda mengunjungi situs web baru, dan semua relay menyediakan perlindungan penuh privasi di Tor. Untuk informasi lebih banyak tentang cara kerja guard relay, lihat <a href=\"https://blog.torproject.org/improving-tors-anonymity-changing-guard-paramet…">posting blog </a> dan <a href=\"https://www-users.cs.umn.edu/~hoppernj/single_guard.pdf\">makalah</a> tentang entry guard." }, "tbb-3": { "id": "#tbb-3", @@ -21,13 +21,13 @@ "id": "#tbb-4", "control": "tbb-4", "title": "Kenapa peramban Tor Browser dibangun dari Firefox dan bukan peramban lain?", - "description": "Tor Browser is a modified version of Firefox specifically designed for use with Tor. A lot of work has been put into making the Tor Browser, including the use of extra patches to enhance privacy and security. While it is technically possible to use Tor with other browsers, you may open yourself up to potential attacks or information leakage, so we strongly discourage it. <a href=\"https://www.torproject.org/projects/torbrowser/design/\">Learn more about the design of Tor Browser</a>." + "description": "Tor Browser adalah versi Firefox yang dimodifikasi dan didesain khusus untuk bekerja di Tor. Telah banyak usaha dalam pembuatan Tor Browser, termasuk penggunaan patch tambahan untuk memperkuat privasi dan keamanan. Walau mungkin untuk menggunakan peramban lain dengan Tor, hal ini buka celah kemungkinan serangan atau kebocoran informasi, jadi kami sangat tidak menyarankannya. <a href=\"https://www.torproject.org/projects/torbrowser/design/\">Pelajari lebih banyak tentang desain Tor Browser</a>." }, "tbb-5": { "id": "#tbb-5", "control": "tbb-5", "title": "Apakah saya masih bisa menggunakan peramban lain, seperti Chrome atau Firefox, ketika sedang menggunakan peramban Tor Browser ", - "description": "You can certainly use another browser while you are also using Tor Browser. However, you should know that the privacy properties of Tor Browser will not be present in the other browser. Be careful when switching back and forth between Tor and a less safe browser, because you may accidentally use the other browser for something you intended to do using Tor." + "description": "Tentu Anda dapat menggunakan peramban lain sambil bersamaan menggunakan Tor Browser. Namun, Anda harus tahu bahwa fasilitas privasi di Tor Browser tidak ada di peramban lain. Hati-hati saat menggunakan kembali Tor dan peramban lain yang kurang aman karena Anda mungkin akan tidak sengaja menggunakan peramban lain untuk melakukan sesuatu yang akan Anda lakukan dengan Tor. " }, "tbb-6": { "id": "#tbb-6", @@ -63,13 +63,13 @@ "id": "#tbb-10", "control": "tbb-10", "title": "Perlindungan program pembasmi virus atau malware saya menghalangi saya menggunakan Tor Browser. ", - "description": "Most antivirus or malware protection allows the user to \"whitelist\" certain processes that would otherwise be blocked. Please open your antivirus or malware protection software and look in the settings for a \"whitelist\" or something similar. Next, exclude the following processes:<ul>For Windows<li>firefox.exe</li><li>tor.exe</li><li>obfs4proxy.exe (if you use bridges)</li></ul><ul>For OS X<li>TorBrowser</li><li>tor.real</li><li>obfs4proxy (if you use bridges)</li></ul>Finally, restart Tor Browser." + "description": "Kebanyakan program pembasmi virus atau perlindungan terhadap malware membuat pengguna memberikan \"whitelist\" terhadap beberapa proses yang mungkin sebelumnya diblokir. SIlakan buka program pembasmi virus atau software perlindungan malware dan cari pengaturan \"whitelist\" atau hal lain yang mirip. Lalu masukkan proses berikut ini<ul>Untuk Windows<li>firefox.exe</li><li>tor.exe</li><li>obfs4proxy.exe (jika Anda menggunakan bridge)</li></ul><ul>Untuk OS X<li>TorBrowser</li><li>tor.real</li><li>obfs4proxy (jika Anda menggunakan bridge)</li></ul>Lalu, restart Tor Browser." }, "tbb-11": { "id": "#tbb-11", "control": "tbb-11", "title": "Saya mengunduh dan memasang Tor Browser untuk Windows, tapi sekarang saya tidak dapat menemukan programnya. ", - "description": "The file you download and run prompts you for a destination. If you don't remember what this destination was, it's most likely your Downloads or Desktop folder. The default setting in the Windows installer also creates a shortcut for you on your Desktop, though be aware that you may have accidentally unticked the option to create a shortcut. If you can't find it in either of those folders, download it again and look for the prompt that asks you to choose a directory to download it in. Choose a directory location that you'll remember easily, and once the download finishes you should see a Tor Browser folder there." + "description": "File yang akan Anda unduh akan meminta tujuan unduhan. Jika Anda tidak ingat tujuan tersebut, Biasanya ada di folder Downloads atau Desktop. Pengaturan standar di Windows installer juga membuat shortcut di Desktop, walau mungkin Anda tidak sengaja menghilangkan centang di pilihan untuk membuat shortcut. Jika Anda tidak dapat menemukannya di kedua folder itu, unduh lagi dan lihat saat Anda diminta untuk memilih folder tempat unduhan. Pilih folder yang mudah diingat dan setelah unduh selesai, seharusnya folder Tor Browser ada di sana." }, "tbb-12": { "id": "#tbb-12", @@ -81,7 +81,7 @@ "id": "#tbb-13", "control": "tbb-13", "title": "Apakah Tor Browser melindungi aplikasi lain di komputer saya?", - "description": " Only Tor Browser's traffic will be routed over the Tor network. Any other application on your system (including other browsers) will not have their connections routed over the Tor network, and will not be protected. They need to be configured separately to use Tor. If you need to be sure that all traffic will go through the Tor network, take a look at the <a href=\"https://tails.boum.org/\">Tails live operating system</a> which you can start on almost any computer from a USB stick or a DVD." + "description": " Hanya lalu lintas Tor Browser's traffic yang dialihkan ke jaringan Tor. Aplikasi lain (termasuk peramban lain) tidak terhubung ke jaringan Tor sehingga tidak terlindungi. Mereka harus diatur supaya dapat menggunakan Tor. Jika Anda ingin memastika semua lalu-lintas data melewati jaringan Tor, silakan lihat <a href=\"https://tails.boum.org/\">Tails live operating system</a>yang dapat digunakan di hampir semua komputer dengan USB flashdisk atau DVD." }, "tbb-14": { "id": "#tbb-14",

1 0