- tbb-commits - lists.torproject.org

[torbutton/master] Merge remote-tracking branch 'gk/bug_10716_v2'
by mikeperry＠torproject.org 30 Sep '14

30 Sep '14

commit eac0d3eefa335b8648acf5ca785cc56224e3dd9e Merge: beb9d71 ca82201 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Sep 29 18:44:23 2014 -0700 Merge remote-tracking branch 'gk/bug_10716_v2' src/components/external-app-blocker.js | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-)

1 0

[torbutton/master] Bug 10716: Take care of drag/drop events in ESR 31.
by mikeperry＠torproject.org 30 Sep '14

30 Sep '14

commit ca8220118f1e3ac3ed190cc15f1091f285cf299a Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 18 13:14:36 2014 +0000 Bug 10716: Take care of drag/drop events in ESR 31. --- src/components/external-app-blocker.js | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/src/components/external-app-blocker.js b/src/components/external-app-blocker.js index 38ddcd7..aed25ce 100644 --- a/src/components/external-app-blocker.js +++ b/src/components/external-app-blocker.js @@ -61,6 +61,7 @@ function ExternalWrapper() { var observerService = Cc["@mozilla.org/observer-service;1"]. getService(Ci.nsIObserverService); observerService.addObserver(this, "on-modify-drag-list", false); + observerService.addObserver(this, "on-datatransfer-available", false); } catch(e) { this.logger.log(5, "Failed to register drag observer"); } @@ -204,7 +205,7 @@ ExternalWrapper.prototype = }, observe: function(subject, topic, data) { - if(topic == "on-modify-drag-list") { + if (topic == "on-modify-drag-list") { this.logger.log(3, "Got drag observer event"); try { subject.QueryInterface(Ci.nsISupportsArray); @@ -213,6 +214,9 @@ ExternalWrapper.prototype = } return this.filterDragURLs(subject); + } else if (topic == "on-datatransfer-available") { + this.logger.log(3, "The DataTransfer is available"); + return this.filterDataTransferURLs(subject); } }, @@ -226,7 +230,7 @@ ExternalWrapper.prototype = .QueryInterface(Ci.nsISupportsArray); for (var f=0; f < flavors.Count(); f++) { - var flavor =flavors.GetElementAt(f); + var flavor =flavors.GetElementAt(f); flavor.QueryInterface(Ci.nsISupportsCString); this.logger.log(3, "Got drag+drop flavor: "+flavor); @@ -241,6 +245,29 @@ ExternalWrapper.prototype = } }, + filterDataTransferURLs: function(aDataTransfer) { + var types = null; + var type = ""; + var count = aDataTransfer.mozItemCount; + var len = 0; + for (var i = 0; i < count; ++i) { + this.logger.log(3, "Inspecting the data transfer: " + i); + types = aDataTransfer.mozTypesAt(i); + len = types.length; + for (var j = 0; j < len; ++j) { + type = types[j]; + this.logger.log(3, "Type is: " + type); + if (type == "text/x-moz-url" || + type == "text/x-moz-url-data" || + type == "text/uri-list" || + type == "application/x-moz-file-promise-url") { + aDataTransfer.clearData(type); + this.logger.log(3, "Removing " + type); + } + } + } + } + }; var ExternalWrapperSingleton = null;

1 0

