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

[tor/master] prop140 clients now only try to get diffs from recent consensuses
by nickm＠torproject.org 16 May '17

16 May '17

commit c9855928744a556ef882ef8409ba8b54afd11834 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 4 12:15:48 2017 -0400 prop140 clients now only try to get diffs from recent consensuses Rationale: If it's a year old, the relay won't have a diff to it. This is as specified in prop140 --- src/or/directory.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 67c28e1..20ff537 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -497,11 +497,23 @@ dir_consensus_request_set_additional_headers(directory_request_t *req, * period of 1 hour. */ const int DEFAULT_IF_MODIFIED_SINCE_DELAY = 180; + const int32_t DEFAULT_TRY_DIFF_FOR_CONSENSUS_NEWER = 72; + const int32_t MIN_TRY_DIFF_FOR_CONSENSUS_NEWER = 0; + const int32_t MAX_TRY_DIFF_FOR_CONSENSUS_NEWER = 8192; + const char TRY_DIFF_FOR_CONSENSUS_NEWER_NAME[] = + "try-diff-for-consensus-newer-than"; int flav = FLAV_NS; if (resource) flav = networkstatus_parse_flavor_name(resource); + int32_t max_age_for_diff = 3600 * + networkstatus_get_param(NULL, + TRY_DIFF_FOR_CONSENSUS_NEWER_NAME, + DEFAULT_TRY_DIFF_FOR_CONSENSUS_NEWER, + MIN_TRY_DIFF_FOR_CONSENSUS_NEWER, + MAX_TRY_DIFF_FOR_CONSENSUS_NEWER); + if (flav != -1) { /* IF we have a parsed consensus of this type, we can do an * if-modified-time based on it. */ @@ -517,8 +529,10 @@ dir_consensus_request_set_additional_headers(directory_request_t *req, ims_delay = (v->fresh_until - v->valid_after)/2; } if_modified_since = v->valid_after + ims_delay; - memcpy(or_diff_from, v->digest_sha3_as_signed, DIGEST256_LEN); - or_diff_from_is_set = 1; + if (v->valid_after >= approx_time() - max_age_for_diff) { + memcpy(or_diff_from, v->digest_sha3_as_signed, DIGEST256_LEN); + or_diff_from_is_set = 1; + } } } else { /* Otherwise it might be a consensus we don't parse, but which we @@ -528,8 +542,10 @@ dir_consensus_request_set_additional_headers(directory_request_t *req, * unparsed consensus, so we use the default. */ if (cd) { if_modified_since = cd->published + DEFAULT_IF_MODIFIED_SINCE_DELAY; - memcpy(or_diff_from, cd->digest_sha3_as_signed, DIGEST256_LEN); - or_diff_from_is_set = 1; + if (cd->published >= approx_time() - max_age_for_diff) { + memcpy(or_diff_from, cd->digest_sha3_as_signed, DIGEST256_LEN); + or_diff_from_is_set = 1; + } } }

1 0

[tor/master] Turn consdiffmgr.cache_max_age_hours into a parameter
by nickm＠torproject.org 16 May '17

16 May '17

