microsoft/playwright
1
1
Fork 0
mirror of https://github.com/microsoft/playwright.git synced 2024-12-15 06:02:57 +03:00
Code Issues Projects Releases Wiki Activity

fix(webkit): swallow requests from detached frames (#6242)

Browse Source
This commit is contained in:
Joel Einbinder 2021-05-03 12:34:09 -07:00 committed by GitHub
parent fd4253991f
commit 6219042c74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/server/webkit/wkPage.ts
View File

@ -898,7 +898,12 @@ export class WKPage implements PageDelegate {
redirectedFrom = request.request; redirectedFrom = request.request;
} }
} }
const frame = this._page._frameManager.frame(event.frameId)!; const frame = redirectedFrom ? redirectedFrom.frame() : this._page._frameManager.frame(event.frameId);
// sometimes we get stray network events for detached frames
// TODO(einbinder) why?
if (!frame)
return;
// TODO(einbinder) this will fail if we are an XHR document request // TODO(einbinder) this will fail if we are an XHR document request
const isNavigationRequest = event.type === 'Document'; const isNavigationRequest = event.type === 'Document';
const documentId = isNavigationRequest ? event.loaderId : undefined; const documentId = isNavigationRequest ? event.loaderId : undefined;
@ -919,8 +924,10 @@ export class WKPage implements PageDelegate {
_onRequestIntercepted(event: Protocol.Network.requestInterceptedPayload) { _onRequestIntercepted(event: Protocol.Network.requestInterceptedPayload) {
const request = this._requestIdToRequest.get(event.requestId); const request = this._requestIdToRequest.get(event.requestId);
if (!request) if (!request) {
this._session.sendMayFail('Network.interceptRequestWithError', {errorType: 'Cancellation', requestId: event.requestId});
return; return;
}
if (!request._allowInterception) { if (!request._allowInterception) {
// Intercepted, although we do not intend to allow interception. // Intercepted, although we do not intend to allow interception.
// Just continue. // Just continue.