- tbb-commits - lists.torproject.org

[tor-launcher/master] Bump version to 0.2.7.7
by gk＠torproject.org 07 Aug '15

07 Aug '15

commit 5db9bfd3fe0a9855bede7fa61d4bd65f236ad879 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 7 19:45:14 2015 +0000 Bump version to 0.2.7.7 --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 0b8fc34..a7524b7 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.7.6</em:version> + <em:version>0.2.7.7</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL> <em:updateKey>-</em:updateKey>

1 0

[torbutton/master] Bug 16730: Reset NoScript whitelist on upgrade
by gk＠torproject.org 07 Aug '15

07 Aug '15

commit 59ef74948aeea8d73f8833ab9e918cd1b70b6a32 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 7 15:09:42 2015 +0000 Bug 16730: Reset NoScript whitelist on upgrade This fixes 16722 as well and resets the toolbar UI to kill "Share this page", but that still requires another restart :/. This is basically Mike's idea and code. --- src/chrome/content/torbutton.js | 38 +++++++++++++++++++++++++++++++ src/defaults/preferences/preferences.js | 3 +++ 2 files changed, 41 insertions(+) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 1d81960..28da420 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2864,6 +2864,41 @@ function torbutton_restore_cookies(tor_enabled) } } +// Bug 1506 P1: This function just cleans up prefs that got set badly in previous releases +function torbutton_fixup_old_prefs() +{ + if(m_tb_prefs.getIntPref('extensions.torbutton.pref_fixup_version') < 1) { + // TBB 5.0a3 had bad Firefox code that silently flipped this pref on us + if (m_tb_prefs.prefHasUserValue("browser.newtabpage.enhanced")) { + m_tb_prefs.clearUserPref("browser.newtabpage.enhanced"); + // TBB 5.0a3 users had all the necessary data cached in + // directoryLinks.json. This meant that resetting the pref above + // alone was not sufficient as the tiles features uses the cache + // even if the pref indicates that feature should be disabled. + // We flip the preference below as this forces a refetching which + // effectively results in an empty JSON file due to our spoofed + // URLs. + let matchOS = m_tb_prefs.getBoolPref("intl.locale.matchOS"); + m_tb_prefs.setBoolPref("intl.locale.matchOS", !matchOS); + m_tb_prefs.setBoolPref("intl.locale.matchOS", matchOS); + } + + // Prior to TBB 5.0, NoScript was allowed to update its whitelist. This caused + // odd things to appear in people's whitelists. + if (m_tb_prefs.prefHasUserValue("capability.policy.maonoscript.sites")) { + m_tb_prefs.clearUserPref("capability.policy.maonoscript.sites"); + } + + // For some reason, the Share This Page button also survived the + // TBB 5.0a4 update's attempt to remove it. + if (m_tb_prefs.prefHasUserValue("browser.uiCustomization.state")) { + m_tb_prefs.clearUserPref("browser.uiCustomization.state"); + } + + m_tb_prefs.setIntPref('extensions.torbutton.pref_fixup_version', 1); + } +} + // ---------------------- Event handlers ----------------- // Bug 1506 P1/P3: This removes any platform-specific junk @@ -2971,6 +3006,9 @@ function torbutton_do_startup() prompts.alert(null, title, warning); } + // For general pref fixups to handle pref damage in older versions + torbutton_fixup_old_prefs(); + m_tb_prefs.setBoolPref("extensions.torbutton.startup", false); } } diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 6b4ec0c..ce66d0e 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -225,3 +225,6 @@ pref("spellchecker.dictionary", "chrome://torbutton/locale/browser.properties"); pref("extensions.torbutton.window.maxHeight", 1000); pref("extensions.torbutton.window.maxWidth", 1000); + +// This pref specifies an ad-hoc "version" for various pref update hacks we need to do +pref("extensions.torbutton.pref_fixup_version", 0);

1 0

[tor-browser-bundle/master] Bug 16730: Prevent NoScript from updating the default whitelist
by mikeperry＠torproject.org 06 Aug '15

06 Aug '15

