зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1256282 - [webext] options_ui browsers should have access to the full WebExtension API. r=kmag
MozReview-Commit-ID: E1GwT0zfGie --HG-- extra : transplant_source : %18%0F%AF%0A%E6B%E7v%2C%F4%A1%C2%9B%CF-%84T%DEKf
This commit is contained in:
Luca Greco
Родитель
86e7533df8
Коммит
2054abd0e6
|
|
@ -68,3 +68,4 @@ tags = fullscreen
|
|||
[browser_ext_tab_runtimeConnect.js]
|
||||
[browser_ext_topwindowid.js]
|
||||
[browser_ext_webNavigation_getFrames.js]
|
||||
[browser_ext_optionsPage_privileges.js]
|
||||
|
|
@ -0,0 +1,63 @@
|
|||
/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
|
||||
/* vim: set sts=2 sw=2 et tw=80: */
|
||||
"use strict";
|
||||
|
||||
add_task(function* test_tab_options_privileges() {
|
||||
function backgroundScript() {
|
||||
browser.runtime.onMessage.addListener(({msgName, tabId}) => {
|
||||
if (msgName == "removeTabId") {
|
||||
browser.tabs.remove(tabId).then(() => {
|
||||
browser.test.notifyPass("options-ui-privileges");
|
||||
}).catch(error => {
|
||||
browser.test.log(`Error: ${error} :: ${error.stack}`);
|
||||
browser.test.notifyFail("options-ui-privileges");
|
||||
});
|
||||
}
|
||||
});
|
||||
browser.runtime.openOptionsPage();
|
||||
}
|
||||
|
||||
function optionsScript() {
|
||||
browser.tabs.query({url: "http://example.com/"}).then(tabs => {
|
||||
browser.test.assertEq("http://example.com/", tabs[0].url, "Got the expect tab");
|
||||
return browser.tabs.getCurrent();
|
||||
}).then(tab => {
|
||||
browser.runtime.sendMessage({msgName: "removeTabId", tabId: tab.id});
|
||||
}).catch(error => {
|
||||
browser.test.log(`Error: ${error} :: ${error.stack}`);
|
||||
browser.test.notifyFail("options-ui-privileges");
|
||||
});
|
||||
}
|
||||
|
||||
let extension = ExtensionTestUtils.loadExtension({
|
||||
useAddonManager: true,
|
||||
|
||||
manifest: {
|
||||
"permissions": ["tabs"],
|
||||
"options_ui": {
|
||||
"page": "options.html",
|
||||
},
|
||||
},
|
||||
files: {
|
||||
"options.html": `<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<script src="options.js" type="text/javascript"></script>
|
||||
</head>
|
||||
</html>`,
|
||||
"options.js": optionsScript,
|
||||
},
|
||||
background: backgroundScript,
|
||||
});
|
||||
|
||||
let tab = yield BrowserTestUtils.openNewForegroundTab(gBrowser, "http://example.com/");
|
||||
|
||||
yield extension.startup();
|
||||
|
||||
yield extension.awaitFinish("options-ui-privileges");
|
||||
|
||||
yield extension.unload();
|
||||
|
||||
yield BrowserTestUtils.removeTab(tab);
|
||||
});
|
||||
|
|
@ -97,9 +97,9 @@ add_task(function* test_inline_options() {
|
|||
browser.test.assertEq("about:addons", tab.url, "Tab contains AddonManager");
|
||||
|
||||
browser.test.log("Ping options page.");
|
||||
return new Promise(resolve => browser.tabs.sendMessage(optionsTab, "ping", resolve));
|
||||
}).then(() => {
|
||||
browser.test.log("Got pong.");
|
||||
return browser.runtime.sendMessage("ping");
|
||||
}).then((pong) => {
|
||||
browser.test.assertEq("pong", pong, "Got pong.");
|
||||
|
||||
browser.test.log("Remove options tab.");
|
||||
return browser.tabs.remove(optionsTab);
|
||||
|
|
|
|||
|
|
@ -236,17 +236,32 @@ function getAPILevelForWindow(window, addonId) {
|
|||
return NO_PRIVILEGES;
|
||||
}
|
||||
|
||||
let docShell = window.QueryInterface(Ci.nsIInterfaceRequestor)
|
||||
.getInterface(Ci.nsIDocShell);
|
||||
|
||||
// WebExtension URLs loaded into sub-frame UI have "content script API level privileges".
|
||||
// (see Bug 1214658 for rationale)
|
||||
if (docShell.sameTypeParent) {
|
||||
// Extension pages running in the content process always defaults to
|
||||
// "content script API level privileges".
|
||||
if (Services.appinfo.processType == Services.appinfo.PROCESS_TYPE_CONTENT) {
|
||||
return CONTENTSCRIPT_PRIVILEGES;
|
||||
}
|
||||
|
||||
// Extension pages running in the content process defaults to "content script API level privileges".
|
||||
if (Services.appinfo.processType == Services.appinfo.PROCESS_TYPE_CONTENT) {
|
||||
let docShell = window.QueryInterface(Ci.nsIInterfaceRequestor)
|
||||
.getInterface(Ci.nsIDocShell);
|
||||
|
||||
// Handling of ExtensionPages running inside sub-frames.
|
||||
if (docShell.sameTypeParent) {
|
||||
let parentWindow = docShell.sameTypeParent.QueryInterface(Ci.nsIInterfaceRequestor)
|
||||
.getInterface(Ci.nsIDOMWindow);
|
||||
|
||||
// The option page iframe embedded in the about:addons tab should have
|
||||
// full API level privileges. (see Bug 1256282 for rationale)
|
||||
let parentDocument = parentWindow.document;
|
||||
let parentIsSystemPrincipal = Services.scriptSecurityManager
|
||||
.isSystemPrincipal(parentDocument.nodePrincipal);
|
||||
if (parentDocument.location.href == "about:addons" && parentIsSystemPrincipal) {
|
||||
return FULL_PRIVILEGES;
|
||||
}
|
||||
|
||||
// In all the other cases, WebExtension URLs loaded into sub-frame UI
|
||||
// will have "content script API level privileges".
|
||||
// (see Bug 1214658 for rationale)
|
||||
return CONTENTSCRIPT_PRIVILEGES;
|
||||
}
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче