February 2013 - tor-commits - lists.torproject.org

[tor/master] Fix a may-be-used-uninitialized warning.
by nickm＠torproject.org 19 Feb '13

19 Feb '13

commit 804be10b096de6e6a7204cf3268857d3b59ef51e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 19 15:00:08 2013 -0500 Fix a may-be-used-uninitialized warning. --- src/test/test_dir.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test_dir.c b/src/test/test_dir.c index bef01e1..fbd49b7 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -783,7 +783,7 @@ get_detached_sigs(networkstatus_t *ns, networkstatus_t *ns2) static vote_routerstatus_t * gen_routerstatus_for_v3ns(int idx, time_t now) { - vote_routerstatus_t *vrs; + vote_routerstatus_t *vrs=NULL; routerstatus_t *rs; tor_addr_t addr_ipv6; @@ -1715,7 +1715,7 @@ static uint32_t alternate_clip_bw = 0; static vote_routerstatus_t * gen_routerstatus_for_umbw(int idx, time_t now) { - vote_routerstatus_t *vrs; + vote_routerstatus_t *vrs = NULL; routerstatus_t *rs; tor_addr_t addr_ipv6; uint32_t max_unmeasured_bw = (alternate_clip_bw > 0) ?

1 0

[tor/master] Tweak consensus method 17 based on arma's comments
by nickm＠torproject.org 19 Feb '13

19 Feb '13

commit e73bbea26271dd6db75ca5c676f3c4ba8fc735e4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 22 09:48:10 2012 -0400 Tweak consensus method 17 based on arma's comments Instead of capping whenever a router has fewer than 3 measurements, we cap whenever a router has fewer than 3 measurements *AND* there are at least 3 authorities publishing measured bandwidths. We also generate bandwidth lines with a new "Unmeasured=1" flag, meaning that we didn't have enough observations for a node to use measured bandwidth values in the authority's input, whether we capped it or not. --- changes/bug2286 | 5 +++++ src/or/dirvote.c | 23 +++++++++++++++++++---- src/or/or.h | 3 +++ src/or/routerparse.c | 1 + 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/changes/bug2286 b/changes/bug2286 new file mode 100644 index 0000000..4f8dfbb --- /dev/null +++ b/changes/bug2286 @@ -0,0 +1,5 @@ + o Major features (directory authority): + - Directory authorities now support a new consensus method (17) + where they cap the published bandwidth of servers for which + insufficient bandwidth measurements exist. Fixes part of bug + 2286. diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 08a9eb4..d1ac8f8 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -1638,6 +1638,7 @@ networkstatus_compute_consensus(smartlist_t *votes, int *named_flag; /* Index of the flag "Named" for votes[j] */ int *unnamed_flag; /* Index of the flag "Unnamed" for votes[j] */ int chosen_named_idx; + int n_authorities_measuring_bandwidth; strmap_t *name_to_id_map = strmap_new(); char conflict[DIGEST_LEN]; @@ -1726,6 +1727,14 @@ networkstatus_compute_consensus(smartlist_t *votes, } SMARTLIST_FOREACH_END(v); } + /* We need to know how many votes measure bandwidth. */ + n_authorities_measuring_bandwidth = 0; + SMARTLIST_FOREACH(votes, networkstatus_t *, v, + if (v->has_measured_bws) { + ++n_authorities_measuring_bandwidth; + } + ); + /* Now go through all the votes */ flag_counts = tor_malloc(sizeof(int) * smartlist_len(flags)); while (1) { @@ -1889,14 +1898,17 @@ networkstatus_compute_consensus(smartlist_t *votes, /* Pick a bandwidth */ if (consensus_method >= 6 && num_mbws > 2) { rs_out.has_bandwidth = 1; + rs_out.has_measured_bw = 1; rs_out.bandwidth = median_uint32(measured_bws, num_mbws); } else if (consensus_method >= 5 && num_bandwidths > 0) { rs_out.has_bandwidth = 1; rs_out.bandwidth = median_uint32(bandwidths, num_bandwidths); - if (consensus_method >= MIN_METHOD_TO_CLIP_UNMEASURED_BW) { - /* Cap non-measured bandwidths to 20k. */ - if (rs_out.bandwidth > max_unmeasured_bw) + if (consensus_method >= MIN_METHOD_TO_CLIP_UNMEASURED_BW && + n_authorities_measuring_bandwidth > 2) { + /* Cap non-measured bandwidths. */ + if (rs_out.bandwidth > max_unmeasured_bw) { rs_out.bandwidth = max_unmeasured_bw; + } } } @@ -2039,7 +2051,10 @@ networkstatus_compute_consensus(smartlist_t *votes, smartlist_add(chunks, tor_strdup("\n")); /* Now the weight line. */ if (rs_out.has_bandwidth) { - smartlist_add_asprintf(chunks, "w Bandwidth=%d\n", rs_out.bandwidth); + int unmeasured = ! rs_out.has_measured_bw && + consensus_method >= MIN_METHOD_TO_CLIP_UNMEASURED_BW; + smartlist_add_asprintf(chunks, "w Bandwidth=%d%s\n", rs_out.bandwidth, + unmeasured?" Unmeasured=1":""); } /* Now the exitpolicy summary line. */ diff --git a/src/or/or.h b/src/or/or.h index a0a921a..d53d9ae 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2383,6 +2383,9 @@ typedef enum { typedef struct networkstatus_t { ENUM_BF(networkstatus_type_t) type : 8; /**< Vote, consensus, or opinion? */ ENUM_BF(consensus_flavor_t) flavor : 8; /**< If a consensus, what kind? */ + unsigned int has_measured_bws : 1;/**< True iff this networkstatus contains + * measured= bandwidth values. */ + time_t published; /**< Vote only: Time when vote was written. */ time_t valid_after; /**< Time after which this vote or consensus applies. */ time_t fresh_until; /**< Time before which this is the most recent vote or diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 2a3de12..c5a584c 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -1985,6 +1985,7 @@ routerstatus_parse_entry_from_string(memarea_t *area, goto err; } rs->has_measured_bw = 1; + vote->has_measured_bws = 1; } } }

1 0

[tor/master] Refactor v3_networkstatus test to allow reuse of test for measuredbw
by nickm＠torproject.org 19 Feb '13

19 Feb '13

commit f4d5ca9b5e54dca2ce6a6e40f222a7bf889f41e4 Author: Andrea Shepard <andrea(a)torproject.org> Date: Fri Feb 15 00:28:04 2013 -0800 Refactor v3_networkstatus test to allow reuse of test for measuredbw --- src/test/test_dir.c | 536 ++++++++++++++++++++++++++++++++++---------------- 1 files changed, 364 insertions(+), 172 deletions(-) diff --git a/src/test/test_dir.c b/src/test/test_dir.c index f1c745e..ec89606 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -766,10 +766,310 @@ get_detached_sigs(networkstatus_t *ns, networkstatus_t *ns2) return r; } -/** Run unit tests for generating and parsing V3 consensus networkstatus - * documents. */ +/** + * Generate a routerstatus for v3_networkstatus test + */ +static vote_routerstatus_t * +gen_routerstatus_for_v3ns(int idx, time_t now) +{ + vote_routerstatus_t *vrs; + routerstatus_t *rs; + tor_addr_t addr_ipv6; + + switch (idx) { + case 0: + /* Generate the first routerstatus. */ + vrs = tor_malloc_zero(sizeof(vote_routerstatus_t)); + rs = &vrs->status; + vrs->version = tor_strdup("0.1.2.14"); + rs->published_on = now-1500; + strlcpy(rs->nickname, "router2", sizeof(rs->nickname)); + memset(rs->identity_digest, 3, DIGEST_LEN); + memset(rs->descriptor_digest, 78, DIGEST_LEN); + rs->addr = 0x99008801; + rs->or_port = 443; + rs->dir_port = 8000; + /* all flags but running cleared */ + rs->is_flagged_running = 1; + break; + case 1: + /* Generate the second routerstatus. */ + vrs = tor_malloc_zero(sizeof(vote_routerstatus_t)); + rs = &vrs->status; + vrs->version = tor_strdup("0.2.0.5"); + rs->published_on = now-1000; + strlcpy(rs->nickname, "router1", sizeof(rs->nickname)); + memset(rs->identity_digest, 5, DIGEST_LEN); + memset(rs->descriptor_digest, 77, DIGEST_LEN); + rs->addr = 0x99009901; + rs->or_port = 443; + rs->dir_port = 0; + tor_addr_parse(&addr_ipv6, "[1:2:3::4]"); + tor_addr_copy(&rs->ipv6_addr, &addr_ipv6); + rs->ipv6_orport = 4711; + rs->is_exit = rs->is_stable = rs->is_fast = rs->is_flagged_running = + rs->is_valid = rs->is_v2_dir = rs->is_possible_guard = 1; + break; + case 2: + /* Generate the third routerstatus. */ + vrs = tor_malloc_zero(sizeof(vote_routerstatus_t)); + rs = &vrs->status; + vrs->version = tor_strdup("0.1.0.3"); + rs->published_on = now-1000; + strlcpy(rs->nickname, "router3", sizeof(rs->nickname)); + memset(rs->identity_digest, 33, DIGEST_LEN); + memset(rs->descriptor_digest, 79, DIGEST_LEN); + rs->addr = 0xAA009901; + rs->or_port = 400; + rs->dir_port = 9999; + rs->is_authority = rs->is_exit = rs->is_stable = rs->is_fast = + rs->is_flagged_running = rs->is_valid = rs->is_v2_dir = + rs->is_possible_guard = 1; + break; + case 3: + /* Generate a fourth routerstatus that is not running. */ + vrs = tor_malloc_zero(sizeof(vote_routerstatus_t)); + rs = &vrs->status; + vrs->version = tor_strdup("0.1.6.3"); + rs->published_on = now-1000; + strlcpy(rs->nickname, "router4", sizeof(rs->nickname)); + memset(rs->identity_digest, 34, DIGEST_LEN); + memset(rs->descriptor_digest, 47, DIGEST_LEN); + rs->addr = 0xC0000203; + rs->or_port = 500; + rs->dir_port = 1999; + /* Running flag (and others) cleared */ + break; + case 4: + /* No more for this test; return NULL */ + vrs = NULL; + break; + default: + /* Shouldn't happen */ + test_assert(0); + } + + done: + return vrs; +} + +/** Apply tweaks to the vote list for each voter */ static void -test_dir_v3_networkstatus(void) +vote_tweaks_for_v3ns(networkstatus_t *v, int voter, time_t now) +{ + vote_routerstatus_t *vrs; + const char *msg = NULL; + + test_assert(v); + (void)now; + + if (voter == 1) { + measured_bw_line_t mbw; + memset(mbw.node_id, 33, sizeof(mbw.node_id)); + mbw.bw = 1024; + test_assert(measured_bw_line_apply(&mbw, + v->routerstatus_list) == 1); + } else if (voter == 2 || voter == 3) { + /* Monkey around with the list a bit */ + vrs = smartlist_get(v->routerstatus_list, 2); + smartlist_del_keeporder(v->routerstatus_list, 2); + tor_free(vrs->version); + tor_free(vrs); + vrs = smartlist_get(v->routerstatus_list, 0); + vrs->status.is_fast = 1; + + if (voter == 3) { + vrs = smartlist_get(v->routerstatus_list, 0); + smartlist_del_keeporder(v->routerstatus_list, 0); + tor_free(vrs->version); + tor_free(vrs); + vrs = smartlist_get(v->routerstatus_list, 0); + memset(vrs->status.descriptor_digest, (int)'Z', DIGEST_LEN); + test_assert(router_add_to_routerlist( + generate_ri_from_rs(vrs), &msg,0,0) >= 0); + } + } + + done: + return; +} + +/** + * Test a parsed vote_routerstatus_t for v3_networkstatus test + */ +static void +test_vrs_for_v3ns(vote_routerstatus_t *vrs, int voter, time_t now) +{ + routerstatus_t *rs; + tor_addr_t addr_ipv6; + + test_assert(vrs); + rs = &(vrs->status); + test_assert(rs); + + /* Split out by digests to test */ + if (tor_memeq(rs->identity_digest, + "\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3" + "\x3\x3\x3\x3", + DIGEST_LEN) && + (voter == 1)) { + /* Check the first routerstatus. */ + test_streq(vrs->version, "0.1.2.14"); + test_eq(rs->published_on, now-1500); + test_streq(rs->nickname, "router2"); + test_memeq(rs->identity_digest, + "\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3" + "\x3\x3\x3\x3", + DIGEST_LEN); + test_memeq(rs->descriptor_digest, "NNNNNNNNNNNNNNNNNNNN", DIGEST_LEN); + test_eq(rs->addr, 0x99008801); + test_eq(rs->or_port, 443); + test_eq(rs->dir_port, 8000); + test_eq(vrs->flags, U64_LITERAL(16)); // no flags except "running" + } else if (tor_memeq(rs->identity_digest, + "\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5" + "\x5\x5\x5\x5", + DIGEST_LEN) && + (voter == 1 || voter == 2)) { + test_memeq(rs->identity_digest, + "\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5" + "\x5\x5\x5\x5", + DIGEST_LEN); + + if (voter == 1) { + /* Check the second routerstatus. */ + test_streq(vrs->version, "0.2.0.5"); + test_eq(rs->published_on, now-1000); + test_streq(rs->nickname, "router1"); + } + test_memeq(rs->descriptor_digest, "MMMMMMMMMMMMMMMMMMMM", DIGEST_LEN); + test_eq(rs->addr, 0x99009901); + test_eq(rs->or_port, 443); + test_eq(rs->dir_port, 0); + tor_addr_parse(&addr_ipv6, "[1:2:3::4]"); + test_assert(tor_addr_eq(&rs->ipv6_addr, &addr_ipv6)); + test_eq(rs->ipv6_orport, 4711); + if (voter == 1) { + test_eq(vrs->flags, U64_LITERAL(254)); // all flags except "authority." + } else { + /* 1023 - authority(1) - madeofcheese(16) - madeoftin(32) */ + test_eq(vrs->flags, U64_LITERAL(974)); + } + } else if (tor_memeq(rs->identity_digest, + "\x33\x33\x33\x33\x33\x33\x33\x33\x33\x33" + "\x33\x33\x33\x33\x33\x33\x33\x33\x33\x33", + DIGEST_LEN) && + (voter == 1 || voter == 2)) { + /* Check the measured bandwidth bits */ + test_assert(vrs->status.has_measured_bw && + vrs->status.measured_bw == 1024); + } else { + /* + * Didn't expect this, but the old unit test only checked some of them, + * so don't assert. + */ + /* test_assert(0); */ + } + + done: + return; +} + +/** + * Test a consensus for v3_networkstatus_test + */ +static void +test_consensus_for_v3ns(networkstatus_t *con, time_t now) +{ + (void)now; + + test_assert(con); + test_assert(!con->cert); + test_eq(2, smartlist_len(con->routerstatus_list)); + /* There should be two listed routers: one with identity 3, one with + * identity 5. */ + + done: + return; +} + +/** + * Test a router list entry for v3_networkstatus test + */ +static void +test_routerstatus_for_v3ns(routerstatus_t *rs, time_t now) +{ + tor_addr_t addr_ipv6; + + test_assert(rs); + + /* There should be two listed routers: one with identity 3, one with + * identity 5. */ + /* This one showed up in 2 digests. */ + if (tor_memeq(rs->identity_digest, + "\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3" + "\x3\x3", + DIGEST_LEN)) { + test_memeq(rs->identity_digest, + "\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3", + DIGEST_LEN); + test_memeq(rs->descriptor_digest, "NNNNNNNNNNNNNNNNNNNN", DIGEST_LEN); + test_assert(!rs->is_authority); + test_assert(!rs->is_exit); + test_assert(!rs->is_fast); + test_assert(!rs->is_possible_guard); + test_assert(!rs->is_stable); + /* (If it wasn't running it wouldn't be here) */ + test_assert(rs->is_flagged_running); + test_assert(!rs->is_v2_dir); + test_assert(!rs->is_valid); + test_assert(!rs->is_named); + /* XXXX check version */ + } else if (tor_memeq(rs->identity_digest, + "\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5" + "\x5\x5\x5\x5", + DIGEST_LEN)) { + /* This one showed up in 3 digests. Twice with ID 'M', once with 'Z'. */ + test_memeq(rs->identity_digest, + "\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5", + DIGEST_LEN); + test_streq(rs->nickname, "router1"); + test_memeq(rs->descriptor_digest, "MMMMMMMMMMMMMMMMMMMM", DIGEST_LEN); + test_eq(rs->published_on, now-1000); + test_eq(rs->addr, 0x99009901); + test_eq(rs->or_port, 443); + test_eq(rs->dir_port, 0); + tor_addr_parse(&addr_ipv6, "[1:2:3::4]"); + test_assert(tor_addr_eq(&rs->ipv6_addr, &addr_ipv6)); + test_eq(rs->ipv6_orport, 4711); + test_assert(!rs->is_authority); + test_assert(rs->is_exit); + test_assert(rs->is_fast); + test_assert(rs->is_possible_guard); + test_assert(rs->is_stable); + test_assert(rs->is_flagged_running); + test_assert(rs->is_v2_dir); + test_assert(rs->is_valid); + test_assert(!rs->is_named); + /* XXXX check version */ + } else { + /* Weren't expecting this... */ + test_assert(0); + } + + done: + return; +} + +/** Run a unit tests for generating and parsing networkstatuses, with + * the supply test fns. */ +static void +test_a_networkstatus( + vote_routerstatus_t * (*vrs_gen)(int idx, time_t now), + void (*vote_tweaks)(networkstatus_t *v, int voter, time_t now), + void (*vrs_test)(vote_routerstatus_t *vrs, int voter, time_t now), + void (*consensus_test)(networkstatus_t *con, time_t now), + void (*rs_test)(routerstatus_t *rs, time_t now)) { authority_cert_t *cert1=NULL, *cert2=NULL, *cert3=NULL; crypto_pk_t *sign_skey_1=NULL, *sign_skey_2=NULL, *sign_skey_3=NULL; @@ -782,8 +1082,8 @@ test_dir_v3_networkstatus(void) networkstatus_t *vote=NULL, *v1=NULL, *v2=NULL, *v3=NULL, *con=NULL, *con_md=NULL; vote_routerstatus_t *vrs; - tor_addr_t addr_ipv6; routerstatus_t *rs; + int idx, n_rs, n_vrs; char *v1_text=NULL, *v2_text=NULL, *v3_text=NULL, *consensus_text=NULL, *cp; smartlist_t *votes = smartlist_new(); @@ -795,6 +1095,10 @@ test_dir_v3_networkstatus(void) networkstatus_t *con2=NULL, *con_md2=NULL, *con3=NULL, *con_md3=NULL; ns_detached_signatures_t *dsig1=NULL, *dsig2=NULL; + test_assert(vrs_gen); + test_assert(rs_test); + test_assert(vrs_test); + /* Parse certificates and keys. */ cert1 = authority_cert_parse_from_string(AUTHORITY_CERT_1, NULL); test_assert(cert1); @@ -852,72 +1156,18 @@ test_dir_v3_networkstatus(void) smartlist_split_string(vote->net_params, "circuitwindow=101 foo=990", NULL, 0, 0); vote->routerstatus_list = smartlist_new(); - /* add the first routerstatus. */ - vrs = tor_malloc_zero(sizeof(vote_routerstatus_t)); - rs = &vrs->status; - vrs->version = tor_strdup("0.1.2.14"); - rs->published_on = now-1500; - strlcpy(rs->nickname, "router2", sizeof(rs->nickname)); - memset(rs->identity_digest, 3, DIGEST_LEN); - memset(rs->descriptor_digest, 78, DIGEST_LEN); - rs->addr = 0x99008801; - rs->or_port = 443; - rs->dir_port = 8000; - /* all flags but running cleared */ - rs->is_flagged_running = 1; - smartlist_add(vote->routerstatus_list, vrs); - test_assert(router_add_to_routerlist(generate_ri_from_rs(vrs), &msg,0,0)>=0); - - /* add the second routerstatus. */ - vrs = tor_malloc_zero(sizeof(vote_routerstatus_t)); - rs = &vrs->status; - vrs->version = tor_strdup("0.2.0.5"); - rs->published_on = now-1000; - strlcpy(rs->nickname, "router1", sizeof(rs->nickname)); - memset(rs->identity_digest, 5, DIGEST_LEN); - memset(rs->descriptor_digest, 77, DIGEST_LEN); - rs->addr = 0x99009901; - rs->or_port = 443; - rs->dir_port = 0; - tor_addr_parse(&addr_ipv6, "[1:2:3::4]"); - tor_addr_copy(&rs->ipv6_addr, &addr_ipv6); - rs->ipv6_orport = 4711; - rs->is_exit = rs->is_stable = rs->is_fast = rs->is_flagged_running = - rs->is_valid = rs->is_v2_dir = rs->is_possible_guard = 1; - smartlist_add(vote->routerstatus_list, vrs); - test_assert(router_add_to_routerlist(generate_ri_from_rs(vrs), &msg,0,0)>=0); - - /* add the third routerstatus. */ - vrs = tor_malloc_zero(sizeof(vote_routerstatus_t)); - rs = &vrs->status; - vrs->version = tor_strdup("0.1.0.3"); - rs->published_on = now-1000; - strlcpy(rs->nickname, "router3", sizeof(rs->nickname)); - memset(rs->identity_digest, 33, DIGEST_LEN); - memset(rs->descriptor_digest, 79, DIGEST_LEN); - rs->addr = 0xAA009901; - rs->or_port = 400; - rs->dir_port = 9999; - rs->is_authority = rs->is_exit = rs->is_stable = rs->is_fast = - rs->is_flagged_running = rs->is_valid = rs->is_v2_dir = - rs->is_possible_guard = 1; - smartlist_add(vote->routerstatus_list, vrs); - test_assert(router_add_to_routerlist(generate_ri_from_rs(vrs), &msg,0,0)>=0); - - /* add a fourth routerstatus that is not running. */ - vrs = tor_malloc_zero(sizeof(vote_routerstatus_t)); - rs = &vrs->status; - vrs->version = tor_strdup("0.1.6.3"); - rs->published_on = now-1000; - strlcpy(rs->nickname, "router4", sizeof(rs->nickname)); - memset(rs->identity_digest, 34, DIGEST_LEN); - memset(rs->descriptor_digest, 47, DIGEST_LEN); - rs->addr = 0xC0000203; - rs->or_port = 500; - rs->dir_port = 1999; - /* Running flag (and others) cleared */ - smartlist_add(vote->routerstatus_list, vrs); - test_assert(router_add_to_routerlist(generate_ri_from_rs(vrs), &msg,0,0)>=0); + /* add routerstatuses */ + idx = 0; + do { + vrs = vrs_gen(idx, now); + if (vrs) { + smartlist_add(vote->routerstatus_list, vrs); + test_assert(router_add_to_routerlist(generate_ri_from_rs(vrs), + &msg,0,0)>=0); + ++idx; + } + } while (vrs); + n_vrs = idx; /* dump the vote and try to parse it. */ v1_text = format_networkstatus_vote(sign_skey_1, vote); @@ -948,47 +1198,15 @@ test_dir_v3_networkstatus(void) cp = smartlist_join_strings(v1->known_flags, ":", 0, NULL); test_streq(cp, "Authority:Exit:Fast:Guard:Running:Stable:V2Dir:Valid"); tor_free(cp); - test_eq(smartlist_len(v1->routerstatus_list), 4); - /* Check the first routerstatus. */ - vrs = smartlist_get(v1->routerstatus_list, 0); - rs = &vrs->status; - test_streq(vrs->version, "0.1.2.14"); - test_eq(rs->published_on, now-1500); - test_streq(rs->nickname, "router2"); - test_memeq(rs->identity_digest, - "\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3", - DIGEST_LEN); - test_memeq(rs->descriptor_digest, "NNNNNNNNNNNNNNNNNNNN", DIGEST_LEN); - test_eq(rs->addr, 0x99008801); - test_eq(rs->or_port, 443); - test_eq(rs->dir_port, 8000); - test_eq(vrs->flags, U64_LITERAL(16)); // no flags except "running" - /* Check the second routerstatus. */ - vrs = smartlist_get(v1->routerstatus_list, 1); - rs = &vrs->status; - test_streq(vrs->version, "0.2.0.5"); - test_eq(rs->published_on, now-1000); - test_streq(rs->nickname, "router1"); - test_memeq(rs->identity_digest, - "\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5", - DIGEST_LEN); - test_memeq(rs->descriptor_digest, "MMMMMMMMMMMMMMMMMMMM", DIGEST_LEN); - test_eq(rs->addr, 0x99009901); - test_eq(rs->or_port, 443); - test_eq(rs->dir_port, 0); - test_assert(tor_addr_eq(&rs->ipv6_addr, &addr_ipv6)); - test_eq(rs->ipv6_orport, 4711); - test_eq(vrs->flags, U64_LITERAL(254)); // all flags except "authority." + test_eq(smartlist_len(v1->routerstatus_list), n_vrs); - { - measured_bw_line_t mbw; - memset(mbw.node_id, 33, sizeof(mbw.node_id)); - mbw.bw = 1024; - test_assert(measured_bw_line_apply(&mbw, - v1->routerstatus_list) == 1); - vrs = smartlist_get(v1->routerstatus_list, 2); - test_assert(vrs->status.has_measured_bw && - vrs->status.measured_bw == 1024); + if (vote_tweaks) vote_tweaks(v1, 1, now); + + /* Check the routerstatuses. */ + for (idx = 0; idx < n_vrs; ++idx) { + vrs = smartlist_get(v1->routerstatus_list, idx); + test_assert(vrs); + vrs_test(vrs, 1, now); } /* Generate second vote. It disagrees on some of the times, @@ -1013,25 +1231,28 @@ test_dir_v3_networkstatus(void) smartlist_add(vote->known_flags, tor_strdup("MadeOfCheese")); smartlist_add(vote->known_flags, tor_strdup("MadeOfTin")); smartlist_sort_strings(vote->known_flags); - vrs = smartlist_get(vote->routerstatus_list, 2); - smartlist_del_keeporder(vote->routerstatus_list, 2); - tor_free(vrs->version); - tor_free(vrs); - vrs = smartlist_get(vote->routerstatus_list, 0); - vrs->status.is_fast = 1; - /* generate and parse. */ + + /* generate and parse v2. */ v2_text = format_networkstatus_vote(sign_skey_2, vote); test_assert(v2_text); v2 = networkstatus_parse_vote_from_string(v2_text, NULL, NS_TYPE_VOTE); test_assert(v2); + + if (vote_tweaks) vote_tweaks(v2, 2, now); + /* Check that flags come out right.*/ cp = smartlist_join_strings(v2->known_flags, ":", 0, NULL); test_streq(cp, "Authority:Exit:Fast:Guard:MadeOfCheese:MadeOfTin:" "Running:Stable:V2Dir:Valid"); tor_free(cp); - vrs = smartlist_get(v2->routerstatus_list, 1); - /* 1023 - authority(1) - madeofcheese(16) - madeoftin(32) */ - test_eq(vrs->flags, U64_LITERAL(974)); + + /* Check the routerstatuses. */ + n_vrs = smartlist_len(v2->routerstatus_list); + for (idx = 0; idx < n_vrs; ++idx) { + vrs = smartlist_get(v2->routerstatus_list, idx); + test_assert(vrs); + vrs_test(vrs, 2, now); + } /* Generate the third vote. */ vote->published = now; @@ -1054,13 +1275,6 @@ test_dir_v3_networkstatus(void) crypto_pk_get_digest(cert3->identity_key, voter->identity_digest); /* This one has a legacy id. */ memset(voter->legacy_id_digest, (int)'A', DIGEST_LEN); - vrs = smartlist_get(vote->routerstatus_list, 0); - smartlist_del_keeporder(vote->routerstatus_list, 0); - tor_free(vrs->version); - tor_free(vrs); - vrs = smartlist_get(vote->routerstatus_list, 0); - memset(vrs->status.descriptor_digest, (int)'Z', DIGEST_LEN); - test_assert(router_add_to_routerlist(generate_ri_from_rs(vrs), &msg,0,0)>=0); v3_text = format_networkstatus_vote(sign_skey_3, vote); test_assert(v3_text); @@ -1068,6 +1282,8 @@ test_dir_v3_networkstatus(void) v3 = networkstatus_parse_vote_from_string(v3_text, NULL, NS_TYPE_VOTE); test_assert(v3); + if (vote_tweaks) vote_tweaks(v3, 3, now); + /* Compute a consensus as voter 3. */ smartlist_add(votes, v3); smartlist_add(votes, v1); @@ -1127,51 +1343,15 @@ test_dir_v3_networkstatus(void) test_same_voter(smartlist_get(con->voters, 3), smartlist_get(v3->voters, 0)); - test_assert(!con->cert); - test_eq(2, smartlist_len(con->routerstatus_list)); - /* There should be two listed routers: one with identity 3, one with - * identity 5. */ - /* This one showed up in 2 digests. */ - rs = smartlist_get(con->routerstatus_list, 0); - test_memeq(rs->identity_digest, - "\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3", - DIGEST_LEN); - test_memeq(rs->descriptor_digest, "NNNNNNNNNNNNNNNNNNNN", DIGEST_LEN); - test_assert(!rs->is_authority); - test_assert(!rs->is_exit); - test_assert(!rs->is_fast); - test_assert(!rs->is_possible_guard); - test_assert(!rs->is_stable); - /* (If it wasn't running it wouldn't be here) */ - test_assert(rs->is_flagged_running); - test_assert(!rs->is_v2_dir); - test_assert(!rs->is_valid); - test_assert(!rs->is_named); - /* XXXX check version */ - - rs = smartlist_get(con->routerstatus_list, 1); - /* This one showed up in 3 digests. Twice with ID 'M', once with 'Z'. */ - test_memeq(rs->identity_digest, - "\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5", - DIGEST_LEN); - test_streq(rs->nickname, "router1"); - test_memeq(rs->descriptor_digest, "MMMMMMMMMMMMMMMMMMMM", DIGEST_LEN); - test_eq(rs->published_on, now-1000); - test_eq(rs->addr, 0x99009901); - test_eq(rs->or_port, 443); - test_eq(rs->dir_port, 0); - test_assert(tor_addr_eq(&rs->ipv6_addr, &addr_ipv6)); - test_eq(rs->ipv6_orport, 4711); - test_assert(!rs->is_authority); - test_assert(rs->is_exit); - test_assert(rs->is_fast); - test_assert(rs->is_possible_guard); - test_assert(rs->is_stable); - test_assert(rs->is_flagged_running); - test_assert(rs->is_v2_dir); - test_assert(rs->is_valid); - test_assert(!rs->is_named); - /* XXXX check version */ + consensus_test(con, now); + + /* Check the routerstatuses. */ + n_rs = smartlist_len(con->routerstatus_list); + for (idx = 0; idx < n_rs; ++idx) { + rs = smartlist_get(con->routerstatus_list, idx); + test_assert(rs); + rs_test(rs, now); + } /* Check signatures. the first voter is a pseudo-entry with a legacy key. * The second one hasn't signed. The fourth one has signed: validate it. */ @@ -1374,6 +1554,18 @@ test_dir_v3_networkstatus(void) ns_detached_signatures_free(dsig2); } +/** Run unit tests for generating and parsing V3 consensus networkstatus + * documents. */ +static void +test_dir_v3_networkstatus(void) +{ + test_a_networkstatus(gen_routerstatus_for_v3ns, + vote_tweaks_for_v3ns, + test_vrs_for_v3ns, + test_consensus_for_v3ns, + test_routerstatus_for_v3ns); +} + static void test_dir_scale_bw(void *testdata) {

1 0

[torbrowser/maint-2.4] bump stable and alpha TBBs for Firefox 17.0.3esr
by erinn＠torproject.org 19 Feb '13

19 Feb '13

commit cd9093cab93a2413010277929254bfcdeda0635b Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Feb 19 19:00:50 2013 +0100 bump stable and alpha TBBs for Firefox 17.0.3esr --- build-scripts/linux-alpha.mk | 2 +- build-scripts/linux.mk | 2 +- build-scripts/osx-alpha.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions-alpha.mk | 2 +- build-scripts/versions.mk | 2 +- build-scripts/windows-alpha.mk | 2 +- build-scripts/windows.mk | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index 182087c..721c943 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 29af4a3..f5d71e4 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=3 +BUILD_NUM=4 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index bd4fa27..db1064f 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=i386 -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 6cd84fa..3f52fb7 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=x86_64 -BUILD_NUM=3 +BUILD_NUM=4 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index 8d0fb62..03bf34d 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -10,7 +10,7 @@ VIDALIA_VER=0.2.21 LIBEVENT_VER=2.0.21-stable TOR_VER=0.2.4.10-alpha PIDGIN_VER=2.6.4 -FIREFOX_VER=17.0.2esr +FIREFOX_VER=17.0.3esr MOZBUILD_VER=1.5.1 TORBUTTON_VER=1.5.0 NOSCRIPT_VER=2.6.4.4 diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index a9d61f8..304ed63 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -10,7 +10,7 @@ VIDALIA_VER=0.2.21 LIBEVENT_VER=2.0.21-stable TOR_VER=0.2.3.25 PIDGIN_VER=2.6.4 -FIREFOX_VER=17.0.2esr +FIREFOX_VER=17.0.3esr MOZBUILD_VER=1.5.1 TORBUTTON_VER=1.5.0 NOSCRIPT_VER=2.6.4.4 diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index 8d68ab0..fdb8610 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Windows ## Location of required libraries diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 8146693..bee5aa7 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=3 +BUILD_NUM=4 PLATFORM=Windows ## Location of required libraries

1 0

[torbrowser/master] bump stable and alpha TBBs for Firefox 17.0.3esr
by erinn＠torproject.org 19 Feb '13

19 Feb '13

commit cd9093cab93a2413010277929254bfcdeda0635b Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Feb 19 19:00:50 2013 +0100 bump stable and alpha TBBs for Firefox 17.0.3esr --- build-scripts/linux-alpha.mk | 2 +- build-scripts/linux.mk | 2 +- build-scripts/osx-alpha.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions-alpha.mk | 2 +- build-scripts/versions.mk | 2 +- build-scripts/windows-alpha.mk | 2 +- build-scripts/windows.mk | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index 182087c..721c943 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 29af4a3..f5d71e4 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=3 +BUILD_NUM=4 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index bd4fa27..db1064f 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=i386 -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 6cd84fa..3f52fb7 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=x86_64 -BUILD_NUM=3 +BUILD_NUM=4 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index 8d0fb62..03bf34d 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -10,7 +10,7 @@ VIDALIA_VER=0.2.21 LIBEVENT_VER=2.0.21-stable TOR_VER=0.2.4.10-alpha PIDGIN_VER=2.6.4 -FIREFOX_VER=17.0.2esr +FIREFOX_VER=17.0.3esr MOZBUILD_VER=1.5.1 TORBUTTON_VER=1.5.0 NOSCRIPT_VER=2.6.4.4 diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index a9d61f8..304ed63 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -10,7 +10,7 @@ VIDALIA_VER=0.2.21 LIBEVENT_VER=2.0.21-stable TOR_VER=0.2.3.25 PIDGIN_VER=2.6.4 -FIREFOX_VER=17.0.2esr +FIREFOX_VER=17.0.3esr MOZBUILD_VER=1.5.1 TORBUTTON_VER=1.5.0 NOSCRIPT_VER=2.6.4.4 diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index 8d68ab0..fdb8610 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Windows ## Location of required libraries diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 8146693..bee5aa7 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=3 +BUILD_NUM=4 PLATFORM=Windows ## Location of required libraries

1 0

[torbrowser/maint-2.4] Remove plugin-blocking prefs.
by erinn＠torproject.org 19 Feb '13

19 Feb '13

commit ddd455a6d38c10a50f666b362e8fdb7ec99d7e31 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Feb 8 22:13:34 2013 -0800 Remove plugin-blocking prefs. The Firefox patch is more precise. --- build-scripts/config/pound_tor.js | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/build-scripts/config/pound_tor.js b/build-scripts/config/pound_tor.js index 38eb3f2..c42d13c 100644 --- a/build-scripts/config/pound_tor.js +++ b/build-scripts/config/pound_tor.js @@ -94,15 +94,6 @@ pref("security.ssl.enable_false_start", true); pref("network.http.keep-alive.timeout", 20); pref("network.http.connection-retry-timeout", 0); -// Plugin blocking (overkill?) -pref("plugin.disable_full_page_plugin_for_types", "application/asx,video/x-ms-asf-plugin,application/x-mplayer2,video/x-ms-asf,video/x-ms-wm,audio/x-ms-wma,audio/x-ms-wax,video/x-ms-wmv,video/x-ms-wvx,application/x-drm-v2,application/x-drm"); -pref("plugin.scan.4xPluginFolder", false); -pref("plugin.scan.Acrobat", "99.0"); -pref("plugin.scan.Quicktime", "99.0"); -pref("plugin.scan.SunJRE", "99.0"); -pref("plugin.scan.WindowsMediaPlayer", "99.0"); -pref("plugin.scan.plid.all", false); - // Extension support pref("extensions.autoDisableScopes", 0); pref("extensions.bootstrappedAddons", "{}");

1 0

[torbrowser/maint-2.4] Reset default search engine to startpage.
by erinn＠torproject.org 19 Feb '13

19 Feb '13

commit 82e963c4dd00d49ac6eeacf8e0d171cad7317b6b Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sat Feb 9 12:50:49 2013 -0800 Reset default search engine to startpage. The prefs have become localized properties.. This may or may not survive on non en_US builds? --- build-scripts/config/pound_tor.js | 4 --- .../0014-Add-DDG-and-StartPage-to-Omnibox.patch | 26 ++++++++++++++++++- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/build-scripts/config/pound_tor.js b/build-scripts/config/pound_tor.js index c509a37..28390be 100644 --- a/build-scripts/config/pound_tor.js +++ b/build-scripts/config/pound_tor.js @@ -109,8 +109,4 @@ pref("xpinstall.whitelist.add", ""); pref("xpinstall.whitelist.add.36", ""); // Omnibox settings -pref("browser.search.order.1", "Startpage"); -pref("browser.search.order.2", "DuckDuckGo"); -pref("browser.search.order.3", "Google"); -pref("browser.search.selectedEngine", "Startpage"); pref("keyword.URL", "https://startpage.com/do/search?q="); diff --git a/src/current-patches/firefox/0014-Add-DDG-and-StartPage-to-Omnibox.patch b/src/current-patches/firefox/0014-Add-DDG-and-StartPage-to-Omnibox.patch index c50adff..caa96f6 100644 --- a/src/current-patches/firefox/0014-Add-DDG-and-StartPage-to-Omnibox.patch +++ b/src/current-patches/firefox/0014-Add-DDG-and-StartPage-to-Omnibox.patch @@ -1,4 +1,4 @@ -From 8b96f6a7116c524ae946736c98c2e2fa75460609 Mon Sep 17 00:00:00 2001 +From ab1a01ca37e8ca848c2629d8b1d0768094d3a1ea Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed, 25 Apr 2012 15:03:46 -0700 Subject: [PATCH 14/26] Add DDG and StartPage to Omnibox. @@ -6,13 +6,35 @@ Subject: [PATCH 14/26] Add DDG and StartPage to Omnibox. You mean there are search engines that don't require captchas if you don't have a cookie? Holy crap. Get those in there now. --- + .../en-US/chrome/browser-region/region.properties | 8 +++--- browser/locales/en-US/searchplugins/duckduckgo.xml | 29 ++++++++++++++++++++ browser/locales/en-US/searchplugins/list.txt | 2 + browser/locales/en-US/searchplugins/startpage.xml | 11 +++++++ - 3 files changed, 42 insertions(+), 0 deletions(-) + 4 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 browser/locales/en-US/searchplugins/duckduckgo.xml create mode 100644 browser/locales/en-US/searchplugins/startpage.xml +diff --git a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties +index c3a980c..9c21f04 100644 +--- a/browser/locales/en-US/chrome/browser-region/region.properties ++++ b/browser/locales/en-US/chrome/browser-region/region.properties +@@ -3,12 +3,12 @@ + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + + # Default search engine +-browser.search.defaultenginename=Google ++browser.search.defaultenginename=Startpage + + # Search engine order (order displayed in the search bar dropdown)s +-browser.search.order.1=Google +-browser.search.order.2=Yahoo +-browser.search.order.3=Bing ++browser.search.order.1=Startpage ++browser.search.order.2=DuckDuckGo ++browser.search.order.3=Google + + # This is the default set of web based feed handlers shown in the reader + # selection UI diff --git a/browser/locales/en-US/searchplugins/duckduckgo.xml b/browser/locales/en-US/searchplugins/duckduckgo.xml new file mode 100644 index 0000000..4f00b4d

1 0

[torbrowser/maint-2.4] Switch to Firefox's native click-to-play for plugins.
by erinn＠torproject.org 19 Feb '13

19 Feb '13

commit db11fa55d2a27a01f766bb0c90858381fd9f0c97 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sat Feb 9 12:23:54 2013 -0800 Switch to Firefox's native click-to-play for plugins. The UI is much easier to understand and use than NoScript's. Unfortunately, we still need NoScript's UI for WebGL and HTML5 video. --- build-scripts/config/extension-overrides.js | 7 ++++++- build-scripts/config/pound_tor.js | 1 + 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/build-scripts/config/extension-overrides.js b/build-scripts/config/extension-overrides.js index d498177..273e104 100644 --- a/build-scripts/config/extension-overrides.js +++ b/build-scripts/config/extension-overrides.js @@ -4,11 +4,11 @@ # Torbutton Preferences: pref("extensions.torbutton.fresh_install", false); +pref("extensions.torbutton.tor_enabled", true); pref("extensions.torbutton.proxies_applied", true); pref("extensions.torbutton.settings_applied", true); pref("extensions.torbutton.socks_host", "127.0.0.1"); pref("extensions.torbutton.socks_port", 9050); -pref("extensions.torbutton.tor_enabled", true); pref("extensions.torbutton.tz_string", "UTC+00:00"); # HTTPS Everywhere Preferences: @@ -46,3 +46,8 @@ pref("noscript.STS.enabled", false); pref("noscript.subscription.lastCheck", -142148139); pref("noscript.temp", ""); pref("noscript.untrusted", ""); +// Now handled by plugins.click_to_play +pref("noscript.forbidFlash", false); +pref("noscript.forbidSilverlight", false); +pref("noscript.forbidJava", false); +pref("noscript.forbidPlugins", false); diff --git a/build-scripts/config/pound_tor.js b/build-scripts/config/pound_tor.js index c42d13c..c509a37 100644 --- a/build-scripts/config/pound_tor.js +++ b/build-scripts/config/pound_tor.js @@ -83,6 +83,7 @@ pref("network.protocol-handler.warn-external.mailto", true); pref("network.protocol-handler.warn-external.news", true); pref("network.protocol-handler.warn-external.nntp", true); pref("network.protocol-handler.warn-external.snews", true); +pref("plugins.click_to_play", true); // Network and performance pref("network.http.pipelining", true);

1 0

[torbrowser/maint-2.4] Fix an exception on New Identity w/ NULL image firstPartyURI.
by erinn＠torproject.org 19 Feb '13

19 Feb '13

commit bd9d79e513c3cbfc7915442599c2224dff147371 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sat Feb 9 16:01:57 2013 -0800 Fix an exception on New Identity w/ NULL image firstPartyURI. --- ...solate-the-Image-Cache-per-url-bar-domain.patch | 59 +++++++++++-------- 1 files changed, 34 insertions(+), 25 deletions(-) diff --git a/src/current-patches/firefox/0024-Isolate-the-Image-Cache-per-url-bar-domain.patch b/src/current-patches/firefox/0024-Isolate-the-Image-Cache-per-url-bar-domain.patch index 862673b..3fb55cf 100644 --- a/src/current-patches/firefox/0024-Isolate-the-Image-Cache-per-url-bar-domain.patch +++ b/src/current-patches/firefox/0024-Isolate-the-Image-Cache-per-url-bar-domain.patch @@ -1,4 +1,4 @@ -From e2d2cca918467240f4265799ead98defb1139db0 Mon Sep 17 00:00:00 2001 +From 3454d300fca2eea0e652f8982ec996575886dd1a Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu, 6 Dec 2012 14:19:34 -0800 Subject: [PATCH 24/26] Isolate the Image Cache per url bar domain. @@ -10,7 +10,7 @@ not obey cacheKeys by default. embedding/browser/webBrowser/nsContextMenuInfo.cpp | 27 ++- extensions/cookie/nsCookiePermission.cpp | 3 + image/public/imgILoader.idl | 4 +- - image/src/imgLoader.cpp | 257 +++++++++++++------- + image/src/imgLoader.cpp | 262 +++++++++++++------- image/src/imgLoader.h | 20 +- image/src/imgRequest.cpp | 11 +- image/src/imgRequest.h | 3 + @@ -18,7 +18,7 @@ not obey cacheKeys by default. netwerk/cookie/nsICookiePermission.idl | 1 + toolkit/system/gnome/nsAlertsIconListener.cpp | 3 +- widget/cocoa/nsMenuItemIconX.mm | 9 +- - 12 files changed, 247 insertions(+), 118 deletions(-) + 12 files changed, 250 insertions(+), 120 deletions(-) diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp index 8d58d8b..6a9c87c 100644 @@ -149,7 +149,7 @@ index da26463..ecff309 100644 in nsIPrincipal aLoadingPrincipal, in nsILoadGroup aLoadGroup, diff --git a/image/src/imgLoader.cpp b/image/src/imgLoader.cpp -index ea51e8d..4d5cfd2 100644 +index ea51e8d..8f2e0c1 100644 --- a/image/src/imgLoader.cpp +++ b/image/src/imgLoader.cpp @@ -39,6 +39,7 @@ @@ -232,11 +232,11 @@ index ea51e8d..4d5cfd2 100644 + // content. + nsTArray<nsRefPtr<imgCacheEntry> > entries; + cache.Enumerate(EnumAllEntries, &entries); - -- nsRefPtr<imgRequest> request = getter_AddRefs(entry->GetRequest()); ++ + for (uint32_t i = 0; i < entries.Length(); ++i) { + bool isEqual = false; -+ + +- nsRefPtr<imgRequest> request = getter_AddRefs(entry->GetRequest()); + nsRefPtr<imgRequest> request = getter_AddRefs(entries[i]->GetRequest()); if (request) { - *_retval = request->Properties(); @@ -437,14 +437,14 @@ index ea51e8d..4d5cfd2 100644 + + return rv; +} - -- LOG_STATIC_FUNC_WITH_PARAM(gImgLog, "imgLoader::RemoveFromCache", "uri", spec.get()); ++ +bool imgLoader::RemoveKeyFromCache(imgCacheTable &cache, + imgCacheQueue &queue, + nsCAutoString key) +{ + if (key.IsEmpty()) return false; -+ + +- LOG_STATIC_FUNC_WITH_PARAM(gImgLog, "imgLoader::RemoveFromCache", "uri", spec.get()); + LOG_STATIC_FUNC_WITH_PARAM(gImgLog, "imgLoader::RemoveKeyFromCache", "uri", key.get()); nsRefPtr<imgCacheEntry> entry; @@ -468,14 +468,14 @@ index ea51e8d..4d5cfd2 100644 + nsCOMPtr<nsIURI> imgURI = request->mURI; + nsCOMPtr<nsIURI> firstPartyURI = request->mFirstPartyURI; + -+ if (imgURI && firstPartyURI) { ++ if (imgURI) { + imgCacheTable &cache = GetCache(imgURI); + imgCacheQueue &queue = GetCacheQueue(imgURI); + nsCAutoString spec = GetCacheKey(firstPartyURI, imgURI); LOG_STATIC_FUNC_WITH_PARAM(gImgLog, "imgLoader::RemoveFromCache", "entry's uri", spec.get()); -@@ -1438,18 +1485,6 @@ bool imgLoader::RemoveFromCache(imgCacheEntry *entry) +@@ -1438,32 +1485,21 @@ bool imgLoader::RemoveFromCache(imgCacheEntry *entry) return false; } @@ -493,8 +493,9 @@ index ea51e8d..4d5cfd2 100644 - nsresult imgLoader::EvictEntries(imgCacheTable &aCacheToClear) { ++ nsresult rv = NS_OK; LOG_STATIC_FUNC(gImgLog, "imgLoader::EvictEntries table"); -@@ -1457,7 +1492,7 @@ nsresult imgLoader::EvictEntries(imgCacheTable &aCacheToClear) + // We have to make a temporary, since RemoveFromCache removes the element // from the queue, invalidating iterators. nsTArray<nsRefPtr<imgCacheEntry> > entries; @@ -503,7 +504,15 @@ index ea51e8d..4d5cfd2 100644 for (uint32_t i = 0; i < entries.Length(); ++i) if (!RemoveFromCache(entries[i])) -@@ -1490,11 +1525,10 @@ nsresult imgLoader::EvictEntries(imgCacheQueue &aQueueToClear) +- return NS_ERROR_FAILURE; ++ rv = NS_ERROR_FAILURE; + +- return NS_OK; ++ return rv; + } + + nsresult imgLoader::EvictEntries(imgCacheQueue &aQueueToClear) +@@ -1490,11 +1526,10 @@ nsresult imgLoader::EvictEntries(imgCacheQueue &aQueueToClear) nsIRequest::VALIDATE_NEVER | \ nsIRequest::VALIDATE_ONCE_PER_SESSION) @@ -517,7 +526,7 @@ index ea51e8d..4d5cfd2 100644 nsIURI *aReferrerURI, nsIPrincipal* aLoadingPrincipal, nsILoadGroup *aLoadGroup, -@@ -1513,8 +1547,8 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, +@@ -1513,8 +1548,8 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, if (!aURI) return NS_ERROR_NULL_POINTER; @@ -528,7 +537,7 @@ index ea51e8d..4d5cfd2 100644 LOG_SCOPE_WITH_PARAM(gImgLog, "imgLoader::LoadImage", "aURI", spec.get()); *_retval = nullptr; -@@ -1566,7 +1600,7 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, +@@ -1566,7 +1601,7 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, imgCacheTable &cache = GetCache(aURI); if (cache.Get(spec, getter_AddRefs(entry)) && entry) { @@ -537,7 +546,7 @@ index ea51e8d..4d5cfd2 100644 aLoadGroup, aObserver, aCX, requestFlags, true, aRequest, _retval, aPolicy, aLoadingPrincipal, corsmode)) { request = getter_AddRefs(entry->GetRequest()); -@@ -1605,7 +1639,7 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, +@@ -1605,7 +1640,7 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, rv = NewImageChannel(getter_AddRefs(newChannel), &forcePrincipalCheck, aURI, @@ -546,7 +555,7 @@ index ea51e8d..4d5cfd2 100644 aReferrerURI, aLoadGroup, mAcceptHeader, -@@ -1627,8 +1661,8 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, +@@ -1627,8 +1662,8 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, do_CreateInstance(NS_LOADGROUP_CONTRACTID); newChannel->SetLoadGroup(loadGroup); @@ -557,7 +566,7 @@ index ea51e8d..4d5cfd2 100644 // Pass the inner window ID of the loading document, if possible. nsCOMPtr<nsIDocument> doc = do_QueryInterface(aCX); -@@ -1676,7 +1710,7 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, +@@ -1676,7 +1711,7 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, } // Try to add the new request into the cache. @@ -566,7 +575,7 @@ index ea51e8d..4d5cfd2 100644 } else { LOG_MSG_WITH_PARAM(gImgLog, "imgLoader::LoadImage |cache hit|", "request", request); -@@ -1736,6 +1770,49 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, +@@ -1736,6 +1771,49 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, return NS_OK; } @@ -616,7 +625,7 @@ index ea51e8d..4d5cfd2 100644 /* imgIRequest loadImageWithChannel(in nsIChannel channel, in imgIDecoderObserver aObserver, in nsISupports cx, out nsIStreamListener); */ NS_IMETHODIMP imgLoader::LoadImageWithChannel(nsIChannel *channel, imgIDecoderObserver *aObserver, nsISupports *aCX, nsIStreamListener **listener, imgIRequest **_retval) { -@@ -1746,22 +1823,27 @@ NS_IMETHODIMP imgLoader::LoadImageWithChannel(nsIChannel *channel, imgIDecoderOb +@@ -1746,22 +1824,27 @@ NS_IMETHODIMP imgLoader::LoadImageWithChannel(nsIChannel *channel, imgIDecoderOb nsCOMPtr<nsIURI> uri; channel->GetURI(getter_AddRefs(uri)); @@ -649,7 +658,7 @@ index ea51e8d..4d5cfd2 100644 if (cache.Get(spec, getter_AddRefs(entry)) && entry) { // We don't want to kick off another network load. So we ask -@@ -1833,7 +1915,7 @@ NS_IMETHODIMP imgLoader::LoadImageWithChannel(nsIChannel *channel, imgIDecoderOb +@@ -1833,7 +1916,7 @@ NS_IMETHODIMP imgLoader::LoadImageWithChannel(nsIChannel *channel, imgIDecoderOb channel->GetOriginalURI(getter_AddRefs(originalURI)); // No principal specified here, because we're not passed one. @@ -658,7 +667,7 @@ index ea51e8d..4d5cfd2 100644 aCX, nullptr, imgIRequest::CORS_NONE); ProxyListener *pl = new ProxyListener(static_cast<nsIStreamListener *>(request.get())); -@@ -1845,7 +1927,7 @@ NS_IMETHODIMP imgLoader::LoadImageWithChannel(nsIChannel *channel, imgIDecoderOb +@@ -1845,7 +1928,7 @@ NS_IMETHODIMP imgLoader::LoadImageWithChannel(nsIChannel *channel, imgIDecoderOb NS_RELEASE(pl); // Try to add the new request into the cache. @@ -667,7 +676,7 @@ index ea51e8d..4d5cfd2 100644 rv = CreateNewProxyForRequest(request, loadGroup, aObserver, requestFlags, nullptr, _retval); -@@ -2132,6 +2214,7 @@ NS_IMETHODIMP imgCacheValidator::OnStartRequest(nsIRequest *aRequest, nsISupport +@@ -2132,6 +2215,7 @@ NS_IMETHODIMP imgCacheValidator::OnStartRequest(nsIRequest *aRequest, nsISupport int32_t corsmode = mRequest->GetCORSMode(); nsCOMPtr<nsIPrincipal> loadingPrincipal = mRequest->GetLoadingPrincipal(); @@ -675,7 +684,7 @@ index ea51e8d..4d5cfd2 100644 // Doom the old request's cache entry mRequest->RemoveFromCache(); -@@ -2142,16 +2225,16 @@ NS_IMETHODIMP imgCacheValidator::OnStartRequest(nsIRequest *aRequest, nsISupport +@@ -2142,16 +2226,16 @@ NS_IMETHODIMP imgCacheValidator::OnStartRequest(nsIRequest *aRequest, nsISupport // We use originalURI here to fulfil the imgIRequest contract on GetURI. nsCOMPtr<nsIURI> originalURI; channel->GetOriginalURI(getter_AddRefs(originalURI));

1 0

[torbrowser/maint-2.4] Bug 8178: Disable WebRTC in Tor Browser.
by erinn＠torproject.org 19 Feb '13

19 Feb '13

commit 8381c2adf6b9c20ec89a7b84064dd59620a60ac6 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sat Feb 9 18:43:33 2013 -0800 Bug 8178: Disable WebRTC in Tor Browser. Potential UDP proxy bypass. --- build-scripts/config/dot_mozconfig | 1 + build-scripts/config/mozconfig-osx-i386 | 1 + build-scripts/config/mozconfig-osx-x86_64 | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/build-scripts/config/dot_mozconfig b/build-scripts/config/dot_mozconfig index c4522b3..635b009 100755 --- a/build-scripts/config/dot_mozconfig +++ b/build-scripts/config/dot_mozconfig @@ -14,3 +14,4 @@ ac_add_options --disable-tests ac_add_options --disable-debug ac_add_options --disable-maintenance-service ac_add_options --disable-crashreporter +ac_add_options --disable-webrtc diff --git a/build-scripts/config/mozconfig-osx-i386 b/build-scripts/config/mozconfig-osx-i386 index 57f943d..385b1e1 100644 --- a/build-scripts/config/mozconfig-osx-i386 +++ b/build-scripts/config/mozconfig-osx-i386 @@ -28,6 +28,7 @@ ac_add_options --enable-strip ac_add_options --disable-debug ac_add_options --disable-tests ac_add_options --disable-crashreporter +ac_add_options --disable-webrtc export CFLAGS="-Wno-return-type" export CXXFLAGS="-Wno-return-type" diff --git a/build-scripts/config/mozconfig-osx-x86_64 b/build-scripts/config/mozconfig-osx-x86_64 index 8136100..ba727dd 100755 --- a/build-scripts/config/mozconfig-osx-x86_64 +++ b/build-scripts/config/mozconfig-osx-x86_64 @@ -30,6 +30,7 @@ ac_add_options --enable-optimize ac_add_options --enable-strip ac_add_options --disable-tests ac_add_options --disable-debug +ac_add_options --disable-webrtc export CFLAGS="-Wno-return-type" export CXXFLAGS="-Wno-return-type"

1 0