- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-31.6.0esr-4.5-1] fixup! Bug #15502. Isolate blob URLs to first party; no blobURLs in Web Workers
by mikeperry＠torproject.org 07 May '15

07 May '15

commit df5c4bffa70cce25c6ae66cf362c4b4c4b1853d0 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu May 7 12:59:04 2015 -0700 fixup! Bug #15502. Isolate blob URLs to first party; no blobURLs in Web Workers --- browser/extensions/pdfjs/content/PdfStreamConverter.jsm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm index 4e7a795..aa7d6df 100644 --- a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm +++ b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm @@ -248,6 +248,12 @@ ChromeActions.prototype = { filename = 'document.pdf'; } var blobUri = data.blobUrl ? NetUtil.newURI(data.blobUrl) : originalUri; + var netChannel; + try { + netChannel = NetUtil.newChannel(blobUri); + } catch (e) { + netChannel = NetUtil.newChannel(originalUri); + } var extHelperAppSvc = Cc['@mozilla.org/uriloader/external-helper-app-service;1']. getService(Ci.nsIExternalHelperAppService); @@ -255,7 +261,6 @@ ChromeActions.prototype = { getService(Ci.nsIWindowWatcher).activeWindow; var docIsPrivate = this.isInPrivateBrowsing(); - var netChannel = NetUtil.newChannel(blobUri); if ('nsIPrivateBrowsingChannel' in Ci && netChannel instanceof Ci.nsIPrivateBrowsingChannel) { netChannel.setPrivate(docIsPrivate);

1 0

[tor-browser/tor-browser-31.6.0esr-4.5-1] fixup! Bug #5742: API allows you to get the url bar URI for a channel or nsIDocument.
by mikeperry＠torproject.org 07 May '15

07 May '15

commit bc811be8123e800330a0a39805646169bd61b5f5 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu May 7 13:13:13 2015 -0700 fixup! Bug #5742: API allows you to get the url bar URI for a channel or nsIDocument. Bug 15933: Isolate by base (top-level) domain name instead of FQDN. TLD isolation is needed for file hosting sites, and sites with lots of subdomains. --- content/base/src/ThirdPartyUtil.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/base/src/ThirdPartyUtil.cpp b/content/base/src/ThirdPartyUtil.cpp index 0e037d1..8d76022 100644 --- a/content/base/src/ThirdPartyUtil.cpp +++ b/content/base/src/ThirdPartyUtil.cpp @@ -601,7 +601,7 @@ ThirdPartyUtil::GetFirstPartyHostForIsolation(nsIURI *aFirstPartyURI, return NS_ERROR_INVALID_ARG; if (!SchemeIsWhiteListed(aFirstPartyURI)) { - nsresult rv = aFirstPartyURI->GetHost(aHost); + nsresult rv = GetBaseDomain(aFirstPartyURI, aHost); return (aHost.Length() > 0) ? NS_OK : rv; }

1 0

[torbutton/master] Bug 15837: Show descriptions if unchecking custom mode
by gk＠torproject.org 07 May '15

07 May '15

commit d1ed854445b313c8539351820785981cda2bd37d Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 7 11:09:51 2015 +0000 Bug 15837: Show descriptions if unchecking custom mode --- src/chrome/content/preferences.xul | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index d25fba4..dfc0f2e 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -297,8 +297,12 @@ </vbox> </hbox> <hbox> +  <checkbox id="torbutton_sec_custom" flex="1" - label="&torbutton.prefs.sec_custom;"/> + oncommand="torbutton_set_slider_text(document, event.target.checked);" + label="&torbutton.prefs.sec_custom;"/> </hbox> </groupbox> </vbox>

1 0

[tor-browser/tor-browser-31.6.0esr-4.5-1] fixup! Bug #3455.2. Allow RFC1929 authentication (username/password) to SOCKS servers.
by mikeperry＠torproject.org 06 May '15

06 May '15

