October 2015 - tor-commits - lists.torproject.org

[tor/master] Sixth test case for dns_resolve_impl.
by nickm＠torproject.org 30 Oct '15

30 Oct '15

commit f53dcf6a357e83a0b018d6f66bfb8a30734bd9a9 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Tue Oct 20 20:40:21 2015 +0300 Sixth test case for dns_resolve_impl. --- src/or/dns.c | 11 ++++----- src/or/dns.h | 5 ++++ src/test/test_dns.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 74 insertions(+), 8 deletions(-) diff --git a/src/or/dns.c b/src/or/dns.c index 234dfbe..297ac6f 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -111,9 +111,6 @@ static int launch_resolve(cached_resolve_t *resolve); static void add_wildcarded_test_address(const char *address); static int configure_nameservers(int force); static int answer_is_wildcarded(const char *ip); -static int set_exitconn_info_from_resolve(edge_connection_t *exitconn, - const cached_resolve_t *resolve, - char **hostname_out); static int evdns_err_is_transient(int err); static void inform_pending_connections(cached_resolve_t *resolve); static void make_pending_resolve_cached(cached_resolve_t *cached); @@ -859,10 +856,10 @@ dns_resolve_impl,(edge_connection_t *exitconn, int is_resolve, * Return -2 on a transient error, -1 on a permenent error, and 1 on * a successful lookup. */ -static int -set_exitconn_info_from_resolve(edge_connection_t *exitconn, - const cached_resolve_t *resolve, - char **hostname_out) +MOCK_IMPL(STATIC int, +set_exitconn_info_from_resolve,(edge_connection_t *exitconn, + const cached_resolve_t *resolve, + char **hostname_out)) { int ipv4_ok, ipv6_ok, answer_with_ipv4, r; uint32_t begincell_flags; diff --git a/src/or/dns.h b/src/or/dns.h index 163d61b..64e970a 100644 --- a/src/or/dns.h +++ b/src/or/dns.h @@ -46,6 +46,11 @@ const char *hostname)); cached_resolve_t *dns_get_cache_entry(cached_resolve_t *query); void dns_insert_cache_entry(cached_resolve_t *new_entry); +MOCK_DECL(STATIC int, +set_exitconn_info_from_resolve,(edge_connection_t *exitconn, + const cached_resolve_t *resolve, + char **hostname_out)); + #endif #endif diff --git a/src/test/test_dns.c b/src/test/test_dns.c index 3fbb6f2..0ed3c9d 100644 --- a/src/test/test_dns.c +++ b/src/test/test_dns.c @@ -576,12 +576,76 @@ NS(test_main)(void *arg) #define NS_SUBMODULE ASPECT(resolve_impl, cache_hit_cached) +/* Given that a finished DNS resolve is available in our cache, we want + * dns_resolve_impl() return it to called via resolve_out and pass the + * handling to set_exitconn_info_from_resolve function. + */ +static int +NS(router_my_exit_policy_is_reject_star)(void) +{ + return 0; +} + +static edge_connection_t *last_exitconn = NULL; +static cached_resolve_t *last_resolve = NULL; + +static int +NS(set_exitconn_info_from_resolve)(edge_connection_t *exitconn, + const cached_resolve_t *resolve, + char **hostname_out) +{ + last_exitconn = exitconn; + last_resolve = (cached_resolve_t *)resolve; + + return 0; +} + static void NS(test_main)(void *arg) { - tt_skip(); + int retval; + int made_pending = 0; + + edge_connection_t *exitconn = create_valid_exitconn(); + or_circuit_t *on_circ = tor_malloc_zero(sizeof(or_circuit_t)); + + cached_resolve_t *resolve_out = NULL; + + cached_resolve_t *cache_entry = tor_malloc_zero(sizeof(cached_resolve_t)); + cache_entry->magic = CACHED_RESOLVE_MAGIC; + cache_entry->state = CACHE_STATE_CACHED; + cache_entry->minheap_idx = -1; + cache_entry->expire = time(NULL) + 60 * 60; + + TO_CONN(exitconn)->address = tor_strdup("torproject.org"); + + strlcpy(cache_entry->address, TO_CONN(exitconn)->address, + sizeof(cache_entry->address)); + + NS_MOCK(router_my_exit_policy_is_reject_star); + NS_MOCK(set_exitconn_info_from_resolve); + + dns_init(); + + dns_insert_cache_entry(cache_entry); + + retval = dns_resolve_impl(exitconn, 1, on_circ, NULL, &made_pending, + &resolve_out); + + tt_int_op(retval,==,0); + tt_int_op(made_pending,==,0); + tt_assert(resolve_out == cache_entry); + + tt_assert(last_exitconn == exitconn); + tt_assert(last_resolve == cache_entry); done: + NS_UNMOCK(router_my_exit_policy_is_reject_star); + NS_UNMOCK(set_exitconn_info_from_resolve); + tor_free(on_circ); + tor_free(TO_CONN(exitconn)->address); + tor_free(cache_entry->pending_connections); + tor_free(cache_entry); return; }

