summaryrefslogtreecommitdiffstats
path: root/toolkit/components
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-07-02 19:05:56 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-07-02 19:05:56 +0200
commite92808f0ebbeab3ffb79a0b1a4d190f61fb8b43a (patch)
treee5ba54415e62d447a4238aa0000f1ef2e58cfd53 /toolkit/components
parent4c9914227ed9e675d65ad16e0bb899e8107a0ee5 (diff)
downloadUXP-e92808f0ebbeab3ffb79a0b1a4d190f61fb8b43a.tar
UXP-e92808f0ebbeab3ffb79a0b1a4d190f61fb8b43a.tar.gz
UXP-e92808f0ebbeab3ffb79a0b1a4d190f61fb8b43a.tar.lz
UXP-e92808f0ebbeab3ffb79a0b1a4d190f61fb8b43a.tar.xz
UXP-e92808f0ebbeab3ffb79a0b1a4d190f61fb8b43a.zip
Prevent suppressing executable warnings using the "don't ask me this again" checkbox.
A hidden preference matching the behavior of "browser.download.manager.alertOnEXEOpen" is kept, but is renamed in order to recover cases where the checkbox was used accidentally. While there, simplify the `confirmLaunchExecutable` function by converting from promises to async function. Since Basilisk moved this prompting to toolkit, we also clean up some unused duplicate strings from application/basilisk while we're there. This resolves #581
Diffstat (limited to 'toolkit/components')
-rw-r--r--toolkit/components/jsdownloads/src/DownloadUIHelper.jsm51
1 files changed, 17 insertions, 34 deletions
diff --git a/toolkit/components/jsdownloads/src/DownloadUIHelper.jsm b/toolkit/components/jsdownloads/src/DownloadUIHelper.jsm
index 5bd351ee9..ce165205b 100644
--- a/toolkit/components/jsdownloads/src/DownloadUIHelper.jsm
+++ b/toolkit/components/jsdownloads/src/DownloadUIHelper.jsm
@@ -124,52 +124,35 @@ this.DownloadPrompter.prototype = {
/**
* Displays a warning message box that informs that the specified file is
- * executable, and asks whether the user wants to launch it. The user is
- * given the option of disabling future instances of this warning.
+ * executable, and asks whether the user wants to launch it.
*
* @param aPath
* String containing the full path to the file to be opened.
*
- * @return {Promise}
* @resolves Boolean indicating whether the launch operation can continue.
- * @rejects JavaScript exception.
*/
- confirmLaunchExecutable: function (aPath)
+ async confirmLaunchExecutable: function (aPath)
{
- const kPrefAlertOnEXEOpen = "browser.download.manager.alertOnEXEOpen";
+ const kPrefConfirmOpenExe = "browser.download.confirmOpenExecutable";
- try {
- // Always launch in case we have no prompter implementation.
- if (!this._prompter) {
- return Promise.resolve(true);
- }
-
- try {
- if (!Services.prefs.getBoolPref(kPrefAlertOnEXEOpen)) {
- return Promise.resolve(true);
- }
- } catch (ex) {
- // If the preference does not exist, continue with the prompt.
- }
-
- let leafName = OS.Path.basename(aPath);
-
- let s = DownloadUIHelper.strings;
- let checkState = { value: false };
- let shouldLaunch = this._prompter.confirmCheck(
- s.fileExecutableSecurityWarningTitle,
- s.fileExecutableSecurityWarning(leafName, leafName),
- s.fileExecutableSecurityWarningDontAsk,
- checkState);
+ // Always launch in case we have no prompter implementation.
+ if (!this._prompter) {
+ return true;
+ }
- if (shouldLaunch) {
- Services.prefs.setBoolPref(kPrefAlertOnEXEOpen, !checkState.value);
+ try {
+ if (!Services.prefs.getBoolPref(kPrefConfirmOpenExe)) {
+ return true;
}
-
- return Promise.resolve(shouldLaunch);
} catch (ex) {
- return Promise.reject(ex);
+ // If the preference does not exist, continue with the prompt.
}
+
+ let leafName = OS.Path.basename(aPath);
+
+ let s = DownloadUIHelper.strings;
+ return this._prompter.confirm(s.fileExecutableSecurityWarningTitle,
+ s.fileExecutableSecurityWarning(leafName, leafName));
},
/**