Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-03 23:30:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out 2 changesets (bug 1780747) for causing xpcshell failures on test_ext_permission_warnings.js CLOSED TREE

Browse Source 
Backed out changeset be950e847c33 (bug 1780747)
Backed out changeset b07c7315a02a (bug 1780747)
This commit is contained in:
Cristian Tuns 2022-08-08 19:04:56 -04:00
parent d5fa74099d
commit a96814126e
12 changed files with 0 additions and 518 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
browser/locales/en-US/chrome/browser/browser.properties
View File

@ -127,7 +127,6 @@ webextPerms.description.browserSettings=Read and modify browser settings
webextPerms.description.browsingData=Clear recent browsing history, cookies, and related data
webextPerms.description.clipboardRead=Get data from the clipboard
webextPerms.description.clipboardWrite=Input data to the clipboard
webextPerms.description.declarativeNetRequest=Block content on any page
webextPerms.description.devtools=Extend developer tools to access your data in open tabs
webextPerms.description.downloads=Download files and read and modify the browser’s download history
webextPerms.description.downloads.open=Open files downloaded to your computer

1
mobile/android/locales/en-US/chrome/browser.properties
View File

@ -49,7 +49,6 @@ webextPerms.description.browserSettings=Read and modify browser settings
webextPerms.description.browsingData=Clear recent browsing history, cookies, and related data
webextPerms.description.clipboardRead=Get data from the clipboard
webextPerms.description.clipboardWrite=Input data to the clipboard
webextPerms.description.declarativeNetRequest=Block content on any page
webextPerms.description.devtools=Extend developer tools to access your data in open tabs
webextPerms.description.downloads=Download files and read and modify the browser’s download history
webextPerms.description.downloads.open=Open files downloaded to your computer

25
toolkit/components/extensions/Extension.jsm
View File

@ -210,9 +210,6 @@ if (
}
}
const PREF_DNR_ENABLED = "extensions.dnr.enabled";
const PREF_DNR_FEEDBACK = "extensions.dnr.feedback";
// Message included in warnings and errors related to privileged permissions and
// privileged manifest properties. Provides a link to the firefox-source-docs.mozilla.org
// section related to developing and sign Privileged Add-ons.
@ -266,23 +263,6 @@ function isMozillaExtension(extension) {
return isSigned && isMozillaLineExtension;
}
function isDNRPermissionAllowed(perm) {
// DNR is under development and therefore disabled by default for now.
if (!Services.prefs.getBoolPref(PREF_DNR_ENABLED, false)) {
return false;
}
// APIs tied to declarativeNetRequestFeedback are for debugging purposes and
// are only supposed to be available when the (add-on dev) user opts in.
if (
perm === "declarativeNetRequestFeedback" &&
!Services.prefs.getBoolPref(PREF_DNR_FEEDBACK, false)
) {
return false;
}
return true;
}
/**
* Classify an individual permission from a webextension manifest
* as a host/origin permission, an api permission, or a regular permission.
@ -315,11 +295,6 @@ function classifyPermission(perm, restrictSchemes, isPrivileged) {
return { api: match[2] };
} else if (!isPrivileged && PRIVILEGED_PERMS.has(match[1])) {
return { invalid: perm, privileged: true };
} else if (
perm.startsWith("declarativeNetRequest") &&
!isDNRPermissionAllowed(perm)
) {
return { invalid: perm };
}
return { permission: perm };
}

8
toolkit/components/extensions/ext-toolkit.json
View File

@ -60,14 +60,6 @@
["cookies"]
]
},
"declarativeNetRequest": {
"url": "chrome://extensions/content/parent/ext-declarativeNetRequest.js",
"schema": "chrome://extensions/content/schemas/declarative_net_request.json",
"scopes": ["addon_parent"],
"paths": [
["declarativeNetRequest"]
]
},
"dns": {
"url": "chrome://extensions/content/parent/ext-dns.js",
"schema": "chrome://extensions/content/schemas/dns.json",

1
toolkit/components/extensions/jar.mn
View File

@ -19,7 +19,6 @@ toolkit.jar:
content/extensions/parent/ext-contextualIdentities.js (parent/ext-contextualIdentities.js)
content/extensions/parent/ext-clipboard.js (parent/ext-clipboard.js)
content/extensions/parent/ext-cookies.js (parent/ext-cookies.js)
content/extensions/parent/ext-declarativeNetRequest.js (parent/ext-declarativeNetRequest.js)
content/extensions/parent/ext-dns.js (parent/ext-dns.js)
content/extensions/parent/ext-downloads.js (parent/ext-downloads.js)
content/extensions/parent/ext-extension.js (parent/ext-extension.js)

22
toolkit/components/extensions/parent/ext-declarativeNetRequest.js
View File

@ -1,22 +0,0 @@
/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set sts=2 sw=2 et tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
this.declarativeNetRequest = class extends ExtensionAPI {
getAPI(context) {
return {
declarativeNetRequest: {
async testMatchOutcome(request) {
// TODO bug 1745758: Implement rule evaluation engine.
// Since rule registration has not been implemented yet, the result
// is always an empty list.
return [];
},
},
};
}
};

138
toolkit/components/extensions/schemas/declarative_net_request.json
View File

@ -1,138 +0,0 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
[
{
"namespace": "manifest",
"types": [
{
"$extend": "Permission",
"choices": [{
"type": "string",
"enum": ["declarativeNetRequest"],
"min_manifest_version": 3
}]
},
{
"$extend": "PermissionNoPrompt",
"choices": [{
"type": "string",
"enum": ["declarativeNetRequestFeedback", "declarativeNetRequestWithHostAccess"],
"min_manifest_version": 3
}]
}
]
},
{
"namespace": "declarativeNetRequest",
"description": "Use the declarativeNetRequest API to block or modify network requests by specifying declarative rules.",
"permissions": ["declarativeNetRequest", "declarativeNetRequestWithHostAccess"],
"types": [
{
"id": "ResourceType",
"type": "string",
"description": "How the requested resource will be used. Comparable to the webRequest.ResourceType type.",
"enum": [
"main_frame",
"sub_frame",
"stylesheet",
"script",
"image",
"object",
"object_subrequest",
"xmlhttprequest",
"xslt",
"ping",
"beacon",
"xml_dtd",
"font",
"media",
"websocket",
"csp_report",
"imageset",
"web_manifest",
"speculative",
"other"
]
},
{
"id": "MatchedRule",
"type": "object",
"properties": {
"ruleId": {
"type": "integer",
"description": "A matching rule's ID."
},
"rulesetId": {
"type": "string",
"description": "ID of the Ruleset this rule belongs to."
}
}
}
],
"functions": [
{
"name": "testMatchOutcome",
"type": "function",
"description": "Checks if any of the extension's declarativeNetRequest rules would match a hypothetical request.",
"permissions": ["declarativeNetRequestFeedback"],
"async": "callback",
"parameters": [
{
"name": "request",
"type": "object",
"description": "The details of the request to test.",
"properties": {
"url": {
"type": "string",
"description": "The URL of the hypothetical request."
},
"initiator": {
"type": "string",
"description": "The initiator URL (if any) for the hypothetical request.",
"optional": true
},
"method": {
"type": "string",
"description": "Standard HTTP method of the hypothetical request.",
"optional": true,
"default": "get"
},
"type": {
"$ref": "ResourceType",
"description": "The resource type of the hypothetical request."
},
"tabId": {
"type": "integer",
"description": "The ID of the tab in which the hypothetical request takes place. Does not need to correspond to a real tab ID. Default is -1, meaning that the request isn't related to a tab.",
"optional": true,
"default": -1
}
}
},
{
"name": "callback",
"type": "function",
"description": "Called with the details of matched rules.",
"parameters": [
{
"name": "result",
"type": "object",
"properties": {
"matchedRules": {
"type": "array",
"description": "The rules (if any) that match the hypothetical request.",
"items": {
"$ref": "MatchedRule"
}
}
}
}
]
}
]
}
]
}
]

1
toolkit/components/extensions/schemas/jar.mn
View File

@ -16,7 +16,6 @@ toolkit.jar:
content/extensions/schemas/content_scripts.json
content/extensions/schemas/contextual_identities.json
content/extensions/schemas/cookies.json
content/extensions/schemas/declarative_net_request.json
content/extensions/schemas/dns.json
content/extensions/schemas/downloads.json
content/extensions/schemas/events.json

256
toolkit/components/extensions/test/xpcshell/test_ext_dnr_api.js
View File

@ -1,256 +0,0 @@
"use strict";
AddonTestUtils.init(this);
const PREF_DNR_FEEDBACK_DEFAULT_VALUE = Services.prefs.getBoolPref(
"extensions.dnr.feedback",
false
);
async function testAvailability({
allowDNRFeedback = false,
testExpectations,
...extensionData
}) {
function background(testExpectations) {
let {
declarativeNetRequest_available = false,
testMatchOutcome_available = false,
} = testExpectations;
browser.test.assertEq(
declarativeNetRequest_available,
!!browser.declarativeNetRequest,
"declarativeNetRequest API namespace availability"
);
browser.test.assertEq(
testMatchOutcome_available,
!!browser.declarativeNetRequest?.testMatchOutcome,
"declarativeNetRequest.testMatchOutcome availability"
);
browser.test.sendMessage("done");
}
let extension = ExtensionTestUtils.loadExtension({
...extensionData,
manifest: {
manifest_version: 3,
...extensionData.manifest,
},
background: `(${background})(${JSON.stringify(testExpectations)});`,
});
Services.prefs.setBoolPref("extensions.dnr.feedback", allowDNRFeedback);
try {
await extension.startup();
await extension.awaitMessage("done");
await extension.unload();
} finally {
Services.prefs.clearUserPref("extensions.dnr.feedback");
}
}
add_setup(async () => {
// TODO bug 1782685: Remove this check.
Assert.equal(
Services.prefs.getBoolPref("extensions.dnr.enabled", false),
false,
"DNR is disabled by default"
);
Services.prefs.setBoolPref("extensions.dnr.enabled", true);
Services.prefs.setBoolPref("extensions.manifestV3.enabled", true);
});
// Verifies that DNR is disabled by default (until true in bug 1782685).
add_task(
{
pref_set: [["extensions.dnr.enabled", false]],
},
async function dnr_disabled_by_default() {
let { messages } = await promiseConsoleOutput(async () => {
await testAvailability({
allowDNRFeedback: PREF_DNR_FEEDBACK_DEFAULT_VALUE,
testExpectations: {
declarativeNetRequest_available: false,
},
manifest: {
permissions: [
"declarativeNetRequest",
"declarativeNetRequestFeedback",
"declarativeNetRequestWithHostAccess",
],
},
});
});
AddonTestUtils.checkMessages(messages, {
expected: [
{
message: /Reading manifest: Invalid extension permission: declarativeNetRequest$/,
},
{
message: /Reading manifest: Invalid extension permission: declarativeNetRequestFeedback/,
},
{
message: /Reading manifest: Invalid extension permission: declarativeNetRequestWithHostAccess/,
},
],
});
}
);
add_task(async function dnr_feedback_apis_disabled_by_default() {
let { messages } = await promiseConsoleOutput(async () => {
await testAvailability({
allowDNRFeedback: PREF_DNR_FEEDBACK_DEFAULT_VALUE,
testExpectations: {
declarativeNetRequest_available: true,
},
manifest: {
permissions: [
"declarativeNetRequest",
"declarativeNetRequestFeedback",
"declarativeNetRequestWithHostAccess",
],
},
});
});
AddonTestUtils.checkMessages(messages, {
expected: [
{
message: /Reading manifest: Invalid extension permission: declarativeNetRequestFeedback/,
},
],
forbidden: [
{
message: /Reading manifest: Invalid extension permission: declarativeNetRequest$/,
},
{
message: /Reading manifest: Invalid extension permission: declarativeNetRequestWithHostAccess/,
},
],
});
});
// TODO bug 1782685: Remove "min_manifest_version":3 from DNR permissions.
add_task(async function dnr_restricted_to_mv3() {
let { messages } = await promiseConsoleOutput(async () => {
// Manifest version-restricted permissions result in schema-generated
// warnings. Don't fail when the "unrecognized" permission appear, to allow
// us to check for warning log messages below.
ExtensionTestUtils.failOnSchemaWarnings(false);
await testAvailability({
allowDNRFeedback: true,
testExpectations: {
declarativeNetRequest_available: false,
},
manifest: {
manifest_version: 2,
permissions: [
"declarativeNetRequest",
"declarativeNetRequestFeedback",
"declarativeNetRequestWithHostAccess",
],
},
});
ExtensionTestUtils.failOnSchemaWarnings(true);
});
AddonTestUtils.checkMessages(messages, {
expected: [
{
message: /Warning processing permissions: Error processing permissions.0: Value "declarativeNetRequest"/,
},
{
message: /Warning processing permissions: Error processing permissions.1: Value "declarativeNetRequestFeedback"/,
},
{
message: /Warning processing permissions: Error processing permissions.2: Value "declarativeNetRequestWithHostAccess"/,
},
],
});
});
add_task(async function with_declarativeNetRequest_permission() {
await testAvailability({
allowDNRFeedback: true,
testExpectations: {
declarativeNetRequest_available: true,
// feature allowed, but missing declarativeNetRequestFeedback:
testMatchOutcome_available: false,
},
manifest: {
permissions: ["declarativeNetRequest"],
},
});
});
add_task(async function with_declarativeNetRequestWithHostAccess_permission() {
await testAvailability({
allowDNRFeedback: true,
testExpectations: {
declarativeNetRequest_available: true,
// feature allowed, but missing declarativeNetRequestFeedback:
testMatchOutcome_available: false,
},
manifest: {
permissions: ["declarativeNetRequestWithHostAccess"],
},
});
});
add_task(async function with_all_declarativeNetRequest_permissions() {
await testAvailability({
allowDNRFeedback: true,
testExpectations: {
declarativeNetRequest_available: true,
// feature allowed, but missing declarativeNetRequestFeedback:
testMatchOutcome_available: false,
},
manifest: {
permissions: [
"declarativeNetRequest",
"declarativeNetRequestWithHostAccess",
],
},
});
});
add_task(async function no_declarativeNetRequest_permission() {
await testAvailability({
allowDNRFeedback: true,
testExpectations: {
// Just declarativeNetRequestFeedback should not unlock the API.
declarativeNetRequest_available: false,
},
manifest: {
permissions: ["declarativeNetRequestFeedback"],
},
});
});
add_task(async function with_declarativeNetRequestFeedback_permission() {
await testAvailability({
allowDNRFeedback: true,
testExpectations: {
declarativeNetRequest_available: true,
// feature allowed, and all permissions specified:
testMatchOutcome_available: true,
},
manifest: {
permissions: ["declarativeNetRequest", "declarativeNetRequestFeedback"],
},
});
});
add_task(async function declarativeNetRequestFeedback_without_feature() {
await testAvailability({
allowDNRFeedback: false,
testExpectations: {
declarativeNetRequest_available: true,
// all permissions set, but DNR feedback feature not allowed.
testMatchOutcome_available: false,
},
manifest: {
permissions: ["declarativeNetRequest", "declarativeNetRequestFeedback"],
},
});
});

62
toolkit/components/extensions/test/xpcshell/test_ext_permission_warnings.js
View File

@ -471,68 +471,6 @@ add_task(async function nativeMessaging_permission() {
}
});
add_task(async function declarativeNetRequest_unavailable_by_default() {
let manifestPermissions = await getManifestPermissions({
manifest: {
manifest_version: 3,
permissions: ["declarativeNetRequest"],
},
});
deepEqual(
manifestPermissions,
{ origins: [], permissions: [] },
"Expected declarativeNetRequest permission to be ignored/stripped"
);
});
add_task(
{ pref_set: [["extensions.dnr.enabled", true]] },
async function declarativeNetRequest_permission_with_warning() {
let manifestPermissions = await getManifestPermissions({
manifest: {
manifest_version: 3,
permissions: ["declarativeNetRequest"],
},
});
deepEqual(
manifestPermissions,
{ origins: [], permissions: ["declarativeNetRequest"] },
"Expected origins and permissions"
);
deepEqual(
getPermissionWarnings(manifestPermissions),
[
bundle.GetStringFromName(
"webextPerms.description.declarativeNetRequest"
),
],
"Expected warnings"
);
}
);
add_task(
{ pref_set: [["extensions.dnr.enabled", true]] },
async function declarativeNetRequest_permission_without_warning() {
let manifestPermissions = await getManifestPermissions({
manifest: {
manifest_version: 3,
permissions: ["declarativeNetRequestWithHostAccess"],
},
});
deepEqual(
manifestPermissions,
{ origins: [], permissions: ["declarativeNetRequestWithHostAccess"] },
"Expected origins and permissions"
);
deepEqual(getPermissionWarnings(manifestPermissions), [], "No warnings");
}
);
// Tests that the expected permission warnings are generated for a mix of host
// permissions and API permissions, for a privileged extension that uses the
// mozillaAddons permission.

2
toolkit/components/extensions/test/xpcshell/test_ext_permissions.js
View File

@ -626,8 +626,6 @@ const GRANTED_WITHOUT_USER_PROMPT = [
"contextMenus",
"contextualIdentities",
"cookies",
"declarativeNetRequestFeedback",
"declarativeNetRequestWithHostAccess",
"dns",
"geckoProfiler",
"identity",

1
toolkit/components/extensions/test/xpcshell/xpcshell-common.ini
View File

@ -101,7 +101,6 @@ skip-if = appname == "thunderbird" || os == "android" # Containers are not expos
[test_ext_cors_mozextension.js]
[test_ext_csp_frame_ancestors.js]
[test_ext_debugging_utils.js]
[test_ext_dnr_api.js]
[test_ext_dns.js]
skip-if = os == "android" # Android needs alternative for proxy.settings - bug 1723523
[test_ext_downloads.js]