Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 2 commits into from
May 3, 2021
Merged

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
602ca9b
fix test
JoelEinbinder Apr 20, 2021
a2e7512
cancel requests without a frame
JoelEinbinder May 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/server/webkit/wkPage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -898,7 +898,12 @@ export class WKPage implements PageDelegate {
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;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's also update line 928 to continue all requests that we did not find in the map, to avoid stalling requests that did not have frameId for some reason.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I canceled them instead of continuing, to avoid accidentally purchasing items via requests that were supposed to be intercepted.


// TODO(einbinder) this will fail if we are an XHR document request
const isNavigationRequest = event.type === 'Document';
const documentId = isNavigationRequest ? event.loaderId : undefined;
Expand All @@ -919,8 +924,10 @@ export class WKPage implements PageDelegate {

_onRequestIntercepted(event: Protocol.Network.requestInterceptedPayload) {
const request = this._requestIdToRequest.get(event.requestId);
if (!request)
if (!request) {
this._session.sendMayFail('Network.interceptRequestWithError', {errorType: 'Cancellation', requestId: event.requestId});
return;
}
if (!request._allowInterception) {
// Intercepted, although we do not intend to allow interception.
// Just continue.
Expand Down