[tor-browser/tor-browser-31.1.1esr-4.x-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 30 Sep '14

30 Sep '14

commit 3a25e7d56006b2ddfcd30cd310df87d9e09f6d3c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Sep 29 18:34:57 2014 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. Bug 13023: Disable the gamepad API. --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 9739f87..c885dae 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -76,6 +76,7 @@ pref("plugin.expose_full_path", false); pref("browser.zoom.siteSpecific", false); pref("intl.charset.default", "windows-1252"); pref("browser.link.open_newwindow.restriction", 0); // Bug 9881: Open popups in new tabs (to avoid fullscreen popups) +pref("dom.gamepad.enabled", false); // bugs.torproject.org/13023 // pref("intl.accept_languages", "en-us, en"); // Set by Torbutton // pref("intl.accept_charsets", "iso-8859-1,*,utf-8"); // Set by Torbutton // pref("intl.charsetmenu.browser.cache", "UTF-8"); // Set by Torbutton

1 0

[tor-browser-bundle/master] Bug #12873: Re-enable TLSv1.1 and v1.2 for Meek.
by mikeperry＠torproject.org 30 Sep '14

30 Sep '14

commit 11d174291621350e9f5524ee416c74597ccef660 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Sep 29 18:26:42 2014 -0700 Bug #12873: Re-enable TLSv1.1 and v1.2 for Meek. --- Bundle-Data/PTConfigs/meek-http-helper-user.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Bundle-Data/PTConfigs/meek-http-helper-user.js b/Bundle-Data/PTConfigs/meek-http-helper-user.js index 26fd819..cddc237 100644 --- a/Bundle-Data/PTConfigs/meek-http-helper-user.js +++ b/Bundle-Data/PTConfigs/meek-http-helper-user.js @@ -4,14 +4,6 @@ // to stdout. user_pref("browser.dom.window.dump.enabled", true); -// Make TLSv1.0 the maximum TLS version, as in stock Firefox 24. Since #11253, -// Tor Browser overrides the maximum to TLSv1.2, which would cause us to look -// unlike ordinary Firefox 24. -// https://trac.torproject.org/projects/tor/ticket/11253 -// https://trac.torproject.org/projects/tor/ticket/12766 -// http://kb.mozillazine.org/Security.tls.version.* -user_pref("security.tls.version.max", 1); - // Enable TLS session tickets (disabled by default in Tor Browser). Otherwise // there is a missing TLS extension. // https://trac.torproject.org/projects/tor/ticket/11183#comment:9

1 0

[tor-browser-bundle/master] Point nightlies at FF31ESR.
by mikeperry＠torproject.org 30 Sep '14

30 Sep '14

commit d6cbef12af2a177cb8d715c00bc9c3f1fa81f5b5 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Sep 29 17:53:39 2014 -0700 Point nightlies at FF31ESR. --- gitian/versions.nightly | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 1d3285d..4d4c4f5 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -4,7 +4,7 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=0 -FIREFOX_VERSION=24.8.0esr +FIREFOX_VERSION=31.1.1esr TORBROWSER_UPDATE_CHANNEL=default @@ -27,7 +27,7 @@ TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0 GOPTLIB_TAG=master MEEK_TAG=master -GITIAN_TAG=tor-browser-builder-3.x-6 +GITIAN_TAG=tor-browser-builder-3.x-7 OPENSSL_VER=1.0.1i GMP_VER=5.1.3

1 0

[torbutton/master] Update changelog.
by mikeperry＠torproject.org 30 Sep '14

30 Sep '14

commit beb9d71b5a101523474e9c72ff75419065ccd326 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Sep 29 17:25:37 2014 -0700 Update changelog. --- src/CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/src/CHANGELOG b/src/CHANGELOG index 11c50a7..74e95fe 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -2,6 +2,7 @@ ?? * Bug 10751: Adapt Torbutton to ESR31's Australis UI. * Bug 13138: ESR31-about:tor shows "Tor is not working" + * Bug 12947: Adapt session storage blocker to ESR 31. 1.6.12.3 23 Sep 2014

1 0

[torbutton/master] Merge remote-tracking branch 'gk/bug_12947'
by mikeperry＠torproject.org 30 Sep '14

30 Sep '14

commit fd5b793ce1d1922411cf632bd0a53139e26efdc8 Merge: 3f80c17 3831da2 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Sep 29 17:25:27 2014 -0700 Merge remote-tracking branch 'gk/bug_12947' src/components/tbSessionStore.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)

1 0

