nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Backed out 3 changesets (bug 1875065) for causing wpt crashes on instance.https.html. CLOSED TREE

Browse source 
Backed out changeset f5d605c87173 (bug 1875065)
Backed out changeset 007c815885ff (bug 1875065)
Backed out changeset 824de0ff3b56 (bug 1875065)
This commit is contained in:
Tamas Szentpeteri 2024-05-07 23:20:55 +03:00
parent 5ad3fb1d60
commit 5330b1be71
14 changed files with 216 additions and 317 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

1
remote/jar.mn
View file

@ -26,7 +26,6 @@ remote.jar:
content/shared/NetworkRequest.sys.mjs (shared/NetworkRequest.sys.mjs)
content/shared/NetworkResponse.sys.mjs (shared/NetworkResponse.sys.mjs)
content/shared/PDF.sys.mjs (shared/PDF.sys.mjs)
content/shared/Permissions.sys.mjs (shared/Permissions.sys.mjs)
content/shared/Prompt.sys.mjs (shared/Prompt.sys.mjs)
content/shared/Realm.sys.mjs (shared/Realm.sys.mjs)
content/shared/RecommendedPreferences.sys.mjs (shared/RecommendedPreferences.sys.mjs)

43
remote/marionette/driver.sys.mjs
View file

@ -29,7 +29,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
MarionettePrefs: "chrome://remote/content/marionette/prefs.sys.mjs",
modal: "chrome://remote/content/shared/Prompt.sys.mjs",
navigate: "chrome://remote/content/marionette/navigate.sys.mjs",
permissions: "chrome://remote/content/shared/Permissions.sys.mjs",
permissions: "chrome://remote/content/marionette/permissions.sys.mjs",
pprint: "chrome://remote/content/shared/Format.sys.mjs",
print: "chrome://remote/content/shared/PDF.sys.mjs",
PromptListener:
@ -3357,7 +3357,24 @@ GeckoDriver.prototype.setPermission = async function (cmd) {
const { descriptor, state, oneRealm = false } = cmd.parameters;
const browsingContext = lazy.assert.open(this.getBrowsingContext());
lazy.permissions.validatePermission(descriptor.name);
// XXX: We currently depend on camera/microphone tests throwing UnsupportedOperationError,
// the fix is ongoing in bug 1609427.
if (["camera", "microphone"].includes(descriptor.name)) {
throw new lazy.error.UnsupportedOperationError(
"setPermission: camera and microphone permissions are currently unsupported"
);
}
// XXX: Allowing this permission causes timing related Android crash, see also bug 1878741
if (descriptor.name === "notifications") {
if (Services.prefs.getBoolPref("notification.prompt.testing", false)) {
// Okay, do nothing. The notifications module will work without permission.
return;
}
throw new lazy.error.UnsupportedOperationError(
"setPermission: expected notification.prompt.testing to be set"
);
}
let params;
try {
@ -3372,27 +3389,7 @@ GeckoDriver.prototype.setPermission = async function (cmd) {
lazy.assert.boolean(oneRealm);
if (!lazy.MarionettePrefs.setPermissionEnabled) {
throw new lazy.error.UnsupportedOperationError(
"'Set Permission' is not available"
);
}
let origin = browsingContext.currentURI.prePath;
let topLevelOrigin;
// storage-access is a special case.
if (descriptor.name === "storage-access") {
topLevelOrigin = browsingContext.top.currentWindowGlobal.documentURI;
params = {
type: lazy.permissions.getStorageAccessPermissionsType(
browsingContext.currentWindowGlobal.documentURI
),
};
}
lazy.permissions.set(params, state, origin, topLevelOrigin);
lazy.permissions.set(params.type, params.state, oneRealm, browsingContext);
};
/**

1
remote/marionette/jar.mn
View file

@ -23,6 +23,7 @@ remote.jar:
content/marionette/message.sys.mjs (message.sys.mjs)
content/marionette/navigate.sys.mjs (navigate.sys.mjs)
content/marionette/packets.sys.mjs (packets.sys.mjs)
content/marionette/permissions.sys.mjs (permissions.sys.mjs)
content/marionette/prefs.sys.mjs (prefs.sys.mjs)
content/marionette/reftest.sys.mjs (reftest.sys.mjs)
content/marionette/reftest.xhtml (chrome/reftest.xhtml)

95
remote/marionette/permissions.sys.mjs Normal file
View file

@ -0,0 +1,95 @@
/* 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/. */
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
error: "chrome://remote/content/shared/webdriver/Errors.sys.mjs",
MarionettePrefs: "chrome://remote/content/marionette/prefs.sys.mjs",
});
/** @namespace */
export const permissions = {};
function mapToInternalPermissionParameters(browsingContext, permissionType) {
const currentURI = browsingContext.currentWindowGlobal.documentURI;
// storage-access is quite special...
if (permissionType === "storage-access") {
const thirdPartyPrincipalSite = Services.eTLD.getSite(currentURI);
const topLevelURI = browsingContext.top.currentWindowGlobal.documentURI;
const topLevelPrincipal =
Services.scriptSecurityManager.createContentPrincipal(topLevelURI, {});
return {
name: "3rdPartyFrameStorage^" + thirdPartyPrincipalSite,
principal: topLevelPrincipal,
};
}
const currentPrincipal =
Services.scriptSecurityManager.createContentPrincipal(currentURI, {});
return {
name: permissionType,
principal: currentPrincipal,
};
}
/**
* Set a permission's state.
* Note: Currently just a shim to support testdriver's set_permission.
*
* @param {object} permissionType
* The Gecko internal permission type
* @param {string} state
* State of the permission. It can be `granted`, `denied` or `prompt`.
* @param {boolean} oneRealm
* Currently ignored
* @param {browsingContext=} browsingContext
* Current browsing context object
* @throws {UnsupportedOperationError}
* If `marionette.setpermission.enabled` is not set or
* an unsupported permission is used.
*/
permissions.set = function (permissionType, state, oneRealm, browsingContext) {
if (!lazy.MarionettePrefs.setPermissionEnabled) {
throw new lazy.error.UnsupportedOperationError(
"'Set Permission' is not available"
);
}
const { name, principal } = mapToInternalPermissionParameters(
browsingContext,
permissionType
);
switch (state) {
case "granted": {
Services.perms.addFromPrincipal(
principal,
name,
Services.perms.ALLOW_ACTION
);
return;
}
case "denied": {
Services.perms.addFromPrincipal(
principal,
name,
Services.perms.DENY_ACTION
);
return;
}
case "prompt": {
Services.perms.removeFromPrincipal(principal, name);
return;
}
default:
throw new lazy.error.UnsupportedOperationError(
"Unrecognized permission keyword for 'Set Permission' operation"
);
}
};

