mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Backed out changeset 4ae7738694e1 (bug 1748158) for causing xpcshell failures in test_ext_native_messaging_permissions.js 

CLOSED TREE
This commit is contained in:
Alexandru Michis 2022-01-06 02:55:58 +02:00
Родитель 0445e1ce71
Коммит 2aa5137dc4
8 изменённых файлов: 53 добавлений и 148 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

5
browser/components/extensions/test/browser/browser_ext_contentscript_nontab_connect.js
Просмотреть файл

@ -11,9 +11,12 @@ function extensionScript() {
browser.runtime.onConnect.addListener(port => { browser.runtime.onConnect.addListener(port => {
browser.test.assertEq(port.sender.tab, undefined, "Sender is not a tab"); browser.test.assertEq(port.sender.tab, undefined, "Sender is not a tab");
browser.test.assertEq(port.sender.frameId, undefined, "frameId unset");
browser.test.assertEq(port.sender.url, FRAME_URL, "Expected sender URL"); browser.test.assertEq(port.sender.url, FRAME_URL, "Expected sender URL");
let { frameId } = port.sender;
browser.test.assertEq(typeof frameId, "number", "frameId is a number");
browser.test.assertTrue(frameId > 0, "frameId greater than 0");
port.onMessage.addListener(msg => { port.onMessage.addListener(msg => {
browser.test.assertEq("pong", msg, "Reply from content script"); browser.test.assertEq("pong", msg, "Reply from content script");
port.disconnect(); port.disconnect();

2
mobile/android/components/extensions/test/xpcshell/test_ext_native_messaging_permissions.js
Просмотреть файл

@ -96,7 +96,7 @@ add_task(async function test_nativeMessaging_unprivileged() {
add_task(async function test_geckoViewAddons_missing() { add_task(async function test_geckoViewAddons_missing() {
const ERROR_NATIVE_MESSAGE_FROM_BACKGROUND = const ERROR_NATIVE_MESSAGE_FROM_BACKGROUND =
"Native manifests are not supported on android"; "Native manifests are not supported on android";
const ERROR_NATIVE_MESSAGE_FROM_CONTENT = /^Native messaging not allowed: \{.*"envType":"content_child","url":"http:\/\/example\.com\/dummy"\}$/; const ERROR_NATIVE_MESSAGE_FROM_CONTENT = /^Native messaging not allowed: \{.*"envType":"content_child","frameId":0,"url":"http:\/\/example\.com\/dummy"\}$/;
async function testBackground() { async function testBackground() {
await browser.test.assertRejects( await browser.test.assertRejects(

3
toolkit/components/extensions/ExtensionParent.jsm
Просмотреть файл

@ -298,6 +298,7 @@ const ProxyMessenger = {
contextId: source.id, contextId: source.id,
id: source.extensionId, id: source.extensionId,
envType: source.envType, envType: source.envType,
frameId: source.frameId,
url: source.url, url: source.url,
}; };
@ -307,8 +308,6 @@ const ProxyMessenger = {
browser && apiManager.global.tabTracker.getBrowserData(browser); browser && apiManager.global.tabTracker.getBrowserData(browser);
if (data?.tabId > 0) { if (data?.tabId > 0) {
sender.tab = extension.tabManager.get(data.tabId, null)?.convert(); sender.tab = extension.tabManager.get(data.tabId, null)?.convert();
// frameId is documented to only be set if sender.tab is set.
sender.frameId = source.frameId;
} }
} }

1
toolkit/components/extensions/test/mochitest/mochitest-common.ini
Просмотреть файл

@ -143,7 +143,6 @@ skip-if = os == 'win' && (debug || asan) # Bug 1563440
[test_ext_request_urlClassification.html] [test_ext_request_urlClassification.html]
skip-if = os == 'android' # Bug 1615427 skip-if = os == 'android' # Bug 1615427
[test_ext_runtime_connect.html] [test_ext_runtime_connect.html]
[test_ext_runtime_connect_iframe.html]
[test_ext_runtime_connect_twoway.html] [test_ext_runtime_connect_twoway.html]
[test_ext_runtime_connect2.html] [test_ext_runtime_connect2.html]
[test_ext_runtime_disconnect.html] [test_ext_runtime_disconnect.html]

1
toolkit/components/extensions/test/mochitest/test_ext_runtime_connect.html
Просмотреть файл

@ -17,7 +17,6 @@ function background() {
browser.test.assertEq(port.name, "ernie", "port name correct"); browser.test.assertEq(port.name, "ernie", "port name correct");
browser.test.assertTrue(port.sender.url.endsWith("file_sample.html"), "URL correct"); browser.test.assertTrue(port.sender.url.endsWith("file_sample.html"), "URL correct");
browser.test.assertTrue(port.sender.tab.url.endsWith("file_sample.html"), "tab URL correct"); browser.test.assertTrue(port.sender.tab.url.endsWith("file_sample.html"), "tab URL correct");
browser.test.assertEq(port.sender.frameId, 0, "frameId of top frame");
let expected = "message 1"; let expected = "message 1";
port.onMessage.addListener(msg => { port.onMessage.addListener(msg => {

136
toolkit/components/extensions/test/mochitest/test_ext_runtime_connect_iframe.html
Просмотреть файл

@ -1,136 +0,0 @@
<!DOCTYPE HTML>
<html>
<head>
<title>WebExtension test</title>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<script src="/tests/SimpleTest/ExtensionTestUtils.js"></script>
<script type="text/javascript" src="head.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head>
<body>
<script type="text/javascript">
"use strict";
// The purpose of this test is to verify that the port.sender properties are
// not set for messages from iframes in background scripts. This is the toolkit
// version of the browser_ext_contentscript_nontab_connect.js test, and exists
// to provide test coverage for non-toolkit builds (e.g. Android).
//
// This used to be a xpcshell test (from bug 1488105), but became a mochitest
// because port.sender.tab and port.sender.frameId do not represent the real
// values in xpcshell tests.
// Specifically, ProxyMessenger.prototype.getSender uses the tabTracker, which
// expects real tabs instead of browsers from the ContentPage API in xpcshell
// tests.
add_task(async function connect_from_background_frame() {
if (!SpecialPowers.getBoolPref("extensions.webextensions.remote", true)) {
info("Cannot load remote content in parent process; skipping test task");
return;
}
async function background() {
const FRAME_URL = "https://example.com/tests/toolkit/components/extensions/test/mochitest/file_sample.html";
browser.runtime.onConnect.addListener(port => {
// The next two assertions are the reason for this being a mochitest
// instead of a xpcshell test.
browser.test.assertEq(port.sender.tab, undefined, "Sender is not a tab");
browser.test.assertEq(port.sender.frameId, undefined, "frameId unset");
browser.test.assertEq(port.sender.url, FRAME_URL, "Expected sender URL");
port.onMessage.addListener(msg => {
browser.test.assertEq("pong", msg, "Reply from content script");
port.disconnect();
});
port.postMessage("ping");
});
await browser.contentScripts.register({
matches: [FRAME_URL],
js: [{ file: "contentscript.js" }],
allFrames: true,
});
let f = document.createElement("iframe");
f.src = FRAME_URL;
document.body.appendChild(f);
}
function contentScript() {
browser.test.log(`Running content script at ${document.URL}`);
let port = browser.runtime.connect();
port.onMessage.addListener(msg => {
browser.test.assertEq("ping", msg, "Expected message to content script");
port.postMessage("pong");
});
port.onDisconnect.addListener(() => {
browser.test.sendMessage("disconnected_in_content_script");
});
}
let extension = ExtensionTestUtils.loadExtension({
manifest: {
permissions: ["https://example.com/*"],
},
files: {
"contentscript.js": contentScript,
},
background,
});
await extension.startup();
await extension.awaitMessage("disconnected_in_content_script");
await extension.unload();
});
// The test_ext_contentscript_fission_frame.html test already checks the
// behavior of onConnect in cross-origin frames, so here we just limit the test
// to checking that the port.sender properties are sensible.
add_task(async function connect_from_content_script_in_frame() {
async function background() {
const TAB_URL = "https://example.org/tests/toolkit/components/extensions/test/mochitest/file_contains_iframe.html";
const FRAME_URL = "https://example.org/tests/toolkit/components/extensions/test/mochitest/file_contains_img.html";
let createdTab;
browser.runtime.onConnect.addListener(port => {
// The next two assertions are the reason for this being a mochitest
// instead of a xpcshell test.
browser.test.assertEq(port.sender.tab.url, TAB_URL, "Sender is the tab");
browser.test.assertTrue(port.sender.frameId > 0, "frameId is set");
browser.test.assertEq(port.sender.url, FRAME_URL, "Expected sender URL");
browser.test.assertEq(createdTab.id, port.sender.tab.id, "Tab to close");
browser.tabs.remove(port.sender.tab.id).then(() => {
browser.test.sendMessage("tab_port_checked_and_tab_closed");
});
});
await browser.contentScripts.register({
matches: [FRAME_URL],
js: [{ file: "contentscript.js" }],
allFrames: true,
});
createdTab = await browser.tabs.create({ url: TAB_URL });
}
function contentScript() {
browser.test.log(`Running content script at ${document.URL}`);
browser.runtime.connect();
}
let extension = ExtensionTestUtils.loadExtension({
manifest: {
permissions: ["https://example.org/*"],
},
files: {
"contentscript.js": contentScript,
},
background,
});
await extension.startup();
await extension.awaitMessage("tab_port_checked_and_tab_closed");
await extension.unload();
});
</script>
</body>
</html>

24
toolkit/components/extensions/test/xpcshell/test_ext_contentscript_in_background.js
Просмотреть файл

@ -9,9 +9,19 @@ server.registerPathHandler("/dummyFrame", (request, response) => {
response.write(""); response.write("");
}); });
add_task(async function content_script_in_background_frame() { add_task(async function connect_from_background_frame() {
async function background() { async function background() {
const FRAME_URL = "http://example.com:8888/dummyFrame"; const FRAME_URL = "http://example.com:8888/dummyFrame";
browser.runtime.onConnect.addListener(port => {
browser.test.assertEq(port.sender.tab, undefined, "Sender is not a tab");
browser.test.assertEq(port.sender.url, FRAME_URL, "Expected sender URL");
port.onMessage.addListener(msg => {
browser.test.assertEq("pong", msg, "Reply from content script");
port.disconnect();
});
port.postMessage("ping");
});
await browser.contentScripts.register({ await browser.contentScripts.register({
matches: ["http://example.com/dummyFrame"], matches: ["http://example.com/dummyFrame"],
js: [{ file: "contentscript.js" }], js: [{ file: "contentscript.js" }],
@ -25,7 +35,15 @@ add_task(async function content_script_in_background_frame() {
function contentScript() { function contentScript() {
browser.test.log(`Running content script at ${document.URL}`); browser.test.log(`Running content script at ${document.URL}`);
browser.test.sendMessage("done_in_content_script");
let port = browser.runtime.connect();
port.onMessage.addListener(msg => {
browser.test.assertEq("ping", msg, "Expected message to content script");
port.postMessage("pong");
});
port.onDisconnect.addListener(() => {
browser.test.sendMessage("disconnected_in_content_script");
});
} }
let extension = ExtensionTestUtils.loadExtension({ let extension = ExtensionTestUtils.loadExtension({
@ -38,6 +56,6 @@ add_task(async function content_script_in_background_frame() {
background, background,
}); });
await extension.startup(); await extension.startup();
await extension.awaitMessage("done_in_content_script"); await extension.awaitMessage("disconnected_in_content_script");
await extension.unload(); await extension.unload();
}); });

29
toolkit/components/extensions/test/xpcshell/test_ext_contentscript_xorigin_frame.js
Просмотреть файл

@ -17,6 +17,23 @@ add_task(async function test_process_switch_cross_origin_frame() {
], ],
}, },
background() {
browser.runtime.onConnect.addListener(port => {
port.onMessage.addListener(async () => {
let { url, frameId } = port.sender;
browser.test.assertTrue(frameId > 0, "sender frameId is ok");
browser.test.assertTrue(
url.endsWith("file_iframe.html"),
"url is ok"
);
port.postMessage(frameId);
port.disconnect();
});
});
},
files: { files: {
"cs.js"() { "cs.js"() {
browser.test.assertEq( browser.test.assertEq(
@ -25,9 +42,15 @@ add_task(async function test_process_switch_cross_origin_frame() {
"url is ok" "url is ok"
); );
// frameId is the BrowsingContext ID in practice. let frameId;
let frameId = browser.runtime.getFrameId(window); let port = browser.runtime.connect();
browser.test.sendMessage("content-script-loaded", frameId); port.onMessage.addListener(response => {
frameId = response;
});
port.onDisconnect.addListener(() => {
browser.test.sendMessage("content-script-loaded", frameId);
});
port.postMessage("hello");
}, },
}, },
}); });