Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-22 01:35:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1629808 - Updated ConfirmAuth dialogs to be tab modal and re-enabled them. r=necko-reviewers,dragana

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D72005
This commit is contained in:
pbz 2020-04-24 13:14:11 +00:00
parent 850cbc20a8
commit a0a5236904
2 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/libpref/init/StaticPrefList.yaml
View File

@ -7346,7 +7346,7 @@
# with userinfo
- name: network.auth.confirmAuth.enabled
type: bool
value: false
value: true
mirror: always
# See the full list of values in nsICookieService.idl.
@ -8216,13 +8216,21 @@
# Prefs starting with "prompts."
#---------------------------------------------------------------------------
# The prompt type to use for the insecure form submit warning.
# Prompt modal type prefs
# See nsIPromptService::MODAL_TYPE fields for possible values.
# Insecure form submit warning.
- name: prompts.modalType.insecureFormSubmit
type: int32_t
value: 2
mirror: always
# nsHttpChannelAuthProvider#ConfirmAuth anti-phishing prompts.
- name: prompts.modalType.confirmAuth
type: int32_t
value: 2
mirror: always
#---------------------------------------------------------------------------
# Prefs starting with "security."
#---------------------------------------------------------------------------

34
netwerk/protocol/http/nsHttpChannelAuthProvider.cpp
View File

@ -21,7 +21,7 @@
#include "nsEscape.h"
#include "nsAuthInformationHolder.h"
#include "nsIStringBundle.h"
#include "nsIPrompt.h"
#include "nsIPromptService.h"
#include "netCore.h"
#include "nsIHttpAuthenticableChannel.h"
#include "nsIURI.h"
@ -33,6 +33,7 @@
#include "nsServiceManagerUtils.h"
#include "nsIURL.h"
#include "mozilla/StaticPrefs_network.h"
#include "mozilla/StaticPrefs_prompts.h"
#include "mozilla/Telemetry.h"
#include "nsIProxiedChannel.h"
#include "nsIProxyInfo.h"
@ -1510,27 +1511,42 @@ bool nsHttpChannelAuthProvider::ConfirmAuth(const char* bundleKey,
rv = mAuthChannel->GetLoadGroup(getter_AddRefs(loadGroup));
if (NS_FAILED(rv)) return true;
nsCOMPtr<nsIPrompt> prompt;
NS_QueryNotificationCallbacks(callbacks, loadGroup, NS_GET_IID(nsIPrompt),
getter_AddRefs(prompt));
if (!prompt) return true;
nsCOMPtr<nsIPromptService> promptSvc =
do_GetService("@mozilla.org/embedcomp/prompt-service;1", &rv);
if (NS_FAILED(rv) || !promptSvc) {
return true;
}
// do not prompt again
mSuppressDefensiveAuth = true;
// Get current browsing context to use as prompt parent
nsCOMPtr<nsIChannel> chan = do_QueryInterface(mAuthChannel);
if (!chan) {
return true;
}
nsCOMPtr<nsILoadInfo> loadInfo = chan->LoadInfo();
RefPtr<mozilla::dom::BrowsingContext> browsingContext;
loadInfo->GetBrowsingContext(getter_AddRefs(browsingContext));
bool confirmed;
if (doYesNoPrompt) {
int32_t choice;
bool checkState = false;
rv = prompt->ConfirmEx(
nullptr, msg.get(),
nsIPrompt::BUTTON_POS_1_DEFAULT + nsIPrompt::STD_YES_NO_BUTTONS,
rv = promptSvc->ConfirmExBC(
browsingContext, StaticPrefs::prompts_modalType_confirmAuth(), nullptr,
msg.get(),
nsIPromptService::BUTTON_POS_1_DEFAULT +
nsIPromptService::STD_YES_NO_BUTTONS,
nullptr, nullptr, nullptr, nullptr, &checkState, &choice);
if (NS_FAILED(rv)) return true;
confirmed = choice == 0;
} else {
rv = prompt->Confirm(nullptr, msg.get(), &confirmed);
rv = promptSvc->ConfirmBC(browsingContext,
StaticPrefs::prompts_modalType_confirmAuth(),
nullptr, msg.get(), &confirmed);
if (NS_FAILED(rv)) return true;
}