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

[orbot/master] feedback
by n8fr8＠torproject.org 02 Mar '17

02 Mar '17

commit 11e663be67685f845364d7af1514173441f32b3b Author: arrase <arrase(a)gmail.com> Date: Sun Nov 20 22:51:36 2016 +0100 feedback --- .../android/ui/hs/HiddenServicesActivity.java | 17 +++++++++++++++++ .../android/ui/hs/dialogs/HSActionsDialog.java | 10 ++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/torproject/android/ui/hs/HiddenServicesActivity.java b/app/src/main/java/org/torproject/android/ui/hs/HiddenServicesActivity.java index 26889d0..80b7e81 100644 --- a/app/src/main/java/org/torproject/android/ui/hs/HiddenServicesActivity.java +++ b/app/src/main/java/org/torproject/android/ui/hs/HiddenServicesActivity.java @@ -1,8 +1,12 @@ package org.torproject.android.ui.hs; +import android.Manifest; +import android.annotation.SuppressLint; import android.content.ContentResolver; +import android.content.pm.PackageManager; import android.database.ContentObserver; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.support.design.widget.FloatingActionButton; @@ -82,6 +86,10 @@ public class HiddenServicesActivity extends AppCompatActivity { Bundle arguments = new Bundle(); arguments.putString("port", port.getText().toString()); arguments.putString("onion", onion.getText().toString()); + boolean has_write_permission = true; + if (usesRuntimePermissions()) + has_write_permission = hasPermission(); + arguments.putBoolean("has_write_permissions", has_write_permission); HSActionsDialog dialog = new HSActionsDialog(); dialog.setArguments(arguments); @@ -89,4 +97,13 @@ public class HiddenServicesActivity extends AppCompatActivity { } }); } + + private boolean usesRuntimePermissions() { + return (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP_MR1); + } + + @SuppressLint("NewApi") + private boolean hasPermission() { + return (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED); + } } diff --git a/app/src/main/java/org/torproject/android/ui/hs/dialogs/HSActionsDialog.java b/app/src/main/java/org/torproject/android/ui/hs/dialogs/HSActionsDialog.java index f490586..8d6ad37 100644 --- a/app/src/main/java/org/torproject/android/ui/hs/dialogs/HSActionsDialog.java +++ b/app/src/main/java/org/torproject/android/ui/hs/dialogs/HSActionsDialog.java @@ -32,10 +32,16 @@ public class HSActionsDialog extends DialogFragment { .setTitle(R.string.hidden_services) .create(); - Button save = (Button) dialog_view.findViewById(R.id.btn_hs_backup); - save.setOnClickListener(new View.OnClickListener() { + Button backup = (Button) dialog_view.findViewById(R.id.btn_hs_backup); + backup.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { Context mContext = v.getContext(); + + if (!arguments.getBoolean("has_write_permissions")) { + Toast.makeText(mContext, R.string.please_grant_permissions_for_external_storage, Toast.LENGTH_LONG).show(); + return; + } + HiddenServiceUtils hsutils = new HiddenServiceUtils(mContext); String backupPath = hsutils.createOnionBackup(Integer.parseInt(arguments.getString("port")));

1 0

[orbot/master] action moved
by n8fr8＠torproject.org 02 Mar '17

02 Mar '17

commit 08fb68dcaad71c550d1441e90d04fb0ef228b205 Author: arrase <arrase(a)gmail.com> Date: Sun Nov 20 21:11:17 2016 +0100 action moved --- .../java/org/torproject/android/ui/hs/HiddenServicesActivity.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/torproject/android/ui/hs/HiddenServicesActivity.java b/app/src/main/java/org/torproject/android/ui/hs/HiddenServicesActivity.java index 8a81a40..fa09cdd 100644 --- a/app/src/main/java/org/torproject/android/ui/hs/HiddenServicesActivity.java +++ b/app/src/main/java/org/torproject/android/ui/hs/HiddenServicesActivity.java @@ -54,9 +54,6 @@ public class HiddenServicesActivity extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.layout_hs_list_view); - if (usesRuntimePermissions()) - checkPermissions(); - mCR = getContentResolver(); FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); @@ -87,6 +84,9 @@ public class HiddenServicesActivity extends AppCompatActivity { @Override public void onItemClick(AdapterView<?> parent, View view, int position, long id) { + if (usesRuntimePermissions()) + checkPermissions(); + TextView port = (TextView) view.findViewById(R.id.hs_port); TextView onion = (TextView) view.findViewById(R.id.hs_onion);

1 0

[snowflake/master] move disable check to snowflakeIsDisabled
by serene＠torproject.org 02 Mar '17

02 Mar '17

commit 6d2b0ac4208250311c2cda2b0f2076c505e380f8 Author: Serene H <git(a)keroserene.net> Date: Wed Mar 1 18:51:24 2017 -0800 move disable check to snowflakeIsDisabled --- proxy/broker.coffee | 5 +++-- proxy/snowflake.coffee | 40 +++++++++++++++++++++++++++------------- 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/proxy/broker.coffee b/proxy/broker.coffee index 9eb378c..6154a4b 100644 --- a/proxy/broker.coffee +++ b/proxy/broker.coffee @@ -18,8 +18,9 @@ class Broker clients: 0 # When interacting with the Broker, snowflake must generate a unique session - # ID so the Broker can keep track of which signalling channel it's speaking - # to. + # ID so the Broker can keep track of each proxy's signalling channels. + # On construction, this Broker object does not do anything until + # |getClientOffer| is called. constructor: (@url) -> @clients = 0 # Ensure url has the right protocol + trailing slash. diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index 3068d6a..0279ad7 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -4,7 +4,9 @@ A Coffeescript WebRTC snowflake proxy Uses WebRTC from the client, and Websocket to the server. Assume that the webrtc client plugin is always the offerer, in which case -this must always act as the answerer. +this proxy must always act as the answerer. + +TODO: More documentation ### # General snowflake proxy constants. @@ -70,16 +72,18 @@ class Snowflake RATE_LIMIT_HISTORY) @retries = 0 - # TODO: Should potentially fetch from broker later. - # Set the target relay address spec, which is expected to be a websocket - # relay. + # Set the target relay address spec, which is expected to be websocket. + # TODO: Should potentially fetch the target from broker later, or modify + # entirely for the Tor-independent version. setRelayAddr: (relayAddr) -> @relayAddr = relayAddr log 'Using ' + relayAddr.host + ':' + relayAddr.port + ' as Relay.' log 'Input offer from the snowflake client:' if COPY_PASTE_ENABLED return true - # Initialize WebRTC PeerConnection + # Initialize WebRTC PeerConnection, which requires beginning the signalling + # process. If in copy paste mode, the user will need to copy and paste the SDP + # blobs. Otherwise, |pollBroker| automatically arranges signalling. beginWebRTC: -> @state = MODE.WEBRTC_CONNECTING for i in [1..CONNECTIONS_PER_CLIENT] @@ -204,12 +208,22 @@ Signalling = snowflake.receiveOffer pair, msg # Log to both console and UI if applicable. +# Requires that the snowflake and UI objects are hooked up in order to +# log to console. log = (msg) -> console.log 'Snowflake: ' + msg - snowflake.ui?.log msg + snowflake?.ui?.log msg dbg = (msg) -> log msg if DEBUG or snowflake.ui?.debug +snowflakeIsDisabled = -> + cookies = Parse.cookie document.cookie + # Do nothing if snowflake has not been opted in by user. + if cookies[COOKIE_NAME] != '1' + log 'Not opted-in. Please click the badge to change options.' + return true + return false + ### Entry point. ### @@ -217,21 +231,21 @@ init = (isNode) -> # Hook up to the debug UI if available. ui = if isNode then null else new UI() silenceNotifications = Params.getBool(query, 'silent', false) - # Establish connectivity information with the Broker. + # Retrieve connectivity information for the Broker and + # initialize Snowflake contexts. brokerUrl = Params.getString(query, 'broker', DEFAULT_BROKER) broker = new Broker brokerUrl snowflake = new Snowflake broker, ui - cookies = Parse.cookie document.cookie - # Do nothing if snowflake has not been opted in. - if cookies[COOKIE_NAME] != "1" - log 'Not activate. Please click the badge to change options.' + log '== snowflake proxy ==' + if snowflakeIsDisabled() + # Do not activate the proxy if any number of conditions are true. + log 'Currently not active.' return - log '== snowflake proxy ==' + # Otherwise, begin setting up WebRTC and acting as a proxy. log 'Copy-Paste mode detected.' if COPY_PASTE_ENABLED dbg 'Contacting Broker at ' + broker.url if not COPY_PASTE_ENABLED - relayAddr = Params.getAddress(query, 'relay', DEFAULT_RELAY) snowflake.setRelayAddr relayAddr snowflake.beginWebRTC()

1 0

[snowflake/master] default to wss and some documentation updates, #40
by serene＠torproject.org 02 Mar '17

02 Mar '17

commit 3fe10f3e7c39991193f4322fee55c7067d21831d Author: Serene H <git(a)keroserene.net> Date: Tue Feb 28 22:46:39 2017 -0800 default to wss and some documentation updates, #40 --- proxy/proxypair.coffee | 5 +++++ proxy/snowflake.coffee | 19 ++++++++++++++----- proxy/util.coffee | 1 + proxy/websocket.coffee | 4 +++- 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/proxy/proxypair.coffee b/proxy/proxypair.coffee index b19df09..28696e2 100644 --- a/proxy/proxypair.coffee +++ b/proxy/proxypair.coffee @@ -22,6 +22,11 @@ class ProxyPair onCleanup: null id: null + ### + Constructs a ProxyPair where: + - @relayAddr is the destination relay + - @rateLimit specifies a rate limit on traffic + ### constructor: (@relayAddr, @rateLimit) -> @active = false @id = genSnowflakeID() diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index 0966053..3068d6a 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -1,16 +1,21 @@ ### A Coffeescript WebRTC snowflake proxy -Using Copy-paste signaling for now. -Uses WebRTC from the client, and websocket to the server. +Uses WebRTC from the client, and Websocket to the server. Assume that the webrtc client plugin is always the offerer, in which case this must always act as the answerer. ### + +# General snowflake proxy constants. +# For websocket-specific constants, see websocket.coffee. DEFAULT_BROKER = 'snowflake-reg.appspot.com' DEFAULT_RELAY = - host: '192.81.135.242' - port: 9902 + host: 'snowflake.bamsoftware.com' + port: '443' + # Original non-wss relay: + # host: '192.81.135.242' + # port: 9902 COPY_PASTE_ENABLED = false COOKIE_NAME = "snowflake-allow" @@ -174,7 +179,7 @@ class Snowflake snowflake = null # Signalling channel - just tells user to copy paste to the peer. -# Eventually this should go over the broker. +# When copy-paste mode is not enabled, this is handled automatically by Broker. Signalling = send: (msg) -> log '---- Please copy the below to peer ----\n' @@ -205,10 +210,14 @@ log = (msg) -> dbg = (msg) -> log msg if DEBUG or snowflake.ui?.debug +### +Entry point. +### init = (isNode) -> # Hook up to the debug UI if available. ui = if isNode then null else new UI() silenceNotifications = Params.getBool(query, 'silent', false) + # Establish connectivity information with the Broker. brokerUrl = Params.getString(query, 'broker', DEFAULT_BROKER) broker = new Broker brokerUrl snowflake = new Snowflake broker, ui diff --git a/proxy/util.coffee b/proxy/util.coffee index a5b247c..e0d965b 100644 --- a/proxy/util.coffee +++ b/proxy/util.coffee @@ -71,6 +71,7 @@ Parse = m = spec.match(/^\[([\0-9a-fA-F:.]+)\]:([0-9]+)$/) if !m # IPv4 syntax. m = spec.match(/^([0-9.]+):([0-9]+)$/) if !m + # TODO: Domain match return null if !m host = m[1] diff --git a/proxy/websocket.coffee b/proxy/websocket.coffee index 94cf274..a23f53d 100644 --- a/proxy/websocket.coffee +++ b/proxy/websocket.coffee @@ -2,6 +2,7 @@ Only websocket-specific stuff. ### +WSS_ENABLED = true DEFAULT_PORTS = http: 80 https: 443 @@ -46,7 +47,8 @@ buildUrl = (scheme, host, port, path, params) -> parts.join '' makeWebsocket = (addr) -> - url = buildUrl 'ws', addr.host, addr.port, '/' + wsProtocol = if WSS_ENABLED then 'wss' else 'ws' + url = buildUrl wsProtocol, addr.host, addr.port, '/' ws = new WebSocket url ### 'User agents can use this as a hint for how to handle incoming binary data: if

1 0

[snowflake/master] disable for TBB user agents. closes #37
by serene＠torproject.org 02 Mar '17

02 Mar '17

commit 9f2e9a6ecb696149708716ca06ce842df03cf492 Author: Serene H <git(a)keroserene.net> Date: Wed Mar 1 19:09:24 2017 -0800 disable for TBB user agents. closes #37 --- proxy/snowflake.coffee | 7 ++++++- proxy/util.coffee | 14 ++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index 0279ad7..1f5674b 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -48,7 +48,7 @@ MODE = WEBRTC_CONNECTING: 1 WEBRTC_READY: 2 -CONFIRMATION_MESSAGE = "You're currently serving a Tor user via Snowflake." +CONFIRMATION_MESSAGE = 'You\'re currently serving a Tor user via Snowflake.' # Minimum viable snowflake for now - just 1 client. class Snowflake @@ -222,8 +222,13 @@ snowflakeIsDisabled = -> if cookies[COOKIE_NAME] != '1' log 'Not opted-in. Please click the badge to change options.' return true + # Also do nothing if running in Tor Browser. + if mightBeTBB() + log 'Will not run within Tor Browser.' + return true return false + ### Entry point. ### diff --git a/proxy/util.coffee b/proxy/util.coffee index e0d965b..3e0a08c 100644 --- a/proxy/util.coffee +++ b/proxy/util.coffee @@ -5,6 +5,20 @@ Contains helpers for parsing query strings and other utilities. ### +# It would not be effective for Tor Browser users to run the proxy. +# Do we seem to be running in Tor Browser? Check the user-agent string and for +# no listing of supported MIME types. +TBB_UAS = [ + 'Mozilla/5.0 (Windows NT 6.1; rv:10.0) Gecko/20100101 Firefox/10.0' + 'Mozilla/5.0 (Windows NT 6.1; rv:17.0) Gecko/20100101 Firefox/17.0' + 'Mozilla/5.0 (Windows NT 6.1; rv:24.0) Gecko/20100101 Firefox/24.0' + 'Mozilla/5.0 (Windows NT 6.1; rv:31.0) Gecko/20100101 Firefox/31.0' +] +mightBeTBB = -> + return TBB_UAS.indexOf(window.navigator.userAgent) > -1 and + (window.navigator.mimeTypes and + window.navigator.mimeTypes.length == 0) + genSnowflakeID = -> Math.random().toString(36).substring(2)

1 0

[tor-browser-bundle/maint-6.5] Release preparations for 6.5.1
by gk＠torproject.org 01 Mar '17

01 Mar '17

commit d134ca5ec7f99e932a68ddc37d0cfc177f777855 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 1 21:22:38 2017 +0000 Release preparations for 6.5.1 Version bumps, Changelog update, and config.yml update --- Bundle-Data/Docs/ChangeLog.txt | 17 +++++++++++++++++ gitian/versions | 12 ++++++------ tools/update-responses/config.yml | 10 +++++----- 3 files changed, 28 insertions(+), 11 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index ff6267c..571b677 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,20 @@ +Tor Browser 6.5.1 -- March 6 2017 + * All Platforms + * Update Firefox to 45.8.0esr + * Tor to 0.2.9.10 + * OpenSSL to 1.0.2k + * Update Torbutton to 1.9.6.13 + * Bug 21396: Allow leaking of resource/chrome URIs (off by default) + * Bug 21574: Add link for zh manual and create manual links dynamically + * Bug 21330: Non-usable scrollbar appears in tor browser security settings + * Translation updates + * Update HTTPS-Everywhere to 5.2.11 + * Bug 21514: Back out backported W^X patches due to conflicts in 45.8.0esr + * Bug 21536: Remove scramblesuit bridge + * Bug 21342: Move meek-azure to the meek.azureedge.net backend and cymrubridge02 bridge + * Linux + * Bug 21326: Update the "Using a system-installed Tor" section in start script + Tor Browser 6.5 -- January 24 2017 * All Platforms * Update Firefox to 45.7.0esr diff --git a/gitian/versions b/gitian/versions index 73bbc83..f7c21df 100755 --- a/gitian/versions +++ b/gitian/versions @@ -10,15 +10,15 @@ DATA_OUTSIDE_APP_DIR=1 VERIFY_TAGS=1 -FIREFOX_VERSION=45.7.0esr +FIREFOX_VERSION=45.8.0esr TORBROWSER_UPDATE_CHANNEL=release TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build1 -TOR_TAG=tor-0.2.9.9 +TOR_TAG=tor-0.2.9.10 TORLAUNCHER_TAG=0.2.10.3 -TORBUTTON_TAG=1.9.6.12 -HTTPSE_TAG=5.2.9 +TORBUTTON_TAG=1.9.6.13 +HTTPSE_TAG=5.2.11 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable @@ -44,7 +44,7 @@ NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 GITIAN_TAG=tor-browser-builder-4-1 -OPENSSL_VER=1.0.2j +OPENSSL_VER=1.0.2k GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 @@ -97,7 +97,7 @@ NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=e7aff292be21c259c6af26469c7a9b3ba26e9abaaffd325e3dccc9785256c431 +OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 90bc017..2db2570 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -20,13 +20,13 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 6.5a6 - release: 6.5 + release: 6.5.1 versions: - 6.5: - platformVersion: 45.7.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-65-released + 6.5.1: + platformVersion: 45.8.0 + detailsURL: https://blog.torproject.org/blog/tor-browser-651-released incremental_from: - - 6.0.8 + - 6.5 migrate_archs: osx32: osx64 migrate_langs:

1 0

[torbutton/maint-1.9.6] Version bump and CHANGELOG update
by gk＠torproject.org 01 Mar '17

01 Mar '17

commit 93613dbfb0b68568b7ebe6b17e624d56d7852f84 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 1 21:02:59 2017 +0000 Version bump and CHANGELOG update --- src/CHANGELOG | 6 ++++++ src/install.rdf | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 0a3da22..9ac2498 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,9 @@ +1.9.6.13 + * Bug 21396: Allow leaking of resource/chrome URIs (off by default) + * Bug 21574: Add link for zh manual and create manual links dynamically + * Bug 21330: Non-usable scrollbar appears in tor browser security settings + * Translation updates + 1.9.6.12 * Bug 20951: Back out Unix domain socket related patches for Tor Browser 6.5 * Bug 19898: Use DuckDuckGo on about:tor diff --git a/src/install.rdf b/src/install.rdf index d34bb86..0954b29 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.9.6.12</em:version> + <em:version>1.9.6.13</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[torbutton/maint-1.9.6] Bug 21396: Allow leaking of resource/chrome URIs
by gk＠torproject.org 01 Mar '17

01 Mar '17

commit fc00aef1fd552784dfca72dcdbb78e72e2f9932e Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 1 20:55:34 2017 +0000 Bug 21396: Allow leaking of resource/chrome URIs Our work around for https://bugzilla.mozilla.org/show_bug.cgi?id=863246 is filtering content requests to resource:// and chrome:// URIs in a way that neuters this fingerprinting vector while not breaking standard Tor Browser functionality. However, there are extensions like Session Manager that are broken with this strategy. Users who think having extensions like that one working is much more important than avoiding the possible information leakage associated with that get a preference they can toggle now. 'extensions.torbutton.resource_and_chrome_uri_fingerprinting' is by default 'false' but setting it to 'true' effectively disables our defense we developed in #8725 and related bugs. --- src/components/content-policy.js | 18 +++++++++++++++--- src/defaults/preferences/preferences.js | 1 + 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/components/content-policy.js b/src/components/content-policy.js index 5c0ecf5..b11c4e7 100644 --- a/src/components/content-policy.js +++ b/src/components/content-policy.js @@ -12,8 +12,16 @@ const Cc = Components.classes, Ci = Components.interfaces, Cu = Components.utils // Import XPCOMUtils object. Cu.import("resource://gre/modules/XPCOMUtils.jsm"); +let { bindPrefAndInit } = + Cu.import("resource://torbutton/modules/utils.js", {}); -function ContentPolicy() {} +function ContentPolicy() { + this.uriFingerprinting = null; + bindPrefAndInit("extensions.torbutton.resource_and_chrome_uri_fingerprinting", + function (enabled) { + this.uriFingerprinting = enabled; + }); +} ContentPolicy.prototype = { classDescription: "ContentPolicy", @@ -44,9 +52,13 @@ ContentPolicy.prototype = { shouldLoad: function(aContentType, aContentLocation, aRequestOrigin, aContext, aMimeTypeGuess, aExtra) { - // Accept if no content URI or scheme is not a resource/chrome. - if (!aContentLocation || !(aContentLocation.schemeIs('resource') || aContentLocation.schemeIs('chrome'))) + // Accept if the user does not care, no content URI is available or scheme + // is not resource/chrome. + if (this.uriFingerprinting || !aContentLocation || + !(aContentLocation.schemeIs('resource') || + aContentLocation.schemeIs('chrome'))) { return Ci.nsIContentPolicy.ACCEPT; + } // Accept if no origin URI or if origin scheme is chrome/resource/about. if (!aRequestOrigin || aRequestOrigin.schemeIs('resource') || aRequestOrigin.schemeIs('chrome') || aRequestOrigin.schemeIs('about')) diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index a8eea21..d91fd77 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -39,6 +39,7 @@ pref("extensions.torbutton.startup_state", 2); // 0=non-tor, 1=tor, 2=last pref("extensions.torbutton.tor_memory_jar",false); pref("extensions.torbutton.nontor_memory_jar",false); pref("extensions.torbutton.launch_warning",true); +pref("extensions.torbutton.resource_and_chrome_uri_fingerprinting",false); // Opt out of Firefox addon pings: // https://developer.mozilla.org/en/Addons/Working_with_AMO pref("extensions.torbutton(a)torproject.org.getAddons.cache.enabled", false);

1 0

[torbutton/master] Bug 21396: Allow leaking of resource/chrome URIs
by gk＠torproject.org 01 Mar '17

01 Mar '17

commit 84ff007519fa475d36800e979169f961fe0c072e Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 1 20:55:34 2017 +0000 Bug 21396: Allow leaking of resource/chrome URIs Our work around for https://bugzilla.mozilla.org/show_bug.cgi?id=863246 is filtering content requests to resource:// and chrome:// URIs in a way that neuters this fingerprinting vector while not breaking standard Tor Browser functionality. However, there are extensions like Session Manager that are broken with this strategy. Users who think having extensions like that one working is much more important than avoiding the possible information leakage associated with that get a preference they can toggle now. 'extensions.torbutton.resource_and_chrome_uri_fingerprinting' is by default 'false' but setting it to 'true' effectively disables our defense we developed in #8725 and related bugs. --- src/components/content-policy.js | 18 +++++++++++++++--- src/defaults/preferences/preferences.js | 1 + 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/components/content-policy.js b/src/components/content-policy.js index 5c0ecf5..b11c4e7 100644 --- a/src/components/content-policy.js +++ b/src/components/content-policy.js @@ -12,8 +12,16 @@ const Cc = Components.classes, Ci = Components.interfaces, Cu = Components.utils // Import XPCOMUtils object. Cu.import("resource://gre/modules/XPCOMUtils.jsm"); +let { bindPrefAndInit } = + Cu.import("resource://torbutton/modules/utils.js", {}); -function ContentPolicy() {} +function ContentPolicy() { + this.uriFingerprinting = null; + bindPrefAndInit("extensions.torbutton.resource_and_chrome_uri_fingerprinting", + function (enabled) { + this.uriFingerprinting = enabled; + }); +} ContentPolicy.prototype = { classDescription: "ContentPolicy", @@ -44,9 +52,13 @@ ContentPolicy.prototype = { shouldLoad: function(aContentType, aContentLocation, aRequestOrigin, aContext, aMimeTypeGuess, aExtra) { - // Accept if no content URI or scheme is not a resource/chrome. - if (!aContentLocation || !(aContentLocation.schemeIs('resource') || aContentLocation.schemeIs('chrome'))) + // Accept if the user does not care, no content URI is available or scheme + // is not resource/chrome. + if (this.uriFingerprinting || !aContentLocation || + !(aContentLocation.schemeIs('resource') || + aContentLocation.schemeIs('chrome'))) { return Ci.nsIContentPolicy.ACCEPT; + } // Accept if no origin URI or if origin scheme is chrome/resource/about. if (!aRequestOrigin || aRequestOrigin.schemeIs('resource') || aRequestOrigin.schemeIs('chrome') || aRequestOrigin.schemeIs('about')) diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index b7fa11b..b9ba458 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -39,6 +39,7 @@ pref("extensions.torbutton.startup_state", 2); // 0=non-tor, 1=tor, 2=last pref("extensions.torbutton.tor_memory_jar",false); pref("extensions.torbutton.nontor_memory_jar",false); pref("extensions.torbutton.launch_warning",true); +pref("extensions.torbutton.resource_and_chrome_uri_fingerprinting",false); // Opt out of Firefox addon pings: // https://developer.mozilla.org/en/Addons/Working_with_AMO pref("extensions.torbutton(a)torproject.org.getAddons.cache.enabled", false);

1 0

[torbutton/maint-1.9.6] Bug 21574.1: Add link for zh manual
by gk＠torproject.org 01 Mar '17

01 Mar '17

commit 6e601029d0e7768790ad01fd06dff61d5b14a50b Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Feb 27 08:39:06 2017 -0800 Bug 21574.1: Add link for zh manual --- src/chrome/content/torbutton.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 0023390..26495a2 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2411,7 +2411,7 @@ function torbutton_update_noscript_button() // Returns true if we should show the tor browser manual. function torbutton_show_torbrowser_manual() { - let availableLocales = ["en", "es", "fr", "pt"]; + let availableLocales = ["en", "es", "fr", "pt", "zh"]; let shortLocale = torbutton_get_general_useragent_locale().substring(0, 2); return availableLocales.indexOf(shortLocale) >= 0; }

1 0