commit f259a80f3ee5a51e9826cdd1979d19a1f3943897 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon May 4 16:55:15 2015 +0200 fixup! Bug #3455.2. Allow RFC1929 authentication (username/password) to SOCKS servers. Remove unused variables proxyHost and proxyPort to fix unused-but-set-variable build errors. --- netwerk/base/src/nsSocketTransport2.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/netwerk/base/src/nsSocketTransport2.cpp b/netwerk/base/src/nsSocketTransport2.cpp index baa14da..658f2e0 100644 --- a/netwerk/base/src/nsSocketTransport2.cpp +++ b/netwerk/base/src/nsSocketTransport2.cpp @@ -1080,8 +1080,6 @@ nsSocketTransport::BuildSocket(PRFileDesc *&fd, bool &proxyTransparent, bool &us const char *host = mHost.get(); int32_t port = (int32_t) mPort; - const char *proxyHost = mProxyHost.IsEmpty() ? nullptr : mProxyHost.get(); - int32_t proxyPort = (int32_t) mProxyPort; uint32_t proxyFlags = 0; nsCOMPtr<nsIProxyInfo> proxyInfo = mProxyInfo; @@ -1154,8 +1152,6 @@ nsSocketTransport::BuildSocket(PRFileDesc *&fd, bool &proxyTransparent, bool &us // since socks is transparent, any layers above // it do not have to worry about proxy stuff proxyInfo = nullptr; - proxyHost = nullptr; - proxyPort = -1; proxyTransparent = true; } }

1 0

[tor-browser/tor-browser-31.6.0esr-4.5-1] fixup! Bug #3455.1: Allow proxy settings to be set per URL bar domain.
by mikeperry＠torproject.org 06 May '15

06 May '15

commit 3b7305457124de7d7fee52d3bd3e3fa1ca5f62e5 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon May 4 18:30:06 2015 +0200 fixup! Bug #3455.1: Allow proxy settings to be set per URL bar domain. Fix reorder build error: ../../../dist/include/mozilla/net/HttpBaseChannel.h:339:11: error: 'mozilla::net::HttpBaseChannel::mRedirectCount' will be initialized after [-Werror=reorder] ../../../dist/include/mozilla/net/HttpBaseChannel.h:327:20: error: 'nsCOMPtr<nsIURI> mozilla::net::HttpBaseChannel::mProxyURI' [-Werror=reorder] /builds/slave/try-l64-d-00000000000000000000/build/src/netwerk/protocol/http/HttpBaseChannel.cpp:39:1: error: when initialized here [-Werror=reorder] --- netwerk/protocol/http/HttpBaseChannel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netwerk/protocol/http/HttpBaseChannel.cpp b/netwerk/protocol/http/HttpBaseChannel.cpp index 64b202a..17f8c72 100644 --- a/netwerk/protocol/http/HttpBaseChannel.cpp +++ b/netwerk/protocol/http/HttpBaseChannel.cpp @@ -65,10 +65,10 @@ HttpBaseChannel::HttpBaseChannel() , mAllRedirectsSameOrigin(true) , mSuspendCount(0) , mProxyResolveFlags(0) + , mProxyURI(nullptr) , mContentDispositionHint(UINT32_MAX) , mHttpHandler(gHttpHandler) , mRedirectCount(0) - , mProxyURI(nullptr) { LOG(("Creating HttpBaseChannel @%x\n", this));

1 0

[tor-browser/tor-browser-31.6.0esr-4.5-1] Bug 15857: Fix file descriptor leak in updater.
by mikeperry＠torproject.org 06 May '15

06 May '15

commit a8348a29adac38d64625fce35baba7684fef3fcd Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed May 6 20:11:40 2015 -0700 Bug 15857: Fix file descriptor leak in updater. Corresponds to Mozilla bug https://bugzilla.mozilla.org/show_bug.cgi?id=1159826. --- toolkit/mozapps/update/updater/updater.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/mozapps/update/updater/updater.cpp b/toolkit/mozapps/update/updater/updater.cpp index 3ba92b3..89f12ec 100644 --- a/toolkit/mozapps/update/updater/updater.cpp +++ b/toolkit/mozapps/update/updater/updater.cpp @@ -799,7 +799,7 @@ static int ensure_copy_recursive(const NS_tchar *path, const NS_tchar *dest, } } } - + NS_tclosedir(dir); return rv; }

1 0

[tor-browser/tor-browser-31.6.0esr-4.5-1] fixup! Bug #15502. Isolate blob URLs to first party; no blobURLs in Web Workers
by mikeperry＠torproject.org 06 May '15

06 May '15

