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

[tor/master] refactor router_pick_published_address to have another arg
by nickm＠torproject.org 21 Nov '16

21 Nov '16

commit 3bb40b213b26467df2604023ae29d915dc740128 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Nov 16 16:13:03 2016 -0500 refactor router_pick_published_address to have another arg no change in behavior except fewer log entries in the case where we use a cached result. --- src/or/control.c | 2 +- src/or/dirserv.c | 3 ++- src/or/router.c | 39 +++++++++++++++++++++++++-------------- src/or/router.h | 3 ++- src/or/transports.c | 2 +- src/test/test_config.c | 4 +++- 6 files changed, 34 insertions(+), 19 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index a4f8e37..c8c5062 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1704,7 +1704,7 @@ getinfo_helper_misc(control_connection_t *conn, const char *question, *answer = tor_strdup("VERBOSE_NAMES EXTENDED_EVENTS"); } else if (!strcmp(question, "address")) { uint32_t addr; - if (router_pick_published_address(get_options(), &addr) < 0) { + if (router_pick_published_address(get_options(), &addr, 0) < 0) { *errmsg = "Address unknown"; return -1; } diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 41945fe..fd92522 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1033,7 +1033,8 @@ directory_fetches_from_authorities(const or_options_t *options) return 1; if (options->BridgeRelay == 1) return 0; - if (server_mode(options) && router_pick_published_address(options, &addr)<0) + if (server_mode(options) && + router_pick_published_address(options, &addr, 0) < 0) return 1; /* we don't know our IP address; ask an authority. */ refuseunknown = ! router_my_exit_policy_is_reject_star() && should_refuse_unknown_exits(options); diff --git a/src/or/router.c b/src/or/router.c index b968072..6d3a32a 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1961,23 +1961,34 @@ static int router_guess_address_from_dir_headers(uint32_t *guess); /** Make a current best guess at our address, either because * it's configured in torrc, or because we've learned it from * dirserver headers. Place the answer in *addr and return - * 0 on success, else return -1 if we have no guess. */ + * 0 on success, else return -1 if we have no guess. + * + * If cache_only is true, just return any cached answers, and + * don't try to get any new answers. + */ MOCK_IMPL(int, -router_pick_published_address,(const or_options_t *options, uint32_t *addr)) +router_pick_published_address,(const or_options_t *options, uint32_t *addr, + int cache_only)) { + /* First, check the cached output from resolve_my_address(). */ *addr = get_last_resolved_addr(); - if (!*addr && - resolve_my_address(LOG_INFO, options, addr, NULL, NULL) < 0) { - log_info(LD_CONFIG, "Could not determine our address locally. " - "Checking if directory headers provide any hints."); - if (router_guess_address_from_dir_headers(addr) < 0) { - log_info(LD_CONFIG, "No hints from directory headers either. " - "Will try again later."); - return -1; + if (*addr) + return 0; + + /* Second, consider doing a resolve attempt right here. */ + if (!cache_only) { + if (resolve_my_address(LOG_INFO, options, addr, NULL, NULL) >= 0) { + log_info(LD_CONFIG,"Success: chose address '%s'.", fmt_addr32(*addr)); + return 0; } } - log_info(LD_CONFIG,"Success: chose address '%s'.", fmt_addr32(*addr)); - return 0; + + /* Third, check the cached output from router_new_address_suggestion(). */ + if (router_guess_address_from_dir_headers(addr) >= 0) + return 0; + + /* We have no useful cached answers. Return failure. */ + return -1; } /* Like router_check_descriptor_address_consistency, but specifically for the @@ -2074,7 +2085,7 @@ router_build_fresh_descriptor(routerinfo_t **r, extrainfo_t **e) int hibernating = we_are_hibernating(); const or_options_t *options = get_options(); - if (router_pick_published_address(options, &addr) < 0) { + if (router_pick_published_address(options, &addr, 0) < 0) { log_warn(LD_CONFIG, "Don't know my address while generating descriptor"); return -1; } @@ -2323,7 +2334,7 @@ router_rebuild_descriptor(int force) if (desc_clean_since && !force) return 0; - if (router_pick_published_address(options, &addr) < 0 || + if (router_pick_published_address(options, &addr, 0) < 0 || router_get_advertised_or_port(options) == 0) { /* Stop trying to rebuild our descriptor every second. We'll * learn that it's time to try again when ip_address_changed() diff --git a/src/or/router.h b/src/or/router.h index 73bfea1..c30a030 100644 --- a/src/or/router.h +++ b/src/or/router.h @@ -91,7 +91,8 @@ const uint8_t *router_get_my_id_digest(void); int router_extrainfo_digest_is_me(const char *digest); int router_is_me(const routerinfo_t *router); MOCK_DECL(int,router_pick_published_address,(const or_options_t *options, - uint32_t *addr)); + uint32_t *addr, + int cache_only)); int router_build_fresh_descriptor(routerinfo_t **r, extrainfo_t **e); int router_rebuild_descriptor(int force); char *router_dump_router_to_string(routerinfo_t *router, diff --git a/src/or/transports.c b/src/or/transports.c index be77c87..7a52b73 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -1611,7 +1611,7 @@ pt_get_extra_info_descriptor_string(void) uint32_t external_ip_address = 0; if (tor_addr_is_null(&t->addr) && router_pick_published_address(get_options(), - &external_ip_address) >= 0) { + &external_ip_address, 0) >= 0) { tor_addr_t addr; tor_addr_from_ipv4h(&addr, external_ip_address); addrport = fmt_addrport(&addr, t->port); diff --git a/src/test/test_config.c b/src/test/test_config.c index 384bff4..2fc37b0 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -3480,10 +3480,12 @@ test_config_default_dir_servers(void *arg) static int mock_router_pick_published_address_result = 0; static int -mock_router_pick_published_address(const or_options_t *options, uint32_t *addr) +mock_router_pick_published_address(const or_options_t *options, + uint32_t *addr, int cache_only) { (void)options; (void)addr; + (void)cache_only; return mock_router_pick_published_address_result; }

1 0

[tor/release-0.2.9] refactor router_pick_published_address to have another arg
by nickm＠torproject.org 21 Nov '16

21 Nov '16

commit 3bb40b213b26467df2604023ae29d915dc740128 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Nov 16 16:13:03 2016 -0500 refactor router_pick_published_address to have another arg no change in behavior except fewer log entries in the case where we use a cached result. --- src/or/control.c | 2 +- src/or/dirserv.c | 3 ++- src/or/router.c | 39 +++++++++++++++++++++++++-------------- src/or/router.h | 3 ++- src/or/transports.c | 2 +- src/test/test_config.c | 4 +++- 6 files changed, 34 insertions(+), 19 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index a4f8e37..c8c5062 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1704,7 +1704,7 @@ getinfo_helper_misc(control_connection_t *conn, const char *question, *answer = tor_strdup("VERBOSE_NAMES EXTENDED_EVENTS"); } else if (!strcmp(question, "address")) { uint32_t addr; - if (router_pick_published_address(get_options(), &addr) < 0) { + if (router_pick_published_address(get_options(), &addr, 0) < 0) { *errmsg = "Address unknown"; return -1; } diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 41945fe..fd92522 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1033,7 +1033,8 @@ directory_fetches_from_authorities(const or_options_t *options) return 1; if (options->BridgeRelay == 1) return 0; - if (server_mode(options) && router_pick_published_address(options, &addr)<0) + if (server_mode(options) && + router_pick_published_address(options, &addr, 0) < 0) return 1; /* we don't know our IP address; ask an authority. */ refuseunknown = ! router_my_exit_policy_is_reject_star() && should_refuse_unknown_exits(options); diff --git a/src/or/router.c b/src/or/router.c index b968072..6d3a32a 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1961,23 +1961,34 @@ static int router_guess_address_from_dir_headers(uint32_t *guess); /** Make a current best guess at our address, either because * it's configured in torrc, or because we've learned it from * dirserver headers. Place the answer in *addr and return - * 0 on success, else return -1 if we have no guess. */ + * 0 on success, else return -1 if we have no guess. + * + * If cache_only is true, just return any cached answers, and + * don't try to get any new answers. + */ MOCK_IMPL(int, -router_pick_published_address,(const or_options_t *options, uint32_t *addr)) +router_pick_published_address,(const or_options_t *options, uint32_t *addr, + int cache_only)) { + /* First, check the cached output from resolve_my_address(). */ *addr = get_last_resolved_addr(); - if (!*addr && - resolve_my_address(LOG_INFO, options, addr, NULL, NULL) < 0) { - log_info(LD_CONFIG, "Could not determine our address locally. " - "Checking if directory headers provide any hints."); - if (router_guess_address_from_dir_headers(addr) < 0) { - log_info(LD_CONFIG, "No hints from directory headers either. " - "Will try again later."); - return -1; + if (*addr) + return 0; + + /* Second, consider doing a resolve attempt right here. */ + if (!cache_only) { + if (resolve_my_address(LOG_INFO, options, addr, NULL, NULL) >= 0) { + log_info(LD_CONFIG,"Success: chose address '%s'.", fmt_addr32(*addr)); + return 0; } } - log_info(LD_CONFIG,"Success: chose address '%s'.", fmt_addr32(*addr)); - return 0; + + /* Third, check the cached output from router_new_address_suggestion(). */ + if (router_guess_address_from_dir_headers(addr) >= 0) + return 0; + + /* We have no useful cached answers. Return failure. */ + return -1; } /* Like router_check_descriptor_address_consistency, but specifically for the @@ -2074,7 +2085,7 @@ router_build_fresh_descriptor(routerinfo_t **r, extrainfo_t **e) int hibernating = we_are_hibernating(); const or_options_t *options = get_options(); - if (router_pick_published_address(options, &addr) < 0) { + if (router_pick_published_address(options, &addr, 0) < 0) { log_warn(LD_CONFIG, "Don't know my address while generating descriptor"); return -1; } @@ -2323,7 +2334,7 @@ router_rebuild_descriptor(int force) if (desc_clean_since && !force) return 0; - if (router_pick_published_address(options, &addr) < 0 || + if (router_pick_published_address(options, &addr, 0) < 0 || router_get_advertised_or_port(options) == 0) { /* Stop trying to rebuild our descriptor every second. We'll * learn that it's time to try again when ip_address_changed() diff --git a/src/or/router.h b/src/or/router.h index 73bfea1..c30a030 100644 --- a/src/or/router.h +++ b/src/or/router.h @@ -91,7 +91,8 @@ const uint8_t *router_get_my_id_digest(void); int router_extrainfo_digest_is_me(const char *digest); int router_is_me(const routerinfo_t *router); MOCK_DECL(int,router_pick_published_address,(const or_options_t *options, - uint32_t *addr)); + uint32_t *addr, + int cache_only)); int router_build_fresh_descriptor(routerinfo_t **r, extrainfo_t **e); int router_rebuild_descriptor(int force); char *router_dump_router_to_string(routerinfo_t *router, diff --git a/src/or/transports.c b/src/or/transports.c index be77c87..7a52b73 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -1611,7 +1611,7 @@ pt_get_extra_info_descriptor_string(void) uint32_t external_ip_address = 0; if (tor_addr_is_null(&t->addr) && router_pick_published_address(get_options(), - &external_ip_address) >= 0) { + &external_ip_address, 0) >= 0) { tor_addr_t addr; tor_addr_from_ipv4h(&addr, external_ip_address); addrport = fmt_addrport(&addr, t->port); diff --git a/src/test/test_config.c b/src/test/test_config.c index 384bff4..2fc37b0 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -3480,10 +3480,12 @@ test_config_default_dir_servers(void *arg) static int mock_router_pick_published_address_result = 0; static int -mock_router_pick_published_address(const or_options_t *options, uint32_t *addr) +mock_router_pick_published_address(const or_options_t *options, + uint32_t *addr, int cache_only) { (void)options; (void)addr; + (void)cache_only; return mock_router_pick_published_address_result; }

1 0

[tor/release-0.2.9] Merge remote-tracking branch 'arma/bug20423' into maint-0.2.9
by nickm＠torproject.org 21 Nov '16

21 Nov '16

commit e2c881487cab57b1b4301560f10b4e3ff4a44167 Merge: 8a767ba f12aad7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 21 12:40:08 2016 -0500 Merge remote-tracking branch 'arma/bug20423' into maint-0.2.9 changes/bug20423 | 6 ++++++ src/or/control.c | 2 +- src/or/dirserv.c | 3 ++- src/or/router.c | 39 +++++++++++++++++++++++++-------------- src/or/router.h | 3 ++- src/or/transports.c | 2 +- src/test/test_config.c | 4 +++- 7 files changed, 40 insertions(+), 19 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.2.9'
by nickm＠torproject.org 21 Nov '16

21 Nov '16

commit c35d481f56284ebeafc2860eed27c9833d631983 Merge: 6dc25e7 e2c8814 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 21 12:44:21 2016 -0500 Merge branch 'maint-0.2.9' changes/bug20423 | 6 ++++++ src/or/control.c | 2 +- src/or/dirserv.c | 3 ++- src/or/router.c | 39 +++++++++++++++++++++++++-------------- src/or/router.h | 3 ++- src/or/transports.c | 2 +- src/test/test_config.c | 4 +++- 7 files changed, 40 insertions(+), 19 deletions(-)

1 0

[tor/release-0.2.9] don't attempt a resolve when the cached answer will do
by nickm＠torproject.org 21 Nov '16

21 Nov '16

commit f12aad7f09a608a803b74315213f6f57c97737de Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Nov 16 16:22:11 2016 -0500 don't attempt a resolve when the cached answer will do For relays that don't know their own address, avoid attempting a local hostname resolve for each descriptor we download. Also cut down on the number of "Success: chose address 'x.x.x.x'" log lines. Fixes bugs 20423 and 20610; bugfix on 0.2.8.1-alpha. --- changes/bug20423 | 6 ++++++ src/or/dirserv.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changes/bug20423 b/changes/bug20423 new file mode 100644 index 0000000..32bdc3f --- /dev/null +++ b/changes/bug20423 @@ -0,0 +1,6 @@ + o Major bugfixes: + - For relays that don't know their own address, avoid attempting + a local hostname resolve for each descriptor we download. Also cut + down on the number of "Success: chose address 'x.x.x.x'" log lines. + Fixes bugs 20423 and 20610; bugfix on 0.2.8.1-alpha. + diff --git a/src/or/dirserv.c b/src/or/dirserv.c index fd92522..34db063 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1034,7 +1034,7 @@ directory_fetches_from_authorities(const or_options_t *options) if (options->BridgeRelay == 1) return 0; if (server_mode(options) && - router_pick_published_address(options, &addr, 0) < 0) + router_pick_published_address(options, &addr, 1) < 0) return 1; /* we don't know our IP address; ask an authority. */ refuseunknown = ! router_my_exit_policy_is_reject_star() && should_refuse_unknown_exits(options);

1 0

[tor/master] don't attempt a resolve when the cached answer will do
by nickm＠torproject.org 21 Nov '16

21 Nov '16

commit f12aad7f09a608a803b74315213f6f57c97737de Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Nov 16 16:22:11 2016 -0500 don't attempt a resolve when the cached answer will do For relays that don't know their own address, avoid attempting a local hostname resolve for each descriptor we download. Also cut down on the number of "Success: chose address 'x.x.x.x'" log lines. Fixes bugs 20423 and 20610; bugfix on 0.2.8.1-alpha. --- changes/bug20423 | 6 ++++++ src/or/dirserv.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changes/bug20423 b/changes/bug20423 new file mode 100644 index 0000000..32bdc3f --- /dev/null +++ b/changes/bug20423 @@ -0,0 +1,6 @@ + o Major bugfixes: + - For relays that don't know their own address, avoid attempting + a local hostname resolve for each descriptor we download. Also cut + down on the number of "Success: chose address 'x.x.x.x'" log lines. + Fixes bugs 20423 and 20610; bugfix on 0.2.8.1-alpha. + diff --git a/src/or/dirserv.c b/src/or/dirserv.c index fd92522..34db063 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1034,7 +1034,7 @@ directory_fetches_from_authorities(const or_options_t *options) if (options->BridgeRelay == 1) return 0; if (server_mode(options) && - router_pick_published_address(options, &addr, 0) < 0) + router_pick_published_address(options, &addr, 1) < 0) return 1; /* we don't know our IP address; ask an authority. */ refuseunknown = ! router_my_exit_policy_is_reject_star() && should_refuse_unknown_exits(options);

1 0

[tor/master] Merge remote-tracking branch 'arma/bug20423' into maint-0.2.9
by nickm＠torproject.org 21 Nov '16

21 Nov '16

commit e2c881487cab57b1b4301560f10b4e3ff4a44167 Merge: 8a767ba f12aad7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 21 12:40:08 2016 -0500 Merge remote-tracking branch 'arma/bug20423' into maint-0.2.9 changes/bug20423 | 6 ++++++ src/or/control.c | 2 +- src/or/dirserv.c | 3 ++- src/or/router.c | 39 +++++++++++++++++++++++++-------------- src/or/router.h | 3 ++- src/or/transports.c | 2 +- src/test/test_config.c | 4 +++- 7 files changed, 40 insertions(+), 19 deletions(-)

1 0

[stem/master] Release changelog
by atagar＠torproject.org 21 Nov '16

21 Nov '16

commit 712ba611fb4541e891d9f50c54e7947946ced81c Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Nov 21 09:30:23 2016 -0800 Release changelog Delimiting the 1.5.2 release log. Glad to finally have this out! --- docs/change_log.rst | 12 +++++++++++- stem/__init__.py | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index ba496a7..ee0484e 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -7,6 +7,7 @@ unreleased. For a monthly report on work being done see my `development log * :ref:`versioning` * :ref:`unreleased` +* :ref:`version_1.5` * :ref:`version_1.4` * :ref:`version_1.3` * :ref:`version_1.2` @@ -42,9 +43,18 @@ Unreleased The following are only available within Stem's `git repository <download.html>`_. +.. _version_1.5: + +Version 1.5 (November 20th, 2016) +--------------------------------- + +Stem 1.5 is a long overdue accumulation of seventeen months of improvements +including dramatically improved python 3.x performance, `tor manual information +<api/manual.html>`_, and much more. + * **Controller** - * Dramatic, `300x performance improvement <https://github.com/DonnchaC/stem/pull/1>`_ for reading from the control port with python 3 + * Dramatic, 300x performance improvement for reading from the control port with python 3 * Added `stem.manual <api/manual.html>`_, which provides information available about Tor from `its manual <https://www.torproject.org/docs/tor-manual.html.en>`_ (:trac:`8251`) * :func:`~stem.connection.connect` and :func:`~stem.control.Controller.from_port` now connect to both port 9051 (relay's default) and 9151 (Tor Browser's default) (:trac:`16075`) * :class:`~stem.exit_policy.ExitPolicy` support for *accept6/reject6* and *\*4/6* wildcards (:trac:`16053`) diff --git a/stem/__init__.py b/stem/__init__.py index 7cf39f2..b02dd9c 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -470,7 +470,7 @@ Library for working with the tor process. import stem.util.enum -__version__ = '1.5.2' +__version__ = '1.5.2-dev' __author__ = 'Damian Johnson' __contact__ = 'atagar(a)torproject.org' __url__ = 'https://stem.torproject.org/'

1 0

[tor/master] Fix typo
by nickm＠torproject.org 21 Nov '16

21 Nov '16

commit 6dc25e79b98ed5cb9f29de174878333a1175f755 Author: overcaffeinated <overcaffeinated(a)airmail.cc> Date: Sun Nov 20 18:09:16 2016 +0000 Fix typo Remove stray 'To run' --- doc/HACKING/WritingTests.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/HACKING/WritingTests.md b/doc/HACKING/WritingTests.md index de80bbd..4dae41e 100644 --- a/doc/HACKING/WritingTests.md +++ b/doc/HACKING/WritingTests.md @@ -48,7 +48,7 @@ isolation, you just run `./src/test/test-memwipe`. To run tests within the unit test programs, you can specify the name of the test. The string ".." can be used as a wildcard at the end of the test name. For example, to run all the cell format tests, enter -`./src/test/test cellfmt/..`. To run +`./src/test/test cellfmt/..`. Many tests that need to mess with global state run in forked subprocesses in order to keep from contaminating one another. But when debugging a failing test,

1 0

[torbutton/master] Bug 20701: Allow the directory listing stylesheet in the content policy.
by gk＠torproject.org 21 Nov '16

21 Nov '16

commit 15496115caf82ed6865fa219c2eed4bc59363388 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Thu Nov 17 18:54:41 2016 +0000 Bug 20701: Allow the directory listing stylesheet in the content policy. --- src/components/content-policy.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/components/content-policy.js b/src/components/content-policy.js index 3379eb7..5c0ecf5 100644 --- a/src/components/content-policy.js +++ b/src/components/content-policy.js @@ -37,6 +37,9 @@ ContentPolicy.prototype = { // Resizing text boxes. "chrome://global/content/bindings/resizer.xml": Ci.nsIContentPolicy.TYPE_XBL, + + // Directory listing. + "chrome://global/skin/dirListing/dirListing.css": Ci.nsIContentPolicy.TYPE_STYLESHEET, }, shouldLoad: function(aContentType, aContentLocation, aRequestOrigin, aContext, aMimeTypeGuess, aExtra) {

1 0