- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-38.4.0esr-5.5-1] Bug 16863: console.error on new Tor Browser window
by gk＠torproject.org 09 Dec '15

09 Dec '15

commit c2ce09f61101f3ac2d16d644d7fb56c035bec9ba Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Dec 9 11:47:08 2015 -0500 Bug 16863: console.error on new Tor Browser window Improve error handling and avoid confusing error log messages when loop.enabled is false. --- browser/components/customizableui/CustomizableUI.jsm | 8 ++++++++ browser/components/customizableui/CustomizableWidgets.jsm | 8 +++----- browser/components/loop/MozLoopService.jsm | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/browser/components/customizableui/CustomizableUI.jsm b/browser/components/customizableui/CustomizableUI.jsm index 54c2ede..a43404e 100644 --- a/browser/components/customizableui/CustomizableUI.jsm +++ b/browser/components/customizableui/CustomizableUI.jsm @@ -1186,6 +1186,11 @@ let CustomizableUIInternal = { throw new Error("buildWidget was passed a non-widget to build."); } + if (aWidget.onIsHidden && aWidget.onIsHidden()) { + LOG("Skipping hidden widget " + aWidget.id + " of type " + aWidget.type); + return undefined; + } + LOG("Building " + aWidget.id + " of type " + aWidget.type); let node; @@ -2180,6 +2185,7 @@ let CustomizableUIInternal = { widget._introducedInVersion = aData.introducedInVersion || 0; } + this.wrapWidgetEventHandler("onIsHidden", widget); this.wrapWidgetEventHandler("onBeforeCreated", widget); this.wrapWidgetEventHandler("onClick", widget); this.wrapWidgetEventHandler("onCreated", widget); @@ -3015,6 +3021,8 @@ this.CustomizableUI = { * of the widget. * - viewId: Only useful for views (and required there): the id of the * <panelview> that should be shown when clicking the widget. + * - onIsHidden(): Called to check whether a widget should be hidden + * (optional; returns a Boolean value). * - onBuild(aDoc): Only useful for custom widgets (and required there); a * function that will be invoked with the document in which * to build a widget. Should return the DOM node that has diff --git a/browser/components/customizableui/CustomizableWidgets.jsm b/browser/components/customizableui/CustomizableWidgets.jsm index 75f69dd..4a8bacf 100644 --- a/browser/components/customizableui/CustomizableWidgets.jsm +++ b/browser/components/customizableui/CustomizableWidgets.jsm @@ -933,12 +933,10 @@ const CustomizableWidgets = [ // Not in private browsing, see bug 1108187. showInPrivateBrowsing: false, introducedInVersion: 4, + onIsHidden: function() { + return !Services.prefs.getBoolPref("loop.enabled"); + }, onBuild: function(aDocument) { - // If we're not supposed to see the button, return zip. - if (!Services.prefs.getBoolPref("loop.enabled")) { - return null; - } - let node = aDocument.createElementNS(kNSXUL, "toolbarbutton"); node.setAttribute("id", this.id); node.classList.add("toolbarbutton-1"); diff --git a/browser/components/loop/MozLoopService.jsm b/browser/components/loop/MozLoopService.jsm index 3f6a77c..d915070 100644 --- a/browser/components/loop/MozLoopService.jsm +++ b/browser/components/loop/MozLoopService.jsm @@ -1107,7 +1107,7 @@ this.MozLoopService = { // Don't do anything if loop is not enabled. if (!Services.prefs.getBoolPref("loop.enabled")) { - return Promise.reject(new Error("loop is not enabled")); + return Promise.resolve(); } if (Services.prefs.getPrefType("loop.fxa.enabled") == Services.prefs.PREF_BOOL) {

1 0

[tor-browser/tor-browser-38.4.0esr-5.5-1] Bug 12516: Compile hardenend Tor Browser with -fwrapv
by gk＠torproject.org 09 Dec '15

09 Dec '15

commit 507be1ee78b54b23106d6e99b5d07835d34682a0 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Dec 8 10:27:03 2015 +0000 Bug 12516: Compile hardenend Tor Browser with -fwrapv --- .mozconfig-asan | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.mozconfig-asan b/.mozconfig-asan index 218d2bd..9472ff2 100644 --- a/.mozconfig-asan +++ b/.mozconfig-asan @@ -1,7 +1,7 @@ . $topsrcdir/browser/config/mozconfig -export CFLAGS="-fsanitize=address -Dxmalloc=myxmalloc" -export CXXFLAGS="-fsanitize=address -Dxmalloc=myxmalloc" +export CFLAGS="-fsanitize=address -Dxmalloc=myxmalloc -fwrapv" +export CXXFLAGS="-fsanitize=address -Dxmalloc=myxmalloc -frwapv" # We need to add -ldl explicitely due to bug 1213698 export LDFLAGS="-fsanitize=address -ldl"

1 0

[tor-browser-bundle/hardened-builds] Bug 17747: Replace schanenlied with ndnop3
by gk＠torproject.org 09 Dec '15

09 Dec '15

commit ce9150067e4bdf5699dc22d64bd0b532516d3292 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Dec 7 11:12:35 2015 +0000 Bug 17747: Replace schanenlied with ndnop3 --- Bundle-Data/PTConfigs/bridge_prefs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index a055d8f..f27d389 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -20,7 +20,7 @@ pref("extensions.torlauncher.default_bridge.fte-ipv6.2", "fte [2001:49f0:d00a:1: pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH"); -pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 178.209.52.110:443 67E72FF33D7D41BF11C569646A0A7B4B188340DF cert=Z+cv8z19Qb8RxWlkagp7SxiDQN++b7D2Tntowhf+j4D15/kLuj3EoSSGvuREGPc3h60Ofw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 109.105.109.165:24215 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 83.212.101.3:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0");

1 0

[tor-browser-bundle/maint-5.0] Bug 17747: Replace schanenlied with ndnop3
by gk＠torproject.org 09 Dec '15

09 Dec '15

commit 0e8100faec7ec7bc38cc009f33a13988eabe90aa Author: Georg Koppen <gk(a)torproject.org> Date: Mon Dec 7 11:12:35 2015 +0000 Bug 17747: Replace schanenlied with ndnop3 --- Bundle-Data/PTConfigs/bridge_prefs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 3aab4c6..4fea91b 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -26,7 +26,7 @@ pref("extensions.torlauncher.default_bridge.fte-ipv6.2", "fte [2001:49f0:d00a:1: pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH"); -pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 178.209.52.110:443 67E72FF33D7D41BF11C569646A0A7B4B188340DF cert=Z+cv8z19Qb8RxWlkagp7SxiDQN++b7D2Tntowhf+j4D15/kLuj3EoSSGvuREGPc3h60Ofw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 109.105.109.165:24215 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 83.212.101.3:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0");

1 0

[tor-browser-bundle/master] Bug 17747: Replace schanenlied with ndnop3
by gk＠torproject.org 09 Dec '15

09 Dec '15

commit 52a18422300ce825e0373468084f210aedc368d7 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Dec 7 11:12:35 2015 +0000 Bug 17747: Replace schanenlied with ndnop3 --- Bundle-Data/PTConfigs/bridge_prefs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index a055d8f..f27d389 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -20,7 +20,7 @@ pref("extensions.torlauncher.default_bridge.fte-ipv6.2", "fte [2001:49f0:d00a:1: pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH"); -pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 178.209.52.110:443 67E72FF33D7D41BF11C569646A0A7B4B188340DF cert=Z+cv8z19Qb8RxWlkagp7SxiDQN++b7D2Tntowhf+j4D15/kLuj3EoSSGvuREGPc3h60Ofw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 109.105.109.165:24215 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 83.212.101.3:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0");

1 0

[tor-browser/tor-browser-38.4.0esr-5.0-1] Bug 17502: Add a pref hiding the "Open with" option
by gk＠torproject.org 09 Dec '15

09 Dec '15

commit 177885fd3e8ee230f2bc03ed78dbe1a699068429 Author: anonym <anonym(a)riseup.net> Date: Sun Nov 1 23:57:59 2015 +0100 Bug 17502: Add a pref hiding the "Open with" option If browser.download.forbid_open_with is set to true (default: false) the download dialog will not ever show the "Open with" option for opening the file with an external application; only the "Save" and "Cancel" options will be available. This is very useful to enable when the browser is sandboxed (e.g. via AppArmor) in such a way that it is forbidden to run external applications, since users then are not presented with this choice which will not work and only cause confusion. --- browser/app/profile/firefox.js | 1 + toolkit/mozapps/downloads/nsHelperAppDlg.js | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index 53fd8d2..95bbe97 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -354,6 +354,7 @@ pref("browser.download.useDownloadDir", true); pref("browser.download.folderList", 1); pref("browser.download.manager.addToRecentDocs", true); pref("browser.download.manager.resumeOnWakeDelay", 10000); +pref("browser.download.forbid_open_with", false); // This allows disabling the animated notifications shown by // the Downloads Indicator when a download starts or completes. diff --git a/toolkit/mozapps/downloads/nsHelperAppDlg.js b/toolkit/mozapps/downloads/nsHelperAppDlg.js index 43653f9..abb7ca2 100644 --- a/toolkit/mozapps/downloads/nsHelperAppDlg.js +++ b/toolkit/mozapps/downloads/nsHelperAppDlg.js @@ -458,7 +458,8 @@ nsUnknownContentTypeDialog.prototype = { var shouldntRememberChoice = (mimeType == "application/octet-stream" || mimeType == "application/x-msdownload" || this.mLauncher.targetFileIsExecutable); - if (shouldntRememberChoice && !this.openWithDefaultOK()) { + if ((shouldntRememberChoice && !this.openWithDefaultOK()) || + Services.prefs.getBoolPref("browser.download.forbid_open_with")) { // hide featured choice this.dialogElement("normalBox").collapsed = true; // show basic choice

1 0

[tor-browser/tor-browser-38.4.0esr-5.0-1] fixup! Bug 17502: Add a pref hiding the "Open with" option
by gk＠torproject.org 09 Dec '15

09 Dec '15

commit 1262b7c5a49b5de4489badf448705925fc3e467f Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 9 13:44:30 2015 +0000 fixup! Bug 17502: Add a pref hiding the "Open with" option --- browser/app/profile/000-tor-browser.js | 4 ++++ browser/app/profile/firefox.js | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index b94b6d1..6e75298 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -172,6 +172,10 @@ pref("devtools.appmanager.enabled", false); // restrictive DNS look-up policy. We use "127.0.0.1" instead of "localhost" as // a workaround. See bug 16523 for more details. pref("devtools.debugger.chrome-debugging-host", "127.0.0.1"); +// Don't show the "Open with" option on the download dialog if the preference +// is |true|. This helps to avoid confusion e.g. in case the browser is +// sandboxed. See bug 17502 for details. +pref("browser.download.forbid_open_with", false); // Security slider pref("svg.in-content.enabled", true); diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index 95bbe97..53fd8d2 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -354,7 +354,6 @@ pref("browser.download.useDownloadDir", true); pref("browser.download.folderList", 1); pref("browser.download.manager.addToRecentDocs", true); pref("browser.download.manager.resumeOnWakeDelay", 10000); -pref("browser.download.forbid_open_with", false); // This allows disabling the animated notifications shown by // the Downloads Indicator when a download starts or completes.

1 0

[tor-browser/tor-browser-38.4.0esr-5.5-1] fixup! Bug 17502: Add a pref hiding the "Open with" option
by gk＠torproject.org 09 Dec '15

09 Dec '15

commit 721f255ca93675c6a3caf2e75678978c8a4db72c Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 9 13:44:30 2015 +0000 fixup! Bug 17502: Add a pref hiding the "Open with" option --- browser/app/profile/000-tor-browser.js | 4 ++++ browser/app/profile/firefox.js | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 1de3ed1..dc38ee4 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -177,6 +177,10 @@ pref("devtools.appmanager.enabled", false); // restrictive DNS look-up policy. We use "127.0.0.1" instead of "localhost" as // a workaround. See bug 16523 for more details. pref("devtools.debugger.chrome-debugging-host", "127.0.0.1"); +// Don't show the "Open with" option on the download dialog if the preference +// is |true|. This helps to avoid confusion e.g. in case the browser is +// sandboxed. See bug 17502 for details. +pref("browser.download.forbid_open_with", false); // Security slider pref("svg.in-content.enabled", true); diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index 6c30b7d..a827f52 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -324,7 +324,6 @@ pref("browser.download.useDownloadDir", true); pref("browser.download.folderList", 1); pref("browser.download.manager.addToRecentDocs", true); pref("browser.download.manager.resumeOnWakeDelay", 10000); -pref("browser.download.forbid_open_with", false); // This allows disabling the animated notifications shown by // the Downloads Indicator when a download starts or completes.

1 0

[tor-browser/tor-browser-38.4.0esr-5.5-1] Bug 17502: Add a pref hiding the "Open with" option
by gk＠torproject.org 09 Dec '15

09 Dec '15

commit c3aafe32d28271e04b616eaf92f826fc70c4627a Author: anonym <anonym(a)riseup.net> Date: Sun Nov 1 23:57:59 2015 +0100 Bug 17502: Add a pref hiding the "Open with" option If browser.download.forbid_open_with is set to true (default: false) the download dialog will not ever show the "Open with" option for opening the file with an external application; only the "Save" and "Cancel" options will be available. This is very useful to enable when the browser is sandboxed (e.g. via AppArmor) in such a way that it is forbidden to run external applications, since users then are not presented with this choice which will not work and only cause confusion. --- browser/app/profile/firefox.js | 1 + toolkit/mozapps/downloads/nsHelperAppDlg.js | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index a827f52..6c30b7d 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -324,6 +324,7 @@ pref("browser.download.useDownloadDir", true); pref("browser.download.folderList", 1); pref("browser.download.manager.addToRecentDocs", true); pref("browser.download.manager.resumeOnWakeDelay", 10000); +pref("browser.download.forbid_open_with", false); // This allows disabling the animated notifications shown by // the Downloads Indicator when a download starts or completes. diff --git a/toolkit/mozapps/downloads/nsHelperAppDlg.js b/toolkit/mozapps/downloads/nsHelperAppDlg.js index 43653f9..abb7ca2 100644 --- a/toolkit/mozapps/downloads/nsHelperAppDlg.js +++ b/toolkit/mozapps/downloads/nsHelperAppDlg.js @@ -458,7 +458,8 @@ nsUnknownContentTypeDialog.prototype = { var shouldntRememberChoice = (mimeType == "application/octet-stream" || mimeType == "application/x-msdownload" || this.mLauncher.targetFileIsExecutable); - if (shouldntRememberChoice && !this.openWithDefaultOK()) { + if ((shouldntRememberChoice && !this.openWithDefaultOK()) || + Services.prefs.getBoolPref("browser.download.forbid_open_with")) { // hide featured choice this.dialogElement("normalBox").collapsed = true; // show basic choice

1 0

[torbutton/maint-1.9.3] Bug 17770: Fix alignments on donation banner
by gk＠torproject.org 09 Dec '15

09 Dec '15

commit b2be87834a9f7bde1e1366d6f395d5c068b53ed4 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Dec 7 17:07:39 2015 -0800 Bug 17770: Fix alignments on donation banner --- src/chrome/content/aboutTor/aboutTor.xhtml | 2 +- src/chrome/skin/aboutTor.css | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index dbfca72..d9e7704 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -217,7 +217,7 @@ function setupDonationBanner() { return; } // Now we can show the banner. - document.getElementById("donation-banner").style.display = "inline"; + document.getElementById("donation-banner").style.display = "block"; } ]]> </script> diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index 038d470..5f43f8c 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -351,12 +351,21 @@ body .top div.hideIfTorIsUpToDate h1.hideIfTorOff { display: none; } +#donation-banner > a { + display: block; +} + #donation-banner-inner { margin: 0px auto; position: relative; text-align: left; width: 700px; z-index: -1; + display: block; +} + +#donation-banner-image { + display: block; } #donation-banner-text { @@ -369,6 +378,7 @@ body .top div.hideIfTorIsUpToDate h1.hideIfTorOff { #donation-banner-quote { color: darkgreen; + font-family: serif; font-size: 18px; text-align: start; white-space: normal; @@ -407,11 +417,11 @@ body .top div.hideIfTorIsUpToDate h1.hideIfTorOff { color: white; font-family: sans-serif; font-size: 20px; - left: 600px; + left: 490px; padding: 10px; position: absolute; text-align: center; - top: 153px; + top: 144px; vertical-align: middle; width: 110px; }

1 0