commit c276c10d3b262e119c114c2e1aa3446a8364506f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 4 12:26:55 2017 -0400 Turn consdiffmgr.cache_max_age_hours into a parameter --- src/or/consdiffmgr.c | 25 +++++++++++++++++++++---- src/or/consdiffmgr.h | 1 - src/test/test_consdiffmgr.c | 2 +- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c index d478101..6ec031e 100644 --- a/src/or/consdiffmgr.c +++ b/src/or/consdiffmgr.c @@ -127,7 +127,6 @@ static HT_HEAD(cdm_diff_ht, cdm_diff_t) cdm_diff_ht = HT_INITIALIZER(); * Configuration for this module */ static consdiff_cfg_t consdiff_cfg = { - /* .cache_max_age_hours = */ 24 * 90, // XXXX I'd like to make this number bigger, but it interferes with the // XXXX seccomp2 syscall filter, which tops out at BPF_MAXINS (4096) // XXXX rules. @@ -423,6 +422,25 @@ cdm_cache_lookup_consensus(consensus_flavor_t flavor, time_t valid_after) return result; } +/** Return the maximum age (in seconds) of consensuses that we should consider + * storing. The available space in the directory may impose additional limits + * on how much we store. */ +static int32_t +get_max_age_to_cache(void) +{ + /* The parameter is in hours. */ + const int32_t DEFAULT_MAX_AGE_TO_CACHE = 8192; + const int32_t MIN_MAX_AGE_TO_CACHE = 0; + const int32_t MAX_MAX_AGE_TO_CACHE = 8192; + const char MAX_AGE_TO_CACHE_NAME[] = "max-consensus-age-to-cache-for-diff"; + + return 3600 * networkstatus_get_param(NULL, + MAX_AGE_TO_CACHE_NAME, + DEFAULT_MAX_AGE_TO_CACHE, + MIN_MAX_AGE_TO_CACHE, + MAX_MAX_AGE_TO_CACHE); +} + /** * Given a string containing a networkstatus consensus, and the results of * having parsed that consensus, add that consensus to the cache if it is not @@ -443,7 +461,7 @@ consdiffmgr_add_consensus(const char *consensus, const consensus_flavor_t flavor = as_parsed->flavor; const time_t valid_after = as_parsed->valid_after; - if (valid_after < approx_time() - 3600 * consdiff_cfg.cache_max_age_hours) { + if (valid_after < approx_time() - get_max_age_to_cache()) { log_info(LD_DIRSERV, "We don't care about this consensus document; it's " "too old."); return -1; @@ -621,8 +639,7 @@ consdiffmgr_cleanup(void) log_debug(LD_DIRSERV, "Looking for consdiffmgr entries to remove"); // 1. Delete any consensus or diff or anything whose valid_after is too old. - const time_t valid_after_cutoff = - approx_time() - 3600 * consdiff_cfg.cache_max_age_hours; + const time_t valid_after_cutoff = approx_time() - get_max_age_to_cache(); consensus_cache_find_all(objects, cdm_cache_get(), NULL, NULL); diff --git a/src/or/consdiffmgr.h b/src/or/consdiffmgr.h index 048dae4..70a64f2 100644 --- a/src/or/consdiffmgr.h +++ b/src/or/consdiffmgr.h @@ -14,7 +14,6 @@ typedef enum consdiff_status_t { } consdiff_status_t; typedef struct consdiff_cfg_t { - int32_t cache_max_age_hours; int32_t cache_max_num; } consdiff_cfg_t; diff --git a/src/test/test_consdiffmgr.c b/src/test/test_consdiffmgr.c index 9d0c5b5..048964f 100644 --- a/src/test/test_consdiffmgr.c +++ b/src/test/test_consdiffmgr.c @@ -28,7 +28,7 @@ consdiffmgr_test_setup(const struct testcase_t *arg) get_options_mutable()->DataDirectory = ddir_fname; // now owns the pointer. check_private_dir(ddir_fname, CPD_CREATE, NULL); - consdiff_cfg_t consdiff_cfg = { 7200, 300 }; + consdiff_cfg_t consdiff_cfg = { 300 }; consdiffmgr_configure(&consdiff_cfg); return (void *)1; // must return something non-null. }

1 0

[tor/master] Merge remote-tracking branch 'public/prop140_aftermath_cfg'
by nickm＠torproject.org 16 May '17

16 May '17

commit afef059795ccdb2157709667614a3741b583e9ba Merge: dae1242 c276c10 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 15 17:26:47 2017 -0400 Merge remote-tracking branch 'public/prop140_aftermath_cfg' src/or/consdiffmgr.c | 25 +++++++++++++++++++++---- src/or/consdiffmgr.h | 1 - src/or/directory.c | 24 ++++++++++++++++++++---- src/test/test_consdiffmgr.c | 2 +- 4 files changed, 42 insertions(+), 10 deletions(-)

1 0

[tor/master] Check for best consensus when no consensusdiff was found.
by nickm＠torproject.org 16 May '17

16 May '17

commit ae33deb91d204da0689f182a0899f9f11a5bb77a Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon May 15 12:09:07 2017 +0200 Check for best consensus when no consensusdiff was found. This patch ensures that we use the current consensus in the case where no consensus diff was found or a consensus diff wasn't requested. See: https://bugs.torproject.org/21667 --- src/or/directory.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/or/directory.c b/src/or/directory.c index 4fa4b3c..8ed1305 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3815,11 +3815,14 @@ handle_get_current_consensus(dir_connection_t *conn, &compression_used); SMARTLIST_FOREACH(diff_from_digests, uint8_t *, d, tor_free(d)); smartlist_free(diff_from_digests); - } else { + } + + if (! cached_consensus) { cached_consensus = find_best_consensus(flav, args->compression_supported, &compression_used); } + time_t fresh_until, valid_until; int have_fresh_until = 0, have_valid_until = 0; if (cached_consensus) {

1 0

[tor/master] dir_handle_get: repair two test cases, note the fixes for 3 others
by nickm＠torproject.org 16 May '17

16 May '17

commit 65d940844887edb3285a35dd535f2fa68b873650 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 15 10:30:35 2017 -0400 dir_handle_get: repair two test cases, note the fixes for 3 others --- src/test/test_dir_handle_get.c | 49 ++++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c index c98938b..b2e9b8b 100644 --- a/src/test/test_dir_handle_get.c +++ b/src/test/test_dir_handle_get.c @@ -12,6 +12,7 @@ #include "or.h" #include "config.h" #include "connection.h" +#include "consdiffmgr.h" #include "directory.h" #include "test.h" #include "compress.h" @@ -465,6 +466,8 @@ init_mock_options(void) mock_options = tor_malloc(sizeof(or_options_t)); memset(mock_options, 0, sizeof(or_options_t)); mock_options->TestingTorNetwork = 1; + mock_options->DataDirectory = tor_strdup(get_fname_rnd("datadir_tmp")); + check_private_dir(mock_options->DataDirectory, CPD_CREATE, NULL); } static const or_options_t * @@ -501,14 +504,6 @@ test_dir_handle_get_micro_d(void *data) /* SETUP */ init_mock_options(); - const char *fn = get_fname("dir_handle_datadir_test1"); - mock_options->DataDirectory = tor_strdup(fn); - -#ifdef _WIN32 - tt_int_op(0, OP_EQ, mkdir(mock_options->DataDirectory)); -#else - tt_int_op(0, OP_EQ, mkdir(mock_options->DataDirectory, 0700)); -#endif /* Add microdesc to cache */ crypto_digest256(digest, microdesc, strlen(microdesc), DIGEST_SHA256); @@ -568,14 +563,6 @@ test_dir_handle_get_micro_d_server_busy(void *data) /* SETUP */ init_mock_options(); - const char *fn = get_fname("dir_handle_datadir_test2"); - mock_options->DataDirectory = tor_strdup(fn); - -#ifdef _WIN32 - tt_int_op(0, OP_EQ, mkdir(mock_options->DataDirectory)); -#else - tt_int_op(0, OP_EQ, mkdir(mock_options->DataDirectory, 0700)); -#endif /* Add microdesc to cache */ crypto_digest256(digest, microdesc, strlen(microdesc), DIGEST_SHA256); @@ -1619,6 +1606,8 @@ test_dir_handle_get_status_vote_current_consensus_ns_not_enough_sigs(void* d) (void) d; /* init mock */ + // XXXX Instead of mocking this, we need to mock + // XXXX consensus_cache_entry_get_voter_id_digests(). mock_ns_val = tor_malloc_zero(sizeof(networkstatus_t)); mock_ns_val->flavor = FLAV_NS; mock_ns_val->voters = smartlist_new(); @@ -1684,6 +1673,8 @@ test_dir_handle_get_status_vote_current_consensus_ns_not_found(void* data) tt_int_op(0, OP_EQ, directory_handle_command_get(conn, GET("/tor/status-vote/current/consensus-ns"), NULL, 0)); + // XXXX This fails with 503 instead of 404; I think that's a regression in + // XXXX our behavior. fetch_from_buf_http(TO_CONN(conn)->outbuf, &header, MAX_HEADERS_SIZE, NULL, NULL, 1, 0); tt_assert(header); @@ -1709,6 +1700,8 @@ test_dir_handle_get_status_vote_current_consensus_too_old(void *data) char *header = NULL; (void)data; + // XXXX Instead of mocking this, we need to mock + // XXXX consensus_cache_entry_get_valid_until. mock_ns_val = tor_malloc_zero(sizeof(networkstatus_t)); mock_ns_val->flavor = FLAV_MICRODESC; mock_ns_val->valid_until = time(NULL) - (60 * 60 * 24) - 1; @@ -1772,16 +1765,26 @@ static void status_vote_current_consensus_ns_test(char **header, char **body, size_t *body_len) { - common_digests_t digests; - uint8_t sha3[DIGEST256_LEN]; dir_connection_t *conn = NULL; #define NETWORK_STATUS "some network status string" +#if 0 + common_digests_t digests; + uint8_t sha3[DIGEST256_LEN]; memset(&digests, 0x60, sizeof(digests)); memset(sha3, 0x06, sizeof(sha3)); dirserv_set_cached_consensus_networkstatus(NETWORK_STATUS, "ns", &digests, sha3, time(NULL)); +#endif + networkstatus_t *ns = tor_malloc_zero(sizeof(networkstatus_t)); + ns->type = NS_TYPE_CONSENSUS; + ns->flavor = FLAV_NS; + ns->valid_after = time(NULL) - 1800; + ns->fresh_until = time(NULL) - 900; + ns->valid_until = time(NULL) - 60; + consdiffmgr_add_consensus(NETWORK_STATUS, ns); + networkstatus_vote_free(ns); MOCK(connection_write_to_buf_impl_, connection_write_to_buf_mock); @@ -2592,11 +2595,11 @@ struct testcase_t dir_handle_get_tests[] = { DIR_HANDLE_CMD(status_vote_current_authority, 0), DIR_HANDLE_CMD(status_vote_next_authority_not_found, 0), DIR_HANDLE_CMD(status_vote_next_authority, 0), - DIR_HANDLE_CMD(status_vote_current_consensus_ns_not_enough_sigs, 0), - DIR_HANDLE_CMD(status_vote_current_consensus_ns_not_found, 0), - DIR_HANDLE_CMD(status_vote_current_consensus_too_old, 0), - DIR_HANDLE_CMD(status_vote_current_consensus_ns_busy, 0), - DIR_HANDLE_CMD(status_vote_current_consensus_ns, 0), + DIR_HANDLE_CMD(status_vote_current_consensus_ns_not_enough_sigs, TT_FORK), + DIR_HANDLE_CMD(status_vote_current_consensus_ns_not_found, TT_FORK), + DIR_HANDLE_CMD(status_vote_current_consensus_too_old, TT_FORK), + DIR_HANDLE_CMD(status_vote_current_consensus_ns_busy, TT_FORK), + DIR_HANDLE_CMD(status_vote_current_consensus_ns, TT_FORK), DIR_HANDLE_CMD(status_vote_current_d_not_found, 0), DIR_HANDLE_CMD(status_vote_next_d_not_found, 0), DIR_HANDLE_CMD(status_vote_d, 0),

1 0

[tor/master] Handle non-compressed requests gracefully.
by nickm＠torproject.org 16 May '17

16 May '17

commit 008194035fa8ab3712dead9152622de8509e8cf3 Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon May 15 15:13:28 2017 +0200 Handle non-compressed requests gracefully. This patch makes us use FALLBACK_COMPRESS_METHOD to try to fetch an object from the consensus diff manager in case no mutually supported result was found. This object, if found, is then decompressed using the spooling system to the client. See: https://bugs.torproject.org/21667 --- src/or/directory.c | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 6504e2e..cf6f0db 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3677,6 +3677,13 @@ parse_or_diff_from_header(smartlist_t **digests_out, const char *headers) return 0; } +/** Fallback compression method. The fallback compression method is used in + * case a client requests a non-compressed document. We only store compressed + * documents, so we use this compression method to fetch the document and let + * the spooling system do the streaming decompression. + */ +#define FALLBACK_COMPRESS_METHOD ZLIB_METHOD + /** * Try to find the best consensus diff possible in order to serve a client * request for a diff from one of the consensuses in digests to the @@ -3706,6 +3713,16 @@ find_best_diff(const smartlist_t *digests, int flav, } } } SMARTLIST_FOREACH_END(diff_from); + + SMARTLIST_FOREACH_BEGIN(digests, const uint8_t *, diff_from) { + if (consdiffmgr_find_diff_from(&result, flav, DIGEST_SHA3_256, diff_from, + DIGEST256_LEN, FALLBACK_COMPRESS_METHOD) == CONSDIFF_AVAILABLE) { + tor_assert_nonfatal(result); + *compression_used_out = FALLBACK_COMPRESS_METHOD; + return result; + } + } SMARTLIST_FOREACH_END(diff_from); + return NULL; } @@ -3735,6 +3752,13 @@ find_best_consensus(int flav, } } + if (consdiffmgr_find_consensus(&result, flav, + FALLBACK_COMPRESS_METHOD) == CONSDIFF_AVAILABLE) { + tor_assert_nonfatal(result); + *compression_used_out = FALLBACK_COMPRESS_METHOD; + return result; + } + return NULL; } @@ -3911,12 +3935,15 @@ handle_get_current_consensus(dir_connection_t *conn, } clear_spool = 0; + + // The compress_method might have been NO_METHOD, but we store the data + // compressed. Decompress them using `compression_used`. See fallback code in + // find_best_consensus() and find_best_diff(). write_http_response_header(conn, -1, - compression_used, + compress_method == NO_METHOD ? + NO_METHOD : compression_used, smartlist_len(conn->spool) == 1 ? lifetime : 0); - // The compress_method requested was NO_METHOD, but we store the data - // compressed. Decompress them using `compression_used`. if (compress_method == NO_METHOD) conn->compress_state = tor_compress_new(0, compression_used, HIGH_COMPRESSION);

1 0

[tor/master] Fix too wide line from `make check-spaces`.
by nickm＠torproject.org 16 May '17

16 May '17

commit fade313ba30279b76794368b4ff9e97be6bb159d Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon May 15 12:34:12 2017 +0200 Fix too wide line from `make check-spaces`. See: https://bugs.torproject.org/21667 --- src/or/directory.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 8ed1305..dbee0b3 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3618,12 +3618,12 @@ handle_get_frontpage(dir_connection_t *conn, const get_handler_args_t *args) return 0; } -/** Warn that the cached consensus cached_consensus of type +/** Warn that the cached consensus consensus of type * flavor is too old and will not be served to clients. Rate-limit the * warning to avoid logging an entry on every request. */ static void -warn_consensus_is_too_old(const struct consensus_cache_entry_t *cached_consensus, +warn_consensus_is_too_old(const struct consensus_cache_entry_t *consensus, const char *flavor, time_t now) { #define TOO_OLD_WARNING_INTERVAL (60*60) @@ -3632,7 +3632,7 @@ warn_consensus_is_too_old(const struct consensus_cache_entry_t *cached_consensus time_t valid_until; char *dupes; - if (consensus_cache_entry_get_valid_until(cached_consensus, &valid_until)) + if (consensus_cache_entry_get_valid_until(consensus, &valid_until)) return; if ((dupes = rate_limit_log(&warned, now))) {

1 0

[tor/master] Remove old consensus fetching code from handle_get_current_consensus().
by nickm＠torproject.org 16 May '17

16 May '17

commit 8d730af0f7cd041cd83c237ca0f102ff076c18b0 Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon May 15 14:50:04 2017 +0200 Remove old consensus fetching code from handle_get_current_consensus(). This patch removes the calls to spooled_resource_new() when trying to download the consensus. All calls should now be going through the consdiff manager. See: https://bugs.torproject.org/21667 --- src/or/directory.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index dbee0b3..6504e2e 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3856,17 +3856,9 @@ handle_get_current_consensus(dir_connection_t *conn, spooled_resource_t *spooled; if (cached_consensus) { spooled = spooled_resource_new_from_cache_entry(cached_consensus); - } else if (flavor) { - spooled = spooled_resource_new(DIR_SPOOL_NETWORKSTATUS, - (uint8_t*)flavor, strlen(flavor)); - compression_used = ZLIB_METHOD; - } else { - spooled = spooled_resource_new(DIR_SPOOL_NETWORKSTATUS, - NULL, 0); - compression_used = ZLIB_METHOD; + smartlist_add(conn->spool, spooled); } tor_free(flavor); - smartlist_add(conn->spool, spooled); } lifetime = (have_fresh_until && fresh_until > now) ? fresh_until - now : 0;

1 0

[tor/master] Merge branch 'ahf_bugs_21667_2_squashed'
by nickm＠torproject.org 16 May '17

16 May '17

commit dae12425328f1ba69498d5dec5ce747af7e19013 Merge: ec6b2bb 9e3f304 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 15 17:22:12 2017 -0400 Merge branch 'ahf_bugs_21667_2_squashed' src/common/compress.c | 26 ++ src/common/compress.h | 1 + src/or/consdiffmgr.c | 621 ++++++++++++++++++++++++++++++++++------- src/or/consdiffmgr.h | 18 ++ src/or/directory.c | 381 +++++++++++++++++-------- src/or/directory.h | 1 + src/or/dirserv.c | 12 +- src/or/main.c | 1 + src/or/networkstatus.c | 18 +- src/or/networkstatus.h | 4 +- src/or/or.h | 4 +- src/test/test_consdiffmgr.c | 6 +- src/test/test_dir_handle_get.c | 71 +++-- 13 files changed, 899 insertions(+), 265 deletions(-)

1 0

[tor/master] Fix dir_handle_get/... test-cases for prop#278 support.
by nickm＠torproject.org 16 May '17

16 May '17

commit 9e3f3041139f60c5d109aff345bc560490329b10 Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon May 15 20:32:26 2017 +0200 Fix dir_handle_get/... test-cases for prop#278 support. See: https://bugs.torproject.org/21667 --- src/or/directory.c | 6 ------ src/test/test_dir_handle_get.c | 34 ++++++++++++++++++++++++++-------- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index cf6f0db..d2ac42c 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3887,12 +3887,6 @@ handle_get_current_consensus(dir_connection_t *conn, lifetime = (have_fresh_until && fresh_until > now) ? fresh_until - now : 0; - if (!smartlist_len(conn->spool)) { /* we failed to create/cache cp */ - write_http_status_line(conn, 503, "Network status object unavailable"); - geoip_note_ns_response(GEOIP_REJECT_UNAVAILABLE); - goto done; - } - size_t size_guess = 0; int n_expired = 0; dirserv_spool_remove_missing_and_guess_size(conn, if_modified_since, diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c index b2e9b8b..7d40db4 100644 --- a/src/test/test_dir_handle_get.c +++ b/src/test/test_dir_handle_get.c @@ -1606,12 +1606,15 @@ test_dir_handle_get_status_vote_current_consensus_ns_not_enough_sigs(void* d) (void) d; /* init mock */ - // XXXX Instead of mocking this, we need to mock - // XXXX consensus_cache_entry_get_voter_id_digests(). mock_ns_val = tor_malloc_zero(sizeof(networkstatus_t)); mock_ns_val->flavor = FLAV_NS; + mock_ns_val->type = NS_TYPE_CONSENSUS; mock_ns_val->voters = smartlist_new(); - mock_ns_val->valid_until = time(NULL); + mock_ns_val->valid_after = time(NULL) - 1800; + mock_ns_val->valid_until = time(NULL) - 60; + + #define NETWORK_STATUS "some network status string" + consdiffmgr_add_consensus(NETWORK_STATUS, mock_ns_val); /* init mock */ init_mock_options(); @@ -1673,8 +1676,6 @@ test_dir_handle_get_status_vote_current_consensus_ns_not_found(void* data) tt_int_op(0, OP_EQ, directory_handle_command_get(conn, GET("/tor/status-vote/current/consensus-ns"), NULL, 0)); - // XXXX This fails with 503 instead of 404; I think that's a regression in - // XXXX our behavior. fetch_from_buf_http(TO_CONN(conn)->outbuf, &header, MAX_HEADERS_SIZE, NULL, NULL, 1, 0); tt_assert(header); @@ -1700,18 +1701,24 @@ test_dir_handle_get_status_vote_current_consensus_too_old(void *data) char *header = NULL; (void)data; - // XXXX Instead of mocking this, we need to mock - // XXXX consensus_cache_entry_get_valid_until. mock_ns_val = tor_malloc_zero(sizeof(networkstatus_t)); + mock_ns_val->type = NS_TYPE_CONSENSUS; mock_ns_val->flavor = FLAV_MICRODESC; - mock_ns_val->valid_until = time(NULL) - (60 * 60 * 24) - 1; + mock_ns_val->valid_after = time(NULL) - (24 * 60 * 60 + 1800); + mock_ns_val->fresh_until = time(NULL) - (24 * 60 * 60 + 900); + mock_ns_val->valid_until = time(NULL) - (24 * 60 * 60 + 20); + + #define NETWORK_STATUS "some network status string" + consdiffmgr_add_consensus(NETWORK_STATUS, mock_ns_val); init_mock_options(); + MOCK(get_options, mock_get_options); MOCK(connection_write_to_buf_impl_, connection_write_to_buf_mock); MOCK(networkstatus_get_latest_consensus_by_flavor, mock_ns_get_by_flavor); conn = new_dir_conn(); + TO_CONN(conn)->address = tor_strdup("127.0.0.1"); setup_capture_of_logs(LOG_WARN); @@ -1727,6 +1734,17 @@ test_dir_handle_get_status_vote_current_consensus_too_old(void *data) tor_free(header); teardown_capture_of_logs(); + tor_free(mock_ns_val); + + mock_ns_val = tor_malloc_zero(sizeof(networkstatus_t)); + mock_ns_val->type = NS_TYPE_CONSENSUS; + mock_ns_val->flavor = FLAV_NS; + mock_ns_val->valid_after = time(NULL) - (24 * 60 * 60 + 1800); + mock_ns_val->fresh_until = time(NULL) - (24 * 60 * 60 + 900); + mock_ns_val->valid_until = time(NULL) - (24 * 60 * 60 + 20); + + #define NETWORK_STATUS "some network status string" + consdiffmgr_add_consensus(NETWORK_STATUS, mock_ns_val); setup_capture_of_logs(LOG_WARN);

1 0