mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Implement dialog (alert/confirm) blocking as a user switch after the first dialog

Browse source 
* This is to enable more browser-like behavior so that users who run third-party code
  will not be DOS'ed with alerts and confirms.  This is already handled like this
  in most major browsers so this will greatly help these developers
This commit is contained in:
Samuel Attard 2018-01-10 17:07:56 +11:00 • committed by Cheng Zhao
parent a3d4d461a3
commit 795447f61a
7 changed files with 47 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

28
atom/browser/atom_javascript_dialog_manager.cc
View file

@ -10,6 +10,7 @@
#include "atom/browser/api/atom_api_web_contents.h"
#include "atom/browser/native_window.h"
#include "atom/browser/ui/message_box.h"
#include "atom/browser/web_contents_preferences.h"
#include "base/bind.h"
#include "base/strings/utf_string_conversions.h"
#include "ui/gfx/image/image_skia.h"
@ -30,6 +31,13 @@ void AtomJavaScriptDialogManager::RunJavaScriptDialog(
const base::string16& default_prompt_text,
const DialogClosedCallback& callback,
bool* did_suppress_message) {
const std::string origin = origin_url.GetOrigin().spec();
if (origin_counts_.find(origin) == origin_counts_.end()) {
origin_counts_[origin] = 0;
}
if (origin_counts_[origin] == -1) return callback.Run(false, base::string16());;
if (dialog_type != JavaScriptDialogType::JAVASCRIPT_DIALOG_TYPE_ALERT &&
dialog_type != JavaScriptDialogType::JAVASCRIPT_DIALOG_TYPE_CONFIRM) {
callback.Run(false, base::string16());
@ -41,12 +49,23 @@ void AtomJavaScriptDialogManager::RunJavaScriptDialog(
buttons.push_back("Cancel");
}
origin_counts_[origin]++;
std::string checkbox_string;
if (origin_counts_[origin] > 1 &&
WebContentsPreferences::IsPreferenceEnabled("safeDialogs", web_contents)) {
if (!WebContentsPreferences::GetString("safeDialogsMessage",
&checkbox_string, web_contents)) {
checkbox_string = "Prevent this app from creating additional dialogs";
}
}
atom::ShowMessageBox(NativeWindow::FromWebContents(web_contents),
atom::MessageBoxType::MESSAGE_BOX_TYPE_NONE, buttons, -1,
0, atom::MessageBoxOptions::MESSAGE_BOX_NONE, "",
base::UTF16ToUTF8(message_text), "", "", false,
base::UTF16ToUTF8(message_text), "", checkbox_string, false,
gfx::ImageSkia(),
base::Bind(&OnMessageBoxCallback, callback));
base::Bind(&OnMessageBoxCallback, callback, origin,
&origin_counts_));
}
void AtomJavaScriptDialogManager::RunBeforeUnloadDialog(
@ -66,8 +85,13 @@ void AtomJavaScriptDialogManager::CancelDialogs(
// static
void AtomJavaScriptDialogManager::OnMessageBoxCallback(
const DialogClosedCallback& callback,
const std::string& origin,
std::map<std::string, int>* origin_counts_,
int code,
bool checkbox_checked) {
if (checkbox_checked) {
(*origin_counts_)[origin] = -1;
}
callback.Run(code == 0, base::string16());
}