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

Bug 1246125 - [webext] webNavigation events should not resolve local special schemes into file/jar URLs. r=krizsa 

- chrome, resource, about and moz-extension URLs should not be reported with their resolved
  file or jar URLs

MozReview-Commit-ID: H03rjxGpgOZ

--HG--
extra : transplant_source : %FA%B3%14%05%0A%CB%F8%CFG%D4%8Br%D2PH%F1%F1%87%CE%B9
This commit is contained in:
Luca Greco 2016-04-07 00:04:23 +02:00
Родитель c50767b44e
Коммит 0f06eace5d
3 изменённых файлов: 97 добавлений и 1 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -13,3 +13,5 @@ skip-if = (os == 'android') # android doesn't have devtools
[test_chrome_ext_eventpage_warning.html]
[test_chrome_ext_contentscript_unrecognizedprop_warning.html]
skip-if = (os == 'android') # browser.tabs is undefined. Bug 1258975 on android.
[test_chrome_ext_webnavigation_resolved_urls.html]
skip-if = (os == 'android') # browser.tabs is undefined. Bug 1258975 on android.

83
toolkit/components/extensions/test/mochitest/test_chrome_ext_webnavigation_resolved_urls.html Normal file
Просмотреть файл

@ -0,0 +1,83 @@
<!DOCTYPE HTML>
<html>
<head>
<title>Test for simple WebExtension</title>
<script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
<script src="chrome://mochikit/content/tests/SimpleTest/SpawnTask.js"></script>
<script src="chrome://mochikit/content/tests/SimpleTest/ExtensionTestUtils.js"></script>
<script type="text/javascript" src="head.js"></script>
<link rel="stylesheet" href="chrome://mochikit/contents/tests/SimpleTest/test.css"/>
</head>
<body>
<script type="text/javascript">
"use strict";
add_task(function* webnav_unresolved_uri_on_expected_URI_scheme() {
function backgroundScript() {
let checkURLs;
browser.webNavigation.onCompleted.addListener((msg) => {
if (checkURLs.length > 0) {
let expectedURL = checkURLs.shift();
browser.test.assertEq(expectedURL, msg.url, "Got the expected URL");
browser.tabs.remove(msg.tabId).then(() => {
browser.test.sendMessage("next");
});
}
});
browser.test.onMessage.addListener((name, urls) => {
if (name == "checkURLs") {
checkURLs = urls;
}
});
browser.test.sendMessage("ready", browser.runtime.getURL("/tab.html"));
}
let extensionData = {
manifest: {
permissions: [
"webNavigation",
],
},
background: "new " + backgroundScript,
files: {
"tab.html": `<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
</head>
</html>
`,
},
};
let extension = ExtensionTestUtils.loadExtension(extensionData);
yield extension.startup();
let checkURLs = [
"resource://gre/modules/Services.jsm",
"chrome://mochikit/content/tests/SimpleTest/SimpleTest.js",
"about:mozilla",
];
let tabURL = yield extension.awaitMessage("ready");
checkURLs.push(tabURL);
extension.sendMessage("checkURLs", checkURLs);
for (let url of checkURLs) {
window.open(url);
yield extension.awaitMessage("next");
}
yield extension.unload();
});
</script>
</body>
</html>

13
toolkit/modules/addons/WebNavigationContent.js
Просмотреть файл

@ -54,7 +54,18 @@ var WebProgressListener = {
},
onStateChange: function onStateChange(webProgress, request, stateFlags, status) {
let locationURI = request.QueryInterface(Ci.nsIChannel).URI;
let {originalURI, URI: locationURI} = request.QueryInterface(Ci.nsIChannel);
// Prevents "about", "chrome", "resource" and "moz-extension" URI schemes to be
// reported with the resolved "file" or "jar" URIs. (see Bug 1246125 for rationale)
if (locationURI.schemeIs("file") || locationURI.schemeIs("jar")) {
let shouldUseOriginalURI = originalURI.schemeIs("about") ||
originalURI.schemeIs("chrome") ||
originalURI.schemeIs("resource") ||
originalURI.schemeIs("moz-extension");
locationURI = shouldUseOriginalURI ? originalURI : locationURI;
}
this.sendStateChange({webProgress, locationURI, stateFlags, status});