commit 918455b0256f15b81c838fd1dd3600e87fecec15 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Aug 6 15:09:57 2015 -0700 Bug 16730: Prevent NoScript from updating the default whitelist --- .../Data/Browser/profile.default/preferences/extension-overrides.js | 1 + .../Data/Browser/profile.default/preferences/extension-overrides.js | 1 + .../Data/Browser/profile.default/preferences/extension-overrides.js | 1 + 3 files changed, 3 insertions(+) diff --git a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js index 7a95619..26b019c 100644 --- a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js @@ -45,6 +45,7 @@ pref("noscript.subscription.lastCheck", -142148139); pref("noscript.temp", ""); pref("noscript.untrusted", ""); pref("noscript.forbidMedia", false); +pref("noscript.allowWhitelistUpdates", false); // Now handled by plugins.click_to_play pref("noscript.forbidFlash", false); pref("noscript.forbidSilverlight", false); diff --git a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js index 7a95619..26b019c 100644 --- a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js @@ -45,6 +45,7 @@ pref("noscript.subscription.lastCheck", -142148139); pref("noscript.temp", ""); pref("noscript.untrusted", ""); pref("noscript.forbidMedia", false); +pref("noscript.allowWhitelistUpdates", false); // Now handled by plugins.click_to_play pref("noscript.forbidFlash", false); pref("noscript.forbidSilverlight", false); diff --git a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js index 976d71c..d92bd3b 100644 --- a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js @@ -45,6 +45,7 @@ pref("noscript.subscription.lastCheck", -142148139); pref("noscript.temp", ""); pref("noscript.untrusted", ""); pref("noscript.forbidMedia", false); +pref("noscript.allowWhitelistUpdates", false); // Now handled by plugins.click_to_play pref("noscript.forbidFlash", false); pref("noscript.forbidSilverlight", false);

1 0

[tor-browser/tor-browser-38.1.0esr-5.0-1] fixup! Bug 4755: Return client window coordinates for mouse event screenX/Y
by mikeperry＠torproject.org 06 Aug '15

06 Aug '15

commit 5282caeb91c9458ddb26edc2684a8b76ee53eb42 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Aug 5 10:29:19 2015 -0400 fixup! Bug 4755: Return client window coordinates for mouse event screenX/Y Use ThreadsafeIsCallerChrome() instead of IsCallerChrome(). --- dom/events/Event.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dom/events/Event.cpp b/dom/events/Event.cpp index 066fc0b..c92d2c9 100644 --- a/dom/events/Event.cpp +++ b/dom/events/Event.cpp @@ -882,7 +882,7 @@ Event::GetScreenCoords(nsPresContext* aPresContext, WidgetEvent* aEvent, LayoutDeviceIntPoint aPoint) { - if (!nsContentUtils::IsCallerChrome()) { + if (!nsContentUtils::ThreadsafeIsCallerChrome()) { // For non-chrome callers, return client coordinates instead. // For some events, the result will be zero; specifically, for dragend // events (there is no widget associated with dragend events, which

1 0

[tor-browser/tor-browser-38.1.0esr-5.0-1] Merge remote-tracking branch 'brade/bug16715-01' into tor-browser-38.1.0esr-5.0-1
by mikeperry＠torproject.org 06 Aug '15

06 Aug '15

commit 2cdcdb2535957a79a2e6577188e25c9f783d3634 Merge: bfdfccc c127300 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Aug 6 14:37:02 2015 -0700 Merge remote-tracking branch 'brade/bug16715-01' into tor-browser-38.1.0esr-5.0-1 dom/canvas/CanvasUtils.cpp | 2 +- dom/events/Event.cpp | 2 +- dom/events/KeyboardEvent.cpp | 2 +- layout/style/nsComputedDOMStyle.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)

1 0

[tor-browser/tor-browser-38.1.0esr-5.0-1] fixup! Bug 15646: Prevent keyboard layout fingerprinting in KeyboardEvent
by mikeperry＠torproject.org 06 Aug '15

06 Aug '15

commit c1273008b1e00a60ce51cec4aa68ed83363c9a20 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Aug 5 10:40:47 2015 -0400 fixup! Bug 15646: Prevent keyboard layout fingerprinting in KeyboardEvent Use ThreadsafeIsCallerChrome() instead of IsCallerChrome(). --- dom/events/KeyboardEvent.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dom/events/KeyboardEvent.cpp b/dom/events/KeyboardEvent.cpp index 76e6e39..6a68f96 100644 --- a/dom/events/KeyboardEvent.cpp +++ b/dom/events/KeyboardEvent.cpp @@ -14,7 +14,7 @@ namespace dom { static bool ResistFingerprinting() { return nsContentUtils::ResistFingerprinting() && - !nsContentUtils::IsCallerChrome(); + !nsContentUtils::ThreadsafeIsCallerChrome(); } KeyboardEvent::KeyboardEvent(EventTarget* aOwner,

1 0

[tor-browser/tor-browser-38.1.0esr-5.0-1] fixup! Bug 6253: Add canvas image extraction prompt.
by mikeperry＠torproject.org 06 Aug '15

06 Aug '15

commit cce64292e7b2633016b2505da8a445b7af633fd5 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Aug 5 10:36:30 2015 -0400 fixup! Bug 6253: Add canvas image extraction prompt. Use ThreadsafeIsCallerChrome() instead of IsCallerChrome(). --- dom/canvas/CanvasUtils.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dom/canvas/CanvasUtils.cpp b/dom/canvas/CanvasUtils.cpp index f1978ff..9883a52 100644 --- a/dom/canvas/CanvasUtils.cpp +++ b/dom/canvas/CanvasUtils.cpp @@ -55,7 +55,7 @@ bool IsImageExtractionAllowed(nsIDocument *aDocument, JSContext *aCx) return true; // Don't show canvas prompt for chrome scripts (e.g. Page Inspector) - if (nsContentUtils::IsCallerChrome()) + if (nsContentUtils::ThreadsafeIsCallerChrome()) return true; JS::AutoFilename scriptFile;

1 0

[tor-browser/tor-browser-38.1.0esr-5.0-1] fixup! Bug 13016: Hide CSS -moz-osx-font-smoothing values.
by mikeperry＠torproject.org 06 Aug '15

06 Aug '15

commit 85bfd5df3fa1dff272e5f527d39e1b69cb3b746a Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Aug 5 10:33:59 2015 -0400 fixup! Bug 13016: Hide CSS -moz-osx-font-smoothing values. Use ThreadsafeIsCallerChrome() instead of IsCallerChrome(). --- layout/style/nsComputedDOMStyle.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layout/style/nsComputedDOMStyle.cpp b/layout/style/nsComputedDOMStyle.cpp index 257a1af..a8c30cc 100644 --- a/layout/style/nsComputedDOMStyle.cpp +++ b/layout/style/nsComputedDOMStyle.cpp @@ -1437,7 +1437,7 @@ nsComputedDOMStyle::DoGetFontSizeAdjust() CSSValue* nsComputedDOMStyle::DoGetOSXFontSmoothing() { - if (!nsContentUtils::IsCallerChrome()) + if (!nsContentUtils::ThreadsafeIsCallerChrome()) return nullptr; nsROCSSPrimitiveValue* val = new nsROCSSPrimitiveValue;

1 0

[torbutton/master] Bug 16731: TBB 5.0 a3/a4 fails to download a file on right click
by gk＠torproject.org 06 Aug '15

06 Aug '15

commit 97796d37738679b232a226f039e9b407b1a47c98 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Aug 5 15:02:19 2015 -0400 Bug 16731: TBB 5.0 a3/a4 fails to download a file on right click Account for an nsIExternalHelperAppService.idl interface change (the parameters to the doContent() method were changed between ESR31 and ESR38). See Mozilla bug #903022. --- src/components/external-app-blocker.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/external-app-blocker.js b/src/components/external-app-blocker.js index cabd72b..b349ab4 100644 --- a/src/components/external-app-blocker.js +++ b/src/components/external-app-blocker.js @@ -191,7 +191,8 @@ ExternalWrapper.prototype = return result; }, - doContent: function(aMimeContentType, aRequest, aWindowContext, aForceSave) { + doContent: function(aMimeContentType, aRequest, aContentContext, + aForceSave, aWindowContext) { if(this.blockApp()) { var check = {value: false}; var result = this._confirmLaunch(aRequest.name, check); @@ -201,7 +202,8 @@ ExternalWrapper.prototype = } } - return this._external().doContent(aMimeContentType, aRequest, aWindowContext, aForceSave); + return this._external().doContent(aMimeContentType, aRequest, + aContentContext, aForceSave, aWindowContext); }, observe: function(subject, topic, data) {

1 0

[tor-browser/tor-browser-38.1.0esr-5.0-1] fixup! Bug 13670.1: Isolate favicon requests by first party.
by gk＠torproject.org 06 Aug '15

06 Aug '15

commit bfdfcccae99d1af38b3320eb7409377bd0ebc154 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Aug 5 11:16:12 2015 -0400 fixup! Bug 13670.1: Isolate favicon requests by first party. Fix debug build error: Inside nsContentUtils::LoadImage(), remove the NS_PRECONDITION() call that references the aLoadingDocument parameter (which had been removed). --- dom/base/nsContentUtils.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp index 0ce2095..6b7461a 100644 --- a/dom/base/nsContentUtils.cpp +++ b/dom/base/nsContentUtils.cpp @@ -2997,7 +2997,6 @@ nsContentUtils::LoadImage(nsIURI* aURI, nsINode* aLoadingNode, uint32_t aContentPolicyType) { NS_PRECONDITION(aURI, "Must have a URI"); - NS_PRECONDITION(aLoadingDocument, "Must have a document"); NS_PRECONDITION(aLoadingPrincipal, "Must have a principal"); NS_PRECONDITION(aRequest, "Null out param");

1 0