Playwright is a framework for Web Testing and Automation. It allows testing Chromium, Firefox and WebKit with a single API.
TypeScript automationchromechromiume2e-testingelectronend-to-end-testingfirefoxjavascriptplaywrighttesttest-automationtestingtesting-toolswebwebkit
chore(bidi): fix support for global permissions (#38795)
Holger Benl327bd18da80a
diff --git a/packages/playwright-core/src/server/bidi/bidiBrowser.ts b/packages/playwright-core/src/server/bidi/bidiBrowser.tsindex 46884d0a3e..f92d3e171b 100644--- a/packages/playwright-core/src/server/bidi/bidiBrowser.ts+++ b/packages/playwright-core/src/server/bidi/bidiBrowser.ts@@ -153,6 +153,7 @@ export class BidiBrowser extends Browser {context = this._defaultContext as BidiBrowserContext;if (!context)return;+ context.doGrantGlobalPermissionsForURL(event.url);const session = this._connection.createMainFrameBrowsingContextSession(event.context);const opener = event.originalOpener && this._findPageForFrame(event.originalOpener);const page = new BidiPage(context, session, opener || null);@@ -237,6 +238,8 @@ export class BidiBrowserContext extends BrowserContext {}if (this._options.extraHTTPHeaders)promises.push(this.doUpdateExtraHTTPHeaders());+ if (this._options.permissions)+ promises.push(this.doGrantPermissions('*', this._options.permissions));await Promise.all(promises);}@@ -295,17 +298,36 @@ export class BidiBrowserContext extends BrowserContext {}async doGrantPermissions(origin: string, permissions: string[]) {+ if (origin === 'null')+ return;const currentPermissions = this._originToPermissions.get(origin) || [];const toGrant = permissions.filter(permission => !currentPermissions.includes(permission));this._originToPermissions.set(origin, [...currentPermissions, ...toGrant]);- await Promise.all(toGrant.map(permission => this._setPermission(origin, permission, bidi.Permissions.PermissionState.Granted)));+ if (origin === '*') {+ await Promise.all(this._bidiPages().flatMap(page =>+ page._page.frames().map(frame =>+ this.doGrantPermissions(new URL(frame._url).origin, permissions)+ )+ ));+ } else {+ await Promise.all(toGrant.map(permission => this._setPermission(origin, permission, bidi.Permissions.PermissionState.Granted)));+ }+ }++ async doGrantGlobalPermissionsForURL(url: string) {+ const permissions = this._originToPermissions.get('*');+ if (!permissions)+ return;+ await this.doGrantPermissions(new URL(url).origin, permissions);}async doClearPermissions() {const currentPermissions = [...this._originToPermissions.entries()];this._originToPermissions = new Map();- await Promise.all(currentPermissions.map(([origin, permissions]) => permissions.map(- p => this._setPermission(origin, p, bidi.Permissions.PermissionState.Prompt))));+ await Promise.all(currentPermissions.flatMap(([origin, permissions]) => {+ if (origin !== '*')+ return permissions.map(p => this._setPermission(origin, p, bidi.Permissions.PermissionState.Prompt));+ }));}private async _setPermission(origin: string, permission: string, state: bidi.Permissions.PermissionState) {diff --git a/packages/playwright-core/src/server/bidi/bidiPage.ts b/packages/playwright-core/src/server/bidi/bidiPage.tsindex 7b47c062dd..60085d2379 100644--- a/packages/playwright-core/src/server/bidi/bidiPage.ts+++ b/packages/playwright-core/src/server/bidi/bidiPage.ts@@ -14,6 +14,7 @@* limitations under the License.*/+import { debugLogger } from '../utils/debugLogger';import { eventsHelper } from '../utils/eventsHelper';import * as dialog from '../dialog';import * as dom from '../dom';@@ -197,6 +198,7 @@ export class BidiPage implements PageDelegate {private _onNavigationCommitted(params: bidi.BrowsingContext.NavigationInfo) {const frameId = params.context;const frame = this._page.frameManager.frame(frameId)!;+ this._browserContext.doGrantGlobalPermissionsForURL(params.url).catch(error => debugLogger.log('error', error));this._page.frameManager.frameCommittedNewDocumentNavigation(frameId, params.url, frame._name, params.navigation!, /* initial */ false);}diff --git a/tests/bidi/expectations/moz-firefox-nightly-library.txt b/tests/bidi/expectations/moz-firefox-nightly-library.txtindex 246e6ddeec..69eb69538a 100644--- a/tests/bidi/expectations/moz-firefox-nightly-library.txt+++ b/tests/bidi/expectations/moz-firefox-nightly-library.txt@@ -93,7 +93,6 @@ library/defaultbrowsercontext-2.spec.ts › should have passed URL when launchinlibrary/defaultbrowsercontext-2.spec.ts › should support colorScheme option [fail]library/defaultbrowsercontext-2.spec.ts › should support contrast option [fail]library/defaultbrowsercontext-2.spec.ts › should support forcedColors option [fail]-library/defaultbrowsercontext-2.spec.ts › should support geolocation and permissions options [fail]library/defaultbrowsercontext-2.spec.ts › should support hasTouch option [fail]library/defaultbrowsercontext-2.spec.ts › should support reducedMotion option [fail]library/download.spec.ts › download event › should be able to cancel pending downloads [timeout]@@ -131,11 +130,6 @@ library/emulation-focus.spec.ts › should focus with more than one page/contextlibrary/emulation-focus.spec.ts › should think that all pages are focused @smoke [fail]library/fetch-proxy.spec.ts › context request should pick up proxy credentials [timeout]library/firefox/launcher.spec.ts › should support custom firefox policies [fail]-library/geolocation.spec.ts › should isolate contexts [fail]-library/geolocation.spec.ts › should use context options [fail]-library/geolocation.spec.ts › should use context options for popup [fail]-library/geolocation.spec.ts › should work @smoke [fail]-library/geolocation.spec.ts › watchPosition should be notified [fail]library/har.spec.ts › should have connection details [fail]library/har.spec.ts › should have connection details for failed requests [fail]library/har.spec.ts › should have connection details for redirects [fail]@@ -168,12 +162,8 @@ library/page-event-crash.spec.ts › should cancel waitForEvent when page crashelibrary/page-event-crash.spec.ts › should emit crash event when page crashes [timeout]library/page-event-crash.spec.ts › should throw on any action after page crashes [timeout]library/permissions.spec.ts › local network request is allowed from public origin [timeout]-library/permissions.spec.ts › permissions › should accumulate when adding [fail]-library/permissions.spec.ts › permissions › should clear permissions [fail]library/permissions.spec.ts › permissions › should deny permission when not listed [fail]library/permissions.spec.ts › permissions › should fail when bad permission is given [fail]-library/permissions.spec.ts › permissions › should grant permission when creating context [fail]-library/permissions.spec.ts › permissions › should grant permission when listed for all domains [fail]library/permissions.spec.ts › permissions › should isolate permissions between browser contexts [fail]library/permissions.spec.ts › permissions › should trigger permission onchange [fail]library/permissions.spec.ts › should support clipboard read [fail]