tor-commits June 2017

tor-commits@lists.torproject.org

13 participants
1918 discussions

[tor/master] Call it a BUG to use -1 in authdir_mode_handles_descs
by nickm＠torproject.org 21 Jun '17

21 Jun '17

commit 35d6313500f3ea07a10b565515d5e9953fc7f1da Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 21 12:38:02 2017 -0400 Call it a BUG to use -1 in authdir_mode_handles_descs --- src/or/router.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index f2052f4..100c4cc 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1598,11 +1598,12 @@ authdir_mode_v3(const or_options_t *options) } /** Return true iff we are an authoritative directory server that is * authoritative about receiving and serving descriptors of type - * purpose on its dirport. Use -1 for "any purpose". */ + * purpose on its dirport. + */ int authdir_mode_handles_descs(const or_options_t *options, int purpose) { - if (purpose < 0) + if (BUG(purpose < 0)) /* Deprecated. */ return authdir_mode(options); else if (purpose == ROUTER_PURPOSE_GENERAL) return authdir_mode_v3(options);

1 0

[tor/master] Convert authdir_mode_handles_descs(options, -1) with authdir_mode(options)
by nickm＠torproject.org 21 Jun '17

21 Jun '17

commit d92b999757336249bcff15c5c498e6e5353d38c4 Author: huyvq <huyvq.c633(a)gmail.com> Date: Fri Jun 2 23:26:53 2017 +0700 Convert authdir_mode_handles_descs(options, -1) with authdir_mode(options) --- src/or/directory.c | 2 +- src/or/main.c | 4 ++-- src/or/router.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index b680b13..5e8e663 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -4850,7 +4850,7 @@ directory_handle_command_post,(dir_connection_t *conn, const char *headers, goto done; } - if (authdir_mode_handles_descs(options, -1) && + if (authdir_mode(options) && !strcmp(url,"/tor/")) { /* server descriptor post */ const char *msg = "[None]"; uint8_t purpose = authdir_mode_bridge(options) ? diff --git a/src/or/main.c b/src/or/main.c index 9699c8d..9709aeb 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2355,7 +2355,7 @@ do_hup(void) tor_free(msg); } } - if (authdir_mode_handles_descs(options, -1)) { + if (authdir_mode(options)) { /* reload the approved-routers file */ if (dirserv_load_fingerprint_file() < 0) { /* warnings are logged from dirserv_load_fingerprint_file() directly */ @@ -3478,7 +3478,7 @@ sandbox_init_filter(void) if (options->BridgeAuthoritativeDir) OPEN_DATADIR_SUFFIX("networkstatus-bridges", ".tmp"); - if (authdir_mode_handles_descs(options, -1)) + if (authdir_mode(options)) OPEN_DATADIR("approved-routers"); if (options->ServerDNSResolvConfFile) diff --git a/src/or/router.c b/src/or/router.c index 849cffd..a264af1 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1635,7 +1635,7 @@ authdir_mode_publishes_statuses(const or_options_t *options) int authdir_mode_tests_reachability(const or_options_t *options) { - return authdir_mode_handles_descs(options, -1); + return authdir_mode(options); } /** Return true iff we believe ourselves to be a bridge authoritative * directory server.

1 0

[tor/master] Remove obsolete authdir_mode_any_nonhidserv()
by nickm＠torproject.org 21 Jun '17

21 Jun '17

commit ad97714f22ace023bda9f334687239127a71413a Author: huyvq <huyvq.c633(a)gmail.com> Date: Fri Jun 2 23:33:40 2017 +0700 Remove obsolete authdir_mode_any_nonhidserv() - Replace it with authdir_mode() --- src/or/router.c | 12 ++---------- src/or/router.h | 1 - src/or/routerlist.c | 2 +- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index e12f138..f2052f4 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1596,14 +1596,6 @@ authdir_mode_v3(const or_options_t *options) { return authdir_mode(options) && options->V3AuthoritativeDir != 0; } -/** Return true if we believe ourselves to be any kind of - * authoritative directory beyond just a hidserv authority. */ -int -authdir_mode_any_nonhidserv(const or_options_t *options) -{ - return options->BridgeAuthoritativeDir || - authdir_mode_any_main(options); -} /** Return true iff we are an authoritative directory server that is * authoritative about receiving and serving descriptors of type * purpose on its dirport. Use -1 for "any purpose". */ @@ -1611,7 +1603,7 @@ int authdir_mode_handles_descs(const or_options_t *options, int purpose) { if (purpose < 0) - return authdir_mode_any_nonhidserv(options); + return authdir_mode(options); else if (purpose == ROUTER_PURPOSE_GENERAL) return authdir_mode_v3(options); else if (purpose == ROUTER_PURPOSE_BRIDGE) @@ -1627,7 +1619,7 @@ authdir_mode_publishes_statuses(const or_options_t *options) { if (authdir_mode_bridge(options)) return 0; - return authdir_mode_any_nonhidserv(options); + return authdir_mode(options); } /** Return true iff we are an authoritative directory server that * tests reachability of the descriptors it learns about. diff --git a/src/or/router.h b/src/or/router.h index 2e62185..97f3317 100644 --- a/src/or/router.h +++ b/src/or/router.h @@ -54,7 +54,6 @@ int net_is_disabled(void); int authdir_mode(const or_options_t *options); int authdir_mode_v3(const or_options_t *options); -int authdir_mode_any_nonhidserv(const or_options_t *options); int authdir_mode_handles_descs(const or_options_t *options, int purpose); int authdir_mode_publishes_statuses(const or_options_t *options); int authdir_mode_tests_reachability(const or_options_t *options); diff --git a/src/or/routerlist.c b/src/or/routerlist.c index da072be..8adaaf6 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -5033,7 +5033,7 @@ launch_descriptor_downloads(int purpose, } } - if (!authdir_mode_any_nonhidserv(options)) { + if (!authdir_mode(options)) { /* If we wind up going to the authorities, we want to only open one * connection to each authority at a time, so that we don't overload * them. We do this by setting PDS_NO_EXISTING_SERVERDESC_FETCH

1 0

[tor/master] Convert authdir_mode_handles_descs() to alternative wrappers
by nickm＠torproject.org 21 Jun '17

21 Jun '17

commit 18cd1993ca852b25a18b266ae7d8dcecf573525a Author: huyvq <huyvq.c633(a)gmail.com> Date: Fri Jun 2 23:32:41 2017 +0700 Convert authdir_mode_handles_descs() to alternative wrappers -authdir_mode_handles_descs(options, ROUTER_PURPOSE_BRIDGE) to authdir_mode_bridge(options). - authdir_mode_handles_descs(options, ROUTER_PURPOSE_GENERAL) to authdir_mode_v3(options). --- src/or/router.c | 4 ++-- src/or/routerlist.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index a264af1..e12f138 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1065,7 +1065,7 @@ init_keys(void) /* 4. Build our router descriptor. */ /* Must be called after keys are initialized. */ mydesc = router_get_my_descriptor(); - if (authdir_mode_handles_descs(options, ROUTER_PURPOSE_GENERAL)) { + if (authdir_mode_v3(options)) { const char *m = NULL; routerinfo_t *ri; /* We need to add our own fingerprint so it gets recognized. */ @@ -1615,7 +1615,7 @@ authdir_mode_handles_descs(const or_options_t *options, int purpose) else if (purpose == ROUTER_PURPOSE_GENERAL) return authdir_mode_v3(options); else if (purpose == ROUTER_PURPOSE_BRIDGE) - return (options->BridgeAuthoritativeDir); + return authdir_mode_bridge(options); else return 0; } diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 0e45f63..da072be 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -5164,7 +5164,7 @@ update_consensus_router_descriptor_downloads(time_t now, int is_vote, smartlist_add(downloadable, rs->descriptor_digest); } SMARTLIST_FOREACH_END(rsp); - if (!authdir_mode_handles_descs(options, ROUTER_PURPOSE_GENERAL) + if (!authdir_mode_v3(options) && smartlist_len(no_longer_old)) { routerlist_t *rl = router_get_routerlist(); log_info(LD_DIR, "%d router descriptors listed in consensus are "

1 0

[stem/master] Ignore pycodestyle warnings about bare 'except:' clauses
by atagar＠torproject.org 21 Jun '17

21 Jun '17

commit 4ebb606dd121a1232aa2f3e24a904aacb8174839 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jun 20 13:35:51 2017 -0700 Ignore pycodestyle warnings about bare 'except:' clauses Odd this didn't manifest for me before. Seems to only come up when running python3 so maybe a new check? I can see the reasoning around this but I'm a shade more concerned about the alternative. --- test/settings.cfg | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/test/settings.cfg b/test/settings.cfg index 128e987..7ccd733 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -119,6 +119,14 @@ target.torrc RUN_PTRACE => PORT, PTRACE # # Pycodestyle only works with this one if we have four space indents (its # detection is based on multiples of four). +# +# * E722 do not use bare except +# +# Iirc they advise against this because it catches KeyboardInterrups and +# interpreter termination. That's a fair concern, but on the other hand we +# don't have strong assurance that socket errors and the like will be caught +# without it. We've been doing this for years without issue but I'd be +# ameanable to a patch if this causes issues for someone. pycodestyle.ignore E111 pycodestyle.ignore E114 @@ -127,6 +135,7 @@ pycodestyle.ignore E501 pycodestyle.ignore E251 pycodestyle.ignore E127 pycodestyle.ignore E131 +pycodestyle.ignore E722 pycodestyle.ignore stem/__init__.py => E402: import stem.util.enum pycodestyle.ignore stem/descriptor/__init__.py => E402: import stem.descriptor.server_descriptor

1 0

[stem/master] Add blank lines after functions
by atagar＠torproject.org 21 Jun '17

21 Jun '17

commit 4ef767c9e07ac0d835355706625dafea19a57147 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jun 20 13:44:25 2017 -0700 Add blank lines after functions Evidently another new pycodestyle constraint. * /home/atagar/Desktop/stem/stem/connection.py line 1301 - E305 expected 2 blank lines after class or function definition, found 1 | AUTHENTICATE_EXCEPTIONS = ( * /home/atagar/Desktop/stem/stem/util/log.py line 94 - E305 expected 2 blank lines after class or function definition, found 1 | if not LOGGER.handlers: * /home/atagar/Desktop/stem/stem/util/test_tools.py line 622 - E305 expected 2 blank lines after class or function definition, found 1 | get_stylistic_issues = stylistic_issues * /home/atagar/Desktop/stem/stem/descriptor/hidden_service_descriptor.py line 189 - E305 expected 2 blank lines after class or function definition, found 1 | _parse_rendezvous_service_descriptor_line = _parse_simple_line('rendezvous-service-descriptor', 'descriptor_id') * /home/atagar/Desktop/stem/stem/util/connection.py line 757 - E305 expected 2 blank lines after class or function definition, found 1 | get_system_resolvers = system_resolvers * /home/atagar/Desktop/stem/stem/__init__.py line 615 - E305 expected 2 blank lines after class or function definition, found 1 | Runlevel = stem.util.enum.UppercaseEnum( * /home/atagar/Desktop/stem/stem/version.py line 335 - E305 expected 2 blank lines after class or function definition, found 1 | safecookie_req = _VersionRequirements() * /home/atagar/Desktop/stem/stem/util/proc.py line 577 - E305 expected 2 blank lines after class or function definition, found 1 | get_system_start_time = system_start_time --- stem/__init__.py | 1 + stem/connection.py | 2 ++ stem/descriptor/__init__.py | 1 + stem/descriptor/hidden_service_descriptor.py | 1 + stem/util/connection.py | 1 + stem/util/log.py | 1 + stem/util/proc.py | 1 + stem/util/str_tools.py | 1 + stem/util/test_tools.py | 1 + stem/version.py | 1 + 10 files changed, 11 insertions(+) diff --git a/stem/__init__.py b/stem/__init__.py index e9e621c..a033745 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -612,6 +612,7 @@ class SocketError(ControllerError): class SocketClosed(SocketError): 'Control socket was closed before completing the message.' + Runlevel = stem.util.enum.UppercaseEnum( 'DEBUG', 'INFO', diff --git a/stem/connection.py b/stem/connection.py index 967b766..a3f27a0 100644 --- a/stem/connection.py +++ b/stem/connection.py @@ -1297,7 +1297,9 @@ class NoAuthCookie(MissingAuthInfo): super(NoAuthCookie, self).__init__(message) self.is_safecookie = is_safecookie + # authentication exceptions ordered as per the authenticate function's pydocs + AUTHENTICATE_EXCEPTIONS = ( IncorrectSocketType, UnrecognizedAuthMethods, diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index be28c7a..96cf0b4 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -1050,6 +1050,7 @@ def _descriptor_components(raw_contents, validate, extra_keywords = (), non_asci else: return entries + # importing at the end to avoid circular dependencies on our Descriptor class import stem.descriptor.server_descriptor diff --git a/stem/descriptor/hidden_service_descriptor.py b/stem/descriptor/hidden_service_descriptor.py index b188012..d752369 100644 --- a/stem/descriptor/hidden_service_descriptor.py +++ b/stem/descriptor/hidden_service_descriptor.py @@ -186,6 +186,7 @@ def _parse_introduction_points_line(descriptor, entries): except TypeError: raise ValueError("'introduction-points' isn't base64 encoded content:\n%s" % block_contents) + _parse_rendezvous_service_descriptor_line = _parse_simple_line('rendezvous-service-descriptor', 'descriptor_id') _parse_permanent_key_line = _parse_key_block('permanent-key', 'permanent_key', 'RSA PUBLIC KEY') _parse_secret_id_part_line = _parse_simple_line('secret-id-part', 'secret_id_part') diff --git a/stem/util/connection.py b/stem/util/connection.py index a5d1edc..0925461 100644 --- a/stem/util/connection.py +++ b/stem/util/connection.py @@ -750,6 +750,7 @@ def _cryptovariables_equal(x, y): _hmac_sha256(CRYPTOVARIABLE_EQUALITY_COMPARISON_NONCE, x) == _hmac_sha256(CRYPTOVARIABLE_EQUALITY_COMPARISON_NONCE, y)) + # TODO: drop with stem 2.x # We renamed our methods to drop a redundant 'get_*' prefix, so alias the old # names for backward compatability. diff --git a/stem/util/log.py b/stem/util/log.py index adcdc41..e157c7c 100644 --- a/stem/util/log.py +++ b/stem/util/log.py @@ -91,6 +91,7 @@ class _NullHandler(logging.Handler): def emit(self, record): pass + if not LOGGER.handlers: LOGGER.addHandler(_NullHandler()) diff --git a/stem/util/proc.py b/stem/util/proc.py index ad24bc8..c470a8d 100644 --- a/stem/util/proc.py +++ b/stem/util/proc.py @@ -570,6 +570,7 @@ def _log_failure(parameter, exc): log.debug('proc call failed (%s): %s' % (parameter, exc)) + # TODO: drop with stem 2.x # We renamed our methods to drop a redundant 'get_*' prefix, so alias the old # names for backward compatability. diff --git a/stem/util/str_tools.py b/stem/util/str_tools.py index 4a76dc4..696e632 100644 --- a/stem/util/str_tools.py +++ b/stem/util/str_tools.py @@ -585,6 +585,7 @@ def _get_label(units, count, decimal, is_long): else: return count_label + short_label + # TODO: drop with stem 2.x # We renamed our methods to drop a redundant 'get_*' prefix, so alias the old # names for backward compatability. diff --git a/stem/util/test_tools.py b/stem/util/test_tools.py index 6aecbd8..cab96e5 100644 --- a/stem/util/test_tools.py +++ b/stem/util/test_tools.py @@ -614,6 +614,7 @@ def _python_files(paths): if not skip: yield file_path + # TODO: drop with stem 2.x # We renamed our methods to drop a redundant 'get_*' prefix, so alias the old # names for backward compatability, and account for pep8 being renamed to diff --git a/stem/version.py b/stem/version.py index 37232c3..6eb9485 100644 --- a/stem/version.py +++ b/stem/version.py @@ -332,6 +332,7 @@ class _VersionRequirements(object): self.rules.append(new_rule) + safecookie_req = _VersionRequirements() safecookie_req.in_range(Version('0.2.2.36'), Version('0.2.3.0')) safecookie_req.greater_than(Version('0.2.3.13'))

1 0

[stem/master] Stylistic compatability with pycodestyle
by atagar＠torproject.org 21 Jun '17

21 Jun '17

commit 3c96963e4be26e1fd9126a4b610153633f8f2e7f Merge: 9a947c6 4ef767c Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jun 21 08:35:59 2017 -0700 Stylistic compatability with pycodestyle Odd. I'm using pycodestyle 2.3.1 with both python 2.7 and 3.2 but these issues only manifest with 3.2. Guess pycodestyle performs extra checks with newer python versions? Meh. Simple things to fix. stem/__init__.py | 1 + stem/connection.py | 2 ++ stem/descriptor/__init__.py | 1 + stem/descriptor/hidden_service_descriptor.py | 1 + stem/descriptor/server_descriptor.py | 3 ++- stem/util/connection.py | 1 + stem/util/log.py | 1 + stem/util/proc.py | 1 + stem/util/str_tools.py | 1 + stem/util/test_tools.py | 1 + stem/version.py | 1 + test/settings.cfg | 9 +++++++++ 12 files changed, 22 insertions(+), 1 deletion(-)

1 0

[stem/master] Replace no-op lambda with function
by atagar＠torproject.org 21 Jun '17

21 Jun '17

commit 785f28af5601149dc97bda4646444bde314db6e8 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jun 20 13:43:48 2017 -0700 Replace no-op lambda with function Forgot pycodestyle dislikes lambda assignment. Not sure why but meh, whatever. --- stem/descriptor/server_descriptor.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 499b53e..4e55ee2 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -846,7 +846,8 @@ class RelayDescriptor(ServerDescriptor): # of excluding these so we need to mock out part of their internals... # ewww. - no_op = lambda *args, **kwargs: None + def no_op(*args, **kwargs): + pass private_signing_key._backend._lib.EVP_PKEY_CTX_set_signature_md = no_op private_signing_key._backend.openssl_assert = no_op

1 0

[stem/master] Authentication failures could cause incorrect response
by atagar＠torproject.org 21 Jun '17

21 Jun '17

commit a275838663a716287110eec7250360a9ab14a670 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jun 21 10:08:37 2017 -0700 Authentication failures could cause incorrect response Oops. To best ensure we performed post-authentication activities I hacked it directly into the BaseController, but these didn't take into account that authentication could fail. The post-auth requests then failed because tor closes the socket. Caught thanks to daftaupe on... https://trac.torproject.org/projects/tor/ticket/22679 While troubleshooting this I ran into another bug that might be an issue with tor. When authentication failed we called 'QUIT'. Tor will sometimes respond with 'closing connection' and other times just hang. Reached out to Nick to see if this is something we'd care to address, but on Stem's side now simply omitting a QUIT call if unauthenticated. --- docs/change_log.rst | 1 + stem/connection.py | 3 +++ stem/control.py | 14 ++------------ test/integ/connection/authentication.py | 19 +++++++++++++++++++ 4 files changed, 25 insertions(+), 12 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 06341b4..96690ac 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -46,6 +46,7 @@ The following are only available within Stem's `git repository * **Controller** * :func:`~stem.process.launch_tor` raised a ValueError if invoked when outside the main thread + * Failure to authenticate could raise an improper response or hang (:trac:`22679`) * Renamed :class:`~stem.response.events.ConnectionBandwidthEvent` type attribute to conn_type to avoid conflict with parent class (:trac:`21774`) * Added the GUARD_WAIT :data:`~stem.CircStatus` (:spec:`6446210`) * Unable to use cookie auth when path includes wide characters (chinese, japanese, etc) diff --git a/stem/connection.py b/stem/connection.py index a3f27a0..db3f218 100644 --- a/stem/connection.py +++ b/stem/connection.py @@ -584,6 +584,9 @@ def authenticate(controller, password = None, chroot_path = None, protocolinfo_r else: authenticate_cookie(controller, cookie_path, False) + if isinstance(controller, stem.control.BaseController): + controller._post_authentication() + return # success! except OpenAuthRejected as exc: auth_exceptions.append(exc) diff --git a/stem/control.py b/stem/control.py index 65e3401..8c01d94 100644 --- a/stem/control.py +++ b/stem/control.py @@ -633,13 +633,6 @@ class BaseController(object): if isinstance(response, stem.ControllerError): raise response else: - # I really, really don't like putting hooks into this method, but - # this is the most reliable method I can think of for taking actions - # immediately after successfully authenticating to a connection. - - if message.upper().startswith('AUTHENTICATE'): - self._post_authentication() - return response except stem.SocketClosed: # If the recv() thread caused the SocketClosed then we could still be @@ -693,10 +686,7 @@ class BaseController(object): and **False** otherwise """ - if self.is_alive(): - return self._is_authenticated - - return False + return self._is_authenticated if self.is_alive() else False def connect(self): """ @@ -1051,7 +1041,7 @@ class Controller(BaseController): def close(self): # making a best-effort attempt to quit before detaching the socket - if self.is_alive(): + if self.is_authenticated(): try: self.msg('QUIT') except: diff --git a/test/integ/connection/authentication.py b/test/integ/connection/authentication.py index 3a2fcb0..a8c0c82 100644 --- a/test/integ/connection/authentication.py +++ b/test/integ/connection/authentication.py @@ -268,6 +268,25 @@ class TestAuthenticate(unittest.TestCase): self.assertRaises(exc_type, self._check_auth, auth_type, auth_value) @test.require.controller + def test_wrong_password_with_controller(self): + """ + We ran into a race condition where providing the wrong password to the + Controller caused inconsistent responses. Checking for that... + + https://trac.torproject.org/projects/tor/ticket/22679 + """ + + runner = test.runner.get_runner() + + if test.runner.Torrc.PASSWORD not in runner.get_options(): + self.skipTest('(requires password auth)') + return + + for i in range(10): + with runner.get_tor_controller(False) as controller: + self.assertRaises(stem.connection.IncorrectPassword, controller.authenticate, 'wrong_password') + + @test.require.controller def test_authenticate_cookie(self): """ Tests the authenticate_cookie function.

1 0

[stem/master] Python3 compatability for networkstatus unit test
by atagar＠torproject.org 21 Jun '17

21 Jun '17

commit 657a2b89b65c4b2c468d784e6ae2ac667ba84706 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jun 21 08:43:09 2017 -0700 Python3 compatability for networkstatus unit test Trivial fix. Just some missing unicode/bytes normalization. ====================================================================== ERROR: test_signature_validation ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/atagar/Desktop/stem/test/require.py", line 58, in wrapped return func(self, *args, **kwargs) File "/home/atagar/Desktop/stem/test/unit/descriptor/networkstatus/document_v3.py", line 421, in test_signature_validation consensus = stem.descriptor.networkstatus.NetworkStatusDocumentV3(consensus_content.replace('test002r', 'different_nickname')) TypeError: expected an object with the buffer interface ---------------------------------------------------------------------- --- test/unit/descriptor/networkstatus/document_v3.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit/descriptor/networkstatus/document_v3.py b/test/unit/descriptor/networkstatus/document_v3.py index efdf1bb..68d7270 100644 --- a/test/unit/descriptor/networkstatus/document_v3.py +++ b/test/unit/descriptor/networkstatus/document_v3.py @@ -418,7 +418,7 @@ DnN5aFtYKiTc19qIC7Nmo+afPdDEf0MlJvEOP5EWl3w= # change a relay's nickname in the consensus so it's no longer validly signed - consensus = stem.descriptor.networkstatus.NetworkStatusDocumentV3(consensus_content.replace('test002r', 'different_nickname')) + consensus = stem.descriptor.networkstatus.NetworkStatusDocumentV3(consensus_content.replace(b'test002r', b'different_nickname')) self.assertRaisesRegexp(ValueError, 'Network Status Document has 0 valid signatures out of 2 total, needed 1', consensus.validate_signatures, certs) def test_handlers(self):

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2017