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

Backed out 3 changesets (bug 1543786) for browser_storageAccessRemovalNavigateTopframe.js failures CLOSED TREE

Browse Source 
Backed out changeset 4f63311e6f00 (bug 1543786)
Backed out changeset 757b729752e0 (bug 1543786)
Backed out changeset 6aabad91d980 (bug 1543786)
This commit is contained in:
Bogdan Tara 2019-04-13 05:14:11 +03:00
parent a9e2a9b857
commit 8fa5eb9862
7 changed files with 5 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
docshell/base/nsDocShell.cpp
View File

@ -2644,8 +2644,8 @@ nsresult nsDocShell::SetDocLoaderParent(nsDocLoader* aParent) {
RecomputeCanExecuteScripts();
// Inform windows when they're being removed from their parent.
if (!aParent) {
MaybeClearStorageAccessFlag();
if (!aParent && mScriptGlobal) {
mScriptGlobal->ParentWindowChanged();
}
NS_ASSERTION(mInheritPrivateBrowsingId || wasPrivate == UsePrivateBrowsing(),
@ -2654,22 +2654,6 @@ nsresult nsDocShell::SetDocLoaderParent(nsDocLoader* aParent) {
return NS_OK;
}
void nsDocShell::MaybeClearStorageAccessFlag() {
if (mScriptGlobal) {
// Tell our window that the parent has now changed.
mScriptGlobal->ParentWindowChanged();
// Tell all of our children about the change recursively as well.
nsTObserverArray<nsDocLoader*>::ForwardIterator iter(mChildList);
while (iter.HasMore()) {
nsCOMPtr<nsIDocShell> child = do_QueryObject(iter.GetNext());
if (child) {
static_cast<nsDocShell*>(child.get())->MaybeClearStorageAccessFlag();
}
}
}
}
NS_IMETHODIMP
nsDocShell::GetSameTypeParent(nsIDocShellTreeItem** aParent) {
NS_ENSURE_ARG_POINTER(aParent);

3
docshell/base/nsDocShell.h
View File

@ -399,9 +399,6 @@ class nsDocShell final : public nsDocLoader,
nsresult InternalLoad(nsDocShellLoadState* aLoadState,
nsIDocShell** aDocShell, nsIRequest** aRequest);
// Clear the document's storage access flag if needed.
void MaybeClearStorageAccessFlag();
private: // member functions
friend class nsDSURIContentListener;
friend class FramingChecker;

8
dom/base/nsFrameLoader.cpp
View File

@ -425,12 +425,6 @@ nsresult nsFrameLoader::ReallyStartLoadingInternal() {
return NS_OK;
}
if (mDocShell) {
// If we already have a docshell, ensure that the docshell's storage access
// flag is cleared.
mDocShell->MaybeClearStorageAccessFlag();
}
nsresult rv = MaybeCreateDocShell();
if (NS_FAILED(rv)) {
return rv;
@ -948,8 +942,6 @@ void nsFrameLoader::Hide() {
if (!mDocShell) return;
mDocShell->MaybeClearStorageAccessFlag();
nsCOMPtr<nsIContentViewer> contentViewer;
mDocShell->GetContentViewer(getter_AddRefs(contentViewer));
if (contentViewer) contentViewer->SetSticky(false);

9
dom/ipc/TabChild.cpp
View File

@ -1051,19 +1051,14 @@ mozilla::ipc::IPCResult TabChild::RecvLoadURL(const nsCString& aURI,
nsIWebNavigation::LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP |
nsIWebNavigation::LOAD_FLAGS_DISALLOW_INHERIT_PRINCIPAL;
nsIWebNavigation* webNav = WebNavigation();
nsresult rv = webNav->LoadURI(NS_ConvertUTF8toUTF16(aURI), loadURIOptions);
nsresult rv =
WebNavigation()->LoadURI(NS_ConvertUTF8toUTF16(aURI), loadURIOptions);
if (NS_FAILED(rv)) {
NS_WARNING(
"WebNavigation()->LoadURI failed. Eating exception, what else can I "
"do?");
}
nsCOMPtr<nsIDocShell> docShell = do_GetInterface(WebNavigation());
if (docShell) {
nsDocShell::Cast(docShell)->MaybeClearStorageAccessFlag();
}
CrashReporter::AnnotateCrashReport(CrashReporter::Annotation::URL, aURI);
return IPC_OK();

46
toolkit/components/antitracking/test/browser/antitracking_head.js
View File

@ -335,7 +335,7 @@ this.AntiTracking = {
} else {
thirdPartyPage = TEST_3RD_PARTY_PAGE;
}
let id = await ContentTask.spawn(browser,
await ContentTask.spawn(browser,
{ page: thirdPartyPage,
nextPage: TEST_4TH_PARTY_PAGE,
callback: options.callback.toString(),
@ -420,58 +420,14 @@ this.AntiTracking = {
ifr.src = obj.nextPage;
});
case "navigate-topframe":
// pass-through
break;
default:
ok(false, "Unexpected accessRemoval code passed: " + obj.accessRemoval);
break;
}
}
return id;
});
if (doAccessRemovalChecks &&
options.accessRemoval == "navigate-topframe") {
await BrowserTestUtils.loadURI(browser, TEST_4TH_PARTY_PAGE);
await BrowserTestUtils.browserLoaded(browser);
let pageshow = BrowserTestUtils.waitForContentEvent(tab.linkedBrowser, "pageshow");
gBrowser.goBack();
await pageshow;
await ContentTask.spawn(browser,
{ id,
callbackAfterRemoval: options.callbackAfterRemoval ?
options.callbackAfterRemoval.toString() : null,
},
async function(obj) {
let ifr = content.document.getElementById(obj.id);
content.alert(ifr);
ifr.contentWindow.postMessage(obj.callbackAfterRemoval, "*");
content.addEventListener("message", function msg(event) {
if (event.data.type == "finish") {
content.removeEventListener("message", msg);
return;
}
if (event.data.type == "ok") {
ok(event.data.what, event.data.msg);
return;
}
if (event.data.type == "info") {
info(event.data.msg);
return;
}
ok(false, "Unknown message");
});
});
}
if (options.allowList) {
info("Enabling content blocking for this page");
win.ContentBlocking.enableForCurrentPage();

2
toolkit/components/antitracking/test/browser/browser.ini
View File

@ -79,8 +79,6 @@ skip-if = serviceworker_e10s
[browser_storageAccessPromiseResolveHandlerUserInteraction.js]
[browser_storageAccessRemovalNavigateSubframe.js]
skip-if = serviceworker_e10s
[browser_storageAccessRemovalNavigateTopframe.js]
skip-if = serviceworker_e10s
[browser_storageAccessSandboxed.js]
skip-if = serviceworker_e10s
[browser_storageAccessWithHeuristics.js]

40
toolkit/components/antitracking/test/browser/browser_storageAccessRemovalNavigateTopframe.js
View File

@ -1,40 +0,0 @@
AntiTracking.runTest("Storage Access is removed when topframe navigates",
// blocking callback
async _ => {
/* import-globals-from storageAccessAPIHelpers.js */
await noStorageAccessInitially();
},
// non-blocking callback
async _ => {
/* import-globals-from storageAccessAPIHelpers.js */
if (allowListed) {
await hasStorageAccessInitially();
} else {
await noStorageAccessInitially();
}
/* import-globals-from storageAccessAPIHelpers.js */
let [threw, rejected] = await callRequestStorageAccess();
ok(!threw, "requestStorageAccess should not throw");
ok(!rejected, "requestStorageAccess should be available");
},
// cleanup function
async _ => {
await new Promise(resolve => {
Services.clearData.deleteData(Ci.nsIClearDataService.CLEAR_ALL, value => resolve());
});
},
null, // extra prefs
false, // no window open test
false, // no user-interaction test
0, // no blocking notifications
false, // run in normal window
null, // no iframe sandbox
"navigate-topframe", // access removal type
// after-removal callback
async _ => {
/* import-globals-from storageAccessAPIHelpers.js */
await noStorageAccessInitially();
}
);