[torbutton/master] Bug 12947: Adapt session storage blocker to ESR 31.
by mikeperry＠torproject.org 30 Sep '14

30 Sep '14

commit 3831da21b6bac9e6cf21ba7d4e48217a6b14e73a Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 5 16:12:23 2014 +0000 Bug 12947: Adapt session storage blocker to ESR 31. --- src/components/tbSessionStore.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/components/tbSessionStore.js b/src/components/tbSessionStore.js index 039e223..7281bcf 100644 --- a/src/components/tbSessionStore.js +++ b/src/components/tbSessionStore.js @@ -85,8 +85,15 @@ TBSessionBlocker.prototype = { if (topic != "sessionstore-state-write") return; this.logger.log(3, "Got Session Store observe: "+topic); - subject = subject.QueryInterface(Ci.nsISupportsString); - + // In ESR 31 |subject| is |null| in non-private browsing mode. Thus, we + // are not able to clean anything. In Private Browsing Mode nothing is + // written in the first place and therefore no |sessionstore-state-write| + // notification is emitted. + try { + subject = subject.QueryInterface(Ci.nsISupportsString); + } catch (e) { + this.logger.log(3, "We got no data to clean"); + } // Bug 1506: This is the only important bit, other than // the registration goop. You don't even need the JSON // garbage...

1 0

[torbutton/master] Merge remote-tracking branch 'brade/bug13138'
by mikeperry＠torproject.org 30 Sep '14

30 Sep '14

commit f82606e56c30ee7db9e6160719ef858b7b9c1e10 Merge: 7f46869 0467379 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Sep 29 17:06:48 2014 -0700 Merge remote-tracking branch 'brade/bug13138' src/chrome/content/aboutTor/aboutTor.xhtml | 7 ++++- src/chrome/content/torbutton.js | 45 ++++++++++++++++++---------- 2 files changed, 35 insertions(+), 17 deletions(-)

1 0

[torbutton/master] Bug #10751.2: Adapt Torbutton to Australis UI.
by mikeperry＠torproject.org 30 Sep '14

30 Sep '14

commit 4024c6ff958724d226a5a30b68316b25fb876616 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Aug 25 16:46:54 2014 -0700 Bug #10751.2: Adapt Torbutton to Australis UI. Use CustomizableUI, if it is available, to add TorButton's button to navigation toolbar. --- src/chrome/content/torbutton.js | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 153cc3c..4ca6614 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -541,14 +541,21 @@ function torbutton_init() { if (!m_tb_prefs.getBoolPref("extensions.torbutton.inserted_button")) { torbutton_log(3, 'Adding button'); try { - var toolbutton = torbutton_get_button_from_toolbox(); - var navbar = document.getElementById("nav-bar"); - // XXX: Will probably fail on fennec. Also explicitly forbidden - // by MDC style guides (for good reason). Fix later.. - var urlbar = document.getElementById("urlbar-container"); - navbar.insertBefore(toolbutton, urlbar); - navbar.setAttribute("currentset", navbar.currentSet); - document.persist("nav-bar", "currentset"); + if (CustomizableUI) { + // ESR31-style toolbar + CustomizableUI.addWidgetToArea("torbutton-button", CustomizableUI.AREA_NAVBAR, 0); + } else { + // ESR24-style toolbar + // TODO: Remove this branch once TBB-ESR24 has been retired. + var toolbutton = torbutton_get_button_from_toolbox(); + var navbar = document.getElementById("nav-bar"); + // XXX: Will probably fail on fennec. Also explicitly forbidden + // by MDC style guides (for good reason). Fix later.. + var urlbar = document.getElementById("urlbar-container"); + navbar.insertBefore(toolbutton, urlbar); + navbar.setAttribute("currentset", navbar.currentSet); + document.persist("nav-bar", "currentset"); + } torbutton_log(3, 'Button added'); m_tb_prefs.setBoolPref("extensions.torbutton.inserted_button", true); } catch(e) {

1 0