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

Bug 1848783, part 6 - Revoke has storage access when the permission is revoked - r=anti-tracking-reviewers,timhuang

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D187287
This commit is contained in:
Benjamin VanderSloot 2023-09-19 21:03:08 +00:00
parent 4297663528
commit cf0a6fd895
7 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dom/base/nsGlobalWindowInner.cpp
View File

@ -7461,7 +7461,7 @@ void nsGlobalWindowInner::ForgetSharedWorker(SharedWorker* aSharedWorker) {
mSharedWorkers.RemoveElement(aSharedWorker);
}
void nsGlobalWindowInner::StorageAccessPermissionGranted() {
void nsGlobalWindowInner::StorageAccessPermissionChanged() {
// Invalidate cached StorageAllowed field so that calls to GetLocalStorage
// give us the updated localStorage object.
ClearStorageAllowedCache();
@ -7649,7 +7649,16 @@ void nsPIDOMWindowInner::SaveStorageAccessPermissionGranted() {
Unused << wc->SetUsingStorageAccess(true);
}
nsGlobalWindowInner::Cast(this)->StorageAccessPermissionGranted();
nsGlobalWindowInner::Cast(this)->StorageAccessPermissionChanged();
}
void nsPIDOMWindowInner::SaveStorageAccessPermissionRevoked() {
WindowContext* wc = GetWindowContext();
if (wc) {
Unused << wc->SetUsingStorageAccess(false);
}
nsGlobalWindowInner::Cast(this)->StorageAccessPermissionChanged();
}
bool nsPIDOMWindowInner::UsingStorageAccess() {

4
dom/base/nsGlobalWindowInner.h
View File

@ -1097,9 +1097,9 @@ class nsGlobalWindowInner final : public mozilla::dom::EventTarget,
nsIPrincipal* GetClientPrincipal();
// This method is called if this window loads a 3rd party tracking resource
// and the storage is just been granted. The window can reset the partitioned
// and the storage is just been changed. The window can reset the partitioned
// storage objects and switch to the first party cookie jar.
void StorageAccessPermissionGranted();
void StorageAccessPermissionChanged();
protected:
static void NotifyDOMWindowDestroyed(nsGlobalWindowInner* aWindow);

1
dom/base/nsPIDOMWindow.h
View File

@ -639,6 +639,7 @@ class nsPIDOMWindowInner : public mozIDOMWindow {
mozilla::TaskCategory aCategory) const = 0;
void SaveStorageAccessPermissionGranted();
void SaveStorageAccessPermissionRevoked();
bool UsingStorageAccess();

2
dom/ipc/PWindowGlobal.ipdl
View File

@ -220,7 +220,7 @@ parent:
CookieStruct[] cookies);
child:
async NotifyPermissionChange(nsCString type);
async NotifyPermissionChange(nsCString type, uint32_t permission);
};
} // namespace dom

11
dom/ipc/WindowGlobalChild.cpp
View File

@ -549,8 +549,8 @@ IPCResult WindowGlobalChild::RecvRawMessage(
return IPC_OK();
}
IPCResult WindowGlobalChild::RecvNotifyPermissionChange(
const nsCString& aType) {
IPCResult WindowGlobalChild::RecvNotifyPermissionChange(const nsCString& aType,
uint32_t aPermission) {
nsCOMPtr<nsIObserverService> observerService = services::GetObserverService();
NS_ENSURE_TRUE(observerService,
IPC_FAIL(this, "Failed to get observer service"));
@ -558,6 +558,13 @@ IPCResult WindowGlobalChild::RecvNotifyPermissionChange(
static_cast<nsPIDOMWindowInner*>(this->GetWindowGlobal());
observerService->NotifyObservers(notifyTarget, "perm-changed-notify-only",
NS_ConvertUTF8toUTF16(aType).get());
// We only need to handle the revoked permission case here. The permission
// grant case is handled via the Storage Access API code.
if (this->GetWindowGlobal() &&
this->GetWindowGlobal()->UsingStorageAccess() &&
aPermission != nsIPermissionManager::ALLOW_ACTION) {
this->GetWindowGlobal()->SaveStorageAccessPermissionRevoked();
}
return IPC_OK();
}

3
dom/ipc/WindowGlobalChild.h
View File

@ -201,7 +201,8 @@ class WindowGlobalChild final : public WindowGlobalActor,
dom::SessionStoreRestoreData* aData,
RestoreTabContentResolver&& aResolve);
mozilla::ipc::IPCResult RecvNotifyPermissionChange(const nsCString& aType);
mozilla::ipc::IPCResult RecvNotifyPermissionChange(const nsCString& aType,
uint32_t aPermission);
virtual void ActorDestroy(ActorDestroyReason aWhy) override;

10
extensions/permissions/PermissionManager.cpp
View File

@ -604,8 +604,8 @@ bool IsPersistentExpire(uint32_t aExpire, const nsACString& aType) {
}
nsresult NotifySecondaryKeyPermissionUpdateInContentProcess(
const nsACString& aType, const nsACString& aSecondaryKey,
nsIPrincipal* aTopPrincipal) {
const nsACString& aType, uint32_t aPermission,
const nsACString& aSecondaryKey, nsIPrincipal* aTopPrincipal) {
NS_ENSURE_ARG_POINTER(aTopPrincipal);
MOZ_ASSERT(XRE_IsParentProcess());
AutoTArray<RefPtr<BrowsingContextGroup>, 5> bcGroups;
@ -636,7 +636,7 @@ nsresult NotifySecondaryKeyPermissionUpdateInContentProcess(
if (!wgp) {
continue;
}
bool success = wgp->SendNotifyPermissionChange(aType);
bool success = wgp->SendNotifyPermissionChange(aType, aPermission);
Unused << NS_WARN_IF(!success);
}
}
@ -1833,8 +1833,8 @@ nsresult PermissionManager::AddInternal(
nsAutoCString secondaryKey;
isSecondaryKeyed = GetSecondaryKey(aType, secondaryKey);
if (isSecondaryKeyed) {
NotifySecondaryKeyPermissionUpdateInContentProcess(aType, secondaryKey,
aPrincipal);
NotifySecondaryKeyPermissionUpdateInContentProcess(
aType, aPermission, secondaryKey, aPrincipal);
}
nsTArray<ContentParent*> cplist;