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

Bug 1731994: part 5) Rename ContentPermissionRequestParent::mMaybeUnsafePermissionDelegate to ContentPermissionRequestParent::mIsRequestDelegatedToUnsafeThirdParty. r=johannh

Browse Source 
This seems clearer. "Is" is more precise then "maybe".

Differential Revision: https://phabricator.services.mozilla.com/D126502
This commit is contained in:
Mirko Brodesser 2021-09-30 08:19:28 +00:00
parent a57818d127
commit b0b4e0cd28
4 changed files with 46 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
browser/modules/PermissionUI.jsm
View File

@ -395,7 +395,7 @@ var PermissionPromptPrototype = {
if (
state == SitePermissions.ALLOW &&
!this.request.maybeUnsafePermissionDelegate
!this.request.isRequestDelegatedToUnsafeThirdParty
) {
this.allow();
return;
@ -710,7 +710,7 @@ GeolocationPermissionPrompt.prototype = {
};
}
if (this.request.maybeUnsafePermissionDelegate) {
if (this.request.isRequestDelegatedToUnsafeThirdParty) {
// Second name should be the third party origin
options.secondName = this.getPrincipalName(this.request.principal);
options.checkbox = { show: false };
@ -738,7 +738,7 @@ GeolocationPermissionPrompt.prototype = {
return gBrowserBundle.GetStringFromName("geolocation.shareWithFile4");
}
if (this.request.maybeUnsafePermissionDelegate) {
if (this.request.isRequestDelegatedToUnsafeThirdParty) {
return gBrowserBundle.formatStringFromName(
"geolocation.shareWithSiteUnsafeDelegation2",
["<>", "{}"]

55
dom/base/nsContentPermissionHelper.cpp
View File

@ -40,11 +40,13 @@ namespace mozilla::dom {
class ContentPermissionRequestParent : public PContentPermissionRequestParent {
public:
ContentPermissionRequestParent(const nsTArray<PermissionRequest>& aRequests,
Element* aElement, nsIPrincipal* aPrincipal,
nsIPrincipal* aTopLevelPrincipal,
const bool aIsHandlingUserInput,
const bool aMaybeUnsafePermissionDelegate);
// @param aIsRequestDelegatedToUnsafeThirdParty see
// mIsRequestDelegatedToUnsafeThirdParty.
ContentPermissionRequestParent(
const nsTArray<PermissionRequest>& aRequests, Element* aElement,
nsIPrincipal* aPrincipal, nsIPrincipal* aTopLevelPrincipal,
const bool aIsHandlingUserInput,
const bool aIsRequestDelegatedToUnsafeThirdParty);
virtual ~ContentPermissionRequestParent();
bool IsBeingDestroyed();
@ -53,7 +55,10 @@ class ContentPermissionRequestParent : public PContentPermissionRequestParent {
nsCOMPtr<nsIPrincipal> mTopLevelPrincipal;
nsCOMPtr<Element> mElement;
bool mIsHandlingUserInput;
bool mMaybeUnsafePermissionDelegate;
// See nsIPermissionDelegateHandler.maybeUnsafePermissionDelegate.
bool mIsRequestDelegatedToUnsafeThirdParty;
RefPtr<nsContentPermissionRequestProxy> mProxy;
nsTArray<PermissionRequest> mRequests;
@ -69,7 +74,7 @@ ContentPermissionRequestParent::ContentPermissionRequestParent(
const nsTArray<PermissionRequest>& aRequests, Element* aElement,
nsIPrincipal* aPrincipal, nsIPrincipal* aTopLevelPrincipal,
const bool aIsHandlingUserInput,
const bool aMaybeUnsafePermissionDelegate) {
const bool aIsRequestDelegatedToUnsafeThirdParty) {
MOZ_COUNT_CTOR(ContentPermissionRequestParent);
mPrincipal = aPrincipal;
@ -77,7 +82,7 @@ ContentPermissionRequestParent::ContentPermissionRequestParent(
mElement = aElement;
mRequests = aRequests.Clone();
mIsHandlingUserInput = aIsHandlingUserInput;
mMaybeUnsafePermissionDelegate = aMaybeUnsafePermissionDelegate;
mIsRequestDelegatedToUnsafeThirdParty = aIsRequestDelegatedToUnsafeThirdParty;
}
ContentPermissionRequestParent::~ContentPermissionRequestParent() {
@ -234,11 +239,11 @@ PContentPermissionRequestParent*
nsContentPermissionUtils::CreateContentPermissionRequestParent(
const nsTArray<PermissionRequest>& aRequests, Element* aElement,
nsIPrincipal* aPrincipal, nsIPrincipal* aTopLevelPrincipal,
const bool aIsHandlingUserInput, const bool aMaybeUnsafePermissionDelegate,
const TabId& aTabId) {
const bool aIsHandlingUserInput,
const bool aIsRequestDelegatedToUnsafeThirdParty, const TabId& aTabId) {
PContentPermissionRequestParent* parent = new ContentPermissionRequestParent(
aRequests, aElement, aPrincipal, aTopLevelPrincipal, aIsHandlingUserInput,
aMaybeUnsafePermissionDelegate);
aIsRequestDelegatedToUnsafeThirdParty);
ContentPermissionRequestParentMap()[parent] = aTabId;
return parent;
@ -278,9 +283,9 @@ nsresult nsContentPermissionUtils::AskPermission(
rv = aRequest->GetIsHandlingUserInput(&isHandlingUserInput);
NS_ENSURE_SUCCESS(rv, rv);
bool maybeUnsafePermissionDelegate;
rv = aRequest->GetMaybeUnsafePermissionDelegate(
&maybeUnsafePermissionDelegate);
bool isRequestDelegatedToUnsafeThirdParty;
rv = aRequest->GetIsRequestDelegatedToUnsafeThirdParty(
&isRequestDelegatedToUnsafeThirdParty);
NS_ENSURE_SUCCESS(rv, rv);
ContentChild::GetSingleton()->SetEventTargetForActor(
@ -290,7 +295,7 @@ nsresult nsContentPermissionUtils::AskPermission(
ContentChild::GetSingleton()->SendPContentPermissionRequestConstructor(
req, permArray, IPC::Principal(principal),
IPC::Principal(topLevelPrincipal), isHandlingUserInput,
maybeUnsafePermissionDelegate, child->GetTabId());
isRequestDelegatedToUnsafeThirdParty, child->GetTabId());
ContentPermissionRequestChildMap()[req.get()] = child->GetTabId();
req->Sendprompt();
@ -393,7 +398,7 @@ ContentPermissionRequestBase::ContentPermissionRequestBase(
mPrefName(aPrefName),
mType(aType),
mIsHandlingUserInput(false),
mMaybeUnsafePermissionDelegate(false) {
mIsRequestDelegatedToUnsafeThirdParty(false) {
if (!aWindow) {
return;
}
@ -410,7 +415,7 @@ ContentPermissionRequestBase::ContentPermissionRequestBase(
nsTArray<nsCString> types;
types.AppendElement(mType);
mPermissionHandler->MaybeUnsafePermissionDelegate(
types, &mMaybeUnsafePermissionDelegate);
types, &mIsRequestDelegatedToUnsafeThirdParty);
}
}
@ -429,9 +434,10 @@ ContentPermissionRequestBase::GetDelegatePrincipal(
}
NS_IMETHODIMP
ContentPermissionRequestBase::GetMaybeUnsafePermissionDelegate(
bool* aMaybeUnsafePermissionDelegate) {
*aMaybeUnsafePermissionDelegate = mMaybeUnsafePermissionDelegate;
ContentPermissionRequestBase::GetIsRequestDelegatedToUnsafeThirdParty(
bool* aIsRequestDelegatedToUnsafeThirdParty) {
*aIsRequestDelegatedToUnsafeThirdParty =
mIsRequestDelegatedToUnsafeThirdParty;
return NS_OK;
}
@ -740,13 +746,14 @@ nsContentPermissionRequestProxy::GetIsHandlingUserInput(
}
NS_IMETHODIMP
nsContentPermissionRequestProxy::GetMaybeUnsafePermissionDelegate(
bool* aMaybeUnsafePermissionDelegate) {
NS_ENSURE_ARG_POINTER(aMaybeUnsafePermissionDelegate);
nsContentPermissionRequestProxy::GetIsRequestDelegatedToUnsafeThirdParty(
bool* aIsRequestDelegatedToUnsafeThirdParty) {
NS_ENSURE_ARG_POINTER(aIsRequestDelegatedToUnsafeThirdParty);
if (mParent == nullptr) {
return NS_ERROR_FAILURE;
}
*aMaybeUnsafePermissionDelegate = mParent->mMaybeUnsafePermissionDelegate;
*aIsRequestDelegatedToUnsafeThirdParty =
mParent->mIsRequestDelegatedToUnsafeThirdParty;
return NS_OK;
}

12
dom/base/nsContentPermissionHelper.h
View File

@ -71,11 +71,13 @@ class nsContentPermissionUtils {
const nsTArray<nsString>& aOptions,
nsIArray** aTypesArray);
// @param aIsRequestDelegatedToUnsafeThirdParty see
// ContentPermissionRequestParent.
static PContentPermissionRequestParent* CreateContentPermissionRequestParent(
const nsTArray<PermissionRequest>& aRequests, Element* aElement,
nsIPrincipal* aPrincipal, nsIPrincipal* aTopLevelPrincipal,
const bool aIsHandlingUserInput,
const bool aMaybeUnsafePermissionDelegate, const TabId& aTabId);
const bool aIsRequestDelegatedToUnsafeThirdParty, const TabId& aTabId);
static nsresult AskPermission(nsIContentPermissionRequest* aRequest,
nsPIDOMWindowInner* aWindow);
@ -111,8 +113,8 @@ class ContentPermissionRequestBase : public nsIContentPermissionRequest {
NS_IMETHOD GetWindow(mozIDOMWindow** aWindow) override;
NS_IMETHOD GetElement(mozilla::dom::Element** aElement) override;
NS_IMETHOD GetIsHandlingUserInput(bool* aIsHandlingUserInput) override;
NS_IMETHOD GetMaybeUnsafePermissionDelegate(
bool* aMaybeUnsafePermissionDelegate) override;
NS_IMETHOD GetIsRequestDelegatedToUnsafeThirdParty(
bool* aIsRequestDelegatedToUnsafeThirdParty) override;
// Overrides for Allow() and Cancel() aren't provided by this class.
// That is the responsibility of the subclasses.
@ -161,7 +163,9 @@ class ContentPermissionRequestBase : public nsIContentPermissionRequest {
const nsCString mType;
bool mIsHandlingUserInput;
bool mMaybeUnsafePermissionDelegate;
// See nsIPermissionDelegateHandler.maybeUnsafePermissionDelegate`.
bool mIsRequestDelegatedToUnsafeThirdParty;
};
} // namespace dom

5
dom/interfaces/base/nsIContentPermissionPrompt.idl
View File

@ -61,7 +61,10 @@ interface nsIContentPermissionRequest : nsISupports {
readonly attribute boolean isHandlingUserInput;
readonly attribute boolean maybeUnsafePermissionDelegate;
/**
* See nsIPermissionDelegateHandler.maybeUnsafePermissionDelegate.
*/
readonly attribute boolean isRequestDelegatedToUnsafeThirdParty;
/*
* Get delegate principal of the permission request. This will return nullptr,