1 0

[tor/master] Fix GCC warnings.
by nickm＠torproject.org 30 Oct '15

30 Oct '15

commit 2e980e9a2ed1b6cc75c0b1d6107ad6b91cf97a2e Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Thu Oct 29 13:12:29 2015 +0100 Fix GCC warnings. --- src/test/test_dns.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/test/test_dns.c b/src/test/test_dns.c index 6ba9cf4..b40a482 100644 --- a/src/test/test_dns.c +++ b/src/test/test_dns.c @@ -355,6 +355,8 @@ NS(test_main)(void *arg) const tor_addr_t *resolved_addr; tor_addr_t addr_to_compare; + (void)arg; + tor_addr_parse(&addr_to_compare, "8.8.8.8"); or_circuit_t *on_circ = tor_malloc_zero(sizeof(or_circuit_t)); @@ -401,6 +403,8 @@ NS(test_main)(void *arg) edge_connection_t *exitconn = create_valid_exitconn(); or_circuit_t *on_circ = tor_malloc_zero(sizeof(or_circuit_t)); + (void)arg; + TO_CONN(exitconn)->address = tor_strdup("torproject.org"); NS_MOCK(router_my_exit_policy_is_reject_star); @@ -442,6 +446,8 @@ NS(test_main)(void *arg) edge_connection_t *exitconn = create_valid_exitconn(); or_circuit_t *on_circ = tor_malloc_zero(sizeof(or_circuit_t)); + (void)arg; + NS_MOCK(router_my_exit_policy_is_reject_star); TO_CONN(exitconn)->address = tor_strdup("invalid#(a)!.org"); @@ -482,6 +488,8 @@ NS(test_main)(void *arg) edge_connection_t *exitconn = create_valid_exitconn(); or_circuit_t *on_circ = tor_malloc_zero(sizeof(or_circuit_t)); + (void)arg; + TO_CONN(exitconn)->address = tor_strdup("127.0.0.1.in-addr.arpa"); NS_MOCK(router_my_exit_policy_is_reject_star); @@ -541,6 +549,8 @@ NS(test_main)(void *arg) cache_entry->minheap_idx = -1; cache_entry->expire = time(NULL) + 60 * 60; + (void)arg; + TO_CONN(exitconn)->address = tor_strdup("torproject.org"); strlcpy(cache_entry->address, TO_CONN(exitconn)->address, @@ -597,6 +607,8 @@ NS(set_exitconn_info_from_resolve)(edge_connection_t *exitconn, last_exitconn = exitconn; last_resolve = (cached_resolve_t *)resolve; + (void)hostname_out; + return 0; } @@ -617,6 +629,8 @@ NS(test_main)(void *arg) cache_entry->minheap_idx = -1; cache_entry->expire = time(NULL) + 60 * 60; + (void)arg; + TO_CONN(exitconn)->address = tor_strdup("torproject.org"); strlcpy(cache_entry->address, TO_CONN(exitconn)->address, @@ -689,6 +703,8 @@ NS(test_main)(void *arg) cached_resolve_t *cache_entry = NULL; cached_resolve_t query; + (void)arg; + TO_CONN(exitconn)->address = tor_strdup("torproject.org"); strlcpy(query.address, TO_CONN(exitconn)->address, sizeof(query.address));

1 0

[tor/master] Merge remote-tracking branch 'rl1987/ticket16831_part2_rebased'
by nickm＠torproject.org 30 Oct '15

30 Oct '15

commit 1385ab0605d8d5dfb441b74bdd324b10790499cd Merge: 0696ac5 2e980e9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 30 09:59:11 2015 -0400 Merge remote-tracking branch 'rl1987/ticket16831_part2_rebased' changes/test16831 | 3 + src/or/dns.c | 29 ++- src/or/dns.h | 12 ++ src/or/router.c | 4 +- src/or/router.h | 2 +- src/test/test_dns.c | 503 ++++++++++++++++++++++++++++++++++++++++++++++++--- 6 files changed, 514 insertions(+), 39 deletions(-)

1 0

[tor/master] Seventh test case for dns_resolve_impl().
by nickm＠torproject.org 30 Oct '15

30 Oct '15

commit a187c772af440cb5543eecc329ee573cebc60391 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Wed Oct 21 22:24:00 2015 +0300 Seventh test case for dns_resolve_impl(). --- src/or/dns.c | 5 ++-- src/or/dns.h | 3 +++ src/test/test_dns.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 70 insertions(+), 4 deletions(-) diff --git a/src/or/dns.c b/src/or/dns.c index 297ac6f..f981817 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -107,7 +107,6 @@ static void dns_found_answer(const char *address, uint8_t query_type, const tor_addr_t *addr, const char *hostname, uint32_t ttl); -static int launch_resolve(cached_resolve_t *resolve); static void add_wildcarded_test_address(const char *address); static int configure_nameservers(int force); static int answer_is_wildcarded(const char *ip); @@ -1661,8 +1660,8 @@ launch_one_resolve(const char *address, uint8_t query_type, /** For eventdns: start resolving as necessary to find the target for * <b>exitconn</b>. Returns -1 on error, -2 on transient error, * 0 on "resolve launched." */ -static int -launch_resolve(cached_resolve_t *resolve) +MOCK_IMPL(STATIC int, +launch_resolve,(cached_resolve_t *resolve)) { tor_addr_t a; int r; diff --git a/src/or/dns.h b/src/or/dns.h index 64e970a..c2778b2 100644 --- a/src/or/dns.h +++ b/src/or/dns.h @@ -51,6 +51,9 @@ set_exitconn_info_from_resolve,(edge_connection_t *exitconn, const cached_resolve_t *resolve, char **hostname_out)); +MOCK_DECL(STATIC int, +launch_resolve,(cached_resolve_t *resolve)); + #endif #endif diff --git a/src/test/test_dns.c b/src/test/test_dns.c index 0ed3c9d..6ba9cf4 100644 --- a/src/test/test_dns.c +++ b/src/test/test_dns.c @@ -653,12 +653,76 @@ NS(test_main)(void *arg) #define NS_SUBMODULE ASPECT(resolve_impl, cache_miss) +/* Given that there are neither pending nor pre-cached resolve for a given + * address, we want dns_resolve_impl() to create a new cached_resolve_t + * object, mark it as pending, insert it into the cache, attach the exit + * connection to list of pending connections and call launch_resolve() + * with the cached_resolve_t object it created. + */ +static int +NS(router_my_exit_policy_is_reject_star)(void) +{ + return 0; +} + +static cached_resolve_t *last_launched_resolve = NULL; + +static int +NS(launch_resolve)(cached_resolve_t *resolve) +{ + last_launched_resolve = resolve; + + return 0; +} + static void NS(test_main)(void *arg) { - tt_skip(); + int retval; + int made_pending = 0; + + pending_connection_t *pending_conn = NULL; + + edge_connection_t *exitconn = create_valid_exitconn(); + or_circuit_t *on_circ = tor_malloc_zero(sizeof(or_circuit_t)); + + cached_resolve_t *cache_entry = NULL; + cached_resolve_t query; + + TO_CONN(exitconn)->address = tor_strdup("torproject.org"); + + strlcpy(query.address, TO_CONN(exitconn)->address, sizeof(query.address)); + + NS_MOCK(router_my_exit_policy_is_reject_star); + NS_MOCK(launch_resolve); + + dns_init(); + + retval = dns_resolve_impl(exitconn, 1, on_circ, NULL, &made_pending, + NULL); + + tt_int_op(retval,==,0); + tt_int_op(made_pending,==,1); + + cache_entry = dns_get_cache_entry(&query); + + tt_assert(cache_entry); + + pending_conn = cache_entry->pending_connections; + + tt_assert(pending_conn != NULL); + tt_assert(pending_conn->conn == exitconn); + + tt_assert(last_launched_resolve == cache_entry); + tt_str_op(cache_entry->address,==,TO_CONN(exitconn)->address); done: + NS_UNMOCK(router_my_exit_policy_is_reject_star); + NS_UNMOCK(launch_resolve); + tor_free(on_circ); + tor_free(TO_CONN(exitconn)->address); + tor_free(cache_entry->pending_connections); + tor_free(cache_entry); return; }

1 0

[tor/master] Adding changes file.
by nickm＠torproject.org 30 Oct '15

30 Oct '15

commit 6d8952fae09bb2da7668d99903c711c8cb941b2d Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Thu Oct 22 18:56:43 2015 +0300 Adding changes file. --- changes/test16831 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/test16831 b/changes/test16831 new file mode 100644 index 0000000..7db2d14 --- /dev/null +++ b/changes/test16831 @@ -0,0 +1,3 @@ + o Testing: + - Cover dns_resolve_impl() in dns.c with unit tests. Implements a + portion of ticket 16831.

1 0

[tor/master] Merge branch 'doc17392'
by nickm＠torproject.org 30 Oct '15

30 Oct '15

commit 0696ac5b5e5d5d63c0fbc493f6e96276c7aaa837 Merge: 92a6c57 3c08b76 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 30 09:25:51 2015 -0400 Merge branch 'doc17392' changes/doc17392 | 4 ++++ doc/tor.1.txt | 24 +++++++++++++----------- 2 files changed, 17 insertions(+), 11 deletions(-)

1 0

[tor/master] Mention torspec URL in the manpage.
by nickm＠torproject.org 30 Oct '15

30 Oct '15

commit 3c08b76fc4b9e7a14f67129e7b81f24a87e705f7 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Thu Oct 22 20:12:46 2015 +0300 Mention torspec URL in the manpage. --- changes/doc17392 | 4 ++++ doc/tor.1.txt | 24 +++++++++++++----------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/changes/doc17392 b/changes/doc17392 new file mode 100644 index 0000000..3c93497 --- /dev/null +++ b/changes/doc17392 @@ -0,0 +1,4 @@ + o Documentation: + - Mention torspec URL in the manpage and point the reader to it + whenever we mention a document that belongs in torspce. + Fixes issue 17392. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index b04d57b..e2d33e7 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -277,11 +277,12 @@ GENERAL OPTIONS [[ControlPort]] **ControlPort** __PORT__|**unix:**__path__|**auto** [__flags__]:: If set, Tor will accept connections on this port and allow those connections to control the Tor process using the Tor Control Protocol - (described in control-spec.txt). Note: unless you also specify one or - more of **HashedControlPassword** or **CookieAuthentication**, - setting this option will cause Tor to allow any process on the local - host to control it. (Setting both authentication methods means either - method is sufficient to authenticate to Tor.) This + (described in control-spec.txt in + https://spec.torproject.org[torspec]) Note: unless you also + specify one or more of **HashedControlPassword** or + **CookieAuthentication**, setting this option will cause Tor to allow + any process on the local host to control it. (Setting both authentication + methods means eithermethod is sufficient to authenticate to Tor.) This option is required for many Tor controllers; most use the value of 9051. Set it to "auto" to have Tor pick a port for you. (Default: 0) + @@ -1721,7 +1722,7 @@ is non-zero): Limits the max number of bytes sent and received within a set time period using a given calculation rule (see: AccountingStart, AccountingRule). Useful if you need to stay under a specific bandwidth. By default, the - number used for calculation is the max of either the bytes sent or + number used for calculation is the max of either the bytes sent or received. For example, with AccountingMax set to 1 GByte, a server could send 900 MBytes and receive 800 MBytes and continue running. It will only hibernate once one of the two reaches 1 GByte. This can @@ -1975,8 +1976,8 @@ on the public Tor network. [[V3AuthoritativeDirectory]] **V3AuthoritativeDirectory** **0**|**1**:: When this option is set in addition to **AuthoritativeDirectory**, Tor generates version 3 network statuses and serves descriptors, etc as - described in doc/spec/dir-spec.txt (for Tor clients and servers running at - least 0.2.0.x). + described in dir-spec.txt file of https://spec.torproject.org/[torspec] + (for Tor clients and servers running atleast 0.2.0.x). [[VersioningAuthoritativeDirectory]] **VersioningAuthoritativeDirectory** **0**|**1**:: When this option is set to 1, Tor adds information on which versions of @@ -2552,9 +2553,9 @@ __DataDirectory__**/bw_accounting**:: __DataDirectory__**/control_auth_cookie**:: Used for cookie authentication with the controller. Location can be overridden by the CookieAuthFile config option. Regenerated on startup. See - control-spec.txt for details. Only used when cookie authentication is - enabled. - + control-spec.txt in https://spec.torproject.org/[torspec] for details. + Only used when cookie authentication is enabled. + __DataDirectory__**/lock**:: This file is used to prevent two Tor instances from using same data directory. If access to this file is locked, data directory is already @@ -2640,6 +2641,7 @@ SEE ALSO **https://www.torproject.org/** +**torspec: https://spec.torproject.org ** BUGS ----

1 0

[tor-browser/tor-browser-38.3.0esr-5.5-2] fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 30 Oct '15

30 Oct '15

commit 517d9fec4b6d464d276410385942323124488255 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Oct 26 18:05:33 2015 +0100 fixup! Bug #4234: Use the Firefox Update Process for Tor Browser. Bug #17305: add the hardened channel --- toolkit/modules/debug.js | 1 + toolkit/mozapps/extensions/moz.build | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/toolkit/modules/debug.js b/toolkit/modules/debug.js index a30b586..486105e 100644 --- a/toolkit/modules/debug.js +++ b/toolkit/modules/debug.js @@ -42,6 +42,7 @@ this.NS_ASSERT = function NS_ASSERT(condition, message) { case "nightly": case "aurora": case "alpha": + case "hardened": case "beta": case "default": releaseBuild = false; diff --git a/toolkit/mozapps/extensions/moz.build b/toolkit/mozapps/extensions/moz.build index c6a072c..58f8c3f 100644 --- a/toolkit/mozapps/extensions/moz.build +++ b/toolkit/mozapps/extensions/moz.build @@ -38,7 +38,7 @@ EXTRA_PP_JS_MODULES += [ 'AddonManager.jsm' ] -if CONFIG['MOZ_UPDATE_CHANNEL'] not in ('aurora', 'alpha', 'beta', 'release', 'esr'): +if CONFIG['MOZ_UPDATE_CHANNEL'] not in ('aurora', 'alpha', 'beta', 'hardened', 'release', 'esr'): DEFINES['MOZ_COMPATIBILITY_NIGHTLY'] = 1 # Additional debugging info is exposed in debug builds

1 0

[tor-browser/tor-browser-38.3.0esr-5.5-2] fixup! Bug 13379: Sign our MAR files.
by gk＠torproject.org 30 Oct '15

30 Oct '15

commit f799aa38f56abda676cacd8d435e16286edea772 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Oct 26 18:09:28 2015 +0100 fixup! Bug 13379: Sign our MAR files. Bug #17305: add the hardened channel --- toolkit/mozapps/update/updater/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/mozapps/update/updater/Makefile.in b/toolkit/mozapps/update/updater/Makefile.in index 1f27acf..100a0df 100644 --- a/toolkit/mozapps/update/updater/Makefile.in +++ b/toolkit/mozapps/update/updater/Makefile.in @@ -15,7 +15,7 @@ endif include $(topsrcdir)/config/rules.mk -ifneq (,$(filter alpha beta release esr,$(MOZ_UPDATE_CHANNEL))) +ifneq (,$(filter alpha beta hardened release esr,$(MOZ_UPDATE_CHANNEL))) PRIMARY_CERT = release_primary.der SECONDARY_CERT = release_secondary.der else ifneq (,$(filter nightly aurora nightly-elm nightly-profiling nightly-oak nightly-ux,$(MOZ_UPDATE_CHANNEL)))

1 0

[tor-browser-bundle/master] updating the obfs4 key we ship
by gk＠torproject.org 30 Oct '15

30 Oct '15

commit 360f726f02e214890ba9be4c6046ecaf0f655541 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 29 10:47:45 2015 +0000 updating the obfs4 key we ship --- gitian/gpg/obfs4proxy.gpg | Bin 34128 -> 41312 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/obfs4proxy.gpg b/gitian/gpg/obfs4proxy.gpg index b9c490a..f26a4cd 100644 Binary files a/gitian/gpg/obfs4proxy.gpg and b/gitian/gpg/obfs4proxy.gpg differ

1 0