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

[tor/master] Changes file for #25852
by nickm＠torproject.org 14 May '18

14 May '18

commit b8ed6e2ac6226c9cf43d28533c7f7eb3315be150 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sat May 5 16:10:50 2018 +0200 Changes file for #25852 --- changes/bug25852 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/bug25852 b/changes/bug25852 new file mode 100644 index 000000000..8b1563841 --- /dev/null +++ b/changes/bug25852 @@ -0,0 +1,5 @@ + o Minor bugfixes (control interface): + - Respond with more human readable error messages to GETINFO + exit-policy/* requests. Also, let controller know if error + is transient (response code 551) or not (response code 552). + Fixes bug 25852; bugfix on 0.2.8.1-alpha.

1 0

[tor/master] Make _with_err return routerinfo, like old function does
by nickm＠torproject.org 14 May '18

14 May '18

commit 36f7d0a940bbe8695d5343fccc1a0560a529883a Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Thu May 10 16:13:16 2018 +0300 Make _with_err return routerinfo, like old function does --- src/or/policies.c | 23 +++++++++++------------ src/or/router.c | 43 ++++++++++++++++++++++++++++--------------- src/or/router.h | 2 +- src/test/test_policy.c | 18 +++++++++++------- 4 files changed, 51 insertions(+), 35 deletions(-) diff --git a/src/or/policies.c b/src/or/policies.c index 15176a97e..4d47985ec 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -2999,9 +2999,8 @@ getinfo_helper_policies(control_connection_t *conn, smartlist_free(private_policy_strings); } else if (!strcmp(question, "exit-policy/reject-private/relay")) { const or_options_t *options = get_options(); - const routerinfo_t *me = NULL; - - int err = router_get_my_routerinfo_with_err((routerinfo_t **)&me); + int err = 0; + const routerinfo_t *me = router_get_my_routerinfo_with_err(&err); if (!me) { *errmsg = routerinfo_errno_to_string(err); @@ -3043,8 +3042,13 @@ getinfo_helper_policies(control_connection_t *conn, int include_ipv4 = 0; int include_ipv6 = 0; - const routerinfo_t *me = NULL; - int err = router_get_my_routerinfo_with_err((routerinfo_t **)&me); + int err = 0; + const routerinfo_t *me = router_get_my_routerinfo_with_err(&err); + + if (!me) { + *errmsg = routerinfo_errno_to_string(err); + return routerinfo_err_is_transient(err) ? -1 : 0; + } if (!strcmp(question, "exit-policy/ipv4")) { include_ipv4 = 1; @@ -3056,13 +3060,8 @@ getinfo_helper_policies(control_connection_t *conn, return 0; /* No such key. */ } - if (!me) { - *errmsg = routerinfo_errno_to_string(err); - return routerinfo_err_is_transient(err) ? -1 : 0; - } else { - *answer = router_dump_exit_policy_to_string(me,include_ipv4, - include_ipv6); - } + *answer = router_dump_exit_policy_to_string(me,include_ipv4, + include_ipv6); } return 0; diff --git a/src/or/router.c b/src/or/router.c index 612e23b3a..7bf40d69d 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2073,28 +2073,41 @@ router_get_my_routerinfo,(void)) return desc_routerinfo; } -/** Set ri to routerinfo of this OR. Rebuild it from - * scratch if needed. Return 0 on success or an appropriate - * TOR_ROUTERINFO_ERROR_* value on failure. +/** Return routerinfo of this OR. Rebuild it from + * scratch if needed. Set *err to 0 on success or to + * appropriate TOR_ROUTERINFO_ERROR_* value on failure. */ -MOCK_IMPL(int, -router_get_my_routerinfo_with_err,(routerinfo_t **ri)) +MOCK_IMPL(const routerinfo_t *, +router_get_my_routerinfo_with_err,(int *err)) { - if (!server_mode(get_options())) - return TOR_ROUTERINFO_ERROR_NOT_A_SERVER; + if (!server_mode(get_options())) { + if (err) + *err = TOR_ROUTERINFO_ERROR_NOT_A_SERVER; + + return NULL; + } if (!desc_clean_since) { - int err = router_rebuild_descriptor(0); - if (err < 0) - return err; + int rebuild_err = router_rebuild_descriptor(0); + if (rebuild_err < 0) { + if (err) + *err = rebuild_err; + + return NULL; + } } - if (!desc_routerinfo) - return TOR_ROUTERINFO_ERROR_NOT_SO_FAST; + if (!desc_routerinfo) { + if (err) + *err = TOR_ROUTERINFO_ERROR_NOT_SO_FAST; - if (ri) - *ri = desc_routerinfo; - return 0; + return NULL; + } + + if (err) + *err = 0; + + return desc_routerinfo; } /** OR only: Return a signed server descriptor for this OR, rebuilding a fresh diff --git a/src/or/router.h b/src/or/router.h index bf0267b77..561802c2c 100644 --- a/src/or/router.h +++ b/src/or/router.h @@ -92,7 +92,7 @@ void router_new_address_suggestion(const char *suggestion, int router_compare_to_my_exit_policy(const tor_addr_t *addr, uint16_t port); MOCK_DECL(int, router_my_exit_policy_is_reject_star,(void)); MOCK_DECL(const routerinfo_t *, router_get_my_routerinfo, (void)); -MOCK_DECL(int, router_get_my_routerinfo_with_err,(routerinfo_t **ri)); +MOCK_DECL(const routerinfo_t *, router_get_my_routerinfo_with_err,(int *err)); extrainfo_t *router_get_my_extrainfo(void); const char *router_get_my_descriptor(void); const char *router_get_descriptor_gen_reason(void); diff --git a/src/test/test_policy.c b/src/test/test_policy.c index aeddc1417..6ae57be8c 100644 --- a/src/test/test_policy.c +++ b/src/test/test_policy.c @@ -1498,16 +1498,20 @@ test_dump_exit_policy_to_string(void *arg) static routerinfo_t *mock_desc_routerinfo = NULL; static int routerinfo_err; -static int -mock_router_get_my_routerinfo_with_err(routerinfo_t **ri) +static const routerinfo_t * +mock_router_get_my_routerinfo_with_err(int *err) { - if (routerinfo_err) - return routerinfo_err; + if (routerinfo_err) { + if (err) + *err = routerinfo_err; - if (ri) - *ri = mock_desc_routerinfo; + return NULL; + } - return 0; + if (err) + *err = 0; + + return mock_desc_routerinfo; } #define DEFAULT_POLICY_STRING "reject *:*"

1 0

[tor/master] Avoid confusion with errno from libc
by nickm＠torproject.org 14 May '18

14 May '18

commit 8ad97b7dcf143fc488422f9866613fea3d900119 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Thu May 10 16:33:08 2018 +0300 Avoid confusion with errno from libc --- src/or/policies.c | 4 ++-- src/or/router.c | 2 +- src/or/router.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/or/policies.c b/src/or/policies.c index 4d47985ec..1210ca687 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -3003,7 +3003,7 @@ getinfo_helper_policies(control_connection_t *conn, const routerinfo_t *me = router_get_my_routerinfo_with_err(&err); if (!me) { - *errmsg = routerinfo_errno_to_string(err); + *errmsg = routerinfo_err_to_string(err); return routerinfo_err_is_transient(err) ? -1 : 0; } @@ -3046,7 +3046,7 @@ getinfo_helper_policies(control_connection_t *conn, const routerinfo_t *me = router_get_my_routerinfo_with_err(&err); if (!me) { - *errmsg = routerinfo_errno_to_string(err); + *errmsg = routerinfo_err_to_string(err); return routerinfo_err_is_transient(err) ? -1 : 0; } diff --git a/src/or/router.c b/src/or/router.c index 7bf40d69d..f88ba3746 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -118,7 +118,7 @@ const char *format_node_description(char *buf, * of err. */ const char * -routerinfo_errno_to_string(int err) +routerinfo_err_to_string(int err) { switch (err) { case TOR_ROUTERINFO_ERROR_NO_EXT_ADDR: diff --git a/src/or/router.h b/src/or/router.h index 561802c2c..9befffae5 100644 --- a/src/or/router.h +++ b/src/or/router.h @@ -135,7 +135,7 @@ const char *node_describe(const node_t *node); const char *routerstatus_describe(const routerstatus_t *ri); const char *extend_info_describe(const extend_info_t *ei); -const char *routerinfo_errno_to_string(int err); +const char *routerinfo_err_to_string(int err); int routerinfo_err_is_transient(int err); void router_get_verbose_nickname(char *buf, const routerinfo_t *router);

1 0

[tor/master] Tweak error handling for #25852
by nickm＠torproject.org 14 May '18

14 May '18

commit 036df13a03f6345913fbe5e7806fd00312d41c4d Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Thu May 10 16:45:57 2018 +0300 Tweak error handling for #25852 --- src/or/router.c | 13 +++++++------ src/or/router.h | 2 +- src/test/test_policy.c | 4 ++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index f88ba3746..91def4b75 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -131,11 +131,12 @@ routerinfo_err_to_string(int err) return "Key digest failed"; case TOR_ROUTERINFO_ERROR_CANNOT_GENERATE: return "Cannot generate descriptor"; - case TOR_ROUTERINFO_ERROR_NOT_SO_FAST: - return "Too soon; not ready yet"; + case TOR_ROUTERINFO_ERROR_DESC_REBUILDING: + return "Descriptor still rebuilding - not ready yet"; } - log_warn(LD_BUG, "unknown errno %d", err); + log_warn(LD_BUG, "unknown routerinfo error %d - shouldn't happen", err); + tor_assert_unreached(); return "Unknown error"; } @@ -157,7 +158,7 @@ routerinfo_err_is_transient(int err) return 0; // XXX: bug? case TOR_ROUTERINFO_ERROR_CANNOT_GENERATE: return 1; - case TOR_ROUTERINFO_ERROR_NOT_SO_FAST: + case TOR_ROUTERINFO_ERROR_DESC_REBUILDING: return 1; } @@ -2099,7 +2100,7 @@ router_get_my_routerinfo_with_err,(int *err)) if (!desc_routerinfo) { if (err) - *err = TOR_ROUTERINFO_ERROR_NOT_SO_FAST; + *err = TOR_ROUTERINFO_ERROR_DESC_REBUILDING; return NULL; } @@ -2530,7 +2531,7 @@ router_rebuild_descriptor(int force) * learn that it's time to try again when ip_address_changed() * marks it dirty. */ desc_clean_since = time(NULL); - return TOR_ROUTERINFO_ERROR_NOT_SO_FAST; + return TOR_ROUTERINFO_ERROR_DESC_REBUILDING; } log_info(LD_OR, "Rebuilding relay descriptor%s", force ? " (forced)" : ""); diff --git a/src/or/router.h b/src/or/router.h index 9befffae5..b34f75e22 100644 --- a/src/or/router.h +++ b/src/or/router.h @@ -19,7 +19,7 @@ #define TOR_ROUTERINFO_ERROR_NOT_A_SERVER (-3) #define TOR_ROUTERINFO_ERROR_DIGEST_FAILED (-4) #define TOR_ROUTERINFO_ERROR_CANNOT_GENERATE (-5) -#define TOR_ROUTERINFO_ERROR_NOT_SO_FAST (-6) +#define TOR_ROUTERINFO_ERROR_DESC_REBUILDING (-6) crypto_pk_t *get_onion_key(void); time_t get_onion_key_set_at(void); diff --git a/src/test/test_policy.c b/src/test/test_policy.c index 6ae57be8c..e89d49aaf 100644 --- a/src/test/test_policy.c +++ b/src/test/test_policy.c @@ -1712,13 +1712,13 @@ test_policies_getinfo_helper_policies(void *arg) tt_ptr_op(errmsg, OP_NE, NULL); tt_str_op(errmsg, OP_EQ, "Cannot generate descriptor"); - routerinfo_err = TOR_ROUTERINFO_ERROR_NOT_SO_FAST; + routerinfo_err = TOR_ROUTERINFO_ERROR_DESC_REBUILDING; rv = getinfo_helper_policies(NULL, "exit-policy/full", &answer, &errmsg); tt_int_op(rv, OP_EQ, -1); tt_ptr_op(answer, OP_EQ, NULL); tt_ptr_op(errmsg, OP_NE, NULL); - tt_str_op(errmsg, OP_EQ, "Too soon; not ready yet"); + tt_str_op(errmsg, OP_EQ, "Descriptor still rebuilding - not ready yet"); done: tor_free(answer);

1 0

[tor/master] Use router_get_my_routerinfo_with_err to implement the old version
by nickm＠torproject.org 14 May '18

14 May '18

commit a9ef335c1b220ad632aad1d75f671a2fcd2b0863 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 14 14:12:36 2018 -0400 Use router_get_my_routerinfo_with_err to implement the old version Having one function implemented in terms of the other should keep them from diverging. follow-up on #25852 --- src/or/router.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index 47416640d..ea6597788 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2076,11 +2076,7 @@ router_is_me(const routerinfo_t *router) MOCK_IMPL(const routerinfo_t *, router_get_my_routerinfo,(void)) { - if (!server_mode(get_options())) - return NULL; - if (router_rebuild_descriptor(0)) - return NULL; - return desc_routerinfo; + return router_get_my_routerinfo_with_err(NULL); } /** Return routerinfo of this OR. Rebuild it from

1 0

[tor/master] Merge remote-tracking branch 'rl1987/bug25852_take2'
by nickm＠torproject.org 14 May '18

14 May '18

commit d27fd7ff6bea7f68dfbf89a38219dbb302f45bf1 Merge: aab626405 036df13a0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 14 14:05:50 2018 -0400 Merge remote-tracking branch 'rl1987/bug25852_take2' changes/bug25852 | 5 +++ src/or/policies.c | 26 +++++++------ src/or/router.c | 102 ++++++++++++++++++++++++++++++++++++++++++++++--- src/or/router.h | 11 ++++++ src/test/test_policy.c | 66 +++++++++++++++++++++++++++++++- 5 files changed, 191 insertions(+), 19 deletions(-)

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 14 May '18

14 May '18

commit 0666149418614ce3e1ffc0913186707c750c1f0b Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 14 17:15:30 2018 +0000 Update translations for https_everywhere --- ast/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ast/https-everywhere.dtd b/ast/https-everywhere.dtd index fe52c3513..fb2c001a3 100644 --- a/ast/https-everywhere.dtd +++ b/ast/https-everywhere.dtd @@ -15,7 +15,7 @@ <!ENTITY https-everywhere.options.generalSettings "General Settings"> <!ENTITY https-everywhere.options.advancedSettings "Advanced Settings"> <!ENTITY https-everywhere.options.importSettings "Import Settings"> -<!ENTITY https-everywhere.options.import "Import"> +<!ENTITY https-everywhere.options.import "Importar"> <!ENTITY https-everywhere.options.enableMixedRulesets "Enable mixed content rulesets"> <!ENTITY https-everywhere.options.showDevtoolsTab "Show Devtools tab"> <!ENTITY https-everywhere.options.autoUpdateRulesets "Auto-update rulesets">

1 0

[webwml/master] Deprecate old Tor Browser versions
by boklm＠torproject.org 14 May '18

14 May '18

commit c76ee7bbe60f155e09206627eeecf223dadd0f79 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon May 14 17:00:12 2018 +0200 Deprecate old Tor Browser versions --- projects/torbrowser/RecommendedTBBVersions | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 10bd6be0..84944ef1 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -1,20 +1,8 @@ [ -"7.5.3", -"7.5.3-MacOS", -"7.5.3-Linux", -"7.5.3-Windows", "7.5.4", "7.5.4-MacOS", "7.5.4-Linux", "7.5.4-Windows", -"8.0a5", -"8.0a5-MacOS", -"8.0a5-Linux", -"8.0a5-Windows", -"8.0a6", -"8.0a6-MacOS", -"8.0a6-Linux", -"8.0a6-Windows", "8.0a7", "8.0a7-MacOS", "8.0a7-Linux",

1 0

[stem/master] Fix timeout handling
by atagar＠torproject.org 14 May '18

14 May '18

commit 60f034ad8b9c3aa48e7e2ecb0a2e159b6ed5bc71 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun May 13 17:49:40 2018 -0700 Fix timeout handling Oops! Great catch from pastly on #26056 that I buggered up this check. :P --- stem/control.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stem/control.py b/stem/control.py index d10989af..c045eba4 100644 --- a/stem/control.py +++ b/stem/control.py @@ -4026,14 +4026,14 @@ def _get_with_timeout(event_queue, timeout, start_time): """ if timeout: - time_left = time.time() - start_time - timeout + time_left = timeout - (time.time() - start_time) if time_left <= 0: raise stem.Timeout('Reached our %0.1f second timeout' % timeout) try: - return event_queue.get(time_left) - except event_queue.Queue.Empty: + return event_queue.get(True, time_left) + except queue.Empty: raise stem.Timeout('Reached our %0.1f second timeout' % timeout) else: return event_queue.get()

1 0

[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