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

[tor/master] Add crypto-initializer functions to those whose return values must be checked
by nickm＠torproject.org 26 Nov '15

26 Nov '15

commit 10fdee628552bca65ddb86b17e0b057628ad3703 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 25 10:36:34 2015 -0500 Add crypto-initializer functions to those whose return values must be checked --- src/common/crypto.c | 3 ++- src/common/crypto.h | 4 ++-- src/test/test_workqueue.c | 5 ++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index b7dc4b8..1ca86ea 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -322,7 +322,8 @@ int crypto_global_init(int useAccel, const char *accelName, const char *accelDir) { if (!crypto_global_initialized_) { - crypto_early_init(); + if (crypto_early_init() < 0) + return -1; crypto_global_initialized_ = 1; diff --git a/src/common/crypto.h b/src/common/crypto.h index d2ced63..60f9e28 100644 --- a/src/common/crypto.h +++ b/src/common/crypto.h @@ -112,10 +112,10 @@ typedef struct crypto_dh_t crypto_dh_t; /* global state */ const char * crypto_openssl_get_version_str(void); const char * crypto_openssl_get_header_version_str(void); -int crypto_early_init(void); +int crypto_early_init(void) ATTR_WUR; int crypto_global_init(int hardwareAccel, const char *accelName, - const char *accelPath); + const char *accelPath) ATTR_WUR; void crypto_thread_cleanup(void); int crypto_global_cleanup(void); diff --git a/src/test/test_workqueue.c b/src/test/test_workqueue.c index 6edfd31..1202f80 100644 --- a/src/test/test_workqueue.c +++ b/src/test/test_workqueue.c @@ -390,7 +390,10 @@ main(int argc, char **argv) init_logging(1); network_init(); - crypto_global_init(1, NULL, NULL); + if (crypto_global_init(1, NULL, NULL) < 0) { + printf("Couldn't initialize crypto subsystem; exiting.\n"); + return 1; + } if (crypto_seed_rng() < 0) { printf("Couldn't seed RNG; exiting.\n"); return 1;

1 0

[tor/master] Now that crypto_rand() cannot fail, it should return void.
by nickm＠torproject.org 26 Nov '15

26 Nov '15

commit ddcbe264745a0c10d80d8ad74125d23eb251662d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 25 10:42:00 2015 -0500 Now that crypto_rand() cannot fail, it should return void. --- src/common/crypto.c | 12 +++++------- src/common/crypto.h | 4 ++-- src/common/crypto_curve25519.c | 3 +-- src/common/tortls.c | 3 +-- src/or/config.c | 3 +-- src/or/connection_or.c | 3 +-- src/or/control.c | 3 +-- src/or/ext_orport.c | 3 +-- src/or/onion_fast.c | 8 ++------ src/or/rendclient.c | 6 +----- src/or/rendcommon.c | 12 ++---------- src/test/test_extorport.c | 5 ++--- 12 files changed, 20 insertions(+), 45 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index 1ca86ea..9e27ad3 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -270,8 +270,7 @@ crypto_init_siphash_key(void) if (have_seeded_siphash) return 0; - if (crypto_rand((char*) &key, sizeof(key)) < 0) - return -1; + crypto_rand((char*) &key, sizeof(key)); siphash_set_global_key(&key); have_seeded_siphash = 1; return 0; @@ -2368,27 +2367,26 @@ crypto_seed_rng(void) /** Write <b>n</b> bytes of strong random data to <b>to</b>. Return 0 on * success, -1 on failure, with support for mocking for unit tests. */ -MOCK_IMPL(int, +MOCK_IMPL(void, crypto_rand, (char *to, size_t n)) { - return crypto_rand_unmocked(to, n); + crypto_rand_unmocked(to, n); } /** Write <b>n</b> bytes of strong random data to <b>to</b>. Return 0 on * success, -1 on failure. Most callers will want crypto_rand instead. */ -int +void crypto_rand_unmocked(char *to, size_t n) { int r; if (n == 0) - return 0; + return; tor_assert(n < INT_MAX); tor_assert(to); r = RAND_bytes((unsigned char*)to, (int)n); tor_assert(r >= 0); - return 0; } /** Return a pseudorandom integer, chosen uniformly from the values diff --git a/src/common/crypto.h b/src/common/crypto.h index 60f9e28..3b471c2 100644 --- a/src/common/crypto.h +++ b/src/common/crypto.h @@ -260,8 +260,8 @@ int crypto_expand_key_material_rfc5869_sha256( /* random numbers */ int crypto_seed_rng(void) ATTR_WUR; -MOCK_DECL(int,crypto_rand,(char *to, size_t n)); -int crypto_rand_unmocked(char *to, size_t n); +MOCK_DECL(void,crypto_rand,(char *to, size_t n)); +void crypto_rand_unmocked(char *to, size_t n); int crypto_strongest_rand(uint8_t *out, size_t out_len); int crypto_rand_int(unsigned int max); int crypto_rand_int_range(unsigned int min, unsigned int max); diff --git a/src/common/crypto_curve25519.c b/src/common/crypto_curve25519.c index ac0b08a..00302a2 100644 --- a/src/common/crypto_curve25519.c +++ b/src/common/crypto_curve25519.c @@ -113,8 +113,7 @@ curve25519_rand_seckey_bytes(uint8_t *out, int extra_strong) { uint8_t k_tmp[CURVE25519_SECKEY_LEN]; - if (crypto_rand((char*)out, CURVE25519_SECKEY_LEN) < 0) - return -1; + crypto_rand((char*)out, CURVE25519_SECKEY_LEN); if (extra_strong && !crypto_strongest_rand(k_tmp, CURVE25519_SECKEY_LEN)) { /* If they asked for extra-strong entropy and we have some, use it as an * HMAC key to improve not-so-good entropy rather than using it directly, diff --git a/src/common/tortls.c b/src/common/tortls.c index 536043e..e3c6859 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -601,8 +601,7 @@ tor_tls_create_certificate(crypto_pk_t *rsa, goto error; { /* our serial number is 8 random bytes. */ - if (crypto_rand((char *)serial_tmp, sizeof(serial_tmp)) < 0) - goto error; + crypto_rand((char *)serial_tmp, sizeof(serial_tmp)); if (!(serial_number = BN_bin2bn(serial_tmp, sizeof(serial_tmp), NULL))) goto error; if (!(BN_to_ASN1_INTEGER(serial_number, X509_get_serialNumber(x509)))) diff --git a/src/or/config.c b/src/or/config.c index fa860af..431d366 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -7329,8 +7329,7 @@ init_cookie_authentication(const char *fname, const char *header, /* Generate the cookie */ *cookie_out = tor_malloc(cookie_len); - if (crypto_rand((char *)*cookie_out, cookie_len) < 0) - goto done; + crypto_rand((char *)*cookie_out, cookie_len); /* Create the string that should be written on the file. */ memcpy(cookie_file_str, header, strlen(header)); diff --git a/src/or/connection_or.c b/src/or/connection_or.c index a967c93..c454d3f 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -2290,8 +2290,7 @@ connection_or_send_auth_challenge_cell(or_connection_t *conn) auth_challenge_cell_t *ac = auth_challenge_cell_new(); - if (crypto_rand((char*)ac->challenge, sizeof(ac->challenge)) < 0) - goto done; + crypto_rand((char*)ac->challenge, sizeof(ac->challenge)); auth_challenge_cell_add_methods(ac, AUTHTYPE_RSA_SHA256_TLSSECRET); auth_challenge_cell_set_n_methods(ac, diff --git a/src/or/control.c b/src/or/control.c index 220e7e5..c89fdde 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -3418,8 +3418,7 @@ handle_control_authchallenge(control_connection_t *conn, uint32_t len, tor_free(client_nonce); return -1; } - const int fail = crypto_rand(server_nonce, SAFECOOKIE_SERVER_NONCE_LEN); - tor_assert(!fail); + crypto_rand(server_nonce, SAFECOOKIE_SERVER_NONCE_LEN); /* Now compute and send the server-to-controller response, and the * server's nonce. */ diff --git a/src/or/ext_orport.c b/src/or/ext_orport.c index e8c8aa6..f159f7d 100644 --- a/src/or/ext_orport.c +++ b/src/or/ext_orport.c @@ -193,8 +193,7 @@ handle_client_auth_nonce(const char *client_nonce, size_t client_nonce_len, return -1; /* Get our nonce */ - if (crypto_rand(server_nonce, EXT_OR_PORT_AUTH_NONCE_LEN) < 0) - return -1; + crypto_rand(server_nonce, EXT_OR_PORT_AUTH_NONCE_LEN); { /* set up macs */ size_t hmac_s_msg_len = strlen(EXT_OR_PORT_AUTH_SERVER_TO_CLIENT_CONST) + diff --git a/src/or/onion_fast.c b/src/or/onion_fast.c index 7584112..22bef4e 100644 --- a/src/or/onion_fast.c +++ b/src/or/onion_fast.c @@ -30,10 +30,7 @@ fast_onionskin_create(fast_handshake_state_t **handshake_state_out, { fast_handshake_state_t *s; *handshake_state_out = s = tor_malloc(sizeof(fast_handshake_state_t)); - if (crypto_rand((char*)s->state, sizeof(s->state)) < 0) { - tor_free(s); - return -1; - } + crypto_rand((char*)s->state, sizeof(s->state)); memcpy(handshake_out, s->state, DIGEST_LEN); return 0; } @@ -56,8 +53,7 @@ fast_server_handshake(const uint8_t *key_in, /* DIGEST_LEN bytes */ size_t out_len; int r = -1; - if (crypto_rand((char*)handshake_reply_out, DIGEST_LEN)<0) - return -1; + crypto_rand((char*)handshake_reply_out, DIGEST_LEN); memcpy(tmp, key_in, DIGEST_LEN); memcpy(tmp+DIGEST_LEN, handshake_reply_out, DIGEST_LEN); diff --git a/src/or/rendclient.c b/src/or/rendclient.c index a39e518..11e940c 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -65,11 +65,7 @@ rend_client_send_establish_rendezvous(origin_circuit_t *circ) tor_assert(circ->rend_data); log_info(LD_REND, "Sending an ESTABLISH_RENDEZVOUS cell"); - if (crypto_rand(circ->rend_data->rend_cookie, REND_COOKIE_LEN) < 0) { - log_warn(LD_BUG, "Internal error: Couldn't produce random cookie."); - circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_INTERNAL); - return -1; - } + crypto_rand(circ->rend_data->rend_cookie, REND_COOKIE_LEN); /* Set timestamp_dirty, because circuit_expire_building expects it, * and the rend cookie also means we've used the circ. */ diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index 22599e9..1e6c6da 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -268,11 +268,7 @@ rend_encrypt_v2_intro_points_basic(char **encrypted_out, tor_assert(client_cookies && smartlist_len(client_cookies) > 0); /* Generate session key. */ - if (crypto_rand(session_key, CIPHER_KEY_LEN) < 0) { - log_warn(LD_REND, "Unable to generate random session key to encrypt " - "introduction point string."); - goto done; - } + crypto_rand(session_key, CIPHER_KEY_LEN); /* Determine length of encrypted introduction points including session * keys. */ @@ -334,11 +330,7 @@ rend_encrypt_v2_intro_points_basic(char **encrypted_out, REND_BASIC_AUTH_CLIENT_MULTIPLE; i < REND_BASIC_AUTH_CLIENT_MULTIPLE - 1; i++) { client_part = tor_malloc_zero(REND_BASIC_AUTH_CLIENT_ENTRY_LEN); - if (crypto_rand(client_part, REND_BASIC_AUTH_CLIENT_ENTRY_LEN) < 0) { - log_warn(LD_REND, "Unable to generate fake client entry."); - tor_free(client_part); - goto done; - } + crypto_rand(client_part, REND_BASIC_AUTH_CLIENT_ENTRY_LEN); smartlist_add(encrypted_session_keys, client_part); } /* Sort smartlist and put elements in result in order. */ diff --git a/src/test/test_extorport.c b/src/test/test_extorport.c index 2e5a32e..5d38ed8 100644 --- a/src/test/test_extorport.c +++ b/src/test/test_extorport.c @@ -309,15 +309,14 @@ test_ext_or_cookie_auth(void *arg) tor_free(client_hash2); } -static int +static void crypto_rand_return_tse_str(char *to, size_t n) { if (n != 32) { TT_FAIL(("Asked for %d bytes, not 32", (int)n)); - return -1; + return; } memcpy(to, "te road There is always another ", 32); - return 0; } static void

1 0

[tor/master] Check the return value of HMAC in crypto.c and assert on error
by nickm＠torproject.org 26 Nov '15

26 Nov '15

commit b1b8f7982ebac1347a86d5eb9eee8e5f3bd3d39c Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Mon Nov 23 20:53:59 2015 +1100 Check the return value of HMAC in crypto.c and assert on error Fixes bug #17658; bugfix on commit in fdbb9cdf746b (11 Oct 2011) in tor version 0.2.3.5-alpha-dev. --- changes/check-crypto-errors | 5 +++++ src/common/crypto.c | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/changes/check-crypto-errors b/changes/check-crypto-errors new file mode 100644 index 0000000..e41862c --- /dev/null +++ b/changes/check-crypto-errors @@ -0,0 +1,5 @@ + o Minor bugfix (crypto): + - Check the return value of HMAC and assert on failure. + Fixes bug #17658; bugfix on commit in fdbb9cdf746b (11 Oct 2011) + in tor version 0.2.3.5-alpha-dev. + Patch by "teor". diff --git a/src/common/crypto.c b/src/common/crypto.c index 913d1c2..86357b0 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -1906,11 +1906,14 @@ crypto_hmac_sha256(char *hmac_out, const char *key, size_t key_len, const char *msg, size_t msg_len) { + unsigned char *rv = NULL; /* If we've got OpenSSL >=0.9.8 we can use its hmac implementation. */ tor_assert(key_len < INT_MAX); tor_assert(msg_len < INT_MAX); - HMAC(EVP_sha256(), key, (int)key_len, (unsigned char*)msg, (int)msg_len, - (unsigned char*)hmac_out, NULL); + tor_assert(hmac_out); + rv = HMAC(EVP_sha256(), key, (int)key_len, (unsigned char*)msg, (int)msg_len, + (unsigned char*)hmac_out, NULL); + tor_assert(rv); } /* DH */

1 0

[tor/master] Merge remote-tracking branch 'teor/check-crypto-errors-v2'
by nickm＠torproject.org 26 Nov '15

26 Nov '15

commit c875265bbbddc50674f65169ee49d5612bef72a7 Merge: e14f9dd b1b8f79 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 25 22:28:12 2015 -0500 Merge remote-tracking branch 'teor/check-crypto-errors-v2' changes/check-crypto-errors | 5 +++++ src/common/crypto.c | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-)

1 0

[tor/master] fixup! Add controller getinfo exit-policy/reject-private
by nickm＠torproject.org 26 Nov '15

26 Nov '15

commit e14f9dd44f637c0211530e5e630eba1a129d1650 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Mon Nov 23 08:46:26 2015 +1100 fixup! Add controller getinfo exit-policy/reject-private Stop ignoring ExitPolicyRejectPrivate in getinfo exit-policy/reject-private. Fix a memory leak. Set ExitPolicyRejectPrivate in the unit tests, and make a mock function declaration static. --- src/or/policies.c | 11 +++++++++-- src/test/test_policy.c | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/or/policies.c b/src/or/policies.c index 4d9b17c..ec11375 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -2140,14 +2140,20 @@ getinfo_helper_policies(control_connection_t *conn, } else if (!strcmp(question, "exit-policy/reject-private/relay")) { const or_options_t *options = get_options(); const routerinfo_t *me = router_get_my_routerinfo(); - smartlist_t *private_policy_list = smartlist_new(); - smartlist_t *configured_addresses = smartlist_new(); if (!me) { *errmsg = "router_get_my_routerinfo returned NULL"; return -1; } + if (!options->ExitPolicyRejectPrivate) { + *answer = tor_strdup(""); + return 0; + } + + smartlist_t *private_policy_list = smartlist_new(); + smartlist_t *configured_addresses = smartlist_new(); + /* Add the configured addresses to the tor_addr_t* list */ policies_add_ipv4h_to_smartlist(configured_addresses, me->addr); policies_add_addr_to_smartlist(configured_addresses, &me->ipv6_addr); @@ -2162,6 +2168,7 @@ getinfo_helper_policies(control_connection_t *conn, *answer = policy_dump_to_string(private_policy_list, 1, 1); addr_policy_list_free(private_policy_list); + addr_policy_list_free(configured_addresses); } else if (!strcmpstart(question, "exit-policy/")) { const routerinfo_t *me = router_get_my_routerinfo(); diff --git a/src/test/test_policy.c b/src/test/test_policy.c index 63672ea..082f930 100644 --- a/src/test/test_policy.c +++ b/src/test/test_policy.c @@ -994,6 +994,7 @@ test_policies_getinfo_helper_policies(void *arg) append_exit_policy_string(&mock_my_routerinfo.exit_policy, "reject *6:*"); mock_options.IPv6Exit = 1; + mock_options.ExitPolicyRejectPrivate = 1; tor_addr_from_ipv4h(&mock_options.OutboundBindAddressIPv4_, TEST_IPV4_ADDR); tor_addr_parse(&mock_options.OutboundBindAddressIPv6_, TEST_IPV6_ADDR);

1 0

[torbutton/master] Bug 16940: After update, load local change notes.
by gk＠torproject.org 25 Nov '15

25 Nov '15

commit 9b800ffc669f7eb7dd6203a24aa85a39b5edd154 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Nov 19 10:13:11 2015 -0500 Bug 16940: After update, load local change notes. Include the localizable strings for the about:tbupdate page in Torbutton. --- src/chrome.manifest | 3 +++ src/chrome/locale/en/aboutTBUpdate.dtd | 6 ++++++ trans_tools/import-translations.sh | 1 + 3 files changed, 10 insertions(+) diff --git a/src/chrome.manifest b/src/chrome.manifest index 1d3efb4..30aa2ff 100644 --- a/src/chrome.manifest +++ b/src/chrome.manifest @@ -12,6 +12,9 @@ override chrome://branding/locale/brand.dtd chrome://torbutton/locale/brand.dtd override chrome://branding/locale/brand.properties chrome://torbutton/locale/brand.properties overlay chrome://browser/content/aboutDialog.xul chrome://torbutton/content/aboutDialog.xul +# Strings for the about:tbupdate page +override chrome://browser/locale/aboutTBUpdate.dtd chrome://torbutton/locale/aboutTBUpdate.dtd + locale torbutton af chrome/locale/af/ locale torbutton ak chrome/locale/ak/ locale torbutton am chrome/locale/am/ diff --git a/src/chrome/locale/en/aboutTBUpdate.dtd b/src/chrome/locale/en/aboutTBUpdate.dtd new file mode 100644 index 0000000..37567bd --- /dev/null +++ b/src/chrome/locale/en/aboutTBUpdate.dtd @@ -0,0 +1,6 @@ +<!ENTITY aboutTBUpdate.title "Tor Browser Update"> +<!ENTITY aboutTBUpdate.updated "Tor Browser has been updated."> +<!ENTITY aboutTBUpdate.linkPrefix "For the most up-to-date information about this release, "> +<!ENTITY aboutTBUpdate.linkLabel "visit our website"> +<!ENTITY aboutTBUpdate.linkSuffix "."> +<!ENTITY aboutTBUpdate.changeLogHeading "Changelog:"> diff --git a/trans_tools/import-translations.sh b/trans_tools/import-translations.sh index 494e64f..cfaa05c 100755 --- a/trans_tools/import-translations.sh +++ b/trans_tools/import-translations.sh @@ -17,6 +17,7 @@ LOCALE_DIR=../src/chrome/locale FILEMAP=( "aboutDialog.dtd:torbutton-aboutdialogdtd" "aboutTor.dtd:abouttor-homepage" "aboutTor.properties:torbutton-abouttorproperties" + "aboutTBUpdate.dtd:torbutton-abouttbupdatedtd" "brand.dtd:torbutton-branddtd" "brand.properties:torbutton-brandproperties" "torbutton.dtd:torbutton-torbuttondtd"

1 0

[tor-browser/tor-browser-38.4.0esr-5.5-1] Bug 16940: After update, load local change notes.
by gk＠torproject.org 25 Nov '15

25 Nov '15

commit 4a726fc8a675c0882cbfba2514deb32b53ade2ab Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Nov 25 11:36:20 2015 -0500 Bug 16940: After update, load local change notes. Add an about:tbupdate page that displays the first section from TorBrowser/Docs/ChangeLog.txt and includes a link to the remote post-update page (typically our blog entry for the release). --- .../base/content/abouttbupdate/aboutTBUpdate.css | 34 +++++++++++ .../base/content/abouttbupdate/aboutTBUpdate.js | 10 +++ .../base/content/abouttbupdate/aboutTBUpdate.xhtml | 34 +++++++++++ .../content/abouttbupdate/aboutTBUpdateLogo.png | Bin 0 -> 23266 bytes browser/base/content/browser.js | 14 ++++- browser/base/content/content.js | 64 ++++++++++++++++++++ browser/base/jar.mn | 8 ++- browser/components/about/AboutRedirector.cpp | 8 +++ browser/components/build/nsModule.cpp | 3 + browser/components/nsBrowserContentHandler.js | 12 ++++ .../locales/en-US/chrome/browser/aboutTBUpdate.dtd | 6 ++ browser/locales/jar.mn | 3 + 12 files changed, 194 insertions(+), 2 deletions(-) diff --git a/browser/base/content/abouttbupdate/aboutTBUpdate.css b/browser/base/content/abouttbupdate/aboutTBUpdate.css new file mode 100644 index 0000000..489c9d2 --- /dev/null +++ b/browser/base/content/abouttbupdate/aboutTBUpdate.css @@ -0,0 +1,34 @@ +body { + font-family: sans-serif; + font-size: 110%; + background-image: -moz-linear-gradient(top, #ffffff, #ffffff 10%, #d5ffd5 50%, #d5ffd5); + background-attachment: fixed; + background-size: 100% 100%; +} + +#logo { + background-image: url("chrome://browser/content/abouttbupdate/aboutTBUpdateLogo.png"); + height: 128px; + width: 128px; + margin: 20px; + float: left; +} + +#msg { + margin-top: 50px; + float: left; +} + +#msg-updated { + font-size: 120%; + margin-bottom: 20px; +} + +#changelog-container { + margin: 0px 20px 20px 20px; +} + +#changelog { + margin-left: 20px; + white-space: pre; +} diff --git a/browser/base/content/abouttbupdate/aboutTBUpdate.js b/browser/base/content/abouttbupdate/aboutTBUpdate.js new file mode 100644 index 0000000..8243647 --- /dev/null +++ b/browser/base/content/abouttbupdate/aboutTBUpdate.js @@ -0,0 +1,10 @@ +// Copyright (c) 2015, The Tor Project, Inc. +// See LICENSE for licensing information. +// +// vim: set sw=2 sts=2 ts=8 et syntax=javascript: + +function init() +{ + let event = new CustomEvent("AboutTBUpdateLoad", { bubbles: true }); + document.dispatchEvent(event); +} diff --git a/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml b/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml new file mode 100644 index 0000000..3a29e0c --- /dev/null +++ b/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE html [ + <!ENTITY % htmlDTD + PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "DTD/xhtml1-strict.dtd"> + %htmlDTD; + <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd"> + %globalDTD; + <!ENTITY % tbUpdateDTD SYSTEM "chrome://browser/locale/aboutTBUpdate.dtd"> + %tbUpdateDTD; +]> + +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> + <title>&aboutTBUpdate.title;</title> + <link rel="stylesheet" type="text/css" + href="chrome://browser/content/abouttbupdate/aboutTBUpdate.css"/> + <script src="chrome://browser/content/abouttbupdate/aboutTBUpdate.js" + type="text/javascript;version=1.7"/> +</head> +<body dir="&locale.dir;" onload="init()"> +<div id="logo"/> +<div id="msg"> +<div id="msg-updated">&aboutTBUpdate.updated;</div> +<div>&aboutTBUpdate.linkPrefix;<a id="infolink">&aboutTBUpdate.linkLabel;</a>&aboutTBUpdate.linkSuffix; +</div> +</div> +<br clear="all"/> +<div id="changelog-container">&aboutTBUpdate.changeLogHeading; +<div id="changelog"></div> +</div> +</body> +</html> diff --git a/browser/base/content/abouttbupdate/aboutTBUpdateLogo.png b/browser/base/content/abouttbupdate/aboutTBUpdateLogo.png new file mode 100644 index 0000000..be5cae9 Binary files /dev/null and b/browser/base/content/abouttbupdate/aboutTBUpdateLogo.png differ diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index baddc59..815f018 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -216,6 +216,9 @@ XPCOMUtils.defineLazyModuleGetter(this, "ReaderParent", let gInitialPages = [ "about:tor", +#ifdef TOR_BROWSER_UPDATE + "about:tbupdate", +#endif "about:blank", "about:newtab", "about:home", @@ -2354,7 +2357,11 @@ function URLBarSetURI(aURI) { // Replace initial page URIs with an empty string // only if there's no opener (bug 370555). // Bug 863515 - Make content.opener checks work in electrolysis. +#ifdef TOR_BROWSER_UPDATE + if (gInitialPages.indexOf(uri.spec.split('?')[0]) != -1) +#else if (gInitialPages.indexOf(uri.spec) != -1) +#endif value = !gMultiProcessBrowser && content.opener ? uri.spec : ""; else value = losslessDecodeURI(uri); @@ -6951,8 +6958,13 @@ var gIdentityHandler = { // Chrome URIs however get special treatment. Some chrome URIs are // whitelisted to provide a positive security signal to the user. - let whitelist = /^about:(accounts|addons|app-manager|config|crashes|customizing|downloads|healthreport|home|license|newaddon|permissions|preferences|privatebrowsing|rights|sessionrestore|support|welcomeback)/i; +#ifdef TOR_BROWSER_UPDATE + let whitelist = /^about:(accounts|addons|app-manager|config|crashes|customizing|downloads|healthreport|home|license|newaddon|permissions|preferences|privatebrowsing|rights|sessionrestore|support|welcomeback|tor|tbupdate)/i; + let isChromeUI = uri.schemeIs("about") && whitelist.test(uri.spec.split('?')[0]); +#else + let whitelist = /^about:(accounts|addons|app-manager|config|crashes|customizing|downloads|healthreport|home|license|newaddon|permissions|preferences|privatebrowsing|rights|sessionrestore|support|welcomeback|tor)/i; let isChromeUI = uri.schemeIs("about") && whitelist.test(uri.spec); +#endif if (isChromeUI) { this.setMode(this.IDENTITY_MODE_CHROMEUI); } else if (unknown) { diff --git a/browser/base/content/content.js b/browser/base/content/content.js index 14f21fc..fd87352 100644 --- a/browser/base/content/content.js +++ b/browser/base/content/content.js @@ -11,6 +11,9 @@ Cu.import("resource:///modules/ContentWebRTC.jsm"); Cu.import("resource:///modules/ContentObservers.jsm"); Cu.import("resource://gre/modules/InlineSpellChecker.jsm"); Cu.import("resource://gre/modules/InlineSpellCheckerContent.jsm"); +#ifdef TOR_BROWSER_UPDATE +Cu.import("resource://gre/modules/NetUtil.jsm"); +#endif XPCOMUtils.defineLazyModuleGetter(this, "E10SUtils", "resource:///modules/E10SUtils.jsm"); @@ -560,6 +563,67 @@ let AboutReaderListener = { }; AboutReaderListener.init(); +#ifdef TOR_BROWSER_UPDATE +let AboutTBUpdateListener = { + init: function(chromeGlobal) { + chromeGlobal.addEventListener('AboutTBUpdateLoad', this, false, true); + }, + + get isAboutTBUpdate() { + return content.document.documentURI.split('?')[0].toLowerCase() + == "about:tbupdate"; + }, + + handleEvent: function(aEvent) { + if (this.isAboutTBUpdate && (aEvent.type == "AboutTBUpdateLoad")) + this.onPageLoad(); + }, + + onPageLoad: function() { + let doc = content.document; + doc.getElementById("infolink").setAttribute("href", this.getPostUpdateURL()); + doc.getElementById("changelog").textContent = this.getChangeLogText(); + }, + + // Extract the post update URL from this page's query string. + getPostUpdateURL: function() { + let idx = content.document.documentURI.indexOf('?'); + if (idx > 0) + return decodeURIComponent(content.document.documentURI.substring(idx+1)); + + // No query string: use the default URL. + return Services.urlFormatter.formatURLPref("startup.homepage_override_url"); + }, + + // Read and return the text from the beginning of the changelog file that is + // located at TorBrowser/Docs/ChangeLog.txt. + // When electrolysis is enabled we will need to adopt an architecture that is + // more similar to the one that is used for about:home (see AboutHomeListener + // in this file and browser/modules/AboutHome.jsm). + getChangeLogText: function() { + try { + // "DefProfRt" is .../TorBrowser/Data/Browser + let f = Cc["@mozilla.org/file/directory_service;1"] + .getService(Ci.nsIProperties).get("DefProfRt", Ci.nsIFile); + f = f.parent.parent; // Remove "Data/Browser" + f.appendRelativePath("Docs/ChangeLog.txt"); + + let fs = Cc["@mozilla.org/network/file-input-stream;1"] + .createInstance(Ci.nsIFileInputStream); + fs.init(f, -1, 0, 0); + let s = NetUtil.readInputStreamToString(fs, fs.available()); + fs.close(); + + // Truncate at the first empty line. + return s.replace(/[\r\n][\r\n][\s\S]*$/m, ""); + } catch (e) {} + + return ""; + }, +}; +AboutTBUpdateListener.init(this); +#endif + // An event listener for custom "WebChannelMessageToChrome" events on pages addEventListener("WebChannelMessageToChrome", function (e) { // if target is window then we want the document principal, otherwise fallback to target itself. diff --git a/browser/base/jar.mn b/browser/base/jar.mn index 00f0c8a..73f370a 100644 --- a/browser/base/jar.mn +++ b/browser/base/jar.mn @@ -72,12 +72,18 @@ browser.jar: content/browser/aboutTabCrashed.css (content/aboutTabCrashed.css) content/browser/aboutTabCrashed.js (content/aboutTabCrashed.js) content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml) +#ifdef TOR_BROWSER_UPDATE + content/browser/abouttbupdate/aboutTBUpdate.xhtml (content/abouttbupdate/aboutTBUpdate.xhtml) + content/browser/abouttbupdate/aboutTBUpdate.js (content/abouttbupdate/aboutTBUpdate.js) + content/browser/abouttbupdate/aboutTBUpdate.css (content/abouttbupdate/aboutTBUpdate.css) + content/browser/abouttbupdate/aboutTBUpdateLogo.png (content/abouttbupdate/aboutTBUpdateLogo.png) +#endif * content/browser/browser.css (content/browser.css) * content/browser/browser.js (content/browser.js) * content/browser/browser.xul (content/browser.xul) * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) * content/browser/chatWindow.xul (content/chatWindow.xul) - content/browser/content.js (content/content.js) +* content/browser/content.js (content/content.js) content/browser/defaultthemes/1.footer.jpg (content/defaultthemes/1.footer.jpg) content/browser/defaultthemes/1.header.jpg (content/defaultthemes/1.header.jpg) content/browser/defaultthemes/1.icon.jpg (content/defaultthemes/1.icon.jpg) diff --git a/browser/components/about/AboutRedirector.cpp b/browser/components/about/AboutRedirector.cpp index 4805c2c..a4f1c4a 100644 --- a/browser/components/about/AboutRedirector.cpp +++ b/browser/components/about/AboutRedirector.cpp @@ -123,6 +123,14 @@ static RedirEntry kRedirMap[] = { nsIAboutModule::URI_MUST_LOAD_IN_CHILD | nsIAboutModule::MAKE_UNLINKABLE | nsIAboutModule::HIDE_FROM_ABOUTABOUT }, +#ifdef TOR_BROWSER_UPDATE + { "tbupdate", "chrome://browser/content/abouttbupdate/aboutTBUpdate.xhtml", + nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | + nsIAboutModule::ALLOW_SCRIPT | + nsIAboutModule::MAKE_UNLINKABLE | + nsIAboutModule::HIDE_FROM_ABOUTABOUT + }, +#endif }; static const int kRedirTotal = ArrayLength(kRedirMap); diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp index 553dfcf..8761b7d 100644 --- a/browser/components/build/nsModule.cpp +++ b/browser/components/build/nsModule.cpp @@ -116,6 +116,9 @@ static const mozilla::Module::ContractIDEntry kBrowserContracts[] = { { NS_ABOUT_MODULE_CONTRACTID_PREFIX "looppanel", &kNS_BROWSER_ABOUT_REDIRECTOR_CID }, { NS_ABOUT_MODULE_CONTRACTID_PREFIX "loopconversation", &kNS_BROWSER_ABOUT_REDIRECTOR_CID }, { NS_ABOUT_MODULE_CONTRACTID_PREFIX "reader", &kNS_BROWSER_ABOUT_REDIRECTOR_CID }, +#ifdef TOR_BROWSER_UPDATE + { NS_ABOUT_MODULE_CONTRACTID_PREFIX "tbupdate", &kNS_BROWSER_ABOUT_REDIRECTOR_CID }, +#endif #if defined(XP_WIN) { NS_IEHISTORYENUMERATOR_CONTRACTID, &kNS_WINIEHISTORYENUMERATOR_CID }, #elif defined(XP_MACOSX) diff --git a/browser/components/nsBrowserContentHandler.js b/browser/components/nsBrowserContentHandler.js index a3465a0..9d7d110 100644 --- a/browser/components/nsBrowserContentHandler.js +++ b/browser/components/nsBrowserContentHandler.js @@ -629,6 +629,13 @@ nsBrowserContentHandler.prototype = { // into account because that requires waiting for the session file // to be read. If a crash occurs after updating, before restarting, // we may open the startPage in addition to restoring the session. + // + // Tor Browser: Instead of opening the post-update "override page" + // directly, an about:tbupdate page is opened that includes a link + // to the override page as well as text from the first part of the + // local ChangeLog.txt file. The override page URL comes from the + // openURL attribute within the updates.xml file or, if no showURL + // action is present, from the startup.homepage_override_url pref. var ss = Components.classes["@mozilla.org/browser/sessionstartup;1"] .getService(Components.interfaces.nsISessionStartup); willRestoreSession = ss.isAutomaticRestoreEnabled(); @@ -642,6 +649,11 @@ nsBrowserContentHandler.prototype = { overridePage = overridePage.replace("%OLD_TOR_BROWSER_VERSION%", old_tbversion); #endif + +#ifdef TOR_BROWSER_UPDATE + if (overridePage) + overridePage = "about:tbupdate?" + encodeURIComponent(overridePage); +#endif break; } } diff --git a/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd b/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd new file mode 100644 index 0000000..37567bd --- /dev/null +++ b/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd @@ -0,0 +1,6 @@ +<!ENTITY aboutTBUpdate.title "Tor Browser Update"> +<!ENTITY aboutTBUpdate.updated "Tor Browser has been updated."> +<!ENTITY aboutTBUpdate.linkPrefix "For the most up-to-date information about this release, "> +<!ENTITY aboutTBUpdate.linkLabel "visit our website"> +<!ENTITY aboutTBUpdate.linkSuffix "."> +<!ENTITY aboutTBUpdate.changeLogHeading "Changelog:"> diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn index 03a8cdf..510ce40 100644 --- a/browser/locales/jar.mn +++ b/browser/locales/jar.mn @@ -24,6 +24,9 @@ locale/browser/syncCustomize.dtd (%chrome/browser/syncCustomize.dtd) locale/browser/aboutSyncTabs.dtd (%chrome/browser/aboutSyncTabs.dtd) #endif +#ifdef TOR_BROWSER_UPDATE + locale/browser/aboutTBUpdate.dtd (%chrome/browser/aboutTBUpdate.dtd) +#endif locale/browser/browser.dtd (%chrome/browser/browser.dtd) locale/browser/baseMenuOverlay.dtd (%chrome/browser/baseMenuOverlay.dtd) locale/browser/browser.properties (%chrome/browser/browser.properties)

1 0

[tor/master] Fix a logic error in connection_tls_continue_handshake().
by nickm＠torproject.org 25 Nov '15

25 Nov '15

commit dce708d11c4ec94ece2fd49b6b697df759f93ef1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 25 09:12:50 2015 -0500 Fix a logic error in connection_tls_continue_handshake(). (If we take the branch above this assertion, than we *didn't* have a v1 handshake. So if we don't take the branch, we did. So if we reach this assertion, we must be running as a server, since clients no longer attempt v1 handshakes.) Fix for bug 17654; bugfix on 9d019a7db725dca3dfdbf8d4dbc3b51835e0b49e. Bug not in any released Tor. --- src/or/connection_or.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 59dea37..08962bd 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1480,7 +1480,7 @@ connection_tls_continue_handshake(or_connection_t *conn) return 0; } } - tor_assert(!tor_tls_is_server(conn->tls)); + tor_assert(tor_tls_is_server(conn->tls)); return connection_tls_finish_handshake(conn); case TOR_TLS_WANTWRITE: connection_start_writing(TO_CONN(conn));

1 0

[tor/master] Merge branch 'bug17654_try1'
by nickm＠torproject.org 25 Nov '15

25 Nov '15

commit 289b184e112885d4feb9569c77d322995b9417c7 Merge: 5dff4ae dce708d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 25 12:25:44 2015 -0500 Merge branch 'bug17654_try1' src/or/connection_or.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[webwml/master] Provide a height for the page footer
by sebastian＠torproject.org 25 Nov '15

25 Nov '15

commit 0f0351daae4e0b4dadc1975d021d9ca318a22bbd Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Nov 25 17:27:26 2015 +0100 Provide a height for the page footer --- include/donatehead.wmi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/donatehead.wmi b/include/donatehead.wmi index 8d0b35c..54e866e 100644 --- a/include/donatehead.wmi +++ b/include/donatehead.wmi @@ -32,7 +32,7 @@ } body { - margin-bottom: 60px; + margin-bottom: 65px; } .footer { @@ -40,7 +40,7 @@ bottom: 0; width: 100%; /* Set the height of the footer here */ - height: auto; + height: 65px; padding-top: 10px; padding-bottom: 10px; background-color: #f5f5f5;

1 0