105
remote/shared/Permissions.sys.mjs
View file

@ -1,105 +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/. */
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
error: "chrome://remote/content/shared/webdriver/Errors.sys.mjs",
});
/** @namespace */
export const permissions = {};
/**
* Get a permission type for the "storage-access" permission.
*
* @param {nsIURI} uri
* The URI to use for building the permission type.
*
* @returns {string} permissionType
* The permission type for the "storage-access" permission.
*/
permissions.getStorageAccessPermissionsType = function (uri) {
const thirdPartyPrincipalSite = Services.eTLD.getSite(uri);
return "3rdPartyFrameStorage^" + thirdPartyPrincipalSite;
};
/**
* Set a permission given a permission descriptor, a permission state,
* an origin.
*
* @param {PermissionDescriptor} descriptor
* The descriptor of the permission which will be updated.
* @param {string} state
* State of the permission. It can be `granted`, `denied` or `prompt`.
* @param {string} origin
* The origin which is used as a target for permission update.
* @param {nsIURI=} topLevelOrigin
* The top-level origin which is used as a target for permission update.
* Required to set "storage-access" permission.
*
* @throws {UnsupportedOperationError}
* If <var>state</var> has unsupported value.
*/
permissions.set = function (descriptor, state, origin, topLevelOrigin) {
const principal = topLevelOrigin
? Services.scriptSecurityManager.createContentPrincipal(topLevelOrigin, {})
: Services.scriptSecurityManager.createContentPrincipalFromOrigin(origin);
switch (state) {
case "granted": {
Services.perms.addFromPrincipal(
principal,
descriptor.type,
Services.perms.ALLOW_ACTION
);
return;
}
case "denied": {
Services.perms.addFromPrincipal(
principal,
descriptor.type,
Services.perms.DENY_ACTION
);
return;
}
case "prompt": {
Services.perms.removeFromPrincipal(principal, descriptor.type);
return;
}
default:
throw new lazy.error.UnsupportedOperationError(
"Unrecognized permission keyword for 'Set Permission' operation"
);
}
};
/**
* Validate the permission.
*
* @param {string} permissionName
* The name of the permission which will be validated.
*
* @throws {UnsupportedOperationError}
* If <var>permissionName</var> is not supported.
*/
permissions.validatePermission = function (permissionName) {
// Bug 1609427: PermissionDescriptor for "camera" and "microphone" are not yet implemented.
if (["camera", "microphone"].includes(permissionName)) {
throw new lazy.error.UnsupportedOperationError(
`"descriptor.name" "${permissionName}" is currently unsupported`
);
}
// Bug 1878741: Allowing this permission causes timing related Android crash.
if (permissionName === "notifications") {
if (Services.prefs.getBoolPref("notification.prompt.testing", false)) {
// Okay, do nothing. The notifications module will work without permission.
return;
}
throw new lazy.error.UnsupportedOperationError(
`Setting "descriptor.name" "notifications" expected "notification.prompt.testing" preference to be set`
);
}
};

