Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: ext/background.js

Issue 29418659: Issue 5130 - Changes listener to register <all_urls> and filter non ws http requests (Closed)
Patch Set: pick nit, move changes to below high level bail out Created April 20, 2017, 8:04 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ext/background.js
===================================================================
--- a/ext/background.js
+++ b/ext/background.js
@@ -564,41 +564,48 @@
chrome.webRequest.onBeforeRequest.addListener(details =>
{
// The high-level code isn't interested in requests that aren't
// related to a tab or requests loading a top-level document,
// those should never be blocked.
if (details.tabId == -1 || details.type == "main_frame")
return;
+ // Filter out requests from non web protocols. Ideally, we'd explicitly
+ // specify the protocols we are interested in (i.e. http://, https://,
+ // ws:// and wss://) with the url patterns, given below, when adding this
+ // listener. But unfortunately, Chrome <=57 doesn't support the WebSocket
+ // protocol and is causing an error if it is given.
+ let url = new URL(details.url);
+ if (url.protocol != "http:" && url.protocol != "https:" &&
+ url.protocol != "ws:" && url.protocol != "wss:")
+ return;
+
// We are looking for the frame that contains the element which
// has triggered this request. For most requests (e.g. images) we
// can just use the request's frame ID, but for subdocument requests
// (e.g. iframes) we must instead use the request's parent frame ID.
let {frameId, type} = details;
if (type == "sub_frame")
{
frameId = details.parentFrameId;
type = "SUBDOCUMENT";
}
let frame = ext.getFrame(details.tabId, frameId);
if (frame)
{
let results = ext.webRequest.onBeforeRequest._dispatch(
- new URL(details.url),
- type.toUpperCase(),
- new Page({id: details.tabId}),
- frame
+ url, type.toUpperCase(), new Page({id: details.tabId}), frame
);
if (results.indexOf(false) != -1)
return {cancel: true};
}
- }, {urls: ["https://*/*", "http://*/*", "ws://*/*", "wss://*/*"]}, ["blocking"]);
+ }, {urls: ["<all_urls>"]}, ["blocking"]);
/* Message passing */
chrome.runtime.onMessage.addListener((message, rawSender, sendResponse) =>
{
let sender = {};
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld