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

[tor/master] Store fresh/valid-until and signatories values on all consensus objects.
by nickm＠torproject.org 15 May '17

15 May '17

commit fd1190581dd1d33e32ae97bf705cd4b470911f09 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun May 14 20:01:36 2017 -0400 Store fresh/valid-until and signatories values on all consensus objects. --- src/or/consdiffmgr.c | 49 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 14 deletions(-) diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c index d117acd..fef5f68 100644 --- a/src/or/consdiffmgr.c +++ b/src/or/consdiffmgr.c @@ -175,8 +175,7 @@ static consdiff_cfg_t consdiff_cfg = { static int consdiffmgr_ensure_space_for_files(int n); static int consensus_queue_compression_work(const char *consensus, - consensus_flavor_t flavor, - time_t valid_after); + const networkstatus_t *as_parsed); static int consensus_diff_queue_diff_work(consensus_cache_entry_t *diff_from, consensus_cache_entry_t *diff_to); static void consdiffmgr_set_cache_flags(void); @@ -492,7 +491,7 @@ consdiffmgr_add_consensus(const char *consensus, } /* We don't have it. Add it to the cache. */ - return consensus_queue_compression_work(consensus, flavor, valid_after); + return consensus_queue_compression_work(consensus, as_parsed); } /** @@ -1591,7 +1590,7 @@ typedef struct consensus_compress_worker_job_t { char *consensus; size_t consensus_len; consensus_flavor_t flavor; - time_t valid_after; + config_line_t *labels_in; compressed_result_t out[ARRAY_LENGTH(compress_consensus_with)]; } consensus_compress_worker_job_t; @@ -1604,6 +1603,7 @@ consensus_compress_worker_job_free(consensus_compress_worker_job_t *job) if (!job) return; tor_free(job->consensus); + config_free_lines(job->labels_in); unsigned u; for (u = 0; u < n_consensus_compression_methods(); ++u) { config_free_lines(job->out[u].labels); @@ -1623,12 +1623,8 @@ consensus_compress_worker_threadfn(void *state_, void *work_) consensus_flavor_t flavor = job->flavor; const char *consensus = job->consensus; size_t bodylen = job->consensus_len; - time_t valid_after = job->valid_after; - - config_line_t *labels = NULL; - char formatted_time[ISO_TIME_LEN+1]; - format_iso_time_nospace(formatted_time, valid_after); + config_line_t *labels = config_lines_dup(job->labels_in); const char *flavname = networkstatus_get_flavor_name(flavor); cdm_labels_prepend_sha3(&labels, LABEL_SHA3_DIGEST_UNCOMPRESSED, @@ -1645,7 +1641,6 @@ consensus_compress_worker_threadfn(void *state_, void *work_) end - start); } config_line_prepend(&labels, LABEL_FLAVOR, flavname); - config_line_prepend(&labels, LABEL_VALID_AFTER, formatted_time); config_line_prepend(&labels, LABEL_DOCTYPE, DOCTYPE_CONSENSUS); compress_multiple(job->out, @@ -1701,14 +1696,40 @@ static int background_compression = 0; */ static int consensus_queue_compression_work(const char *consensus, - consensus_flavor_t flavor, - time_t valid_after) + const networkstatus_t *as_parsed) { + tor_assert(consensus); + tor_assert(as_parsed); + consensus_compress_worker_job_t *job = tor_malloc_zero(sizeof(*job)); job->consensus = tor_strdup(consensus); job->consensus_len = strlen(consensus); - job->flavor = flavor; - job->valid_after = valid_after; + job->flavor = as_parsed->flavor; + + char va_str[ISO_TIME_LEN+1]; + char vu_str[ISO_TIME_LEN+1]; + char fu_str[ISO_TIME_LEN+1]; + format_iso_time_nospace(va_str, as_parsed->valid_after); + format_iso_time_nospace(fu_str, as_parsed->fresh_until); + format_iso_time_nospace(vu_str, as_parsed->valid_until); + config_line_append(&job->labels_in, LABEL_VALID_AFTER, va_str); + config_line_append(&job->labels_in, LABEL_FRESH_UNTIL, fu_str); + config_line_append(&job->labels_in, LABEL_VALID_UNTIL, vu_str); + if (as_parsed->voters) { + smartlist_t *hexvoters = smartlist_new(); + SMARTLIST_FOREACH_BEGIN(as_parsed->voters, + networkstatus_voter_info_t *, vi) { + if (smartlist_len(vi->sigs) == 0) + continue; // didn't sign. + char d[HEX_DIGEST_LEN+1]; + base16_encode(d, sizeof(d), vi->identity_digest, DIGEST_LEN); + smartlist_add_strdup(hexvoters, d); + } SMARTLIST_FOREACH_END(vi); + char *signers = smartlist_join_strings(hexvoters, ",", 0, NULL); + config_line_prepend(&job->labels_in, LABEL_SIGNATORIES, signers); + tor_free(signers); + SMARTLIST_FOREACH(hexvoters, char *, cp, tor_free(cp)); + } if (background_compression) { workqueue_entry_t *work;

1 0

[tor/master] Move stub accessor functions a level higher, to consdiffmgr
by nickm＠torproject.org 15 May '17

15 May '17

commit 2f06345db3b6f85144c1d8a0b6ca55e2b1e243ce Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun May 14 19:19:59 2017 -0400 Move stub accessor functions a level higher, to consdiffmgr --- src/or/conscache.c | 59 ---------------------------------------------------- src/or/conscache.h | 8 ------- src/or/consdiffmgr.c | 51 +++++++++++++++++++++++++++++++++++++++++++++ src/or/consdiffmgr.h | 14 +++++++++++++ 4 files changed, 65 insertions(+), 67 deletions(-) diff --git a/src/or/conscache.c b/src/or/conscache.c index fd46cbe..5ffa129 100644 --- a/src/or/conscache.c +++ b/src/or/conscache.c @@ -374,65 +374,6 @@ consensus_cache_entry_get_body(const consensus_cache_entry_t *ent, return 0; } -/** Read the lifetime of cached object ent into lifetime. */ -int consensus_cache_entry_get_lifetime(const consensus_cache_entry_t *ent, - long *lifetime) -{ - if (BUG(ent->magic != CCE_MAGIC)) - return -1; // LCOV_EXCL_LINE - - tor_assert(lifetime); - - // FIXME(ahf): Fill out. - *lifetime = 0; - - return 0; -} - -/** Return non-zero if the cache object found in ent is - * reasonably live, otherwise return 0. Use now to pass the - * timestamp used for comparison. */ -int consensus_cache_entry_is_reasonably_live(const consensus_cache_entry_t *ent, - time_t now) -{ - if (BUG(ent->magic != CCE_MAGIC)) - return -1; // LCOV_EXCL_LINE - - // FIXME(ahf): Fill out. - (void)now; - - return 1; -} - -/** Read the set of voters from the cached object ent into out. */ -int consensus_cache_entry_get_voters(const consensus_cache_entry_t *ent, - smartlist_t *out) -{ - if (BUG(ent->magic != CCE_MAGIC)) - return -1; // LCOV_EXCL_LINE - - // FIXME(ahf): Fill out. - (void)out; - - return 0; -} - -/** Read the valid until timestamp from the cached object ent - * into out. */ -int consensus_cache_entry_valid_until(const consensus_cache_entry_t *ent, - time_t *out) -{ - if (BUG(ent->magic != CCE_MAGIC)) - return -1; // LCOV_EXCL_LINE - - tor_assert(out); - - // FIXME(ahf): Fill out. - *out = time(NULL); - - return 0; -} - /** * Unmap every mmap'd element of cache that has been unused * since cutoff. diff --git a/src/or/conscache.h b/src/or/conscache.h index fcc3f3e..aef5420 100644 --- a/src/or/conscache.h +++ b/src/or/conscache.h @@ -52,14 +52,6 @@ void consensus_cache_entry_mark_for_aggressive_release( int consensus_cache_entry_get_body(const consensus_cache_entry_t *ent, const uint8_t **body_out, size_t *sz_out); -int consensus_cache_entry_get_lifetime(const consensus_cache_entry_t *ent, - long *lifetime); -int consensus_cache_entry_is_reasonably_live(const consensus_cache_entry_t *ent, - time_t now); -int consensus_cache_entry_get_voters(const consensus_cache_entry_t *ent, - smartlist_t *out); -int consensus_cache_entry_valid_until(const consensus_cache_entry_t *ent, - time_t *out); #ifdef TOR_UNIT_TESTS int consensus_cache_entry_is_mapped(consensus_cache_entry_t *ent); diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c index a2e2693..c208865 100644 --- a/src/or/consdiffmgr.c +++ b/src/or/consdiffmgr.c @@ -1729,3 +1729,54 @@ consdiffmgr_enable_background_compression(void) background_compression = 1; } +/** Read the lifetime of cached object ent into lifetime. */ +int +consensus_cache_entry_get_lifetime(const consensus_cache_entry_t *ent, + long *lifetime) +{ + tor_assert(lifetime); + + // FIXME(ahf): Fill out. + *lifetime = 0; + + return 0; +} + +/** Return non-zero if the cache object found in ent is + * reasonably live, otherwise return 0. Use now to pass the + * timestamp used for comparison. */ +int +consensus_cache_entry_is_reasonably_live(const consensus_cache_entry_t *ent, + time_t now) +{ + // FIXME(ahf): Fill out. + (void)now; + + return 1; +} + +/** Read the set of voters from the cached object ent into out. */ +int +consensus_cache_entry_get_voters(const consensus_cache_entry_t *ent, + smartlist_t *out) +{ + // FIXME(ahf): Fill out. + (void)out; + + return 0; +} + +/** Read the valid until timestamp from the cached object ent + * into out. */ +int +consensus_cache_entry_valid_until(const consensus_cache_entry_t *ent, + time_t *out) +{ + tor_assert(out); + + // FIXME(ahf): Fill out. + *out = time(NULL); + + return 0; +} + diff --git a/src/or/consdiffmgr.h b/src/or/consdiffmgr.h index abe1ea9..a8111dd 100644 --- a/src/or/consdiffmgr.h +++ b/src/or/consdiffmgr.h @@ -35,6 +35,20 @@ consdiff_status_t consdiffmgr_find_diff_from( const uint8_t *digest, size_t digestlen, compress_method_t method); + +int consensus_cache_entry_get_lifetime( + const struct consensus_cache_entry_t *ent, + long *lifetime); +int consensus_cache_entry_is_reasonably_live( + const struct consensus_cache_entry_t *ent, + time_t now); +int consensus_cache_entry_get_voters( + const struct consensus_cache_entry_t *ent, + smartlist_t *out); +int consensus_cache_entry_valid_until( + const struct consensus_cache_entry_t *ent, + time_t *out); + void consdiffmgr_rescan(void); int consdiffmgr_cleanup(void); void consdiffmgr_enable_background_compression(void);

1 0

[tor/master] Fix tautological constant out-of-range comparison warnings.
by nickm＠torproject.org 15 May '17

15 May '17

commit 64116ab97f14592ed67899512e8e3279df898adc Author: Alexander Færøy <ahf(a)torproject.org> Date: Fri May 12 17:59:29 2017 +0200 Fix tautological constant out-of-range comparison warnings. --- src/or/consdiffmgr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c index b8a52dc..a2e2693 100644 --- a/src/or/consdiffmgr.c +++ b/src/or/consdiffmgr.c @@ -540,7 +540,7 @@ consdiffmgr_find_consensus(struct consensus_cache_entry_t **entry_out, consensus_flavor_t flavor, compress_method_t method) { - tor_assert(flavor < N_CONSENSUS_FLAVORS); + tor_assert((int)flavor < N_CONSENSUS_FLAVORS); int pos = consensus_compression_method_pos(method); if (pos < 0) { @@ -1670,7 +1670,7 @@ consensus_compress_worker_replyfn(void *work_) unsigned u; consensus_flavor_t f = job->flavor; - tor_assert(f < N_CONSENSUS_FLAVORS); + tor_assert((int)f < N_CONSENSUS_FLAVORS); for (u = 0; u < ARRAY_LENGTH(handles); ++u) { if (handles[u] == NULL) continue;

1 0

[tor/master] Fetch the current consensus from the conscache subsystem.
by nickm＠torproject.org 15 May '17

15 May '17

commit ef2a62b2ff0c8db17e146a79034c8e43ee528c86 Author: Alexander Færøy <ahf(a)torproject.org> Date: Fri May 12 21:17:09 2017 +0200 Fetch the current consensus from the conscache subsystem. This patch changes handle_get_current_consensus() to make it read the current consensus document from the consensus caching subsystem. See: https://bugs.torproject.org/21667 --- src/or/directory.c | 121 ++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 88 insertions(+), 33 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 4a528f2..946792b 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -13,6 +13,7 @@ #include "config.h" #include "connection.h" #include "connection_edge.h" +#include "conscache.h" #include "consdiff.h" #include "consdiffmgr.h" #include "control.h" @@ -117,7 +118,8 @@ static void dir_routerdesc_download_failed(smartlist_t *failed, int was_descriptor_digests); static void dir_microdesc_download_failed(smartlist_t *failed, int status_code); -static int client_likes_consensus(networkstatus_t *v, const char *want_url); +static int client_likes_consensus(const struct consensus_cache_entry_t *ent, + const char *want_url); static void connection_dir_close_consensus_fetches( dir_connection_t *except_this_one, const char *resource); @@ -3377,14 +3379,20 @@ accept_encoding_header(void) * consensus, 0 otherwise. */ int -client_likes_consensus(networkstatus_t *v, const char *want_url) +client_likes_consensus(const struct consensus_cache_entry_t *ent, + const char *want_url) { smartlist_t *want_authorities = smartlist_new(); + smartlist_t *voters = smartlist_new(); int need_at_least; int have = 0; dir_split_resource_into_fingerprints(want_url, want_authorities, NULL, 0); need_at_least = smartlist_len(want_authorities)/2+1; + + if (consensus_cache_entry_get_voters(ent, voters) != 0) + goto done; + SMARTLIST_FOREACH_BEGIN(want_authorities, const char *, d) { char want_digest[DIGEST_LEN]; size_t want_len = strlen(d)/2; @@ -3398,7 +3406,7 @@ client_likes_consensus(networkstatus_t *v, const char *want_url) continue; }; - SMARTLIST_FOREACH_BEGIN(v->voters, networkstatus_voter_info_t *, vi) { + SMARTLIST_FOREACH_BEGIN(voters, networkstatus_voter_info_t *, vi) { if (smartlist_len(vi->sigs) && tor_memeq(vi->identity_digest, want_digest, want_len)) { have++; @@ -3411,8 +3419,11 @@ client_likes_consensus(networkstatus_t *v, const char *want_url) break; } SMARTLIST_FOREACH_END(d); + done: SMARTLIST_FOREACH(want_authorities, char *, d, tor_free(d)); smartlist_free(want_authorities); + SMARTLIST_FOREACH(voters, networkstatus_voter_info_t *, v, tor_free(v)); + smartlist_free(voters); return (have >= need_at_least); } @@ -3619,20 +3630,25 @@ handle_get_frontpage(dir_connection_t *conn, const get_handler_args_t *args) return 0; } -/** Warn that the consensus v 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. +/** Warn that the cached consensus cached_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(networkstatus_t *v, const char *flavor, time_t now) +warn_consensus_is_too_old(const struct consensus_cache_entry_t *cached_consensus, + const char *flavor, time_t now) { #define TOO_OLD_WARNING_INTERVAL (60*60) static ratelim_t warned = RATELIM_INIT(TOO_OLD_WARNING_INTERVAL); char timestamp[ISO_TIME_LEN+1]; + time_t valid_until; char *dupes; + if (consensus_cache_entry_valid_until(cached_consensus, &valid_until)) + return; + if ((dupes = rate_limit_log(&warned, now))) { - format_local_iso_time(timestamp, v->valid_until); + format_local_iso_time(timestamp, valid_until); log_warn(LD_DIRSERV, "Our %s%sconsensus is too old, so we will not " "serve it to clients. It was valid until %s local time and we " "continued to serve it for up to 24 hours after it expired.%s", @@ -3705,6 +3721,35 @@ find_best_diff(const smartlist_t *digests, int flav, return NULL; } +/** Lookup the cached consensus document by the flavor found in flav. + * The prefered set of compression methods should be listed in the + * compression_methods bitfield. The compression method chosen (if any) + * is stored in compression_used_out. */ +static struct consensus_cache_entry_t * +find_best_consensus(int flav, + unsigned compression_methods, + compress_method_t *compression_used_out) +{ + struct consensus_cache_entry_t *result = NULL; + unsigned u; + + for (u = 0; u < ARRAY_LENGTH(srv_meth_pref_precompressed); ++u) { + compress_method_t method = srv_meth_pref_precompressed[u]; + + if (0 == (compression_methods & (1u<<method))) + continue; + + if (consdiffmgr_find_consensus(&result, flav, + method) == CONSDIFF_AVAILABLE) { + tor_assert_nonfatal(result); + *compression_used_out = method; + return result; + } + } + + return NULL; +} + /** Try to find the best supported compression method possible from a given * compression_methods. Return NO_METHOD if no mutually supported * compression method could be found. */ @@ -3747,7 +3792,6 @@ handle_get_current_consensus(dir_connection_t *conn, /* v3 network status fetch. */ long lifetime = NETWORKSTATUS_CACHE_LIFETIME; - networkstatus_t *v; time_t now = time(NULL); const char *want_fps = NULL; char *flavor = NULL; @@ -3773,18 +3817,33 @@ handle_get_current_consensus(dir_connection_t *conn, want_fps = url+strlen(CONSENSUS_URL_PREFIX); } - v = networkstatus_get_latest_consensus_by_flavor(flav); + struct consensus_cache_entry_t *cached_consensus = NULL; + smartlist_t *diff_from_digests = NULL; + compress_method_t compression_used = NO_METHOD; + if (!parse_or_diff_from_header(&diff_from_digests, args->headers)) { + tor_assert(diff_from_digests); + cached_consensus = find_best_diff(diff_from_digests, flav, + args->compression_supported, + &compression_used); + SMARTLIST_FOREACH(diff_from_digests, uint8_t *, d, tor_free(d)); + smartlist_free(diff_from_digests); + } else { + cached_consensus = find_best_consensus(flav, + args->compression_supported, + &compression_used); + } - if (v && !networkstatus_consensus_reasonably_live(v, now)) { + if (cached_consensus && + !consensus_cache_entry_is_reasonably_live(cached_consensus, now)) { write_http_status_line(conn, 404, "Consensus is too old"); - warn_consensus_is_too_old(v, flavor, now); + warn_consensus_is_too_old(cached_consensus, flavor, now); geoip_note_ns_response(GEOIP_REJECT_NOT_FOUND); tor_free(flavor); goto done; } - if (v && want_fps && - !client_likes_consensus(v, want_fps)) { + if (cached_consensus && want_fps && + !client_likes_consensus(cached_consensus, want_fps)) { write_http_status_line(conn, 404, "Consensus not signed by sufficient " "number of requested authorities"); geoip_note_ns_response(GEOIP_REJECT_NOT_ENOUGH_SIGS); @@ -3792,37 +3851,30 @@ handle_get_current_consensus(dir_connection_t *conn, goto done; } - struct consensus_cache_entry_t *cached_diff = NULL; - smartlist_t *diff_from_digests = NULL; - compress_method_t compression_used = NO_METHOD; - if (!parse_or_diff_from_header(&diff_from_digests, args->headers)) { - tor_assert(diff_from_digests); - cached_diff = find_best_diff(diff_from_digests, flav, - args->compression_supported, - &compression_used); - SMARTLIST_FOREACH(diff_from_digests, uint8_t *, d, tor_free(d)); - smartlist_free(diff_from_digests); - } - conn->spool = smartlist_new(); clear_spool = 1; { spooled_resource_t *spooled; - if (cached_diff) { - spooled = spooled_resource_new_from_cache_entry(cached_diff); + 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 = compress_method; + compression_used = ZLIB_METHOD; } else { spooled = spooled_resource_new(DIR_SPOOL_NETWORKSTATUS, NULL, 0); - compression_used = compress_method; + compression_used = ZLIB_METHOD; } tor_free(flavor); smartlist_add(conn->spool, spooled); } - lifetime = (v && v->fresh_until > now) ? v->fresh_until - now : 0; + + if (cached_consensus && + consensus_cache_entry_get_lifetime(cached_consensus, + &lifetime) != 0) { + lifetime = 0; + } if (!smartlist_len(conn->spool)) { /* we failed to create/cache cp */ write_http_status_line(conn, 503, "Network status object unavailable"); @@ -3875,8 +3927,11 @@ handle_get_current_consensus(dir_connection_t *conn, write_http_response_header(conn, -1, compression_used, smartlist_len(conn->spool) == 1 ? lifetime : 0); - if (compress_method != NO_METHOD) - conn->compress_state = tor_compress_new(0, compress_method, + + // 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); /* Prime the connection with some data. */

1 0

[tor/master] Implement functions to expose valid/fresh-until and voters
by nickm＠torproject.org 15 May '17

15 May '17

commit dcc533fb133646d81c2fa6632d6fb7f05f99f650 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun May 14 19:43:41 2017 -0400 Implement functions to expose valid/fresh-until and voters These still won't do anything till I get the values to be filled in. Also, I changed the API a little (with corresponding changes in directory.c) to match things that it's easier to store. --- src/or/consdiffmgr.c | 80 +++++++++++++++++++++++++++----------------------- src/or/consdiffmgr.h | 13 ++++---- src/or/directory.c | 54 +++++++++++++++------------------- src/or/networkstatus.c | 18 ++++++++---- src/or/networkstatus.h | 4 ++- 5 files changed, 88 insertions(+), 81 deletions(-) diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c index c208865..d117acd 100644 --- a/src/or/consdiffmgr.c +++ b/src/or/consdiffmgr.c @@ -32,6 +32,15 @@ /* The valid-after time for a consensus (or for the target consensus of a * diff), encoded as ISO UTC. */ #define LABEL_VALID_AFTER "consensus-valid-after" +/* The fresh-until time for a consensus (or for the target consensus of a + * diff), encoded as ISO UTC. */ +#define LABEL_FRESH_UNTIL "consensus-fresh-until" +/* The valid-until time for a consensus (or for the target consensus of a + * diff), encoded as ISO UTC. */ +#define LABEL_VALID_UNTIL "consensus-valid-until" +/* Comma-separated list of hex-encoded identity digests for the voting + * authorities. */ +#define LABEL_SIGNATORIES "consensus-signatories" /* A hex encoded SHA3 digest of the object, as compressed (if any) */ #define LABEL_SHA3_DIGEST "sha3-digest" /* A hex encoded SHA3 digest of the object before compression. */ @@ -1729,54 +1738,53 @@ consdiffmgr_enable_background_compression(void) background_compression = 1; } -/** Read the lifetime of cached object ent into lifetime. */ +/** Read the set of voters from the cached object ent into + * out, as a list of hex-encoded digests. Return 0 on success, + * -1 if no signatories were recorded. */ int -consensus_cache_entry_get_lifetime(const consensus_cache_entry_t *ent, - long *lifetime) +consensus_cache_entry_get_voter_id_digests(const consensus_cache_entry_t *ent, + smartlist_t *out) { - tor_assert(lifetime); - - // FIXME(ahf): Fill out. - *lifetime = 0; - + tor_assert(ent); + tor_assert(out); + const char *s; + s = consensus_cache_entry_get_value(ent, LABEL_SIGNATORIES); + if (s == NULL) + return -1; + smartlist_split_string(out, s, ",", SPLIT_SKIP_SPACE|SPLIT_STRIP_SPACE, 0); return 0; } -/** Return non-zero if the cache object found in ent is - * reasonably live, otherwise return 0. Use now to pass the - * timestamp used for comparison. */ -int -consensus_cache_entry_is_reasonably_live(const consensus_cache_entry_t *ent, - time_t now) -{ - // FIXME(ahf): Fill out. - (void)now; - - return 1; -} - -/** Read the set of voters from the cached object ent into out. */ +/** Read the fresh-until time of cached object ent into *out + * and return 0, or return -1 if no such time was recorded. */ int -consensus_cache_entry_get_voters(const consensus_cache_entry_t *ent, - smartlist_t *out) +consensus_cache_entry_get_fresh_until(const consensus_cache_entry_t *ent, + time_t *out) { - // FIXME(ahf): Fill out. - (void)out; - - return 0; + tor_assert(ent); + tor_assert(out); + const char *s; + s = consensus_cache_entry_get_value(ent, LABEL_FRESH_UNTIL); + if (s == NULL || parse_iso_time_nospace(s, out) < 0) + return -1; + else + return 0; } -/** Read the valid until timestamp from the cached object ent - * into out. */ +/** Read the valid until timestamp from the cached object ent into + * *out and return 0, or return -1 if no such time was recorded. */ int -consensus_cache_entry_valid_until(const consensus_cache_entry_t *ent, - time_t *out) +consensus_cache_entry_get_valid_until(const consensus_cache_entry_t *ent, + time_t *out) { + tor_assert(ent); tor_assert(out); - // FIXME(ahf): Fill out. - *out = time(NULL); - - return 0; + const char *s; + s = consensus_cache_entry_get_value(ent, LABEL_VALID_UNTIL); + if (s == NULL || parse_iso_time_nospace(s, out) < 0) + return -1; + else + return 0; } diff --git a/src/or/consdiffmgr.h b/src/or/consdiffmgr.h index a8111dd..0325a00 100644 --- a/src/or/consdiffmgr.h +++ b/src/or/consdiffmgr.h @@ -36,16 +36,13 @@ consdiff_status_t consdiffmgr_find_diff_from( size_t digestlen, compress_method_t method); -int consensus_cache_entry_get_lifetime( - const struct consensus_cache_entry_t *ent, - long *lifetime); -int consensus_cache_entry_is_reasonably_live( - const struct consensus_cache_entry_t *ent, - time_t now); -int consensus_cache_entry_get_voters( +int consensus_cache_entry_get_voter_id_digests( const struct consensus_cache_entry_t *ent, smartlist_t *out); -int consensus_cache_entry_valid_until( +int consensus_cache_entry_get_fresh_until( + const struct consensus_cache_entry_t *ent, + time_t *out); +int consensus_cache_entry_get_valid_until( const struct consensus_cache_entry_t *ent, time_t *out); diff --git a/src/or/directory.c b/src/or/directory.c index 946792b..4fa4b3c 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3382,47 +3382,35 @@ int client_likes_consensus(const struct consensus_cache_entry_t *ent, const char *want_url) { - smartlist_t *want_authorities = smartlist_new(); smartlist_t *voters = smartlist_new(); int need_at_least; int have = 0; + if (consensus_cache_entry_get_voter_id_digests(ent, voters) != 0) { + return 1; // We don't know the voters; assume the client won't mind. */ + } + + smartlist_t *want_authorities = smartlist_new(); dir_split_resource_into_fingerprints(want_url, want_authorities, NULL, 0); need_at_least = smartlist_len(want_authorities)/2+1; - if (consensus_cache_entry_get_voters(ent, voters) != 0) - goto done; - - SMARTLIST_FOREACH_BEGIN(want_authorities, const char *, d) { - char want_digest[DIGEST_LEN]; - size_t want_len = strlen(d)/2; - if (want_len > DIGEST_LEN) - want_len = DIGEST_LEN; + SMARTLIST_FOREACH_BEGIN(want_authorities, const char *, want_digest) { - if (base16_decode(want_digest, DIGEST_LEN, d, want_len*2) - != (int) want_len) { - log_fn(LOG_PROTOCOL_WARN, LD_DIR, - "Failed to decode requested authority digest %s.", escaped(d)); - continue; - }; - - SMARTLIST_FOREACH_BEGIN(voters, networkstatus_voter_info_t *, vi) { - if (smartlist_len(vi->sigs) && - tor_memeq(vi->identity_digest, want_digest, want_len)) { + SMARTLIST_FOREACH_BEGIN(voters, const char *, digest) { + if (!strcasecmpstart(digest, want_digest)) { have++; break; }; - } SMARTLIST_FOREACH_END(vi); + } SMARTLIST_FOREACH_END(digest); /* early exit, if we already have enough */ if (have >= need_at_least) break; - } SMARTLIST_FOREACH_END(d); + } SMARTLIST_FOREACH_END(want_digest); - done: SMARTLIST_FOREACH(want_authorities, char *, d, tor_free(d)); smartlist_free(want_authorities); - SMARTLIST_FOREACH(voters, networkstatus_voter_info_t *, v, tor_free(v)); + SMARTLIST_FOREACH(voters, char *, cp, tor_free(cp)); smartlist_free(voters); return (have >= need_at_least); } @@ -3644,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_valid_until(cached_consensus, &valid_until)) + if (consensus_cache_entry_get_valid_until(cached_consensus, &valid_until)) return; if ((dupes = rate_limit_log(&warned, now))) { @@ -3832,9 +3820,17 @@ handle_get_current_consensus(dir_connection_t *conn, args->compression_supported, &compression_used); } + time_t fresh_until, valid_until; + int have_fresh_until = 0, have_valid_until = 0; + if (cached_consensus) { + have_fresh_until = + !consensus_cache_entry_get_fresh_until(cached_consensus, &fresh_until); + have_valid_until = + !consensus_cache_entry_get_valid_until(cached_consensus, &valid_until); + } - if (cached_consensus && - !consensus_cache_entry_is_reasonably_live(cached_consensus, now)) { + if (cached_consensus && have_valid_until && + !networkstatus_valid_until_is_reasonably_live(valid_until, now)) { write_http_status_line(conn, 404, "Consensus is too old"); warn_consensus_is_too_old(cached_consensus, flavor, now); geoip_note_ns_response(GEOIP_REJECT_NOT_FOUND); @@ -3870,11 +3866,7 @@ handle_get_current_consensus(dir_connection_t *conn, smartlist_add(conn->spool, spooled); } - if (cached_consensus && - consensus_cache_entry_get_lifetime(cached_consensus, - &lifetime) != 0) { - lifetime = 0; - } + 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"); diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index bd106fd..fffd107 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1407,16 +1407,24 @@ networkstatus_get_live_consensus,(time_t now)) * Return 1 if the consensus is reasonably live, or 0 if it is too old. */ int -networkstatus_consensus_reasonably_live(networkstatus_t *consensus, time_t now) +networkstatus_consensus_reasonably_live(const networkstatus_t *consensus, + time_t now) { -#define REASONABLY_LIVE_TIME (24*60*60) if (BUG(!consensus)) return 0; - if (now <= consensus->valid_until + REASONABLY_LIVE_TIME) - return 1; + return networkstatus_valid_until_is_reasonably_live(consensus->valid_until, + now); +} - return 0; +/** As networkstatus_consensus_reasonably_live, but takes a valid_until + * time rather than an entire consensus. */ +int +networkstatus_valid_until_is_reasonably_live(time_t valid_until, + time_t now) +{ +#define REASONABLY_LIVE_TIME (24*60*60) + return (now <= valid_until + REASONABLY_LIVE_TIME); } /* XXXX remove this in favor of get_live_consensus. But actually, diff --git a/src/or/networkstatus.h b/src/or/networkstatus.h index 37a5a3b..e774c4d 100644 --- a/src/or/networkstatus.h +++ b/src/or/networkstatus.h @@ -81,8 +81,10 @@ MOCK_DECL(networkstatus_t *,networkstatus_get_latest_consensus,(void)); MOCK_DECL(networkstatus_t *,networkstatus_get_latest_consensus_by_flavor, (consensus_flavor_t f)); MOCK_DECL(networkstatus_t *, networkstatus_get_live_consensus,(time_t now)); -int networkstatus_consensus_reasonably_live(networkstatus_t *consensus, +int networkstatus_consensus_reasonably_live(const networkstatus_t *consensus, time_t now); +int networkstatus_valid_until_is_reasonably_live(time_t valid_until, + time_t now); networkstatus_t *networkstatus_get_reasonably_live_consensus(time_t now, int flavor); MOCK_DECL(int, networkstatus_consensus_is_bootstrapping,(time_t now));

1 0

[tor/master] Fix DoubleNL warning from `make check-spaces`.
by nickm＠torproject.org 15 May '17

15 May '17

commit a1e8ef007634c4916e1bf3f2473182aa179187d9 Author: Alexander Færøy <ahf(a)torproject.org> Date: Fri May 12 17:57:11 2017 +0200 Fix DoubleNL warning from `make check-spaces`. --- src/or/consdiffmgr.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c index 3e1edf0..b8a52dc 100644 --- a/src/or/consdiffmgr.c +++ b/src/or/consdiffmgr.c @@ -716,7 +716,6 @@ consdiffmgr_cleanup(void) const char *retain_methodname = compression_method_get_name( RETAIN_CONSENSUS_COMPRESSED_WITH_METHOD); - if (BUG(most_recent_sha3_uncompressed == NULL)) continue; SMARTLIST_FOREACH_BEGIN(consensuses, consensus_cache_entry_t *, ent) {

1 0

[tor/master] bugfix-on version for 21329. thanks, meejah!
by nickm＠torproject.org 15 May '17

15 May '17

commit ec6b2bbf9bb561e34f9fbe6663d1eb691604348d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 15 15:45:15 2017 -0400 bugfix-on version for 21329. thanks, meejah! --- changes/bug21329 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug21329 b/changes/bug21329 index c25c98f..c31586e 100644 --- a/changes/bug21329 +++ b/changes/bug21329 @@ -1,3 +1,3 @@ o Minor bugfixes (controller): - GETINFO onions/current and onions/detached no longer 551 on empty lists - Fixes bug 21329. + Fixes bug 21329; bugfix on 0.2.7.1-alpha.

1 0

[tor/master] Fix another lintchanges issue
by nickm＠torproject.org 15 May '17

15 May '17

commit c88e913b09d5d0820ad3ab2d291f737338369c66 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 15 15:32:33 2017 -0400 Fix another lintchanges issue --- changes/bug21641 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug21641 b/changes/bug21641 index 559af57..b04e52c 100644 --- a/changes/bug21641 +++ b/changes/bug21641 @@ -2,4 +2,4 @@ - Onion key rotation and expiry intervals are now defined as a network consensus parameter as per proposal 274. The default lifetime of an onion key is bumped from 7 to 28 days. Old onion keys will expire after 7 - days by default. Fixes bug 21641. + days by default. Closes ticket 21641.

1 0

[tor/master] fix a bunch of lintchanges complaints
by nickm＠torproject.org 15 May '17

15 May '17

commit f98f5ca40bfd5cc53b8265488df74b31d6e96141 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 15 15:27:13 2017 -0400 fix a bunch of lintchanges complaints --- changes/21662_21663_21664 | 2 +- changes/bug16706 | 2 +- changes/bug16861 | 4 ++-- changes/bug17592 | 4 ++-- changes/bug17604 | 4 ++-- changes/bug21155 | 2 +- changes/bug21293 | 2 +- changes/bug21329 | 2 +- changes/bug21586 | 2 +- changes/bug21641 | 4 ++-- changes/bug21654 | 2 +- changes/bug21715 | 2 +- changes/bug21788 | 2 +- changes/bug22060 | 3 ++- changes/fast_channel_lookup | 2 +- changes/test21470 | 2 +- changes/ticket21953 | 2 +- changes/ticket4998 | 2 +- 18 files changed, 23 insertions(+), 22 deletions(-) diff --git a/changes/21662_21663_21664 b/changes/21662_21663_21664 index 6712b0f..da47c6d 100644 --- a/changes/21662_21663_21664 +++ b/changes/21662_21663_21664 @@ -1,4 +1,4 @@ - o Major features: + o Major features (directory system): - Tor's compression module now includes support for the zstd and lzma2 compression algorithms, if the libzstd and liblzma libraries are available when Tor is compiled. Once these features are exposed in the diff --git a/changes/bug16706 b/changes/bug16706 index 9c1e315..b0b3351 100644 --- a/changes/bug16706 +++ b/changes/bug16706 @@ -1,3 +1,3 @@ o Minor bugfixes (hidden service): - Stop printing cryptic warning when a client tries to connect on an - invalid port of the service. Fixes #16706.; bugfix on tor-0.2.6.3-alpha. + invalid port of the service. Fixes bug 16706; bugfix on 0.2.6.3-alpha. diff --git a/changes/bug16861 b/changes/bug16861 index 7fc8d05..f540254 100644 --- a/changes/bug16861 +++ b/changes/bug16861 @@ -1,4 +1,4 @@ - o Major features (traffic analysis) + o Major features (traffic analysis resistance): - Relays and clients will now send a padding cell on idle OR connections every 1.5 to 9.5 seconds (tunable via consensus parameters). Directory connections and inter-relay connections @@ -9,7 +9,7 @@ by setting ConnectionPadding 0 in torrc. Padding may be minimized for mobile users with the torrc option ReducedConnectionPadding. Implements Proposal 251 and Section 2 of Proposal 254; closes ticket - #16861. + 16861. - Relays will publish 24 hour totals of padding and non-padding cell counts to their extra-info descriptors, unless PaddingStatistics 0 is set in torrc. These 24 hour totals are also rounded to multiples diff --git a/changes/bug17592 b/changes/bug17592 index 4b5f22c..856e75b 100644 --- a/changes/bug17592 +++ b/changes/bug17592 @@ -1,9 +1,9 @@ - o Minor bugfixes (connection lifespan) + o Minor bugfixes (connection lifespan): - Allow more control over how long TLS connections are kept open: unify CircuitIdleTimeout and PredictedPortsRelevanceTime into a single option called CircuitsAvailableTimeout. Also, allow the consensus to control the default values for both this preference, as well as the lifespan - of relay-to-relay connections. Fixes bug #17592. + of relay-to-relay connections. Fixes bug 17592. - Increase the intial circuit build timeout testing frequency, to help ensure that ReducedConnectionPadding clients finish learning a timeout before their orconn would expire. The initial testing rate was set back diff --git a/changes/bug17604 b/changes/bug17604 index 20ac2c3..0c7b983 100644 --- a/changes/bug17604 +++ b/changes/bug17604 @@ -1,4 +1,4 @@ - o Minor bugfixes (connection usage) + o Minor bugfixes (connection usage): - Use NETINFO cells to try to determine if both relays involved in a connection will agree on the canonical status of that connection. Prefer the connections where this is the case for extend cells, @@ -6,7 +6,7 @@ status early. Also, additionally alter the connection selection logic to prefer the oldest valid connection for extend cells. These two changes should reduce the number of long-term connections - that are kept open between relays. Fixes bug #17604. + that are kept open between relays. Fixes bug 17604. - Relays will now log hourly statistics on the total number of connections to other relays. If the number of connections per relay unexpectedly large, this log message is at notice level. Otherwise diff --git a/changes/bug21155 b/changes/bug21155 index f2a34db..33c0cd1 100644 --- a/changes/bug21155 +++ b/changes/bug21155 @@ -2,4 +2,4 @@ - Warn user if multiple entries in EntryNodes and at least one HiddenService are used together. Pinning EntryNodes along with an hidden service can be possibly harmful for instance see ticket 14917 or 21155. - Closes bug 21155. + Fixes bug 21155. diff --git a/changes/bug21293 b/changes/bug21293 index 23a7547..37e0c8c 100644 --- a/changes/bug21293 +++ b/changes/bug21293 @@ -2,4 +2,4 @@ - Downgrade a log statement from bug to protocol warning because there is at least one use case where it can be triggered by a buggy tor implementation on the Internet for instance. Fixes bug 21293; bugfix on - tor-0.1.1.14-alpha. + 0.1.1.14-alpha. diff --git a/changes/bug21329 b/changes/bug21329 index 60b9363..c25c98f 100644 --- a/changes/bug21329 +++ b/changes/bug21329 @@ -1,3 +1,3 @@ o Minor bugfixes (controller): - GETINFO onions/current and onions/detached no longer 551 on empty lists - Fixes bug 21329 + Fixes bug 21329. diff --git a/changes/bug21586 b/changes/bug21586 index 200d55a..29701d9 100644 --- a/changes/bug21586 +++ b/changes/bug21586 @@ -1,4 +1,4 @@ o Minor bugfix (directory authority): - Prevent the shared randomness subsystem from asserting when initialized by a bridge authority with an incomplete configuration file. Fixes bug - #21856; bugfix on 0.2.9.8. + 21586; bugfix on 0.2.9.8. diff --git a/changes/bug21641 b/changes/bug21641 index 96fdf5f..559af57 100644 --- a/changes/bug21641 +++ b/changes/bug21641 @@ -1,5 +1,5 @@ o Minor feature (defaults, directory): - Onion key rotation and expiry intervals are now defined as a network - consensus parameter as per proposal #274. The default lifetime of an + consensus parameter as per proposal 274. The default lifetime of an onion key is bumped from 7 to 28 days. Old onion keys will expire after 7 - days by default. Fixes bug #21641. + days by default. Fixes bug 21641. diff --git a/changes/bug21654 b/changes/bug21654 index fd1c650..6b22587 100644 --- a/changes/bug21654 +++ b/changes/bug21654 @@ -1,4 +1,4 @@ - o Code simplifications and refactoring + o Minor bugfixes (testing): - Use unbuffered I/O for utility functions around the process_handle_t type. This fixes unit test failures reported on OpenBSD and FreeBSD. Fixes bug 21654. diff --git a/changes/bug21715 b/changes/bug21715 index ad9d8bf..f8b5ae2 100644 --- a/changes/bug21715 +++ b/changes/bug21715 @@ -1,4 +1,4 @@ - o Documentation (man page): + o Minor bugfixes (documentation): - Default of NumEntryGuards is 1 if the consensus parameter guard-n-primary-guards-to-use isn't set. Default of NumDirectoryGuards is 3 if the consensus parameter guard-n-primary-dir-guards-to-use isn't diff --git a/changes/bug21788 b/changes/bug21788 index 48deec2..ad8365f 100644 --- a/changes/bug21788 +++ b/changes/bug21788 @@ -1,3 +1,3 @@ - o Minor bugfixes: + o Minor bugfixes (memory leak): - Fix a small memory leak at exit from the backtrace handler code. Fixes bug 21788; bugfix on 0.2.5.2-alpha. Patch from Daniel Pinto. diff --git a/changes/bug22060 b/changes/bug22060 index d23e771..db373dd 100644 --- a/changes/bug22060 +++ b/changes/bug22060 @@ -1,4 +1,4 @@ - o Remove configuration option (confic): + o Removed features (configuration options, all in ticket 22060): - AllowInvalidNodes was deprecated in 0.2.9.2-alpha and now has been removed. It is not possible anymore to use Invalid nodes. - AllowSingleHopCircuits was deprecated in 0.2.9.2-alpha and now has been @@ -25,3 +25,4 @@ P256 EC group is always used. - {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress was deprecated in 0.2.9.2-alpha and now has been removed. Use the ORPort (and others). + diff --git a/changes/fast_channel_lookup b/changes/fast_channel_lookup index 7d60fe6..de0f351 100644 --- a/changes/fast_channel_lookup +++ b/changes/fast_channel_lookup @@ -1,2 +1,2 @@ - o Minor features: + o Minor features (performance, controller): - Add an O(1) implementation of channel_find_by_global_id(). diff --git a/changes/test21470 b/changes/test21470 index 8bb78df..f3ce484 100644 --- a/changes/test21470 +++ b/changes/test21470 @@ -1,4 +1,4 @@ - o Minor enhancements (unit tests): + o Minor features (unit tests): - Improve version parsing tests: add tests for typical version components, add tests for invalid versions, including numeric range and non-numeric prefixes. diff --git a/changes/ticket21953 b/changes/ticket21953 index 7cc84f5..46e1642 100644 --- a/changes/ticket21953 +++ b/changes/ticket21953 @@ -1,4 +1,4 @@ - o Minor features: + o Minor features (security, windows): - Enable a couple of pieces of Windows hardening: one (HeapEnableTerminationOnCorruption) that has been on-by-default since Windows 8, and unavailable before Windows 7, and one diff --git a/changes/ticket4998 b/changes/ticket4998 index 01d169d..b7b5d62 100644 --- a/changes/ticket4998 +++ b/changes/ticket4998 @@ -1,4 +1,4 @@ - o Minor features: + o Minor features (relay, configuration): - The MyFamily line may now be repeated as many times as desired, for relays that want to configure large families. Closes ticket 4998; patch by Daniel Pinto.

1 0

[tor/master] Remove changes files for issues resolved in 0.3.0.7.
by nickm＠torproject.org 15 May '17

15 May '17

commit 480f966a74846179894f25093c6f99d286641902 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 15 14:32:10 2017 -0400 Remove changes files for issues resolved in 0.3.0.7. --- changes/bug21943 | 6 ------ changes/geoip-may2017 | 4 ---- changes/prop275-minimal | 9 --------- 3 files changed, 19 deletions(-) diff --git a/changes/bug21943 b/changes/bug21943 deleted file mode 100644 index dbe2c72..0000000 --- a/changes/bug21943 +++ /dev/null @@ -1,6 +0,0 @@ - o Minor bugfixes (Linux seccomp2 sandbox): - - The getpid() system call is now permitted under the Linux seccomp2 - sandbox, to avoid crashing with versions of OpenSSL (and other - libraries) that attempt to learn the process's PID by using the - syscall rather than the VDSO code. Fixes bug 21943; bugfix on - 0.2.5.1-alpha. diff --git a/changes/geoip-may2017 b/changes/geoip-may2017 deleted file mode 100644 index 4e504d7..0000000 --- a/changes/geoip-may2017 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features: - - Update geoip and geoip6 to the May 2 2017 Maxmind GeoLite2 - Country database. - diff --git a/changes/prop275-minimal b/changes/prop275-minimal deleted file mode 100644 index 83d42f8..0000000 --- a/changes/prop275-minimal +++ /dev/null @@ -1,9 +0,0 @@ - o Minor features (future-proofing): - - - Tor no longer refuses to download microdescriptors or descriptors if - they are listed as "published in the future". This change will - eventually allow us to stop listing meaningful "published" dates - in microdescriptor consensuses, and thereby allow us to reduce the - resources required to download consensus diffs by over 50%. - Implements part of ticket 21642; implements part of proposal 275. -

1 0