46
remote/test/puppeteer/test/TestExpectations.json
View file

@ -1028,13 +1028,6 @@
"expectations": ["FAIL"],
"comment": "TODO: add a comment explaining why this expectation is required (include links to issues)"
},
{
"testIdPattern": "[browsercontext.spec] BrowserContext BrowserContext.overridePermissions should deny permission when not listed",
"platforms": ["darwin", "linux", "win32"],
"parameters": ["firefox", "webDriverBiDi"],
"expectations": ["FAIL"],
"comment": "https://bugzilla.mozilla.org/show_bug.cgi?id=1894217"
},
{
"testIdPattern": "[browsercontext.spec] BrowserContext BrowserContext.overridePermissions should fail when bad permission is given",
"platforms": ["darwin", "linux", "win32"],
@ -1048,13 +1041,6 @@
"expectations": ["FAIL"],
"comment": "TODO: add a comment explaining why this expectation is required (include links to issues)"
},
{
"testIdPattern": "[browsercontext.spec] BrowserContext BrowserContext.overridePermissions should grant permission when listed",
"platforms": ["darwin", "linux", "win32"],
"parameters": ["firefox", "webDriverBiDi"],
"expectations": ["FAIL"],
"comment": "https://bugzilla.mozilla.org/show_bug.cgi?id=1894217"
},
{
"testIdPattern": "[browsercontext.spec] BrowserContext BrowserContext.overridePermissions should grant persistent-storage",
"platforms": ["darwin", "linux", "win32"],
@ -1062,13 +1048,6 @@
"expectations": ["FAIL"],
"comment": "TODO: add a comment explaining why this expectation is required (include links to issues)"
},
{
"testIdPattern": "[browsercontext.spec] BrowserContext BrowserContext.overridePermissions should grant persistent-storage",
"platforms": ["darwin", "linux", "win32"],
"parameters": ["firefox", "webDriverBiDi"],
"expectations": ["FAIL"],
"comment": "https://bugzilla.mozilla.org/show_bug.cgi?id=1894217"
},
{
"testIdPattern": "[browsercontext.spec] BrowserContext BrowserContext.overridePermissions should isolate permissions between browser contexts",
"platforms": ["darwin", "linux", "win32"],
@ -1076,13 +1055,6 @@
"expectations": ["FAIL"],
"comment": "TODO: add a comment explaining why this expectation is required (include links to issues)"
},
{
"testIdPattern": "[browsercontext.spec] BrowserContext BrowserContext.overridePermissions should isolate permissions between browser contexts",
"platforms": ["darwin", "linux", "win32"],
"parameters": ["firefox", "webDriverBiDi"],
"expectations": ["FAIL"],
"comment": "https://bugzilla.mozilla.org/show_bug.cgi?id=1894217"
},
{
"testIdPattern": "[browsercontext.spec] BrowserContext BrowserContext.overridePermissions should reset permissions",
"platforms": ["darwin", "linux", "win32"],
@ -1090,26 +1062,12 @@
"expectations": ["FAIL"],
"comment": "TODO: add a comment explaining why this expectation is required (include links to issues)"
},
{
"testIdPattern": "[browsercontext.spec] BrowserContext BrowserContext.overridePermissions should reset permissions",
"platforms": ["darwin", "linux", "win32"],
"parameters": ["firefox", "webDriverBiDi"],
"expectations": ["FAIL"],
"comment": "https://bugzilla.mozilla.org/show_bug.cgi?id=1894217"
},
{
"testIdPattern": "[browsercontext.spec] BrowserContext BrowserContext.overridePermissions should trigger permission onchange",
"platforms": ["darwin", "linux", "win32"],
"parameters": ["cdp", "firefox"],
"expectations": ["FAIL"],
"comment": "TODO: add a comment explaining why this expectation is required (include links to issues)"
},
{
"testIdPattern": "[browsercontext.spec] BrowserContext BrowserContext.overridePermissions should trigger permission onchange",
"platforms": ["darwin", "linux", "win32"],
"parameters": ["firefox", "webDriverBiDi"],
"parameters": ["cdp", "firefox"],
"expectations": ["FAIL"],
"comment": "https://bugzilla.mozilla.org/show_bug.cgi?id=1894217"
"comment": "TODO: add a comment explaining why this expectation is required (include links to issues)"
},
{
"testIdPattern": "[browsercontext.spec] BrowserContext should fire target events",

1
remote/webdriver-bidi/jar.mn
View file

@ -21,7 +21,6 @@ remote.jar:
content/webdriver-bidi/modules/root/input.sys.mjs (modules/root/input.sys.mjs)
content/webdriver-bidi/modules/root/log.sys.mjs (modules/root/log.sys.mjs)
content/webdriver-bidi/modules/root/network.sys.mjs (modules/root/network.sys.mjs)
content/webdriver-bidi/modules/root/permissions.sys.mjs (modules/root/permissions.sys.mjs)
content/webdriver-bidi/modules/root/script.sys.mjs (modules/root/script.sys.mjs)
content/webdriver-bidi/modules/root/session.sys.mjs (modules/root/session.sys.mjs)
content/webdriver-bidi/modules/root/storage.sys.mjs (modules/root/storage.sys.mjs)

2
remote/webdriver-bidi/modules/ModuleRegistry.sys.mjs
View file

@ -18,8 +18,6 @@ ChromeUtils.defineESModuleGetters(modules.root, {
log: "chrome://remote/content/webdriver-bidi/modules/root/log.sys.mjs",
network:
"chrome://remote/content/webdriver-bidi/modules/root/network.sys.mjs",
permissions:
"chrome://remote/content/webdriver-bidi/modules/root/permissions.sys.mjs",
script: "chrome://remote/content/webdriver-bidi/modules/root/script.sys.mjs",
session:
"chrome://remote/content/webdriver-bidi/modules/root/session.sys.mjs",

130
remote/webdriver-bidi/modules/root/permissions.sys.mjs
View file

@ -1,130 +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/. */
import { Module } from "chrome://remote/content/shared/messagehandler/Module.sys.mjs";
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
assert: "chrome://remote/content/shared/webdriver/Assert.sys.mjs",
error: "chrome://remote/content/shared/webdriver/Errors.sys.mjs",
permissions: "chrome://remote/content/shared/Permissions.sys.mjs",
});
export const PermissionState = {
denied: "denied",
granted: "granted",
prompt: "prompt",
};
class PermissionsModule extends Module {
constructor(messageHandler) {
super(messageHandler);
}
destroy() {}
/**
* An object that holds the information about permission descriptor
* for Webdriver BiDi permissions.setPermission command.
*
* @typedef PermissionDescriptor
*
* @property {string} name
* The name of the permission.
*/
/**
* Set to a given permission descriptor a given state on a provided origin.
*
* @param {object=} options
* @param {PermissionDescriptor} options.descriptor
* The descriptor of the permission which will be updated.
* @param {PermissionState} options.state
* The state which will be set to the permission.
* @param {string} options.origin
* The origin which is used as a target for permission update.
* @param {string=} options.userContext [unsupported]
* The id of the user context which should be used as a target
* for permission update.
*
* @throws {InvalidArgumentError}
* Raised if an argument is of an invalid type or value.
* @throws {UnsupportedOperationError}
* Raised when unsupported permissions are set or <var>userContext</var>
* argument is used.
*/
async setPermission(options = {}) {
const {
descriptor,
state,
origin,
userContext: userContextId = null,
} = options;
lazy.assert.object(
descriptor,
`Expected "descriptor" to be an object, got ${descriptor}`
);
const permissionName = descriptor.name;
lazy.assert.string(
permissionName,
`Expected "descriptor.name" to be a string, got ${permissionName}`
);
lazy.permissions.validatePermission(permissionName);
if (permissionName === "storage-access") {
// TODO: Bug 1895457. Add support for "storage-access" permission.
throw new lazy.error.UnsupportedOperationError(
`"descriptor.name" "${permissionName}" is currently unsupported`
);
}
const permissionStateTypes = Object.keys(PermissionState);
lazy.assert.that(
state => permissionStateTypes.includes(state),
`Expected "state" to be one of ${permissionStateTypes}, got ${state}`
)(state);
lazy.assert.string(
origin,
`Expected "origin" to be a string, got ${origin}`
);
lazy.assert.that(
origin => URL.canParse(origin),
`Expected "origin" to be a valid URL, got ${origin}`
)(origin);
let userContext;
if (userContextId !== null) {
lazy.assert.string(
userContextId,
`Expected "userContext" to be a string, got ${userContextId}`
);
// TODO: Bug 1894217. Add support for "userContext" argument.
throw new lazy.error.UnsupportedOperationError(
`"userContext" is not supported yet`
);
}
const activeWindow = Services.wm.getMostRecentBrowserWindow();
let typedDescriptor;
try {
typedDescriptor = activeWindow.navigator.permissions.parseSetParameters({
descriptor,
state,
});
} catch (err) {
throw new lazy.error.InvalidArgumentError(
`The conversion of "descriptor" was not successful: ${err.message}`
);
}
lazy.permissions.set(typedDescriptor, state, origin, userContext);
}
}
export const permissions = PermissionsModule;

4
testing/marionette/harness/marionette_harness/tests/unit/test_set_permission.py
View file

@ -48,7 +48,3 @@ class TestSetPermission(MarionetteTestCase):
self.assertEqual(
self.query_permission({"name": "midi", "sysex": True}), "prompt"
)
def test_storage_access(self):
self.marionette.set_permission({"name": "storage-access"}, "granted")
self.assertEqual(self.query_permission({"name": "storage-access"}), "granted")

68
testing/web-platform/meta/webdriver/tests/bidi/external/permissions/set_permission/invalid.py.ini vendored Normal file
View file

@ -0,0 +1,68 @@
[invalid.py]
expected:
if (processor == "x86") and not debug: [OK, TIMEOUT]
[test_params_descriptor_invalid_type[False\]]
expected: FAIL
[test_params_descriptor_invalid_type[SOME_STRING\]]
expected: FAIL
[test_params_descriptor_invalid_type[42\]]
expected: FAIL
[test_params_descriptor_invalid_type[descriptor3\]]
expected: FAIL
[test_params_descriptor_invalid_type[descriptor4\]]
expected: FAIL
[test_params_descriptor_invalid_type[descriptor5\]]
expected: FAIL
[test_params_descriptor_invalid_type[None\]]
expected: FAIL
[test_params_descriptor_invalid_type[descriptor7\]]
expected: FAIL
[test_params_descriptor_invalid_value[descriptor0\]]
expected: FAIL
[test_params_state_invalid_type[False\]]
expected: FAIL
[test_params_state_invalid_type[42\]]
expected: FAIL
[test_params_state_invalid_type[state2\]]
expected: FAIL
[test_params_state_invalid_type[state3\]]
expected: FAIL
[test_params_state_invalid_type[None\]]
expected: FAIL
[test_params_state_invalid_type[state5\]]
expected: FAIL
[test_params_state_invalid_value[Granted\]]
expected: FAIL
[test_params_origin_invalid_type[False\]]
expected: FAIL
[test_params_origin_invalid_type[42\]]
expected: FAIL
[test_params_origin_invalid_type[None\]]
expected: FAIL
[test_params_state_invalid_value[UNKNOWN\]]
expected: FAIL
[test_params_origin_invalid_type[user_context2\]]
expected: FAIL
[test_params_origin_invalid_type[user_context3\]]
expected: FAIL

12
testing/web-platform/meta/webdriver/tests/bidi/external/permissions/set_permission/set_permission.py.ini vendored
View file

@ -1,4 +1,13 @@
[set_permission.py]
[test_set_permission]
expected: FAIL
[test_set_permission_insecure_context]
expected: FAIL
[test_set_permission_new_context]
expected: FAIL
[test_set_permission_origin_unknown[UNKNOWN\]]
expected: FAIL
@ -7,6 +16,3 @@
[test_set_permission_user_context]
expected: FAIL
bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1894217
disabled:
if os == "android": bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1877953

5
testing/web-platform/tests/webdriver/tests/bidi/external/permissions/set_permission/invalid.py vendored
View file

@ -4,7 +4,6 @@ from webdriver.bidi.undefined import UNDEFINED
pytestmark = pytest.mark.asyncio
@pytest.mark.parametrize("descriptor", [False, "SOME_STRING", 42, {}, [], {"name": 23}, None, UNDEFINED])
async def test_params_descriptor_invalid_type(bidi_session, descriptor):
with pytest.raises(error.InvalidArgumentException):
@ -55,8 +54,8 @@ async def test_params_origin_invalid_type(bidi_session, origin):
)
@pytest.mark.parametrize("user_context", [False, 42, {}, []])
async def test_params_user_context_invalid_type(bidi_session, user_context):
@pytest.mark.parametrize("user_context", [False, 42, {}, [], None])
async def test_params_origin_invalid_type(bidi_session, user_context):
with pytest.raises(error.InvalidArgumentException):
await bidi_session.permissions.set_permission(
descriptor={"name": "geolocation"},

20
testing/web-platform/tests/webdriver/tests/bidi/external/permissions/set_permission/set_permission.py vendored
View file

@ -1,10 +1,10 @@
import pytest
import webdriver.bidi.error as error
from . import get_context_origin, get_permission_state
pytestmark = pytest.mark.asyncio
@pytest.mark.asyncio
async def test_set_permission(bidi_session, new_tab, url):
test_url = url("/common/blank.html", protocol="https")
@ -43,6 +43,24 @@ async def test_set_permission(bidi_session, new_tab, url):
assert await get_permission_state(bidi_session, new_tab, "geolocation") == "prompt"
@pytest.mark.asyncio
async def test_set_permission_insecure_context(bidi_session, new_tab, url):
test_url = url("/common/blank.html", protocol="http")
await bidi_session.browsing_context.navigate(
context=new_tab["context"],
url=test_url,
wait="complete",
)
origin = await get_context_origin(bidi_session, new_tab)
with pytest.raises(error.InvalidArgumentException):
await bidi_session.permissions.set_permission(
descriptor={"name": "push"},
state="granted",
origin=origin,
)
@pytest.mark.asyncio
async def test_set_permission_new_context(bidi_session, new_tab, url):
test_url = url("/common/blank.html", protocol="https")