commit 15bf754badd65bccc1ea898324392a4d34a8e97e Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri May 1 14:49:58 2015 -0700 fixup! Bug #15502. Isolate blob URLs to first party; no blobURLs in Web Workers --- browser/extensions/pdfjs/content/build/pdf.worker.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/browser/extensions/pdfjs/content/build/pdf.worker.js b/browser/extensions/pdfjs/content/build/pdf.worker.js index a8779ab..805cc66 100644 --- a/browser/extensions/pdfjs/content/build/pdf.worker.js +++ b/browser/extensions/pdfjs/content/build/pdf.worker.js @@ -1048,7 +1048,14 @@ PDFJS.createObjectURL = (function createObjectURLClosure() { if (!PDFJS.disableCreateObjectURL && typeof URL !== 'undefined' && URL.createObjectURL) { var blob = PDFJS.createBlob(data, contentType); - return URL.createObjectURL(blob); + try { + return URL.createObjectURL(blob); + } catch(e) { + // URL.createObjectURL has thrown an error; continue to + // data schema fallback. + // TODO: Remove this try-catch when we re-enable + // createObjectURL in workers. + } } var buffer = 'data:' + contentType + ';base64,';

1 0

[tor-browser/tor-browser-31.6.0esr-4.5-1] Merge remote-tracking branch 'arthur/15899' into tor-browser-31.6.0esr-4.5-1
by mikeperry＠torproject.org 06 May '15

06 May '15

commit 31c6bfb7ef8eb79fe526ceaece91d6236f8cdd8a Merge: 3006aa5 15bf754 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed May 6 19:42:54 2015 -0700 Merge remote-tracking branch 'arthur/15899' into tor-browser-31.6.0esr-4.5-1 browser/extensions/pdfjs/content/build/pdf.worker.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)

1 0

[tor-browser-bundle/master] Bug 15945: Disable NoScript's ClearClick protection for now.
by mikeperry＠torproject.org 06 May '15

06 May '15

commit a9619e0a54d7c134325ad5a9496ffc67d07b0dcf Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed May 6 18:56:45 2015 -0700 Bug 15945: Disable NoScript's ClearClick protection for now. Bug #14985 has analysis toward a more complete fix for enabling it. --- .../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 d1469a8..7a95619 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 @@ -61,3 +61,4 @@ pref("noscript.cascadePermissions", true); pref("noscript.restrictSubdocScripting", true); pref("noscript.showVolatilePrivatePermissionsToggle", false); pref("noscript.volatilePrivatePermissions", true); +pref("noscript.clearClick", 0); 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 d1469a8..7a95619 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 @@ -61,3 +61,4 @@ pref("noscript.cascadePermissions", true); pref("noscript.restrictSubdocScripting", true); pref("noscript.showVolatilePrivatePermissionsToggle", false); pref("noscript.volatilePrivatePermissions", true); +pref("noscript.clearClick", 0); 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 fb2141b..976d71c 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 @@ -61,3 +61,4 @@ pref("noscript.cascadePermissions", true); pref("noscript.restrictSubdocScripting", true); pref("noscript.showVolatilePrivatePermissionsToggle", false); pref("noscript.volatilePrivatePermissions", true); +pref("noscript.clearClick", 0);

1 0

[torbutton/master] Bug 15927: Force update of the NoScript UI
by gk＠torproject.org 06 May '15

06 May '15

commit fecc621d6c3928918b4c62071f41ac2e4287e121 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue May 5 00:22:15 2015 -0700 Bug 15927: Force update of the NoScript UI --- src/chrome/content/torbutton.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 21e567e..c580c59 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2378,6 +2378,22 @@ function torbutton_update_security_slider() { } break; } + /* Update the NoScript button to reflect any changes */ + try { + let wm = Components.classes["@mozilla.org/appshell/window-mediator;1"] + .getService(Components.interfaces.nsIWindowMediator); + let browserEnumerator = wm.getEnumerator("navigator:browser"); + + // Update every window's NoScript status... + while (browserEnumerator.hasMoreElements()) { + let win = browserEnumerator.getNext(); + win.noscriptOverlay._syncUINow(); + } + torbutton_log(3, 'Updated NoScript status for security slider'); + } catch(e) { + torbutton_log(4, 'Failed to update NoScript status for security slider: '+e); + } + torbutton_log(3, 'Security Slider Pref Update Complete'); m_tb_sliderUpdate = false; }

1 0