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

Backed out changeset d847e5e30768 (bug 1470651) for failures on test_ext_contentScripts_register.js. CLOSED TREE

This commit is contained in:
Csoregi Natalia 2021-12-07 16:09:50 +02:00
Родитель c581e3ff18
Коммит 4bac4f56b0
6 изменённых файлов: 1 добавлений и 301 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
dom/chrome-webidl/WebExtensionContentScript.webidl
Просмотреть файл

@ -86,12 +86,6 @@ interface MozDocumentMatcher {
[Cached, Constant, Frozen]
readonly attribute sequence<MatchGlob>? excludeGlobs;
/**
* The originAttributesPattern for which this script should be enabled for.
*/
[Constant, Throws]
readonly attribute any originAttributesPatterns;
/**
* The policy object for the extension that this matcher belongs to.
*/
@ -102,8 +96,6 @@ interface MozDocumentMatcher {
dictionary MozDocumentMatcherInit {
boolean allFrames = false;
sequence<OriginAttributesPatternDictionary>? originAttributesPatterns = null;
boolean matchAboutBlank = false;
unsigned long long? frameID = null;

5
toolkit/components/extensions/WebExtensionContentScript.h
Просмотреть файл

@ -144,10 +144,6 @@ class MozDocumentMatcher : public nsISupports, public nsWrapperCache {
Nullable<uint64_t> GetFrameID() const { return mFrameID; }
void GetOriginAttributesPatterns(JSContext* aCx,
JS::MutableHandle<JS::Value> aVal,
ErrorResult& aError) const;
WebExtensionPolicy* GetParentObject() const { return mExtension; }
virtual JSObject* WrapObject(JSContext* aCx,
JS::HandleObject aGivenProto) override;
@ -175,7 +171,6 @@ class MozDocumentMatcher : public nsISupports, public nsWrapperCache {
bool mAllFrames;
Nullable<uint64_t> mFrameID;
bool mMatchAboutBlank;
Nullable<dom::Sequence<OriginAttributesPattern>> mOriginAttributesPatterns;
private:
template <typename T, typename U>

34
toolkit/components/extensions/WebExtensionPolicy.cpp
Просмотреть файл

@ -667,17 +667,6 @@ MozDocumentMatcher::MozDocumentMatcher(GlobalObject& aGlobal,
return;
}
}
if (!aInit.mOriginAttributesPatterns.IsNull()) {
Sequence<OriginAttributesPattern>& arr =
mOriginAttributesPatterns.SetValue();
for (const auto& pattern : aInit.mOriginAttributesPatterns.Value()) {
if (!arr.AppendElement(OriginAttributesPattern(pattern), fallible)) {
aRv.Throw(NS_ERROR_OUT_OF_MEMORY);
return;
}
}
}
}
WebExtensionContentScript::WebExtensionContentScript(
@ -709,21 +698,6 @@ bool MozDocumentMatcher::Matches(const DocInfo& aDoc) const {
return false;
}
if (loadContext && !mOriginAttributesPatterns.IsNull()) {
OriginAttributes docShellAttrs;
loadContext->GetOriginAttributes(docShellAttrs);
bool patternMatch = false;
for (const auto& pattern : mOriginAttributesPatterns.Value()) {
if (pattern.Matches(docShellAttrs)) {
patternMatch = true;
break;
}
}
if (!patternMatch) {
return false;
}
}
if (!mMatchAboutBlank && aDoc.URL().InheritsPrincipal()) {
return false;
}
@ -786,14 +760,6 @@ bool MozDocumentMatcher::MatchesWindowGlobal(WindowGlobalChild& aWindow) const {
return Matches(inner->GetOuterWindow());
}
void MozDocumentMatcher::GetOriginAttributesPatterns(
JSContext* aCx, JS::MutableHandle<JS::Value> aVal,
ErrorResult& aError) const {
if (!ToJSValue(aCx, mOriginAttributesPatterns, aVal)) {
aError.NoteJSContextException(aCx);
}
}
JSObject* MozDocumentMatcher::WrapObject(JSContext* aCx,
JS::HandleObject aGivenProto) {
return MozDocumentMatcher_Binding::Wrap(aCx, this, aGivenProto);

34
toolkit/components/extensions/parent/ext-contentScripts.js
Просмотреть файл

@ -15,30 +15,6 @@ var { ExtensionUtils } = ChromeUtils.import(
var { ExtensionError, getUniqueId } = ExtensionUtils;
function getOriginAttributesPatternForCookieStoreId(cookieStoreId) {
if (isDefaultCookieStoreId(cookieStoreId)) {
return {
userContextId: Ci.nsIScriptSecurityManager.DEFAULT_USER_CONTEXT_ID,
privateBrowsingId:
Ci.nsIScriptSecurityManager.DEFAULT_PRIVATE_BROWSING_ID,
};
}
if (isPrivateCookieStoreId(cookieStoreId)) {
return {
userContextId: Ci.nsIScriptSecurityManager.DEFAULT_USER_CONTEXT_ID,
privateBrowsingId: 1,
};
}
if (isContainerCookieStoreId(cookieStoreId)) {
let userContextId = getContainerForCookieStoreId(cookieStoreId);
if (userContextId !== null) {
return { userContextId };
}
}
throw new ExtensionError("Invalid cookieStoreId");
}
/**
* Represents (in the main browser process) a content script registered
* programmatically (instead of being included in the addon manifest).
@ -98,18 +74,8 @@ class ContentScriptParent {
runAt: details.runAt || "document_idle",
jsPaths: [],
cssPaths: [],
originAttributesPatterns: null,
};
if (details.cookieStoreId != null) {
const cookieStoreIds = Array.isArray(details.cookieStoreId)
? details.cookieStoreId
: [details.cookieStoreId];
options.originAttributesPatterns = cookieStoreIds.map(cookieStoreId =>
getOriginAttributesPatternForCookieStoreId(cookieStoreId)
);
}
const convertCodeToURL = (data, mime) => {
const blob = new context.cloneScope.Blob(data, { type: mime });
const blobURL = context.cloneScope.URL.createObjectURL(blob);

14
toolkit/components/extensions/schemas/content_scripts.json
Просмотреть файл

@ -51,20 +51,6 @@
"$ref": "extensionTypes.RunAt",
"optional": true,
"description": "The soonest that the JavaScript or CSS will be injected into the tab. Defaults to \"document_idle\"."
},
"cookieStoreId": {
"choices": [
{
"type": "array",
"minItems": 1,
"items": { "type": "string" }
},
{
"type": "string"
}
],
"optional": true,
"description": "limit the set of matched tabs to those that belong to the given cookie store id"
}
}
},

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

@ -380,12 +380,6 @@ add_task(async function test_contentscripts_register_js() {
js: [{ code: `(${textScriptCodeIdle})()` }],
runAt: "document_idle",
},
{
matches: ["http://localhost/*/file_sample.html"],
js: [{ code: `(${textScriptCodeIdle})()` }],
runAt: "document_idle",
cookieStoreId: "firefox-container-1",
},
// Extension URLs.
{
matches: ["http://localhost/*/file_sample.html"],
@ -407,12 +401,6 @@ add_task(async function test_contentscripts_register_js() {
js: [{ file: "content_script.js" }],
// "runAt" is not specified here to ensure that it defaults to document_idle when missing.
},
{
matches: ["http://localhost/*/file_sample.html"],
js: [{ file: "content_script_idle.js" }],
runAt: "document_idle",
cookieStoreId: "firefox-container-1",
},
];
const expectedAPIs = ["unregister"];
@ -564,14 +552,7 @@ add_task(async function test_contentscripts_register_all_options() {
);
const script = policy.contentScripts[0];
let {
allFrames,
cssPaths,
jsPaths,
matchAboutBlank,
runAt,
originAttributesPatterns,
} = script;
let { allFrames, cssPaths, jsPaths, matchAboutBlank, runAt } = script;
deepEqual(
{
@ -580,7 +561,6 @@ add_task(async function test_contentscripts_register_all_options() {
jsPaths,
matchAboutBlank,
runAt,
originAttributesPatterns,
},
{
allFrames: true,
@ -588,7 +568,6 @@ add_task(async function test_contentscripts_register_all_options() {
jsPaths: [`${baseExtURL}/content_script.js`],
matchAboutBlank: true,
runAt: "document_start",
originAttributesPatterns: null,
},
"Got the expected content script properties"
);
@ -610,187 +589,3 @@ add_task(async function test_contentscripts_register_all_options() {
await extension.unload();
});
add_task(async function test_contentscripts_register_cookieStoreId() {
async function background() {
let cookieStoreIdCSSArray = [
{ id: null, color: "rgb(123, 45, 67)" },
{ id: "firefox-private", color: "rgb(255,255,0)" },
{ id: "firefox-default", color: "red" },
{ id: "firefox-container-1", color: "green" },
{ id: "firefox-container-2", color: "blue" },
{
id: ["firefox-container-3", "firefox-container-4"],
color: "rgb(100,100,0)",
},
];
const matches = ["http://localhost/*/file_sample_registered_styles.html"];
for (let { id, color } of cookieStoreIdCSSArray) {
await browser.contentScripts.register({
css: [
{
code: `#registered-extension-text-style {
background-color: ${color}}`,
},
],
matches,
runAt: "document_start",
cookieStoreId: id,
});
}
await browser.test.assertRejects(
browser.contentScripts.register({
css: [{ code: `body {}` }],
matches,
cookieStoreId: "not_a_valid_cookieStoreId",
}),
/Invalid cookieStoreId/,
"contentScript.register with an invalid cookieStoreId"
);
await browser.test.assertRejects(
browser.contentScripts.register({
css: [{ code: `body {}` }],
matches,
cookieStoreId: "firefox-container-999",
}),
/Invalid cookieStoreId/,
"contentScript.register with an invalid cookieStoreId"
);
await browser.test.assertRejects(
browser.contentScripts.register({
css: [{ code: `body {}` }],
matches,
cookieStoreId: "",
}),
/Invalid cookieStoreId/,
"contentScript.register with an invalid cookieStoreId"
);
browser.test.sendMessage("background_ready");
}
const extensionData = {
manifest: {
permissions: [
"http://localhost/*/file_sample_registered_styles.html",
"<all_urls>",
],
content_scripts: [
{
matches: ["http://localhost/*/file_sample_registered_styles.html"],
run_at: "document_idle",
js: ["check_applied_styles.js"],
},
],
},
background,
files: {
"check_applied_styles.js": check_applied_styles,
},
};
const extension = ExtensionTestUtils.loadExtension({
...extensionData,
incognitoOverride: "spanning",
});
await extension.startup();
await extension.awaitMessage("background_ready");
// Index 0 is the one from manifest.json.
let contentScriptMatchTests = [
{
contentPageOptions: { userContextId: 5 },
expectedStyles: "rgb(123, 45, 67)",
originAttributesPatternExpected: null,
contentScriptIndex: 1,
},
{
contentPageOptions: { privateBrowsing: true },
expectedStyles: "rgb(255, 255, 0)",
originAttributesPatternExpected: [
{
privateBrowsingId: 1,
userContextId: 0,
},
],
contentScriptIndex: 2,
},
{
contentPageOptions: { userContextId: 0 },
expectedStyles: "rgb(255, 0, 0)",
originAttributesPatternExpected: [
{
privateBrowsingId: 0,
userContextId: 0,
},
],
contentScriptIndex: 3,
},
{
contentPageOptions: { userContextId: 1 },
expectedStyles: "rgb(0, 128, 0)",
originAttributesPatternExpected: [{ userContextId: 1 }],
contentScriptIndex: 4,
},
{
contentPageOptions: { userContextId: 2 },
expectedStyles: "rgb(0, 0, 255)",
originAttributesPatternExpected: [{ userContextId: 2 }],
contentScriptIndex: 5,
},
{
contentPageOptions: { userContextId: 3 },
expectedStyles: "rgb(100, 100, 0)",
originAttributesPatternExpected: [
{ userContextId: 3 },
{ userContextId: 4 },
],
contentScriptIndex: 6,
},
{
contentPageOptions: { userContextId: 4 },
expectedStyles: "rgb(100, 100, 0)",
originAttributesPatternExpected: [
{ userContextId: 3 },
{ userContextId: 4 },
],
contentScriptIndex: 6,
},
];
const policy = WebExtensionPolicy.getByID(extension.id);
for (const testCase of contentScriptMatchTests) {
const {
contentPageOptions,
expectedStyles,
originAttributesPatternExpected,
contentScriptIndex,
} = testCase;
const script = policy.contentScripts[contentScriptIndex];
deepEqual(script.originAttributesPatterns, originAttributesPatternExpected);
let contentPage = await ExtensionTestUtils.loadContentPage(
`about:blank`,
contentPageOptions
);
await contentPage.loadURL(`${BASE_URL}/file_sample_registered_styles.html`);
let registeredStylesResults = await extension.awaitMessage(
"registered-styles-results"
);
equal(
registeredStylesResults.registeredExtensionBlobStyleBG,
expectedStyles,
`Expected styles applied on content page loaded with options
${JSON.stringify(contentPageOptions)}`
);
await contentPage.close();
}
await extension.unload();
});